diff --git a/src/Mods/SecExp/rebellionHandler.tw b/src/Mods/SecExp/rebellionHandler.tw index 616d38db20bbeb2f28c4b6e79be41262a52628ed..5d0e24adf5c79c1c3951534543c81ddc2e315cb9 100644 --- a/src/Mods/SecExp/rebellionHandler.tw +++ b/src/Mods/SecExp/rebellionHandler.tw @@ -117,7 +117,7 @@ <<set _morale += (App.SecExp.BaseDroneUnit.morale * $SecExp.units.bots.active + App.SecExp.BaseMilitiaUnit.morale * App.SecExp.battle.deployedUnits('militia') + App.SecExp.BaseSlaveUnit.morale * App.SecExp.battle.deployedUnits('slaves') + App.SecExp.BaseMercUnit.morale * App.SecExp.battle.deployedUnits('mercs') + App.SecExp.BaseSpecialForcesUnit.morale * $SF.Active) / ($SecExp.units.bots.active + App.SecExp.battle.deployedUnits('militia') + App.SecExp.battle.deployedUnits('slaves') + App.SecExp.battle.deployedUnits('mercs') + $SF.Active)>> <<set _morale += _morale * $SecExp.buildings.barracks ? $SecExp.buildings.barracks.luxury * 0.05 : 0>> /* barracks bonus */ <<set _morale *= _moraleTroopMod>> -<<set _baseHp = (App.SecExp.BaseDroneUnit.hp * $SecExp.units.bots.active + App.SecExp.BaseMilitiaUnit.hp * App.SecExp.battle.deployedUnits('militia') + App.SecExp.BaseSlaveUnit.hp * App.SecExp.battle.deployedUnits('slaves') + App.SecExp.BaseMercUnit.hp * App.SecExp.battle.deployedUnits('mercs') + App.SecExp.BaseSpecialForcesUnit.hp * $SF.Active) / ($SecExp.units.bots.active + App.SecExp.battle.deployedUnits('militia') + App.SecExp.battle.deployedUnits('slaves') + App.SecExp.battle.deployedUnits('mercs') + $SF.Active)>> +<<set _baseHp = (App.SecExp.BaseDroneUnit.hp * ($SecExp.units.bots.active ? $SecExp.units.bots.active : 0) + App.SecExp.BaseMilitiaUnit.hp * App.SecExp.battle.deployedUnits('militia') + App.SecExp.BaseSlaveUnit.hp * App.SecExp.battle.deployedUnits('slaves') + App.SecExp.BaseMercUnit.hp * App.SecExp.battle.deployedUnits('mercs') + App.SecExp.BaseSpecialForcesUnit.hp * $SF.Active) / (($SecExp.units.bots.active ? $SecExp.units.bots.active : 0) + App.SecExp.battle.deployedUnits('militia') + App.SecExp.battle.deployedUnits('slaves') + App.SecExp.battle.deployedUnits('mercs') + $SF.Active)>> /* calculates rebelling army stats */ <<if $week <= 30>> diff --git a/src/uncategorized/reRecruit.tw b/src/uncategorized/reRecruit.tw index 93cc40cb257e3fb6b984f35a17ccca58ea90b91d..f1996ce392fd9532ba4a5c2278029a1920905970 100644 --- a/src/uncategorized/reRecruit.tw +++ b/src/uncategorized/reRecruit.tw @@ -253,7 +253,8 @@ <<set _slave.prestigeDesc = "$He was a famous young musical prodigy known throughout both the old world and the Free Cities.">> <<set _slave.accent = 1>> <<case "desperate milf">> - <<set _pram = {minAge: $fertilityAge + $minimumSlaveAge, maxAge: Math.max(_pram.minAge,$retirementAge-2), ageOverridesPedoMode: 1, disableDisability: 1}>> + <<set _pram = {minAge: $fertilityAge + $minimumSlaveAge, ageOverridesPedoMode: 1, disableDisability: 1}>> + <<set _pram.maxAge = Math.max(_pram.minAge,$retirementAge-2)>> <<if $arcologies[0].FSSupremacistLawME === 1>> <<set _pram.race = $arcologies[0].FSSupremacistRace>> <<elseif $arcologies[0].FSSubjugationistLawME === 1>> diff --git a/src/uncategorized/seCoursing.tw b/src/uncategorized/seCoursing.tw index f2812566172894debb44acdef7b4f1808fbcab33..a24a1352f998eb7e5843aeca464692d56257f4a8 100644 --- a/src/uncategorized/seCoursing.tw +++ b/src/uncategorized/seCoursing.tw @@ -234,6 +234,7 @@ The rules have been explained to the hares: they're to be freed if they can reac </div> <</if>> /* 000-250-006 */ + The <<= ordinalSuffix(_sec + 1)>> <<if $origin == "virgin">> is an appealingly young _slave.race _girl2, and has V symbols drawn over _his2 cunt and on _his2 lower back, in the interests of fairness. _He2's a @@.pink;double virgin. @@<<if !canSee(_activeLurcher)>>To accommodate your blind lurcher, a bell is fastened around _his2 neck.<</if>> <<elseif $origin == "heavily pregnant">>