Skip to content

Fix scavenger trait r0.5 on trashed planets. #1548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
IntoxicatedPlatypus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix scavenger trait r0.5 on trashed planets. #1548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fea98fa
Fix scavenger trait r0.5 on trashed planets.
IntoxicatedPlatypus Jan 22, 2026
09757aa
Extract scavengerBonus into a function, cleanup scavenger behaviour
IntoxicatedPlatypus Feb 2, 2026
73cd30c
Minor fixes
IntoxicatedPlatypus Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 51 additions & 14 deletions src/jobs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { global, keyMultiplier, p_on, support_on, tmp_vars } from './vars.js';
import { vBind, clearElement, popover, darkEffect, eventActive, easterEgg, getHalloween } from './functions.js';
import { loc } from './locale.js';
import { highPopAdjust } from './prod.js';
import { racialTrait, servantTrait, races, traits, biomes, planetTraits, fathomCheck } from './races.js';
import { highPopAdjust, teamster } from './prod.js';
import { racialTrait, servantTrait, races, traits, biomes, planetTraits, fathomCheck, traitRank } from './races.js';
import { armyRating } from './civics.js';
import { govActive } from './governor.js';
import { craftingRatio, craftCost, craftingPopover } from './resources.js';
Expand Down Expand Up @@ -155,18 +155,10 @@ export const job_desc = {
}
return desc;
},
scavenger: function(servant){
let scavenger = traits.scavenger.vars()[0];
if (global.city.ptrait.includes('trashed') && global.race['scavenger']){
scavenger *= 1 + (traits.scavenger.vars()[1] / 100);
}
if (global.race['high_pop'] && !servant){
scavenger *= traits.high_pop.vars()[1] / 100;
}
if (!servant){
scavenger = +workerScale(scavenger,'scavenger').toFixed(2);
}
let desc = loc('job_scavenger_desc',[races[global.race.species].home,scavenger]);
scavenger: function(servant) {
let bonus = scavengerBonus(servant).toFixed(2);

let desc = loc('job_scavenger_desc',[races[global.race.species].home, bonus]);
if (global.civic.d_job === 'scavenger' && !servant){
desc = desc + ' ' + loc('job_default',[jobName('scavenger')]);
}
Expand Down Expand Up @@ -410,6 +402,51 @@ export function defineJobs(define){
}
}

export function scavengerBonus(servant = false){
if (!servant) {
let rank = 0;
if (global.race['scavenger']) {
rank = traitRank('scavenger');
}
if (global.city.ptrait.includes('trashed') && rank < 1) {
rank = 1;
}

let bonus = traits.scavenger.vars(rank)[0];
bonus = workerScale(bonus, 'scavenger');
if (global.city.ptrait.includes('trashed') && global.race['scavenger']){
bonus *= 1 + (traits.scavenger.vars()[1] / 100);
}
if (global.city.ptrait.includes('trashed')){
bonus *= planetTraits.trashed.vars()[1];
}
bonus = highPopAdjust(bonus);
if (global.race['gravity_well']){
bonus = teamster(bonus);
}

return bonus;
}
else {
let rank = 1;
if (global.race['scavenger']) {
let scavRank = traitRank('scavenger');
if (scavRank > rank)
rank = scavRank;
}

let bonus = traits.scavenger.vars(rank)[0];
if (global.city.ptrait.includes('trashed') && global.race['scavenger']){
bonus *= 1 + (traits.scavenger.vars()[1] / 100);
}
if (global.city.ptrait.includes('trashed')){
bonus *= planetTraits.trashed.vars()[1];
}
bonus *= servantTrait(global.race.servants.jobs.scavenger ?? 0, 'scavenger');
return bonus;
}
}

export function workerScale(num,job){
if (global.race['strong'] && ['hunter','forager','farmer','lumberjack','quarry_worker','crystal_miner','scavenger'].includes(job)){
num *= traits.strong.vars()[1];
Expand Down
25 changes: 9 additions & 16 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { global, save, seededRandom, webWorker, intervals, keyMap, atrack, resiz
import { loc } from './locale.js';
import { unlockAchieve, checkAchievements, drawAchieve, alevel, universeAffix, challengeIcon, unlockFeat, checkAdept } from './achieve.js';
import { gameLoop, vBind, popover, clearPopper, flib, tagEvent, timeCheck, arpaTimeCheck, timeFormat, powerModifier, resetResBuffer, modRes, initMessageQueue, messageQueue, calc_mastery, calcPillar, darkEffect, calcQueueMax, calcRQueueMax, buildQueue, shrineBonusActive, getShrineBonus, eventActive, easterEggBind, trickOrTreatBind, powerGrid, deepClone, addATime, exceededATimeThreshold, loopTimers, calcQuantumLevel, drawPet } from './functions.js';
import { races, traits, racialTrait, orbitLength, servantTrait, randomMinorTrait, biomes, planetTraits, shapeShift, fathomCheck, blubberFill, cleanRemoveTrait } from './races.js';
import { races, traits, racialTrait, orbitLength, servantTrait, randomMinorTrait, biomes, planetTraits, shapeShift, fathomCheck, blubberFill, cleanRemoveTrait, traitRank } from './races.js';
import { defineResources, resource_values, spatialReasoning, craftCost, plasmidBonus, faithBonus, faithTempleCount, tradeRatio, craftingRatio, crateValue, containerValue, tradeSellPrice, tradeBuyPrice, atomic_mass, supplyValue, galaxyOffers } from './resources.js';
import { defineJobs, job_desc, loadFoundry, farmerValue, jobName, jobScale, workerScale, limitCraftsmen, loadServants} from './jobs.js';
import {defineJobs, job_desc, loadFoundry, farmerValue, jobName, jobScale, workerScale, limitCraftsmen, loadServants, scavengerBonus } from './jobs.js';
import { defineIndustry, f_rate, manaCost, setPowerGrid, gridEnabled, gridDefs, nf_resources, replicator, luxGoodPrice, smelterUnlocked, smelterFuelConfig, setupRituals, maxRitualNum, ritual_types } from './industry.js';
import { checkControlling, garrisonSize, armyRating, govTitle, govCivics, govEffect, weaponTechModifer } from './civics.js';
import { actions, updateDesc, checkTechRequirements, drawEvolution, BHStorageMulti, storageMultipler, checkAffordable, checkPowerRequirements, drawCity, drawTech, gainTech, housingLabel, updateQueueNames, wardenLabel, planetGeology, resQueue, bank_vault, start_cataclysm, orbitDecayed, postBuild, skipRequirement, structName, templeCount, initStruct, casino_vault, casinoEarn, doCallbacks, cLabels } from './actions.js';
Expand Down Expand Up @@ -1032,21 +1032,14 @@ function fastLoop(){
global_multiplier *= 1 + (bonus / 100);
}
if ((global.city.ptrait.includes('trashed') || global.race['scavenger'] || (global.race['servants'] && global.race.servants['force_scavenger'])) && global.civic['scavenger']){
let scavenger = global.city.ptrait.includes('trashed') || global.race['scavenger'] ? workerScale(global.civic.scavenger.workers,'scavenger') : 0;
if (global.race['servants']){ scavenger += jobScale(global.race.servants.jobs.scavenger); }
let popScavenger = workerScale(global.civic.scavenger.workers,'scavenger') * scavengerBonus(false);
let servantScavenger = global.race['servants'] ? global.race.servants.jobs.scavenger * scavengerBonus(true) : 0;

let scavenger = popScavenger + servantScavenger;

if (scavenger > 0){
let bonus = (scavenger * traits.scavenger.vars()[0]);
if (global.city.ptrait.includes('trashed') && global.race['scavenger']){
bonus *= 1 + (traits.scavenger.vars()[1] / 100);
}
if (global.city.ptrait.includes('trashed')){
bonus *= planetTraits.trashed.vars()[1];
}
if (global.race['high_pop']){
bonus = highPopAdjust(bonus);
}
breakdown.p['Global'][jobName('scavenger')] = bonus+'%';
global_multiplier *= 1 + (bonus / 100);
breakdown.p['Global'][jobName('scavenger')] = scavenger+'%';
global_multiplier *= 1 + (scavenger / 100);
}
}
if (global.race['unfathomable'] && global.city['surfaceDwellers'] && global.city['captive_housing']){
Expand Down