diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index de7ab53cea5149135b343d761255142a95c24983..1a09610664d5e14de588626ad7abce1d74468fff 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -1,5 +1,16 @@ Pregmod +0.10.7.1-1.5.x + + 0 + -fixed cloning + -added an ovary implant to boost fertility + -added an ovary implant to that doubles ovulation + -added an ovary implant that forces asexual reproduction + -resetting a slave in starting girls no longer wipes origins + -various code clean up + -fixes + 0.10.7.1-1.4.x 12/28/2018 diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt index e11a87022dce5295ef5b34b25f2b4c6afd185054..b272ec3d15cd9c4013699fe6f6bb7c90e39384f7 100644 --- a/devNotes/twine JS.txt +++ b/devNotes/twine JS.txt @@ -1582,6 +1582,10 @@ window.setPregType = function(actor) { ovum = Math.clamp(ovum, 0, 8); } else if(actor.pregType == 0) { ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins + if(actor.ovaImplant == "fertility") { + ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); + fertilityStack++; + } if(actor.hormones == 2) { ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]); fertilityStack++; @@ -1619,9 +1623,17 @@ window.setPregType = function(actor) { } else { ovum += jsRandom(0, fertilityStack); } + if(actor.ovaImplant == "sympathy") { + ovum *= 2; + } } else { ovum += jsRandom(0, fertilityStack); - if(ovum > 12) { + if(actor.ovaImplant == "sympathy") { + ovum *= 2; + if(ovum > 12) { + ovum = jsEither([10, 12]); + } + } else if(ovum > 12) { ovum = jsRandom(6, 12); } } @@ -2051,7 +2063,7 @@ window.getCost = function(array) { secExpCost += State.variables.propHubUpkeep; } if(State.variables.secHQ > 0) { - secExpCost += State.variables.secHQUpkeep + 20 * state.variables.secHelots; + secExpCost += State.variables.secHQUpkeep + 20 * State.variables.secMenials; } if(State.variables.secBarracks > 0) { secExpCost += State.variables.secBarracksUpkeep; @@ -2120,7 +2132,7 @@ window.getCost = function(array) { } if(State.variables.citizenRetirementMenials == 1) { - costs += State.variables.helots * 2; + costs += State.variables.menials * 2; } costs += State.variables.FSSpending; @@ -9355,21 +9367,21 @@ window.MenialPopCap = function MenialPopCap () { popCap += 500; } } - let overMenialCap = V.helots + V.fuckdolls + V.menialBioreactors - popCap; + let overMenialCap = V.menials + V.fuckdolls + V.menialBioreactors - popCap; if (overMenialCap > 0) { let price = menialSlaveCost(-overMenialCap); - if (V.helots > 0) { - if (V.helots > overMenialCap) { + if (V.menials > 0) { + if (V.menials > overMenialCap) { V.cash += overMenialCap * price; V.menialDemandFactor -= overMenialCap; - V.helots -= overMenialCap; + V.menials -= overMenialCap; overMenialCap = 0; r += "You don't have enough room for all your menials and are obliged to sell some."; } else { - V.cash += V.helots * price; - V.menialDemandFactor -= V.helots; - overMenialCap -= V.helots; - V.helots = 0; + V.cash += V.menials * price; + V.menialDemandFactor -= V.menials; + overMenialCap -= V.menials; + V.menials = 0; r += "You don't have enough room for your menials and are obliged to sell them."; } } @@ -11416,11 +11428,12 @@ window.WombImpregnateClone = function(actor, fCount, mother, motherOriginal, age State.variables.missingParentID--; } if (mother.mother === 0 || (mother.mother < -1 && mother.mother >= -20 && mother.mother !== -3)) { - mother.father = State.variables.missingParentID; + mother.mother = State.variables.missingParentID; State.variables.missingParentID--; } //gene corrections + tf.fatherID = -7; tf.genetics.gender = mother.genes; tf.genetics.mother = mother.mother; tf.genetics.father = mother.father; @@ -11445,6 +11458,7 @@ window.WombImpregnateClone = function(actor, fCount, mother, motherOriginal, age if (actor.womb.length == 0) { actor.pregWeek = age; actor.preg = age; + actor.pregSource = -7; } actor.womb.push(tf); } catch(err){ @@ -35597,7 +35611,7 @@ window.SFInit = function() { V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""}; V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0}; V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0}; - V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}; + V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0}; V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1; V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]}; }; @@ -35642,8 +35656,8 @@ window.SFBC = function() { delete V.CurrentTradeShowAttendance; delete V.TradeShowIncome; delete V.TotalTradeShowIncome; - delete V.TradeShowHelots; - delete V.TotalTradeShowHelots; + delete V.TradeShowMenials; + delete V.TotalTradeShowMenials; } function Units() { delete V.securityForcePersonnel; @@ -35695,15 +35709,23 @@ window.SFBC = function() { if (V.TradeShowIncome === undefined) V.TradeShowIncome = 0; if (V.TotalTradeShowIncome === undefined) V.TotalTradeShowIncome = 0; - if (V.TradeShowHelots === undefined) V.TradeShowHelots = 0; - if (V.TotalTradeShowHelots === undefined) V.TotalTradeShowHelots = 0; + if (V.TradeShowMenials === undefined) V.TradeShowMenials = 0; + if (typeof V.TradeShowHelots !== 'undefined' || V.TradeShowHelots !== null) { + V.TradeShowHelots = undefined; + delete(V.TradeShowHelots); + } + if (V.TotalTradeShowMenials === undefined) V.TotalTradeShowMenials = 0; + if (typeof V.TotalTradeShowHelots !== 'undefined' || V.TotalTradeShowHelots !== null) { + V.TotalTradeShowHelots = undefined; + delete(V.TotalTradeShowHelots); + } V.SF.MercCon = { History:V.OverallTradeShowAttendance, CanAttend:V.CurrentTradeShowAttendance, Income:V.TradeShowIncome, Revenue:V.TotalTradeShowIncome, - Helots:V.TradeShowHelots, - TotalHelots:V.TotalTradeShowHelots, + Menials:V.TradeShowMenials, + TotalMenials:V.TotalTradeShowMenials, Mercs:0, TotalMercs:0}; TradeShow(); if (V.SF.MercCon.History > 0) V.SF.MercCon.View = 1; @@ -35741,7 +35763,7 @@ window.SFBC = function() { V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0}; V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1; V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0}; - V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}; + V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0}; if (V.securityForceName) { Init(); Main(); Colonel(); TradeShow(); Units(); } @@ -35820,7 +35842,7 @@ window.BadOutcome = function() { case "Cruel": V.SF.BadOutcome = "Revolt",V.trinkets.push("${t} dog tags"),V.Rep = 0, V.cash -= 10000,V,arcologies[0].prosperity -= 50,V.ASlaves = 49, - V.ACitizens = 751,V.helots = 0, V.researchLab.menials = 0, + V.ACitizens = 751,V.menials = 0, V.researchLab.menials = 0, V.researchLab.hired = 0, V.fuckdolls = 0,V.menialBioreactors = 0, V.activeUnits = 0,V.secBots.troops = 0, V.createdSlavesUnits = 0, V.createdMilitiaUnits = 0, V.createdMercUnits = 0; @@ -35843,7 +35865,7 @@ window.BadOutcome = function() { break; case "Kind": V.SF.BadOutcome = "Exodus",V.trinkets.push("${t} gift card"), - V.Cash += 55000,V.helots += 73; + V.Cash += 55000,V.menials += 73; r += `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`; r += `<br>At midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`; r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about 55,000# of miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavilion, you see a white gift card standing upright.`; @@ -37811,9 +37833,9 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() { V.disasterResponse = Math.clamp(+V.disasterResponse, 0, 2) || 0; V.GDP = Math.max(+V.GDP, 1) || 278.6; V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0; - V.helots = Math.max(+V.helots, 0) || 0; - V.fuckdolls = Math.max(+V.fuckdolls , 0) || 0; - V.menialBioreactors = Math.max(+V.menialBioreactors , 0) || 0; + V.menials = Math.max(+V.menials, 0) || 0; + V.fuckdolls = Math.max(+V.fuckdolls, 0) || 0; + V.menialBioreactors = Math.max(+V.menialBioreactors, 0) || 0; V.foodCost = Math.trunc(2500/V.economy); V.drugsCost = Math.trunc(10000/V.economy); diff --git a/slave variables documentation - Pregmod.txt b/slave variables documentation - Pregmod.txt index ad48108bcd786ac73319f09b1d629094c61af43e..6f5d1763cac0258afa0a58569f5466db3fb5a41c 100644 --- a/slave variables documentation - Pregmod.txt +++ b/slave variables documentation - Pregmod.txt @@ -1778,14 +1778,14 @@ readyOva: Number of ready to be impregnated ova (override normal cases), default - 0. For delayed impregnations with multiples. Used onetime on next call of the SetPregType widget. After SetPregType use it to override .pregType, it set back to 0 automatically. -ovaImplant: (future usage) +ovaImplant: -Ovary implant state and type. +Ovary implant type. --1 - present, suppress natural superfetation (normalize slave with natural superfetation), still allow partial birth. -0 - no implant -1 - artificial superfetation and partial birth support. -2 - ova release on orgasm and partial birth support. +0 - no implants +"fertility" - higher chance of twins (or more) +"sympathy" - doubles eggs released +"asexual" - self-fertilizing wombImplant: diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw index 8d485753311eed8d65d808a04ba0bb031a236ffa..3ec837428ca8e9b61e8137abd4dc0cf346401452 100644 --- a/src/SecExp/SecExpBackwardCompatibility.tw +++ b/src/SecExp/SecExpBackwardCompatibility.tw @@ -258,11 +258,13 @@ <<if ndef $secBarracksUpgrades.loyaltyMod>> <<set $secBarracksUpgrades.loyaltyMod = 0>> <</if>> -<<if ndef $secHelots>> - <<set $secHelots = 0>> +<<if ndef $secMenials>> + <<set $secMenials = $secHelots || 0>> + <<unset $secHelots>> <</if>> -<<if ndef $reqHelots>> - <<set $reqHelots = 20>> +<<if ndef $reqMenials>> + <<set $reqMenials = $reqHelots || 20>> + <<unset $reqHelots>> <</if>> <<if ndef $secUpgrades >> <<set $secUpgrades = { @@ -361,8 +363,9 @@ <<if ndef $brainImplantProject>> <<set $brainImplantProject = 0>> <</if>> -<<if ndef $weapHelots>> - <<set $weapHelots = 0>> +<<if def $weapHelots>> + <<set $weapMenials = $weapHelots || 0>> + <<unset $weapHelots>> <</if>> <<if ndef $weapManu>> <<set $weapManu = 0>> @@ -1003,7 +1006,7 @@ <<fixBrokenFS>> <<recalcSecRestPoint>> <<recalcCrimeCap>> -<<recalcReqHelots>> +<<recalcReqMenials>> <<recalcManpower>> <<recalcEdictsUpkeep>> <<recalcBaseStats>> diff --git a/src/SecExp/attackHandler.tw b/src/SecExp/attackHandler.tw index 8ef5463833342212ceecc2b58572c5b051e64eba..a196d0af7409b655ce67ed41b341e7bb471a599b 100644 --- a/src/SecExp/attackHandler.tw +++ b/src/SecExp/attackHandler.tw @@ -242,7 +242,7 @@ <<set _mercMod += 0.10>> <<set _SFMod += 0.10>> <</if>> - <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>> + <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>> <<set _atkMod += 0.25>> <<set _defMod += 0.25>> <<set _tacChance += 0.50>> @@ -250,7 +250,7 @@ <<set _atkMod += 0.20>> <<set _defMod += 0.15>> <<set _tacChance += 0.35>> - <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>> + <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>> <<set _atkMod += 0.15>> <<set _defMod += 0.10>> <<set _tacChance += 0.25>> @@ -258,7 +258,7 @@ <<set _atkMod += 0.10>> <<set _defMod += 0.10>> <<set _tacChance += 0.20>> - <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>> + <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>> <<set _atkMod += 0.10>> <<set _defMod += 0.05>> <<set _tacChance += 0.15>> @@ -266,7 +266,7 @@ <<set _atkMod += 0.5>> <<set _defMod += 0.05>> <<set _tacChance += 0.10>> - <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>> + <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>> <<set _atkMod -= 0.15>> <<set _defMod -= 0.15>> <<set _tacChance -= 0.30>> @@ -274,7 +274,7 @@ <<set _atkMod -= 0.15>> <<set _defMod -= 0.10>> <<set _tacChance -= 0.25>> - <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>> + <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>> <<set _atkMod -= 0.10>> <<set _defMod -= 0.10>> <<set _tacChance -= 0.20>> @@ -370,7 +370,7 @@ <<set _mercMod += 0.10>> <<set _SFMod += 0.10>> <</if>> - <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>> + <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>> <<set _atkMod += 0.25>> <<set _defMod += 0.25>> <<set _tacChance += 0.50>> @@ -378,7 +378,7 @@ <<set _atkMod += 0.20>> <<set _defMod += 0.15>> <<set _tacChance += 0.35>> - <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>> + <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>> <<set _atkMod += 0.15>> <<set _defMod += 0.10>> <<set _tacChance += 0.25>> @@ -386,7 +386,7 @@ <<set _atkMod += 0.10>> <<set _defMod += 0.10>> <<set _tacChance += 0.20>> - <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>> + <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>> <<set _atkMod += 0.10>> <<set _defMod += 0.05>> <<set _tacChance += 0.15>> @@ -394,7 +394,7 @@ <<set _atkMod += 0.05>> <<set _defMod += 0.05>> <<set _tacChance += 0.10>> - <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>> + <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>> <<set _atkMod -= 0.15>> <<set _defMod -= 0.15>> <<set _tacChance -= 0.30>> @@ -402,7 +402,7 @@ <<set _atkMod -= 0.15>> <<set _defMod -= 0.10>> <<set _tacChance -= 0.25>> - <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>> + <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>> <<set _atkMod -= 0.10>> <<set _defMod -= 0.10>> <<set _tacChance -= 0.20>> diff --git a/src/SecExp/attackReport.tw b/src/SecExp/attackReport.tw index 5db8b0df4bd59020a3ca07fb0a18629879768f11..9c7ca95b8bb59e952070133117df93069c4846c3 100644 --- a/src/SecExp/attackReport.tw +++ b/src/SecExp/attackReport.tw @@ -463,7 +463,7 @@ <<set $lowerClass -= random(100) * _majorBattleMod>> <<set _lostSlaves = random(150) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5) * _majorBattleMod>> @@ -471,7 +471,7 @@ <<set $lowerClass -= random(120) * _majorBattleMod>> <<set _lostSlaves = random(170) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10) * _majorBattleMod>> @@ -479,7 +479,7 @@ <<set $lowerClass -= random(140) * _majorBattleMod>> <<set _lostSlaves = random(190) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(15) * _majorBattleMod>> @@ -487,7 +487,7 @@ <<set $lowerClass -= random(160) * _majorBattleMod>> <<set _lostSlaves = random(210) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(20) * _majorBattleMod>> @@ -495,7 +495,7 @@ <<set $lowerClass -= random(180) * _majorBattleMod>> <<set _lostSlaves = random(230) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(25) * _majorBattleMod>> @@ -547,7 +547,7 @@ <<set $lowerClass -= random(10) * _majorBattleMod>> <<set _lostSlaves = random(20) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<elseif $battleResult == -2>> @@ -573,7 +573,7 @@ <<set $lowerClass -= random(50) * _majorBattleMod>> <<set _lostSlaves = random(75) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(2) * _majorBattleMod>> @@ -581,7 +581,7 @@ <<set $lowerClass -= random(60) * _majorBattleMod>> <<set _lostSlaves = random(85) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5) * _majorBattleMod>> @@ -589,7 +589,7 @@ <<set $lowerClass -= random(70) * _majorBattleMod>> <<set _lostSlaves = random(95) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(7) * _majorBattleMod>> @@ -597,7 +597,7 @@ <<set $lowerClass -= random(80) * _majorBattleMod>> <<set _lostSlaves = random(105) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10) * _majorBattleMod>> @@ -605,7 +605,7 @@ <<set $lowerClass -= random(90) * _majorBattleMod>> <<set _lostSlaves = random(115) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(12) * _majorBattleMod>> @@ -632,7 +632,7 @@ <<set $lowerClass -= random(80) * _majorBattleMod>> <<set _lostSlaves = random(120) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5) * _majorBattleMod>> @@ -640,7 +640,7 @@ <<set $lowerClass -= random(100) * _majorBattleMod>> <<set _lostSlaves = random(140) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10) * _majorBattleMod>> @@ -648,7 +648,7 @@ <<set $lowerClass -= random(120) * _majorBattleMod>> <<set _lostSlaves = random(160) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(15) * _majorBattleMod>> @@ -656,7 +656,7 @@ <<set $lowerClass -= random(140) * _majorBattleMod>> <<set _lostSlaves = random(180) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(20) * _majorBattleMod>> @@ -664,7 +664,7 @@ <<set $lowerClass -= random(160) * _majorBattleMod>> <<set _lostSlaves = random(200) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(25) * _majorBattleMod>> @@ -692,7 +692,7 @@ <<set $lowerClass -= random(80) * _majorBattleMod>> <<set _lostSlaves = random(120) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5) * _majorBattleMod>> @@ -700,7 +700,7 @@ <<set $lowerClass -= random(100) * _majorBattleMod>> <<set _lostSlaves = random(140) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10) * _majorBattleMod>> @@ -708,7 +708,7 @@ <<set $lowerClass -= random(120) * _majorBattleMod>> <<set _lostSlaves = random(160) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(15) * _majorBattleMod>> @@ -716,7 +716,7 @@ <<set $lowerClass -= random(140) * _majorBattleMod>> <<set _lostSlaves = random(180) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(20) * _majorBattleMod>> @@ -724,7 +724,7 @@ <<set $lowerClass -= random(160) * _majorBattleMod>> <<set _lostSlaves = random(200) * _majorBattleMod, $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(25) * _majorBattleMod>> @@ -988,23 +988,23 @@ Your soldiers <<if $deployingSlaves == 1>>however,<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. <</if>> <</if>> - <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>> + <<if (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>> With her experience and her great intellect, she is able to exploits the smallest of tactical advantages, making your troops very effective. <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 95>> While she lacks experience, her great intellect allows her to seize and exploit any tactical advantage the battlefield offers her. - <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>> + <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>> Having both the experience and the intelligence, she performs admirably as your commander. Her competence greatly increases the efficiency of your troops. <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 50>> Despite not having a lot of experience as a leader, her intelligence makes her a good commander, increasing the efficiency of your troops. - <<elseif setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>> + <<elseif (setup.bodyguardCareers.includes($Bodyguard.career) || setup.HGCareers.includes($Bodyguard.career) || setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) && $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>> Thanks to her experience, she is a decent commander, competently guiding your troops through the battle. <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant > 15>> Lacking experience, her performance as a commander is rather forgettable. - <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>> + <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>> Despite the experience she accumulated during her past career, her very low intelligence is a great disadvantage for your troops. <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -50>> Without experience and low intelligence, she performs horribly as a commander, greatly affecting your troops. - <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>> + <<elseif !(setup.bodyguardCareers.includes($Bodyguard.career) && setup.HGCareers.includes($Bodyguard.career) && setup.secExCombatPrestige.includes($Bodyguard.prestigeDesc)) || $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>> Despite the experience she accumulated during her past career, she lacks the intelligence to apply it quickly and effectively, making for a rather poor performance in the field. <<elseif $Bodyguard.intelligence+$Bodyguard.intelligenceImplant < -15>> She lacks the experience and the intelligence to be an effective commander, the performance of your troops suffers because of her poor leadership. @@ -1124,23 +1124,23 @@ Your soldiers <<if $deployingSlaves == 1>>however<</if>> are not enthusiastic to have a slave as a commander, but they trust you enough not to question your decision. <</if>> <</if>> - <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>> + <<if (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>> With her experience and her great intellect, she is able to exploits the smallest of tactical advantages, making your troops greatly effective. <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 95>> While she lacks experience, her great intellect allows her to seize and exploit any tactical advantage the battlefield offers her. - <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>> + <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>> Having both the experience and the intelligence, she performs admirably as your commander. Her competence greatly increases the efficiency of your troops. <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 50>> Despite not having a lot of experience as a leader, her intelligence makes her a good commander, increasing the efficiency of your troops. - <<elseif setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>> + <<elseif (setup.bodyguardCareers.includes($HeadGirl.career) || setup.HGCareers.includes($HeadGirl.career) || setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) && $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>> Thanks to her experience, she is a decent commander, competently guiding your troops through the battle. <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant > 15>> Lacking experience her performance as a commander is rather forgettable. - <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>> + <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>> Despite the experience she accumulated during her past career, her very low intelligence is a great disadvantage for your troops. <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -50>> Without experience and low intelligence, she performs horribly as a commander, greatly affecting your troops. - <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>> + <<elseif !(setup.bodyguardCareers.includes($HeadGirl.career) && setup.HGCareers.includes($HeadGirl.career) && setup.secExCombatPrestige.includes($HeadGirl.prestigeDesc)) || $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>> Despite the experience she accumulated during her past career, she lacks the intelligence to apply it quickly and effectively, making for a rather poor performance in the field. <<elseif $HeadGirl.intelligence+$HeadGirl.intelligenceImplant < -15>> She lacks the experience and the intelligence to be an effective commander, the performance of your troops suffers because of her poor leadership. @@ -1562,7 +1562,7 @@ <</link>> | <<link "Keep them as menial slaves">> - <<set $helots += _captives>> + <<set $menials += _captives>> <<replace "#captOptions">>Captives added as menial slaves<</replace>> <</link>> </span> diff --git a/src/SecExp/edicts.tw b/src/SecExp/edicts.tw index e4d33710c7006521ec6d003c9b272c8ca2dbd49e..32a7318a0babe670098bfc66591430c7ca7d5671 100644 --- a/src/SecExp/edicts.tw +++ b/src/SecExp/edicts.tw @@ -48,19 +48,19 @@ <br><br>__Special Force:__ <<if $SFSupportLevel === 1>> <br>''Equipment provision:'' $SF.Caps is providing the security HQ with advanced equipment, boosting its efficiency. - [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 1000, $reqHelots += 5]] + [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 1000, $reqMenials += 5]] <<elseif $SFSupportLevel === 2>> <br>''Personnel training:'' $SF.Caps is currently providing advanced equipment and training to security HQ personnel. - [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 2000, $reqHelots += 5]] + [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 2000, $reqMenials += 5]] <<elseif $SFSupportLevel === 3>> <br>''Troops detachment:'' $SF.Caps has currently transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. - [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]] + [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqMenials += 5]] <<elseif $SFSupportLevel === 4>> <br>''Full support:''$SF.Caps is currently providing its full support to the security department, while transferring troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. - [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqHelots += 5]] + [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 3000, $reqMenials += 5]] <<elseif $SFSupportLevel === 5>> <br>''Network assistance:''$SF.Caps is currently assisting with a local install of its custom network full support and has transferred troops to the security department HQ in addition to providing advanced equipment and training to security HQ personnel. - [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 4000, $secHQUpkeep -= 1000, $reqHelots += 5]] + [[Repeal|edicts][$SFSupportLevel--, $SFSupportUpkeep -= 4000, $secHQUpkeep -= 1000, $reqMenials += 5]] <</if>> <</if>> @@ -309,42 +309,42 @@ <<if $SF.Toggle && $SF.Active >= 1 && $SFSupportLevel < 5>> <br><br>__Special Force:__ - <<if !$SFSupportLevel && $reqHelots > 5>> + <<if !$SFSupportLevel && $reqMenials > 5>> <br>''Equipment provision:'' $SF.Caps will provide the security HQ with advanced equipment. <<if $authority >= 1000>> - [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 1000, $reqHelots -= 5]] + [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 1000, $reqMenials -= 5]] <<else>> <br>//Not enough Authority.// <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by 5, but will incur upkeep costs.// - <<elseif $SFSupportLevel && $SF.Squad.Firebase >= 4 && $reqHelots > 5>> + <<elseif $SFSupportLevel && $SF.Squad.Firebase >= 4 && $reqMenials > 5>> <br>''Personnel training:'' $SF.Caps will provide the security HQ personnel with advanced training. <<if $authority >= 1000>> - [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 2000, $reqHelots -= 5]] + [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 2000, $reqMenials -= 5]] <<else>> <br>//Not enough Authority.// <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.// - <<elseif $SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && $reqHelots > 5>> + <<elseif $SFSupportLevel === 2 && $SF.Squad.Firebase >= 6 && $reqMenials > 5>> <br>''Troops detachment:'' $SF.Caps will provide troops to the security department. <<if $authority >= 1000>> - [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]] + [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqMenials -= 5]] <<else>> <br>//Not enough Authority.// <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.// - <<elseif $SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && $reqHelots > 5>> + <<elseif $SFSupportLevel === 3 && $SF.Squad.Firebase >= 6 && $reqMenials > 5>> <br>''Full Support:'' $SF.Caps will give the security department its full support. <<if $authority >= 1000>> - [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqHelots -= 5]] + [[Implement|edicts][$SFSupportLevel++, $cash -=5000, $authority -= 1000, $SFSupportUpkeep += 3000, $reqMenials -= 5]] <<else>> <br>//Not enough Authority.// <</if>> <br> //Will lower the amount of personnel necessary to man the security HQ by a further 5, but will incur additional upkeep costs.// - <<elseif $SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && $reqHelots > 5>> + <<elseif $SFSupportLevel === 4 && $SF.Squad.Firebase === 10 && $reqMenials > 5>> <br>''Network assistance:'' $SF.Caps will assist the security department with installing a local version of their custom network. <<if $authority >= 1000>> - [[Implement|edicts][$SFSupportLevel++, $cash -=50000, $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqHelots -= 5]] + [[Implement|edicts][$SFSupportLevel++, $cash -=50000, $authority -= 1000, $SFSupportUpkeep += 4000, $secHQUpkeep += 1000, $reqMenials -= 5]] <<else>> <br>//Not enough Authority.// <</if>> diff --git a/src/SecExp/rebellionReport.tw b/src/SecExp/rebellionReport.tw index dea4677f6461fcd43ec1363ce910cc75efcc20ba..50974a9a53724500d661e61b59335acf3b380d8d 100644 --- a/src/SecExp/rebellionReport.tw +++ b/src/SecExp/rebellionReport.tw @@ -92,7 +92,7 @@ More units were able to survive thanks to wearing $SF.Lower's combat armor suits. <</if>> <<set $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * $enemyLosses), - $helots -= Math.trunc(($helots / $ASlaves) * $enemyLosses), + $menials -= Math.trunc(($menials / $ASlaves) * $enemyLosses), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * $enemyLosses), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * $enemyLosses)>> <<if $battleResult == 3>> @@ -134,7 +134,7 @@ <<set $lowerClass -= random(50,100)>> <<set _lostSlaves = Math.trunc(($attackTroops - $enemyLosses) * 0.8), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $rebelDefeatAftermath = 5>> @@ -146,7 +146,7 @@ <<set $lowerClass -= random(40,80)>> <<set _lostSlaves = Math.trunc(($attackTroops - $enemyLosses) * 0.8), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $rebelDefeatAftermath = 3>> @@ -167,7 +167,7 @@ <<set $lowerClass -= random(100)>> <<set _lostSlaves = random(150), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5)>> @@ -175,7 +175,7 @@ <<set $lowerClass -= random(120)>> <<set _lostSlaves = random(170), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10)>> @@ -183,7 +183,7 @@ <<set $lowerClass -= random(140)>> <<set _lostSlaves = random(190), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(15)>> @@ -191,7 +191,7 @@ <<set $lowerClass -= random(160)>> <<set _lostSlaves = random(210), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(20)>> @@ -199,7 +199,7 @@ <<set $lowerClass -= random(180)>> <<set _lostSlaves = random(230), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(25)>> @@ -208,7 +208,7 @@ <<set $lowerClass -= random(50,100)>> <<set _lostSlaves = Math.trunc(($attackTroops - $enemyLosses) * 0.8), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $rebelDefeatAftermath = 5>> @@ -224,7 +224,7 @@ More units were able to survive thanks to wearing $SF.Lower's combat armor suits. <</if>> <<set $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * $enemyLosses), - $helots -= Math.trunc(($helots / $ASlaves) * $enemyLosses), + $menials -= Math.trunc(($menials / $ASlaves) * $enemyLosses), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * $enemyLosses), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * $enemyLosses)>> <<if $battleResult == 3>> @@ -273,7 +273,7 @@ <<set $lowerClass -= random(40,80)>> <<set _lostSlaves = Math.trunc(($attackTroops - $enemyLosses) * 0.6), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $rebelDefeatAftermath = 3>> @@ -294,7 +294,7 @@ <<set $lowerClass -= random(100)>> <<set _lostSlaves = random(150), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5)>> @@ -302,7 +302,7 @@ <<set $lowerClass -= random(120)>> <<set _lostSlaves = random(170), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10)>> @@ -310,7 +310,7 @@ <<set $lowerClass -= random(140)>> <<set _lostSlaves = random(190), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(15)>> @@ -318,7 +318,7 @@ <<set $lowerClass -= random(160)>> <<set _lostSlaves = random(210), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(20)>> @@ -326,7 +326,7 @@ <<set $lowerClass -= random(180)>> <<set _lostSlaves = random(230), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(25)>> @@ -335,7 +335,7 @@ <<set $lowerClass -= random(50,100)>> <<set _lostSlaves = Math.trunc(($attackTroops - $enemyLosses) * 0.8), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $rebelDefeatAftermath = 5>> @@ -352,7 +352,7 @@ <<set $lowerClass -= random(40)>> <<set _lostSlaves = random(65), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(2)>> @@ -360,7 +360,7 @@ <<set $lowerClass -= random(50)>> <<set _lostSlaves = random(75), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5)>> @@ -368,7 +368,7 @@ <<set $lowerClass -= random(60)>> <<set _lostSlaves = random(85), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(7)>> @@ -376,7 +376,7 @@ <<set $lowerClass -= random(70)>> <<set _lostSlaves = random(95), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10)>> @@ -384,7 +384,7 @@ <<set $lowerClass -= random(80)>> <<set _lostSlaves = random(105), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(12)>> @@ -397,7 +397,7 @@ <<set $lowerClass -= random(60)>> <<set _lostSlaves = random(85), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(4)>> @@ -405,7 +405,7 @@ <<set $lowerClass -= random(70)>> <<set _lostSlaves = random(95), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(7)>> @@ -413,7 +413,7 @@ <<set $lowerClass -= random(80)>> <<set _lostSlaves = random(105), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(9)>> @@ -421,7 +421,7 @@ <<set $lowerClass -= random(90)>> <<set _lostSlaves = random(115), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(12)>> @@ -429,7 +429,7 @@ <<set $lowerClass -= random(100)>> <<set _lostSlaves = random(125), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(14)>> @@ -442,7 +442,7 @@ <<set $lowerClass -= random(100)>> <<set _lostSlaves = random(150), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(5)>> @@ -450,7 +450,7 @@ <<set $lowerClass -= random(120)>> <<set _lostSlaves = random(170), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10)>> @@ -458,7 +458,7 @@ <<set $lowerClass -= random(140)>> <<set _lostSlaves = random(190), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(15)>> @@ -466,7 +466,7 @@ <<set $lowerClass -= random(160)>> <<set _lostSlaves = random(210), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(20)>> @@ -474,7 +474,7 @@ <<set $lowerClass -= random(180)>> <<set _lostSlaves = random(230), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(25)>> @@ -488,7 +488,7 @@ <<set $lowerClass -= random(20)>> <<set _lostSlaves = random(45), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(2)>> @@ -496,7 +496,7 @@ <<set $lowerClass -= random(30)>> <<set _lostSlaves = random(55), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(4)>> @@ -504,7 +504,7 @@ <<set $lowerClass -= random(40)>> <<set _lostSlaves = random(65), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(6)>> @@ -512,7 +512,7 @@ <<set $lowerClass -= random(50)>> <<set _lostSlaves = random(75), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(8)>> @@ -520,7 +520,7 @@ <<set $lowerClass -= random(60)>> <<set _lostSlaves = random(85), $NPCSlaves -= Math.trunc(($NPCSlaves / $ASlaves) * _lostSlaves), - $helots -= Math.trunc(($helots / $ASlaves) * _lostSlaves), + $menials -= Math.trunc(($menials / $ASlaves) * _lostSlaves), $fuckdolls -= Math.trunc(($fuckdolls / $ASlaves) * _lostSlaves), $menialBioreactors -= Math.trunc(($menialBioreactors / $ASlaves) * _lostSlaves)>> <<set $arcologies[0].prosperity -= random(10)>> diff --git a/src/SecExp/secBarracks.tw b/src/SecExp/secBarracks.tw index 341567e8a958bedc11f68ba16be39699717f8879..72f02b55b83a711d241b62d9dd26a355941b7d77 100644 --- a/src/SecExp/secBarracks.tw +++ b/src/SecExp/secBarracks.tw @@ -165,30 +165,30 @@ Your current maximum number of units is <<print $maxUnits>> (<<print commaNum($s <br><br>__Slaves__ <br>/* slaves */ -You are free to organize your menial slaves into fighting units. Currently you have <<print commaNum($helots)>> slaves available, while <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print commaNum($slavesTotalCasualties)>>. +You are free to organize your menial slaves into fighting units. Currently you have <<print commaNum($menials)>> slaves available, while <<print commaNum($slavesEmployedManpower)>> are already employed as soldiers. During all your battles you lost a total of <<print commaNum($slavesTotalCasualties)>>. <<silently>><<= MenialPopCap()>><</silently>> <<set _menialPrice = menialSlaveCost()>> -<<set _bulkMax = $PopCap-$helots-$fuckdolls-$menialBioreactors>> +<<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>> <<if $cash > _menialPrice>> <<if _bulkMax > 0>> <br> - [[Buy|secBarracks][$helots+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] + [[Buy|secBarracks][$menials+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] <<if $cash > (menialSlaveCost(10))*10>> - [[(x10)|secBarracks][$helots+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] + [[(x10)|secBarracks][$menials+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] <</if>> <<if $cash > (menialSlaveCost(100))*100>> - [[(x100)|secBarracks][$helots+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] + [[(x100)|secBarracks][$menials+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] <</if>> <<if $cash > (_menialPrice+1)*2>> <<set _menialBulkPremium = Math.trunc(1 + Math.clamp($cash/_menialPrice,0,_bulkMax)/400)>> - [[(max)|secBarracks][$helots+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]] + [[(max)|secBarracks][$menials+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]] <</if>> //Bulk transactions may require offering a premium.// <</if>> <</if>> <br> <<set _sL = $slaveUnits.length>> -<<if $helots > 0 && $activeUnits < $maxUnits>> +<<if $menials > 0 && $activeUnits < $maxUnits>> <br> <<link "Form a new unit" "secBarracks">> <<set _newUnit = { @@ -196,7 +196,7 @@ You are free to organize your menial slaves into fighting units. Currently you h platoonName: ordinalSuffix(++$createdSlavesUnits) + " slave platoon", active: 1, isDeployed: 0, - troops: Math.min($maxTroops, $helots), + troops: Math.min($maxTroops, $menials), maxTroops: $maxTroops, equip: 0, training: 0, @@ -208,7 +208,7 @@ You are free to organize your menial slaves into fighting units. Currently you h battlesFought: 0}>> <<generateUnitID _newUnit>> <<set $slaveUnits.push(_newUnit)>> - <<set $helots -= _newUnit.troops>> + <<set $menials -= _newUnit.troops>> <<set $slavesEmployedManpower += _newUnit.troops>> <<set $activeUnits++>> <</link>> @@ -221,7 +221,7 @@ You are free to organize your menial slaves into fighting units. Currently you h <<slaveUnitsDescription $slaveUnits[_i]>> <br> <<link "Disband the unit" "secBarracks">> - <<set $helots += $slaveUnits[_i].troops>> + <<set $menials += $slaveUnits[_i].troops>> <<set $slavesEmployedManpower -= $slaveUnits[_i].troops>> <<set $slaveUnits.deleteAt(_i)>> <<set $activeUnits-->> @@ -232,21 +232,21 @@ You are free to organize your menial slaves into fighting units. Currently you h <<set $targetIndex = _i>> <</link>> - <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $helots > 0>> + <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $menials > 0>> | <<link "Replenish unit" "secBarracks">> - <<if $helots >= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> - <<set $helots -= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> + <<if $menials >= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> + <<set $menials -= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> <<set $slavesEmployedManpower += $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> <<set _expLoss = ($slaveUnits[_i].maxTroops - $slaveUnits[_i].troops) / $slaveUnits[_i].troops>> <<set $slaveUnits[_i].training -= $slaveUnits[_i].training * _expLoss>> <<set $slaveUnits[_i].troops = $slaveUnits[_i].maxTroops>> <<else>> - <<set $slavesEmployedManpower += $helots>> - <<set _expLoss = $helots / $slaveUnits[_i].troops>> + <<set $slavesEmployedManpower += $menials>> + <<set _expLoss = $menials / $slaveUnits[_i].troops>> <<set $slaveUnits[_i].training -= $slaveUnits[_i].training * _expLoss>> - <<set $slaveUnits[_i].troops += $helots>> - <<set $helots = 0>> + <<set $slaveUnits[_i].troops += $menials>> + <<set $menials = 0>> <</if>> <</link>> <</if>> @@ -268,18 +268,18 @@ You are free to organize your menial slaves into fighting units. Currently you h <<set $activeUnits-->> <</link>> - <<if $helots > 0>> + <<if $menials > 0>> | <<link "Reform the unit" "secBarracks">> - <<if $helots >= $slaveUnits[_i].maxTroops>> + <<if $menials >= $slaveUnits[_i].maxTroops>> <<set $slavesEmployedManpower += $slaveUnits[_i].maxTroops>> - <<set $helots -= $slaveUnits[_i].maxTroops>> + <<set $menials -= $slaveUnits[_i].maxTroops>> <<set $slaveUnits[_i].troops = $slaveUnits[_i].maxTroops>> <<set $slaveUnits[_i].training = 0>> <<else>> - <<set $slavesEmployedManpower += $helots>> - <<set $slaveUnits[_i].troops += $helots>> - <<set $helots = 0>> + <<set $slavesEmployedManpower += $menials>> + <<set $slaveUnits[_i].troops += $menials>> + <<set $menials = 0>> <<set $slaveUnits[_i].training = 0>> <</if>> <<set $slaveUnits[_i].active = 1>> diff --git a/src/SecExp/secExpOptions.tw b/src/SecExp/secExpOptions.tw index 5824456e48a0d02d9a75edd4b2952d4ad3dbbe98..a64aa54663a3246f175d09a0df1a2ea0e7f34c41 100644 --- a/src/SecExp/secExpOptions.tw +++ b/src/SecExp/secExpOptions.tw @@ -476,9 +476,9 @@ __Debug/cheats:__ <<set $crime = Math.clamp($crime - 5, 0, 100)>> <</link>> <br><<link "Give menial slaves" "secExpOptions">> - <<set $helots = Math.clamp($helots + 30, 0, $PopCap)>> + <<set $menials = Math.clamp($menials + 30, 0, $PopCap)>> <</link>> | <<link "Remove menial slaves" "secExpOptions">> - <<set $helots = Math.clamp($helots - 30, 0, $PopCap)>> + <<set $menials = Math.clamp($menials - 30, 0, $PopCap)>> <</link>> <br><<link "Give militia manpower" "secExpOptions">> <<set $militiaFreeManpower += 30>> diff --git a/src/SecExp/secInit.tw b/src/SecExp/secInit.tw index b45c8c7513e686f9facbd46ca9059df6d7196648..4d9d98f715ef31f82da9b456a46979ae3502b2c9 100644 --- a/src/SecExp/secInit.tw +++ b/src/SecExp/secInit.tw @@ -96,8 +96,8 @@ luxury: 0, training: 0, loyaltyMod: 0}>> -<<set $secHelots = 0>> -<<set $reqHelots = 20>> +<<set $secMenials = 0>> +<<set $reqMenials = 20>> <<set $secUpgrades = { nanoCams: 0, cyberBots: 0, @@ -143,7 +143,7 @@ <<set $brainImplant = -1>> <<set $brainImplantProject = 0>> <<set $weapManu = 0>> -<<set $weapHelots = 0>> +<<set $weapMenials = 0>> <<set $weapProductivity = 1>> <<set $weapLab = 1>> <<set $baseUpgradeTime = 10>> diff --git a/src/SecExp/securityHQ.tw b/src/SecExp/securityHQ.tw index 09dac9c8841802f1ad7f21d09bcb03a0225c530a..b9bf5e393a9ac02e1518168b4203bf085b3d680d 100644 --- a/src/SecExp/securityHQ.tw +++ b/src/SecExp/securityHQ.tw @@ -12,161 +12,161 @@ Security headquarters <hr> -The security headquarters stand in front of you. Innumerable screens flood with light the great central room. <<if $secHelots > 0>>Some slaves see you enter and interrupt their work to greet you.<</if>> From here you can build a safe and prosperous arcology. +The security headquarters stand in front of you. Innumerable screens flood with light the great central room. <<if $secMenials > 0>>Some slaves see you enter and interrupt their work to greet you.<</if>> From here you can build a safe and prosperous arcology. <br> /* security level. Slaves */ -You have <span id="secHel"> <<print commaNum($secHelots)>> </span> slaves working in the HQ. $reqHelots are required and you have <span id="hel"> <<print commaNum($helots)>> </span> free menial slaves. -<<if $secHelots < $reqHelots>> +You have <span id="secHel"> <<print commaNum($secMenials)>> </span> slaves working in the HQ. $reqMenials are required and you have <span id="hel"> <<print commaNum($menials)>> </span> free menial slaves. +<<if $secMenials < $reqMenials>> You do not have enough slaves here. You will not receive the full benefit of the installed upgrades. <<else>> You have enough slaves to man all security systems. <</if>> <<silently>><<= MenialPopCap()>><</silently>> <<set _menialPrice = menialSlaveCost()>> -<<set _bulkMax = $PopCap-$helots-$fuckdolls-$menialBioreactors>> +<<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>> <<if $cash > _menialPrice>> -<<if _bulkMax > 0 || $helots+$fuckdolls+$menialBioreactors == 0>> +<<if _bulkMax > 0 || $menials+$fuckdolls+$menialBioreactors == 0>> <br> - [[Buy|securityHQ][$helots+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] + [[Buy|securityHQ][$menials+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] <<if $cash > (menialSlaveCost(10))*10>> - [[(x10)|securityHQ][$helots+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] + [[(x10)|securityHQ][$menials+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] <</if>> <<if $cash > (menialSlaveCost(100))*100>> - [[(x100)|securityHQ][$helots+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] + [[(x100)|securityHQ][$menials+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] <</if>> <<if $cash > (_menialPrice+1)*2>> <<set _menialBulkPremium = Math.trunc(1 + Math.clamp($cash/_menialPrice,0,_bulkMax)/400)>> - [[(max)|securityHQ][$helots+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]] + [[(max)|securityHQ][$menials+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]] <</if>> //Bulk transactions may require offering a premium.// <</if>> <</if>> -<<if $helots > 0>> +<<if $menials > 0>> <br>Transfer in: - <<if $helots >= 5>> + <<if $menials >= 5>> <<link "5">> - <<set $helots -= 5>> - <<set $secHelots += 5>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $helots < 5 || $secHelots >= $reqHelots || $secHelots == 5>> + <<set $menials -= 5>> + <<set $secMenials += 5>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $menials < 5 || $secMenials >= $reqMenials || $secMenials == 5>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $helots >= 10>> + <<if $menials >= 10>> |<<link "10">> - <<set $helots -= 10>> - <<set $secHelots += 10>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $helots < 10 || $secHelots >= $reqHelots || $secHelots == 10>> + <<set $menials -= 10>> + <<set $secMenials += 10>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $menials < 10 || $secMenials >= $reqMenials || $secMenials == 10>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $helots >= 100>> + <<if $menials >= 100>> |<<link "100">> - <<set $helots -= 100>> - <<set $secHelots += 100>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $helots < 100 || $secHelots >= $reqHelots || $secHelots == 100>> + <<set $menials -= 100>> + <<set $secMenials += 100>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $menials < 100 || $secMenials >= $reqMenials || $secMenials == 100>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $helots >= 500>> + <<if $menials >= 500>> |<<link "500">> - <<set $helots -= 500>> - <<set $secHelots += 500>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $helots < 500 || $secHelots >= $reqHelots || $secHelots == 500>> + <<set $menials -= 500>> + <<set $secMenials += 500>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $menials < 500 || $secMenials >= $reqMenials || $secMenials == 500>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $helots >= 1000>> + <<if $menials >= 1000>> |<<link "1000">> - <<set $helots -= 1000>> - <<set $secHelots += 1000>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $helots < 1000 || $secHelots >= $reqHelots || $secHelots == 1000>> + <<set $menials -= 1000>> + <<set $secMenials += 1000>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $menials < 1000 || $secMenials >= $reqMenials || $secMenials == 1000>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $secHelots > 0>> + <<if $secMenials > 0>> <br>Transfer out - <<if $secHelots >= 5>> + <<if $secMenials >= 5>> <<link "5">> - <<set $helots += 5>> - <<set $secHelots -= 5>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $secHelots < 5>> + <<set $menials += 5>> + <<set $secMenials -= 5>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $secMenials < 5>> <<goto "securityHQ">> <</if>> - <<if $secHelots < $reqHelots>> + <<if $secMenials < $reqMenials>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $secHelots >= 10>> + <<if $secMenials >= 10>> |<<link "10">> - <<set $helots += 10>> - <<set $secHelots -= 10>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $secHelots < 10>> + <<set $menials += 10>> + <<set $secMenials -= 10>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $secMenials < 10>> <<goto "securityHQ">> <</if>> - <<if $secHelots < $reqHelots>> + <<if $secMenials < $reqMenials>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $secHelots >= 100>> + <<if $secMenials >= 100>> |<<link "100">> - <<set $helots += 100>> - <<set $secHelots -= 100>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $secHelots < 100>> + <<set $menials += 100>> + <<set $secMenials -= 100>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $secMenials < 100>> <<goto "securityHQ">> <</if>> - <<if $secHelots < $reqHelots>> + <<if $secMenials < $reqMenials>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $secHelots >= 500>> + <<if $secMenials >= 500>> |<<link "500">> - <<set $helots += 500>> - <<set $secHelots -= 500>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $secHelots < 500>> + <<set $menials += 500>> + <<set $secMenials -= 500>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $secMenials < 500>> <<goto "securityHQ">> <</if>> - <<if $secHelots < $reqHelots>> + <<if $secMenials < $reqMenials>> <<goto "securityHQ">> <</if>> <</link>> <</if>> - <<if $secHelots >= 1000>> + <<if $secMenials >= 1000>> |<<link "1000">> - <<set $helots += 1000>> - <<set $secHelots -= 1000>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $secHelots < 1000>> + <<set $menials += 1000>> + <<set $secMenials -= 1000>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $secMenials < 1000>> <<goto "securityHQ">> <</if>> - <<if $secHelots < $reqHelots>> + <<if $secMenials < $reqMenials>> <<goto "securityHQ">> <</if>> <</link>> @@ -174,21 +174,21 @@ You have <span id="secHel"> <<print commaNum($secHelots)>> </span> slaves workin <</if>> <</if>> -<<if $secHelots != $reqHelots>> +<<if $secMenials != $reqMenials>> <br><<link "Match the requirement">> - <<if $helots >= $reqHelots - $secHelots>> - <<set $helots -= $reqHelots - $secHelots>> - <<set $secHelots = $reqHelots>> - <<elseif $reqHelots < $secHelots>> - <<set $helots += $secHelots - $reqHelots>> - <<set $secHelots = $reqHelots>> + <<if $menials >= $reqMenials - $secMenials>> + <<set $menials -= $reqMenials - $secMenials>> + <<set $secMenials = $reqMenials>> + <<elseif $reqMenials < $secMenials>> + <<set $menials += $secMenials - $reqMenials>> + <<set $secMenials = $reqMenials>> <<else>> - <<set $secHelots += $helots>> - <<set $helots = 0>> + <<set $secMenials += $menials>> + <<set $menials = 0>> <</if>> - <<replace "#secHel">><<print $secHelots>><</replace>> - <<replace "#hel">><<print $helots>><</replace>> - <<if $secHelots == $reqHelots>> + <<replace "#secHel">><<print $secMenials>><</replace>> + <<replace "#hel">><<print $menials>><</replace>> + <<if $secMenials == $reqMenials>> <<goto "securityHQ">> <</if>> <</link>> @@ -209,20 +209,20 @@ Your security level (@@.deepskyblue;<<print $security>>@@) <<else>> is great. <</if>> -Considering the current upgrades the resting level for security is <<print $secRestPoint>>, while the effective maximum level is <<print Math.trunc($secRestPoint * (Math.clamp($secHelots,0,$reqHelots) / $reqHelots))>>. +Considering the current upgrades the resting level for security is <<print $secRestPoint>>, while the effective maximum level is <<print Math.trunc($secRestPoint * (Math.clamp($secMenials,0,$reqMenials) / $reqMenials))>>. <br> <br> <<if $secUpgrades.nanoCams == 0>> - [[Install a nano-camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + [[Install a nano-camera system |securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.nanoCams = 1, $secRestPoint += 15, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed all across the arcology closed circuit nano-cameras to keep the arcology under your watchful eye. <</if>> <br> <<if $secUpgrades.cyberBots == 0>> - [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + [[Buy cybersecurity algorithms|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.cyberBots = 1, $secRestPoint += 15, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will raise rest point of security by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought advanced cybersecurity algorithms that will defend your arcology against hack attempts or cyber frauds. @@ -230,14 +230,14 @@ Considering the current upgrades the resting level for security is <<print $secR <br> <<if $rep > 10000>> <<if $secUpgrades.eyeScan == 0>> - [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + [[Install invisible eye scanners|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.eyeScan = 1, $secRestPoint += 20, $reqMenials += 10, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed numerous hidden eye scanners that accurately register the movements of everyone inside the arcology. <</if>> <br> <<if $secUpgrades.cryptoAnalyzer == 0>> - [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + [[Buy and install crypto analyzers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.cryptoAnalyzer = 1, $secRestPoint += 20, $reqMenials += 10, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will raise rest point of security by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought and employed sophisticated crypto analyzing software to accurately track and archive every financial movement or transaction made inside the walls of your arcology. @@ -262,20 +262,20 @@ Your crime level (@@.orangered;<<print $crime>>@@) <<else>> is extremely high. <</if>> -Considering the current upgrades the maximum level of crime is <<print $crimeCap>>, while the effective maximum level is <<print Math.trunc(Math.clamp($crimeCap + ($crimeCap - $crimeCap * ($secHelots / $reqHelots)),0,100))>>. +Considering the current upgrades the maximum level of crime is <<print $crimeCap>>, while the effective maximum level is <<print Math.trunc(Math.clamp($crimeCap + ($crimeCap - $crimeCap * ($secMenials / $reqMenials)),0,100))>>. <br> <br> <<if $crimeUpgrades.advForensic == 0>> - [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Install advanced forensic equipment|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.advForensic = 1, $crimeCap -= 10, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced forensic equipment, able to extract every bit of precious information from any clue. <</if>> <br> <<if $crimeUpgrades.autoArchive == 0>> - [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Install auto-curating archiver|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.autoArchive = 1, $crimeCap -= 10, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will bring down the crime level cap by 10 points, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed auto-curating archiver software, which will update in real time your data archives with any new relevant information on criminals residing in your arcology. @@ -283,14 +283,14 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $rep > 10000>> <<if $crimeUpgrades.autoTrial == 0>> - [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Install automated trials software|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.autoTrial = 1, $crimeCap -= 15, $reqMenials += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced legal algorithms that allows the handling of legal matters much quicker and much more accurately. <</if>> <br> <<if $crimeUpgrades.worldProfiler == 0>> - [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Install worldwide profilers|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $crimeUpgrades.worldProfiler = 1, $crimeCap -= 15, $reqMenials += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will bring down the crime level cap by 15 points, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced profiler software, which will constantly scour every known data archive on the globe (legally or not) to gather as much information as possible on dangerous criminals. @@ -318,14 +318,14 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $intelUpgrades.sensors == 0>> - [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Install perimeter sensors|securityHQ][$cash -= Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.sensors = 1, $recon += 1, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(5000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed perimeter seismic sensors able to detect movement with high accuracy. <</if>> <br> <<if $intelUpgrades.signalIntercept == 0>> - [[Create signal interception hub|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Create signal interception hub|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.signalIntercept = 1, $recon += 1, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilities, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed advanced signal interception equipment. @@ -333,7 +333,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $rep > 10000>> <<if $intelUpgrades.radar == 0>> - [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.radar = 1, $recon += 1, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Install advanced radar equipment|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $intelUpgrades.radar = 1, $recon += 1, $reqMenials += 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will increase recon capabilities, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have installed sophisticated radar equipment. @@ -368,7 +368,7 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <</if>> <br> <<if $readinessUpgrades.rapidVehicles == 0>> - [[Buy rapid armored transport vehicles|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.rapidVehicles = 1, $readiness += 2, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + [[Buy rapid armored transport vehicles|securityHQ][$cash -= Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.rapidVehicles = 1, $readiness += 2, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(7500*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 2, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have bought rapid armored transport vehicles able to bring your troops to battle much quicker than before. @@ -376,14 +376,14 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <br> <<if $rep > 10000>> <<if $readinessUpgrades.rapidPlatforms == 0>> - [[Build rapid deployment platforms|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.rapidPlatforms = 1, $readiness += 2, $reqHelots += 5, $secHQUpkeep += $upgradeUpkeep]] + [[Build rapid deployment platforms|securityHQ][$cash -= Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.rapidPlatforms = 1, $readiness += 2, $reqMenials += 5, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 2, but will require 5 extra slaves in the headquarters and increases upkeep.// <<else>> You have built rapid deployment platforms able to equip and deploy units within very limited time windows. <</if>> <br> <<if $readinessUpgrades.earlyWarn == 0>> - [[Institute early warning systems|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.earlyWarn = 1, $readiness += 2, $reqHelots += 10, $secHQUpkeep += $upgradeUpkeep]] + [[Institute early warning systems|securityHQ][$cash -= Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount), $readinessUpgrades.earlyWarn = 1, $readiness += 2, $reqMenials += 10, $secHQUpkeep += $upgradeUpkeep]] <br>//Costs <<print cashFormat(Math.trunc(15000*$upgradeMultiplierArcology*_HistoryDiscount))>>. Will increase readiness by 2, but will require 10 extra slaves in the headquarters and increases upkeep.// <<else>> You have created early warning systems that constantly analyze in real time data to determine the likeness of an attack. @@ -397,42 +397,42 @@ Considering the current upgrades the maximum level of crime is <<print $crimeCap <<if $rep > 12000>> <br>__Cold Data Storage Facility__: - <<if $secUpgrades.coldstorage == 6 && $rep >= 19500 && $reqHelots > 10>> + <<if $secUpgrades.coldstorage == 6 && $rep >= 19500 && $reqMenials > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of two years. <br> - [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Expand the cold storage facility to increase data retention to three years|securityHQ][$cash -= Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(2400000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.// - <<elseif $secUpgrades.coldstorage == 5 && $rep >= 19500 && $reqHelots > 10>> + <<elseif $secUpgrades.coldstorage == 5 && $rep >= 19500 && $reqMenials > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one year. <br> - [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Expand the cold storage facility to increase data retention to two years|securityHQ][$cash -= Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(1200000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.// - <<elseif $secUpgrades.coldstorage == 4 && $rep >= 19500 && $reqHelots > 10>> + <<elseif $secUpgrades.coldstorage == 4 && $rep >= 19500 && $reqMenials > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of nine months. <br> - [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Expand the cold storage facility to increase data retention to one year|securityHQ][$cash -= Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(900000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.// - <<elseif $secUpgrades.coldstorage == 3 && $rep > 18000 && $reqHelots > 10>> + <<elseif $secUpgrades.coldstorage == 3 && $rep > 18000 && $reqMenials > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of six months. <br> - [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Expand the cold storage facility to increase data retention to nine months|securityHQ][$cash -= Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(600000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.// - <<elseif $secUpgrades.coldstorage == 2 && $rep > 16000 && $reqHelots > 10>> + <<elseif $secUpgrades.coldstorage == 2 && $rep > 16000 && $reqMenials > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three months. <br> - [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Expand the cold storage facility to increase data retention to six months|securityHQ][$cash -= Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(300000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.// - <<elseif $secUpgrades.coldstorage == 1 && $rep > 14000 && $reqHelots > 10>> + <<elseif $secUpgrades.coldstorage == 1 && $rep > 14000 && $reqMenials > 10>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of one month. <br> - [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + [[Expand the cold storage facility to increase data retention to three months|securityHQ][$cash -= Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(100000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by a further 10, but will increase upkeep.// - <<elseif $secUpgrades.coldstorage == 0 && $rep > 12000 && $reqHelots > 10>> - [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqHelots -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] + <<elseif $secUpgrades.coldstorage == 0 && $rep > 12000 && $reqMenials > 10>> + [[Install a cold storage facility|securityHQ][$cash -= Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier), $secUpgrades.coldstorage++, $reqMenials -= 10, $secHQUpkeep += $upgradeUpkeep, $PC.hacking += 1]] <br>//Costs <<print cashFormat(Math.trunc(50000*$upgradeMultiplierArcology*_HistoryDiscount*$HackingSkillMultiplier))>>. Will lower the amount of required slaves by 10, but will increase upkeep.// <<elseif $secUpgrades.coldstorage > 6>> <br>You have installed a cold storage facility for the Security HQ's archives with a data retention capability of three years. - <<elseif $reqHelots <= 10>> + <<elseif $reqMenials <= 10>> <br>Personnel cannot be further reduced. <<else>> <br>You lack the reputation to access more advanced upgrades. diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index a4bedc61185f08ab56477a5cdf67a1f657ba2755..0c1f5154dcc79424e200c000190b49ff598c028b 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -20,8 +20,8 @@ <br> <strong>Security</strong>: -<<if $secHelots > 0>> - <<print commaNum($secHelots)>> slaves work to improve the security of your arcology, +<<if $secMenials > 0>> + <<print commaNum($secMenials)>> slaves work to improve the security of your arcology, <<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>> while your mercenaries and security drones tirelessly patrol the streets to keep them safe. <<elseif $arcologyUpgrade.drones == 1>> @@ -168,7 +168,7 @@ <</if>> /* resting point */ -<<set _secRest = $secRestPoint * (Math.clamp($secHelots,0,$reqHelots) / $reqHelots)>> +<<set _secRest = $secRestPoint * (Math.clamp($secMenials,0,$reqMenials) / $reqMenials)>> <<if _secRest < 0>> <<set _secRest = 20>> <</if>> @@ -267,7 +267,7 @@ <</if>> /* crime cap */ -<<set _crimeCap = Math.trunc(Math.clamp($crimeCap + ($crimeCap - $crimeCap * ($secHelots / $reqHelots)),0,100))>> +<<set _crimeCap = Math.trunc(Math.clamp($crimeCap + ($crimeCap - $crimeCap * ($secMenials / $reqMenials)),0,100))>> <<if _crimeCap > $crimeCap && $secHQ == 1>> The limited staff assigned to the HQ allows more space for criminals to act. <</if>> diff --git a/src/SecExp/seeUnit.tw b/src/SecExp/seeUnit.tw index 95b82e8d174a289d9d17e39c519fadc6d0100694..87ad9e17b3123ee9a23dd85b3f6731aafb1584c7 100644 --- a/src/SecExp/seeUnit.tw +++ b/src/SecExp/seeUnit.tw @@ -213,21 +213,21 @@ <<slaveUnitsDescription $slaveUnits[$targetIndex]>> <br> Rename unit <<textbox "$slaveUnits[$targetIndex].platoonName" $slaveUnits[$targetIndex].platoonName "seeUnit">> - <<if $slaveUnits[$targetIndex].maxTroops > $slaveUnits[$targetIndex].troops && $helots > 0>> + <<if $slaveUnits[$targetIndex].maxTroops > $slaveUnits[$targetIndex].troops && $menials > 0>> <br> <<link "Replenish unit" "seeUnit">> - <<if $helots >= $slaveUnits[$targetIndex].maxTroops - $slaveUnits[$targetIndex].troops>> - <<set $helots -= $slaveUnits[$targetIndex].maxTroops - $slaveUnits[$targetIndex].troops>> + <<if $menials >= $slaveUnits[$targetIndex].maxTroops - $slaveUnits[$targetIndex].troops>> + <<set $menials -= $slaveUnits[$targetIndex].maxTroops - $slaveUnits[$targetIndex].troops>> <<set $slavesEmployedManpower += $slaveUnits[$targetIndex].maxTroops - $slaveUnits[$targetIndex].troops>> <<set _expLoss = ($slaveUnits[$targetIndex].maxTroops - $slaveUnits[$targetIndex].troops) / $slaveUnits[$targetIndex].troops>> <<set $slaveUnits[$targetIndex].training -= $slaveUnits[$targetIndex].training * _expLoss>> <<set $slaveUnits[$targetIndex].troops = $slaveUnits[$targetIndex].maxTroops>> <<else>> - <<set $slavesEmployedManpower += $helots>> - <<set _expLoss = $helots / $slaveUnits[$targetIndex].troops>> + <<set $slavesEmployedManpower += $menials>> + <<set _expLoss = $menials / $slaveUnits[$targetIndex].troops>> <<set $slaveUnits[$targetIndex].training -= $slaveUnits[$targetIndex].training * _expLoss>> - <<set $slaveUnits[$targetIndex].troops += $helots>> - <<set $helots = 0>> + <<set $slaveUnits[$targetIndex].troops += $menials>> + <<set $menials = 0>> <</if>> <</link>> <</if>> diff --git a/src/SecExp/unitsBattleReport.tw b/src/SecExp/unitsBattleReport.tw index 3c110c598440b6784ce0ae354fa5dfb07d377e10..e8e1f63ab1d27a375bfb7e95d9fe1d0983a960dd 100644 --- a/src/SecExp/unitsBattleReport.tw +++ b/src/SecExp/unitsBattleReport.tw @@ -212,7 +212,7 @@ <<set $slaveUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$slaveUnits[_j].maxTroops))>> <<set $slavesEmployedManpower -= Math.trunc(_loss - _med)>> <<set $slavesTotalCasualties += Math.trunc(_loss - _med)>> - <<set $helots -= Math.trunc(_loss - _med)>> + <<set $menials -= Math.trunc(_loss - _med)>> <<if $slaveUnits[_j].training < 100>> <<if random(1,100) > 60>> Experience has increased. diff --git a/src/SecExp/unitsRebellionReport.tw b/src/SecExp/unitsRebellionReport.tw index 9ab83927154c3cd9e56ee41d5dbc3a7761aaaf2e..00b09199bb5a429b78a57a26c14668ef619ae6f5 100644 --- a/src/SecExp/unitsRebellionReport.tw +++ b/src/SecExp/unitsRebellionReport.tw @@ -118,7 +118,7 @@ <span id="slaveResult"> <br><<link "Dissolve the units">> <<removeUnits _slaveRebelledID>> - <<set $helots += _slaveManpower>> + <<set $menials += _slaveManpower>> <<for _i = 0; _i < $militiaUnits.length; _i++>> <<if $slaveUnits[_i].active == 1>> <<set $slaveUnits[_i].loyalty = Math.clamp($slaveUnits[_i].loyalty - random(10,40),0,100)>> @@ -132,7 +132,7 @@ <br>//Manpower will be refunded, but will negatively influence the loyalty of the other units// <br><<link "Purge the dissidents and dissolve the units">> <<removeUnits _slaveRebelledID>> - <<set $helots += _slaveManpower * 0.5>> + <<set $menials += _slaveManpower * 0.5>> <<recalcManpower>> <<replace "#slaveResult">> <br>Dissidents purged and units dissolved. @@ -463,7 +463,7 @@ <<set $slaveUnits[_j].troops -= Math.trunc(Math.clamp(_loss - _med,0,$slaveUnits[_j].maxTroops))>> <<set $slavesEmployedManpower -= _loss - _med>> <<set $slavesTotalCasualties += _loss - _med>> - <<set $helots -= Math.trunc(_loss - _med)>> + <<set $menials -= Math.trunc(_loss - _med)>> <<if $slaveUnits[_j].training < 100>> <<if random(1,100) > 60>> Experience gained. @@ -595,7 +595,7 @@ <span id="slaveResult"> <br><<link "Dissolve the units">> <<removeUnits _slaveRebelledID>> - <<set $helots += _slaveManpower>> + <<set $menials += _slaveManpower>> <<for _i = 0; _i < $militiaUnits.length; _i++>> <<if $slaveUnits[_i].active == 1>> <<set $slaveUnits[_i].loyalty = Math.clamp($slaveUnits[_i].loyalty - random(10,40),0,100)>> @@ -609,7 +609,7 @@ <br>//Manpower will be refunded, but will negatively influence the loyalty of the other units// <br><<link "Purge the dissidents and dissolve the units">> <<removeUnits _slaveRebelledID>> - <<set $helots += _slaveManpower * 0.5>> + <<set $menials += _slaveManpower * 0.5>> <<recalcManpower>> <<replace "#slaveResult">> <br>Dissidents purged and units dissolved. diff --git a/src/SecExp/weaponsManufacturing.tw b/src/SecExp/weaponsManufacturing.tw index 9a7c2fc5851bbaf7d1ce84f09dac66832c64f697..475c1367d99c60e2cc252e0970d6c6095934a142 100644 --- a/src/SecExp/weaponsManufacturing.tw +++ b/src/SecExp/weaponsManufacturing.tw @@ -29,64 +29,64 @@ many small old world nations as the advanced technology that free cities have av There's a large lab attached to the complex. The complement of equipment and personnel makes it a great beacon of military science in an otherwise ignorant world. <</if>> <br> -<<if $weapHelots> 0>>Assigned here are $weapHelots slaves working to produce as much equipment as possible<<else>>There are no assigned menial slaves here. The spaces is manned exclusively by low rank citizens.<</if>> -You own <<print commaNum($helots)>> free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapHelots>> free slots. +<<if $weapMenials> 0>>Assigned here are $weapMenials slaves working to produce as much equipment as possible<<else>>There are no assigned menial slaves here. The spaces is manned exclusively by low rank citizens.<</if>> +You own <<print commaNum($menials)>> free menial slaves. This manufacturing complex can house 500 at most, with <<print 500 - $weapMenials>> free slots. <br> <<silently>><<= MenialPopCap()>><</silently>> <<set _menialPrice = menialSlaveCost()>> -<<set _bulkMax = $PopCap-$helots-$fuckdolls-$menialBioreactors>> +<<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>> <<if $cash > _menialPrice>> -<<if _bulkMax > 0 || $helots+$fuckdolls+$menialBioreactors == 0>> +<<if _bulkMax > 0 || $menials+$fuckdolls+$menialBioreactors == 0>> <br> - [[Buy|weaponsManufacturing][$helots+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] + [[Buy|weaponsManufacturing][$menials+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] <<if $cash > (menialSlaveCost(10))*10>> - [[(x10)|weaponsManufacturing][$helots+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] + [[(x10)|weaponsManufacturing][$menials+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] <</if>> <<if $cash > (menialSlaveCost(100))*100>> - [[(x100)|weaponsManufacturing][$helots+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] + [[(x100)|weaponsManufacturing][$menials+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] <</if>> <<if $cash > (_menialPrice+1)*2>> <<set _menialBulkPremium = Math.trunc(1 + Math.clamp($cash/_menialPrice,0,_bulkMax)/400)>> - [[(max)|weaponsManufacturing][$helots+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]] + [[(max)|weaponsManufacturing][$menials+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)*(_menialPrice+_menialBulkPremium))]] <</if>> //Bulk transactions may require offering a premium.// <</if>> <</if>> -<<if $weapHelots < 500>> - <<if $helots >= 1>> +<<if $weapMenials < 500>> + <<if $menials >= 1>> <<link "Transfer a menial slave">> - <<set $helots-->> - <<set $weapHelots++>> + <<set $menials-->> + <<set $weapMenials++>> <<goto "weaponsManufacturing">> <</link>> <</if>> - <<if $helots >= 10 && $weapHelots <= 490>> + <<if $menials >= 10 && $weapMenials <= 490>> | <<link "Transfer 10 menial slaves">> - <<set $helots -= 10>> - <<set $weapHelots += 10>> + <<set $menials -= 10>> + <<set $weapMenials += 10>> <<goto "weaponsManufacturing">> <</link>> <</if>> - <<if $helots > 0>> + <<if $menials > 0>> | <<link "Transfer all free menial slaves">> - <<if $helots > 500 - $weapHelots>> - <<set $helots -= 500 - $weapHelots>> - <<set $weapHelots = 500>> + <<if $menials > 500 - $weapMenials>> + <<set $menials -= 500 - $weapMenials>> + <<set $weapMenials = 500>> <<else>> - <<set $weapHelots += $helots>> - <<set $helots = 0>> + <<set $weapMenials += $menials>> + <<set $menials = 0>> <</if>> <<goto "weaponsManufacturing">> <</link>> <</if>> - <<if $weapHelots > 0>> + <<if $weapMenials > 0>> <br> <<link "Transfer out all menial slaves">> - <<set $helots += $weapHelots>> - <<set $weapHelots = 0>> + <<set $menials += $weapMenials>> + <<set $weapMenials = 0>> <<goto "weaponsManufacturing">> <</link>> <</if>> @@ -94,8 +94,8 @@ You own <<print commaNum($helots)>> free menial slaves. This manufacturing compl The complex does not require more workers. <br> <<link "Transfer out all menial slaves">> - <<set $helots += $weapHelots>> - <<set $weapHelots = 0>> + <<set $menials += $weapMenials>> + <<set $weapMenials = 0>> <<goto "weaponsManufacturing">> <</link>> <</if>> diff --git a/src/SecExp/widgets/miscSecExpWidgets.tw b/src/SecExp/widgets/miscSecExpWidgets.tw index 922a5a13c42182135d77ecbd5eb8cc6c5f516976..45ab7fdaa20cb959e3a489d6ab57fa2941ed10be 100644 --- a/src/SecExp/widgets/miscSecExpWidgets.tw +++ b/src/SecExp/widgets/miscSecExpWidgets.tw @@ -93,7 +93,7 @@ <<set $crimeCap = _newCap>> <</widget>> -<<widget "recalcReqHelots">> +<<widget "recalcReqMenials">> <<set _newReq = 0>> <<set _baseReq = 20>> <<if $secUpgrades.nanoCams == 1>> @@ -145,7 +145,7 @@ <<set _newReq -= 10 * $secUpgrades.coldstorage>> <</if>> <<set _newReq += _baseReq>> - <<set $reqHelots = _newReq>> + <<set $reqMenials = _newReq>> <</widget>> <<widget "recalcEdictsUpkeep">> @@ -546,7 +546,7 @@ <</for>> <<for _i = 0; _i < $slaveUnits.length; _i++>> - <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $helots > 0>> + <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $menials > 0>> <<set _hasLossesS = 1>> <<break>> <</if>> @@ -559,7 +559,7 @@ <</if>> <</for>> - <<if _hasLossesM == 1 && $militiaFreeManpower > 0 || _hasLossesS == 1 && $helots > 0 || _hasLossesMe == 1 && $mercFreeManpower > 0>> + <<if _hasLossesM == 1 && $militiaFreeManpower > 0 || _hasLossesS == 1 && $menials > 0 || _hasLossesMe == 1 && $mercFreeManpower > 0>> <<link "Replenish all units">> @@ -585,19 +585,19 @@ <<if _hasLossesS == 1>> <<for _i = 0; _i < $slaveUnits.length; _i++>> - <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $helots > 0>> - <<if $helots >= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> - <<set $helots -= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> + <<if $slaveUnits[_i].troops < $slaveUnits[_i].maxTroops && $menials > 0>> + <<if $menials >= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> + <<set $menials -= $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> <<set $slavesEmployedManpower += $slaveUnits[_i].maxTroops - $slaveUnits[_i].troops>> <<set _expLoss = ($slaveUnits[_i].maxTroops - $slaveUnits[_i].troops) / $slaveUnits[_i].troops>> <<set $slaveUnits[_i].training -= $slaveUnits[_i].training * _expLoss>> <<set $slaveUnits[_i].troops = $slaveUnits[_i].maxTroops>> <<else>> - <<set $slavesEmployedManpower += $helots>> - <<set _expLoss = $helots / $slaveUnits[_i].troops>> + <<set $slavesEmployedManpower += $menials>> + <<set _expLoss = $menials / $slaveUnits[_i].troops>> <<set $slaveUnits[_i].training -= $slaveUnits[_i].training * _expLoss>> - <<set $slaveUnits[_i].troops += $helots>> - <<set $helots = 0>> + <<set $slaveUnits[_i].troops += $menials>> + <<set $menials = 0>> <</if>> <</if>> <</for>> diff --git a/src/SpecialForce/JS.js b/src/SpecialForce/JS.js index 807ab149118a21c4f7e464890fd34696df3d5d9b..9fc45acd2e2e1317d2b0d8a62ddb7671c799568a 100644 --- a/src/SpecialForce/JS.js +++ b/src/SpecialForce/JS.js @@ -454,7 +454,7 @@ window.SFInit = function() { V.SF = {Toggle:V.SF.Toggle,Active:-1,Depravity:0, Bonus:0, Size:0, Upgrade:0, Gift:0, UC:{Assign:0, Lock:0}, ROE:"hold", Target:"recruit", Regs:"strict", Caps:"The Special Force", Lower:"the special force", Subsidy:1, BadOutcome:""}; V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0}; V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0}; - V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}; + V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0}; V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1; V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]}; }; @@ -559,8 +559,8 @@ window.SFBC = function() { CanAttend:V.CurrentTradeShowAttendance, Income:V.TradeShowIncome, Revenue:V.TotalTradeShowIncome, - Helots:V.TradeShowHelots, - TotalHelots:V.TotalTradeShowHelots, + Menials:V.TradeShowHelots, + TotalMenials:V.TotalTradeShowHelots, Mercs:0, TotalMercs:0}; TradeShow(); if (V.SF.MercCon.History > 0) V.SF.MercCon.View = 1; @@ -598,7 +598,7 @@ window.SFBC = function() { V.SF.Squad = {Troops:40, Armoury:0, Firebase:0, AV:0, TV:0, Drones:0, Drugs:0, PGT:0, AA:0, TA:0, SpacePlane:0, GunS:0, Satellite:{lv:0, InOrbit:0}, GiantRobot:0, MissileSilo:0, AircraftCarrier:0, Sub:0, HAT:0}; V.arcologies[0].SFRaid = 1,V.arcologies[0].SFRaidTarget = -1; V.SF.Colonel = {Core:"", Talk:0, Fun:0, Status:0}; - V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Helots:0, TotalHelots:0, Mercs:0, TotalMercs:0}; + V.SF.MercCon = {History:0, CanAttend:0, Income:0, Revenue:0, Menials:0, TotalMenials:0, Mercs:0, TotalMercs:0}; if (V.securityForceName) { Init(); Main(); Colonel(); TradeShow(); Units(); } @@ -626,6 +626,11 @@ window.SFBC = function() { if (V.SF.WG != undefined) { V.SF.Gift = V.SF.WG; delete V.SF.WG; } + if (V.SF.MercCon.Helots != undefined) { + V.SF.MercCon.Menials = V.SF.MercCon.Helots; + V.SF.MercCon.TotalMenials = V.SF.MercCon.TotalHelots; + delete V.SF.MercCon.Helots;delete V.SF.MercCon.TotalHelots; + } if (V.SF.Facility == undefined) { V.SF.Facility = {Toggle:0, Active:0, LC:0, Workers:0, Max:5, Caps:"Special force support facility", Lower:"special force support facility", Decoration:"standard", Speed:0, Upgrade:0, IDs:[]}; } @@ -677,7 +682,7 @@ window.BadOutcome = function() { case "Cruel": V.SF.BadOutcome = "Revolt",V.trinkets.push("${t} dog tags"),V.Rep = 0, V.cash -= 10000,V,arcologies[0].prosperity -= 50,V.ASlaves = 49, - V.ACitizens = 751,V.helots = 0, V.researchLab.menials = 0, + V.ACitizens = 751,V.menials = 0, V.researchLab.menials = 0, V.researchLab.hired = 0, V.fuckdolls = 0,V.menialBioreactors = 0, V.activeUnits = 0,V.secBots.troops = 0, V.createdSlavesUnits = 0, V.createdMilitiaUnits = 0, V.createdMercUnits = 0; @@ -700,7 +705,7 @@ window.BadOutcome = function() { break; case "Kind": V.SF.BadOutcome = "Exodus",V.trinkets.push("${t} gift card"), - V.Cash += 55000,V.helots += 73; + V.Cash += 55000,V.menials += 73; r += `Your Colonel has had enough of your meddling. In her eyes, you've broken faith with her. She asked one thing of you in return for her full support, and you could not even give her that.`; r += `<br>At midnight, a great mechanized convoy, the biggest you've seen in a long while, streams out of your Arcology. Troop Carriers, Aircraft, Heavy Trucks, and other war machines of varying sizes pour out of the Firebase in tight formation. The Colonel is refusing your calls, and you know it would be ill advised to go out there yourself or to try to stop them with force. The many bandits and mercenary groups that the convoy will inevitably pass by will probably feel this way as well. You have no idea where they are going or how they will end up, but with their wealth and weaponry, you are not worried.`; r += `<br>Upon your inspection of the abandoned firebase itself, most of the heavier installations have been dismantled and carried away, but about 55,000# of miscellaneous supplies and 73 menials have been left behind, presumably because the convoy had no space for them. On The Colonel's old pavilion, you see a white gift card standing upright.`; diff --git a/src/SpecialForce/Report.tw b/src/SpecialForce/Report.tw index a5efa5d773299797725e6098283c7b753d8de465..2973ac83a9fb04925a169ee33396b3509865e0df 100644 --- a/src/SpecialForce/Report.tw +++ b/src/SpecialForce/Report.tw @@ -191,7 +191,7 @@ $SF.Caps managed to recruit <<print Math.round(_FNGs/2)>> new soldiers this week <<set _MenialSlaves = Math.ceil(random(1,((_TradeShowAttendes*_MenialSlavesPerAttendee)/10)))>> <<set _TSProfit = Math.ceil(500000*(1+($SF.Size/1000))*(1+($arcologies[0].prosperity/1000))*_Env)>> During a break, The Colonel managed to sell some generic schematics to the _TradeShowAttendes attendees, some decided to also give her some menial slaves as a bonus.<br> - <<set $helots += _MenialSlaves>> + <<set $menials += _MenialSlaves>> <<set $SF.MercCon.Helots += _MenialSlaves,$SF.MercCon.TotalHelots += _MenialSlaves>> <<set $cash += _TSProfit,$SF.MercCon.Income += _TSProfit>> <<set $SF.MercCon.Revenue += _TSProfit>> diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw index 5a902bd4fdf999e0ff517c6b14726e6cf5bbcbb6..f2aa5f1139b1efa423d33c7260946f7177f2efa2 100644 --- a/src/events/intro/introSummary.tw +++ b/src/events/intro/introSummary.tw @@ -1179,4 +1179,4 @@ __''Mods''__ <</if>> <br><br> -[[Cheat Start|init Nationalities][$cash += 1000000,$girls = 3,$rep += 10000,$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.trading = 100,$PC.warfare = 100,$PC.slaving = 100,$PC.engineering = 100,$PC.medicine = 100,$PC.hacking = 100]] | //Intended for debugging: may have unexpected effects// +[[Cheat Start|init Nationalities][$cash += 1000000,$girls = 3,$rep = 20000,$dojo += 1,$cheatMode = 1,$seeDesk = 0, $seeFCNN = 0, $sortSlavesBy = "devotion",$sortSlavesOrder = "descending",$sortSlavesMain = 0,$rulesAssistantMain = 1,$abbreviateDevotion = 1,$abbreviateRules = 1,$abbreviateClothes = 2,$abbreviateHealth = 1,$abbreviateDiet = 1,$abbreviateDrugs = 1,$abbreviateRace = 1,$abbreviateNationality = 1,$abbreviateGenitalia = 1,$abbreviatePhysicals = 1,$abbreviateSkills = 1,$abbreviateMental = 2,$PC.trading = 100,$PC.warfare = 100,$PC.slaving = 100,$PC.engineering = 100,$PC.medicine = 100,$PC.hacking = 100]] | //Intended for debugging: may have unexpected effects// diff --git a/src/init/setupVars.tw b/src/init/setupVars.tw index 2d2b679855040709d5cbd90df0b5e00f6c77d743..8078172630e2a47bc66fbbce6e0a0f89b15ff6fe 100644 --- a/src/init/setupVars.tw +++ b/src/init/setupVars.tw @@ -2103,6 +2103,8 @@ Then pick _namePool.random(), or display those names as possible choices, or do <<set setup.facilityHeads = ["be the Attendant", "be the DJ", "be the Farmer", "be the Madam", "be the Matron", "be the Milkmaid", "be the Nurse", "be the Schoolteacher", "be the Stewardess", "be the Wardeness", "be your Concubine"]>> +<<set setup.secExCombatPrestige = ["She is well known for being a great commander.", "She is famous for being an incredible commander.", "She is known as a legendary commander all over the world."]>> + <<set setup.lightColorMap = { "rgb(0, 0, 0)":"rgb(255, 255, 255)", "rgb(255, 255, 0)":"rgb(255, 255, 0)", diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index f3c689b7d30d0b260143ff3b314f0a87783a1bb3..8571f715b4366406604a501b5f3cda379f6f3d8d 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License along with thi <<set $returnTo = "init", $nextButton = "Continue", $nextLink = "Alpha disclaimer">> <<unset $releaseID>> -<<set $ver = "0.10.7", $pmodVer = "1.4.X", $releaseID = 1037>> -<<if ndef $pmodVer>><<set $pmodVer = "1.4.X">><</if>> +<<set $ver = "0.10.7", $pmodVer = "1.5.X", $releaseID = 1038>> +<<if ndef $pmodVer>><<set $pmodVer = "1.5.X">><</if>> /* This needs to be broken down into individual files that can be added to StoryInit instead. */ @@ -1160,7 +1160,7 @@ DairyRestraintsSetting($dairyRestraintsSetting) <</if>> <</for>> -<<set $helots = 0>> +<<set $menials = 0>> <<set $fuckdolls = 0>> <<set $menialBioreactors = 0>> <<set $prestigeAuctioned = 0>> @@ -1438,7 +1438,7 @@ erectileImplant: 0 } >> <<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>> -<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "AnimalOrgans"]>> +<<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction"]>> /* , "AnimalOrgans"*/ <<set $RapidCellGrowthFormula = 0>> <<set $UterineRestraintMesh = 0>> <<set $PGHack = 0>> diff --git a/src/interaction/researchLab.tw b/src/interaction/researchLab.tw index af980ed1a51b094abdfbed1d61f381da1c0fc37f..74667629ac0bb1efcac0c23e9edb6ef7f6b8fab0 100644 --- a/src/interaction/researchLab.tw +++ b/src/interaction/researchLab.tw @@ -8,7 +8,7 @@ //You switch one of the screens in your office to the feed from research facility.//<br><br> - <br>[[Decommission facility|Manage Arcology][$researchLab.built = "false",$researchLab.hired = 0,$helots += $researchLab.menials,$researchLab.menials = 0,$researchLab.research = "none",$researchLab.manufacture = "none",$researchLab.productionTime = 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.// + <br>[[Decommission facility|Manage Arcology][$researchLab.built = "false",$researchLab.hired = 0,$menials += $researchLab.menials,$researchLab.menials = 0,$researchLab.research = "none",$researchLab.manufacture = "none",$researchLab.productionTime = 0]] //Warning! This will cancel all projects, remove all staff and shut down this facility.// <br><br>[[Purchase cybernetics|Research Lab][$temp = 1]] <br><br> @@ -71,13 +71,13 @@ scientists.<br> //Each scientist will require an initial fee of <<print cashFormat(5000)>> and incur <<print cashFormat(300)>> weekly.// <br> - <<if $helots > 0>> - Assign [[x1|Research Lab][$researchLab.menials += 1,$helots -= 1]] - <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5 && $helots >= 5>> - | [[x5|Research Lab][$researchLab.menials += 5,$helots -= 5]] + <<if $menials > 0>> + Assign [[x1|Research Lab][$researchLab.menials += 1,$menials -= 1]] + <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 5 && $menials >= 5>> + | [[x5|Research Lab][$researchLab.menials += 5,$menials -= 5]] <</if>> - <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10 && $helots >= 10>> - | [[x10|Research Lab][$researchLab.menials += 10,$helots -= 10]] + <<if ($researchLab.maxSpace - ($researchLab.hired + $researchLab.menials)) >= 10 && $menials >= 10>> + | [[x10|Research Lab][$researchLab.menials += 10,$menials -= 10]] <</if>> menial slaves to lab.<br> <<else>>You do not own any <<if $researchLab.menials != 0>>unassigned <</if>>menial slaves.<br> @@ -99,14 +99,14 @@ scientists. <</if>> <<if $researchLab.menials > 0>><br> - Dismiss [[x1|Research Lab][$researchLab.menials -= 1,$helots += 1]] + Dismiss [[x1|Research Lab][$researchLab.menials -= 1,$menials += 1]] <<if $researchLab.menials >= 5>> - | [[x5|Research Lab][$researchLab.menials -= 5,$helots += 5]] + | [[x5|Research Lab][$researchLab.menials -= 5,$menials += 5]] <</if>> <<if $researchLab.menials >= 10>> - | [[x10|Research Lab][$researchLab.menials -= 10,$helots += 10]] + | [[x10|Research Lab][$researchLab.menials -= 10,$menials += 10]] <</if>> - | [[All|Research Lab][$helots += $researchLab.menials,$researchLab.menials = 0]] + | [[All|Research Lab][$menials += $researchLab.menials,$researchLab.menials = 0]] menial slaves. <</if>> diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw index fd990ef0ddb901a475d2a301b151cef2d40c7fcb..e05a98340fea65a0f4a090431e4aa33e7f4fe8e8 100644 --- a/src/js/assayJS.tw +++ b/src/js/assayJS.tw @@ -2042,21 +2042,21 @@ window.MenialPopCap = function MenialPopCap () { popCap += 500; } } - let overMenialCap = V.helots + V.fuckdolls + V.menialBioreactors - popCap; + let overMenialCap = V.menials + V.fuckdolls + V.menialBioreactors - popCap; if (overMenialCap > 0) { let price = menialSlaveCost(-overMenialCap); - if (V.helots > 0) { - if (V.helots > overMenialCap) { + if (V.menials > 0) { + if (V.menials > overMenialCap) { V.cash += overMenialCap * price; V.menialDemandFactor -= overMenialCap; - V.helots -= overMenialCap; + V.menials -= overMenialCap; overMenialCap = 0; r += "You don't have enough room for all your menials and are obliged to sell some."; } else { - V.cash += V.helots * price; - V.menialDemandFactor -= V.helots; - overMenialCap -= V.helots; - V.helots = 0; + V.cash += V.menials * price; + V.menialDemandFactor -= V.menials; + overMenialCap -= V.menials; + V.menials = 0; r += "You don't have enough room for your menials and are obliged to sell them."; } } diff --git a/src/js/datatypeCleanupJS.tw b/src/js/datatypeCleanupJS.tw index c9407a0a94101ed89b42052fb0ac68ee7e9c6c1e..748d5f6b5a21c5e9cfc717e1445df282a9bd2db6 100644 --- a/src/js/datatypeCleanupJS.tw +++ b/src/js/datatypeCleanupJS.tw @@ -1230,7 +1230,7 @@ window.ArcologyDatatypeCleanup = function ArcologyDatatypeCleanup() { V.disasterResponse = Math.clamp(+V.disasterResponse, 0, 2) || 0; V.GDP = Math.max(+V.GDP, 1) || 278.6; V.NPCSlaves = Math.max(+V.NPCSlaves, 0) || 0; - V.helots = Math.max(+V.helots, 0) || 0; + V.menials = Math.max(+V.menials, 0) || 0; V.fuckdolls = Math.max(+V.fuckdolls , 0) || 0; V.menialBioreactors = Math.max(+V.menialBioreactors , 0) || 0; diff --git a/src/js/economyJS.tw b/src/js/economyJS.tw index f5440d8e7a5358c70b5ca22e6e8b9dc7820c4c89..e7aebe72ff114a1771771305425e51ee91970451 100644 --- a/src/js/economyJS.tw +++ b/src/js/economyJS.tw @@ -83,7 +83,7 @@ window.getCost = function(array) { secExpCost += State.variables.propHubUpkeep; } if(State.variables.secHQ > 0) { - secExpCost += State.variables.secHQUpkeep + 20 * state.variables.secHelots; + secExpCost += State.variables.secHQUpkeep + 20 * State.variables.secMenials; } if(State.variables.secBarracks > 0) { secExpCost += State.variables.secBarracksUpkeep; @@ -152,7 +152,7 @@ window.getCost = function(array) { } if(State.variables.citizenRetirementMenials == 1) { - costs += State.variables.helots * 2; + costs += State.variables.menials * 2; } costs += State.variables.FSSpending; diff --git a/src/js/pregJS.tw b/src/js/pregJS.tw index 402a1b7239aaf8960aa26efbc921a95edb1f7daf..2e41463211212efd89ccda2029c8a0eb7355feef 100644 --- a/src/js/pregJS.tw +++ b/src/js/pregJS.tw @@ -123,6 +123,10 @@ window.setPregType = function(actor) { ovum = Math.clamp(ovum, 0, 8); } else if(actor.pregType == 0) { ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); //base chance for twins + if(actor.ovaImplant == "fertility") { + ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 0, 1]); + fertilityStack++; + } if(actor.hormones == 2) { ovum += jsEither([0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2]); fertilityStack++; @@ -160,9 +164,17 @@ window.setPregType = function(actor) { } else { ovum += jsRandom(0, fertilityStack); } + if(actor.ovaImplant == "sympathy") { + ovum *= 2; + } } else { ovum += jsRandom(0, fertilityStack); - if(ovum > 12) { + if(actor.ovaImplant == "sympathy") { + ovum *= 2; + if(ovum > 12) { + ovum = jsEither([10, 12]); + } + } else if(ovum > 12) { ovum = jsRandom(6, 12); } } diff --git a/src/js/wombJS.tw b/src/js/wombJS.tw index b1e71119801da8f525ede4d749181f4b9f54403d..254aeb5bc3056716d639c7f55dbdc96a2d29fd16 100644 --- a/src/js/wombJS.tw +++ b/src/js/wombJS.tw @@ -146,6 +146,7 @@ window.WombImpregnateClone = function(actor, fCount, mother, motherOriginal, age } //gene corrections + tf.fatherID = -7; tf.genetics.gender = mother.genes; tf.genetics.mother = mother.mother; tf.genetics.father = mother.father; @@ -170,6 +171,7 @@ window.WombImpregnateClone = function(actor, fCount, mother, motherOriginal, age if (actor.womb.length == 0) { actor.pregWeek = age; actor.preg = age; + actor.pregSource = -7; } actor.womb.push(tf); } catch(err){ diff --git a/src/npc/startingGirls/startingGirls.tw b/src/npc/startingGirls/startingGirls.tw index 625fcc714deef0f87d8176b185f8dbd171c8cd8d..8c4e2c5cbae3b1aaadfe3032e91f87071c9e6e47 100644 --- a/src/npc/startingGirls/startingGirls.tw +++ b/src/npc/startingGirls/startingGirls.tw @@ -417,7 +417,7 @@ __You are customizing this slave:__ | [[More customization options]] -| <<link "Start over with a random slave">> +| <<link "Start over with a random slave" "Starting Girls">> <<set $fixedNationality = hashChoice($nationalities)>> <<StartingGirlsWorkaround>> <<StartingGirlsRefresh>> diff --git a/src/pregmod/geneLab.tw b/src/pregmod/geneLab.tw index 137017baa4b77c6164192399e4e1dd335f50727c..603565ef09eae87888fb00aab3a659c3fc889d3f 100644 --- a/src/pregmod/geneLab.tw +++ b/src/pregmod/geneLab.tw @@ -7,13 +7,32 @@ The Gene Lab <hr> -//The gene lab is fully operational. It can identify genetic traits in slaves. It can be used to modify a slave's genome should you obtain the data necessary to adjust it.// +//The gene lab is fully operational. It is capable of mapping a slave's genes, identifying genetic traits and abnormalities. It can be used to modify a slave's genome should you obtain the data necessary to adjust it.// + +<br><br> +Genetic Modification +<hr> + +<<if $dispensaryUpgrade == 0>> + //The fabricator must upgraded before it can produce treatments to alter genes// + <br> +<<else>> + The fabricator is capable of producing treatments to alter a slave's genetic code. + <br> + <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>> + The fabricator is capable of producing treatments to induce NCS. + <br> + <</if>> + <<if $RapidCellGrowthFormula == 1>> + The fabricator is capable of producing treatments to accelerate cellular reproduction. + <br> + <</if>> +<</if>> <br><br> Genetic Harvesting <hr> -<<if $cheatMode == 1>> <<if ($cloningSystem != 1) && ($rep <= 18000*_PCSkillCheck)>> //You lack the reputation needed to access methods for human cloning// <br> @@ -30,5 +49,4 @@ Genetic Harvesting <<elseif ($cloningSystem > 0)>> The gene lab is capable of implanting a slave's genetic sequence into a blank embryo to produce a basic clone. [[Make a clone|Cloning Workaround][$donatrix = "Undecided", $receptrix = "Undecided"]] <br> -<</if>> <</if>> \ No newline at end of file diff --git a/src/pregmod/implantManufactory.tw b/src/pregmod/implantManufactory.tw index 416858adfd0982a449e234f5002aa2b272f36e5b..d06ddd80db27ba89c83f4e5144f44f8882553fd0 100644 --- a/src/pregmod/implantManufactory.tw +++ b/src/pregmod/implantManufactory.tw @@ -59,28 +59,47 @@ The manufactory is capable of producing customized fillable implants. <</if>> <</if>> -<br> -Fertility Implants -<hr> +<<if $seePreg != 0>> + <br> + Fertility Implants + <hr> -<<if $seeHyperPreg == 1 && $seeExtreme == 1 && $seePreg != 0>> - <<if ($permaPregImplant == 0) && ($rep <= 4000*_PCSkillCheck)>> - //You lack the reputation to access experimental pregnancy generator schematics// + <<if $fertilityImplant == 1>> + The manufactory is capable of crafting fertility enhancing implants for ovaries. <br> - <</if>> - <<if ($permaPregImplant == 0) && ($rep > 4000*_PCSkillCheck)>> - [[Purchase schematics for an experimental implantable pregnancy generator|Implant Manufactory][$cash -= 40000*_PCSkillCheck, $permaPregImplant = 1]] - //Costs <<print cashFormat(40000*_PCSkillCheck)>>// - <br> //Will allow the construction of implants that force perpetual pregnancy.// + <<elseif $fertilityImplant == 0 && ($rep <= 3000*_PCSkillCheck)>> + //You lack the reputation to access fertility boosting ovarian implants// <br> - <<elseif ($permaPregImplant > 0)>> - The manufactory is capable of crafting pregnancy generators. + <<else>> + [[Purchase schematics for fertility enhancing ovarian implants|Implant Manufactory][$cash -= 10000*_PCSkillCheck, $fertilityImplant = 1]] + //Costs <<print cashFormat(10000*_PCSkillCheck)>>// + <br> //Will allow the construction of implants that encourage multiple eggs being released during ovulation.// <br> <</if>> - <<if $PGHack == 1>> - The tools required to hack the firmware of basic pregnancy generator implants have been produced by the manufactory for use in the remote surgery. + + <<if $sympatheticOvaries == 1>> + The manufactory is capable of crafting implants that synchronize ovum release. <br> <</if>> + + <<if $seeHyperPreg == 1 && $seeExtreme == 1>> + <<if ($permaPregImplant == 0) && ($rep <= 4000*_PCSkillCheck)>> + //You lack the reputation to access experimental pregnancy generator schematics// + <br> + <<elseif ($permaPregImplant == 0) && ($rep > 4000*_PCSkillCheck)>> + [[Purchase schematics for an experimental implantable pregnancy generator|Implant Manufactory][$cash -= 40000*_PCSkillCheck, $permaPregImplant = 1]] + //Costs <<print cashFormat(40000*_PCSkillCheck)>>// + <br> //Will allow the construction of implants that force perpetual pregnancy.// + <br> + <<elseif ($permaPregImplant > 0)>> + The manufactory is capable of crafting pregnancy generators. + <br> + <</if>> + <<if $PGHack == 1>> + The tools required to hack the firmware of basic pregnancy generator implants have been produced by the manufactory for use in the remote surgery. + <br> + <</if>> + <</if>> <</if>> <br> diff --git a/src/pregmod/organFarm.tw b/src/pregmod/organFarm.tw index 549c903794f7158d0c022a5ba65fbcb7efa8732b..177ee4e970c84d13e82e3a8553769e9dd8537f40 100644 --- a/src/pregmod/organFarm.tw +++ b/src/pregmod/organFarm.tw @@ -144,6 +144,12 @@ Organ Production The organ farm is capable of growing fertile ovaries for postmenopausal slaves. <br> <</if>> + +<<if $asexualReproduction == 1>> + The organ farm is capable of growing modified ovary pairs capable of self-fertilization. + <br> +<</if>> + /* <<if $seePreg != 0 && $seeBestiality != 0>> <<if $farmyardLabUpgrades.animalOvaries > 0>> diff --git a/src/pregmod/organFarmOptions.tw b/src/pregmod/organFarmOptions.tw index d219480d19f794f3cc39589fc52f57263858ae00..de6da69bcc7b0507508a12fa7accfe9dc80a00cc 100644 --- a/src/pregmod/organFarmOptions.tw +++ b/src/pregmod/organFarmOptions.tw @@ -12,6 +12,7 @@ foreskin: 0, ovaries: 0, freshOvaries: 0, + asexualReproOvaries: 0, prostate: 0, pigOvaries: 0, dogOvaries: 0, @@ -73,6 +74,8 @@ <<set $slaveOrgans.mpregCow = 1>> <<elseif $organs[_i].type == "freshOvaries">> <<set $slaveOrgans.freshOvaries = 1>> + <<elseif $organs[_i].type == "asexualReproOvaries">> + <<set $slaveOrgans.asexualReproOvaries = 1>> <</if>> <</if>> <</for>> @@ -186,6 +189,18 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi <<goto "Remote Surgery">> <</link>> //Costs <<print cashFormat(10000)>> and requires a vagina for successful implantation// <</if>> +<<if $asexualReproduction == 1>> + <<if $slaveOrgans.asexualReproOvaries != 1>> + <br> + <<link "Asexual reproduction modification">> + <<set $cash -= 10000>> + <<set _newOrgan = {type: "asexualReproOvaries", weeksToCompletion: "10", ID: 0}>> + <<set _newOrgan.ID = $activeSlave.ID>> + <<set $organs.push(_newOrgan)>> + <<goto "Remote Surgery">> + <</link>> //Costs <<print cashFormat(10000)>> and requires existing ovaries for successful implantation// + <</if>> +<</if>> <<if $animalOvaries != 0>> <<if $slaveOrgans.pigOvaries != 1>> <br> @@ -370,6 +385,8 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi anal womb and horse ovaries are <<case "mpregCow">> anal womb and cow ovaries are + <<case "asexualReproOvaries">> + sperm producing ovary replacement is <</switch>> expected to be ready in <<if $organFarmUpgrade == 1>><<print $organs[_i].weeksToCompletion>><<elseif $organFarmUpgrade == 2>><<print Math.ceil($organs[_i].weeksToCompletion/2)>><<elseif $organFarmUpgrade == 3>><<print Math.ceil($organs[_i].weeksToCompletion/4)>><</if>> weeks. <</if>> @@ -1817,6 +1834,60 @@ The fabricator is ready to grow an organ for $him. Extract tissue to begin growi <</if>> <</link>> <</if>> + <<case "asexualReproOvaries">> + <<if ($activeSlave.mpreg == 0 && $activeSlave.ovaries == 0)>> + <br> + ERROR: this slave lacks ovaries. + <<link "Discard" "Remote Surgery">> + <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "asexualReproOvaries"; })>> + <<if _ofo != -1>> + <<set $completedOrgans.deleteAt(_ofo)>> + <<else>> + @@.red;Organ not found for deletion!@@ + <</if>> + <</link>> + <<else>> + <br> + <<link "Implant" "Surgery Degradation">> + <<set $cash -= $surgeryCost>> + <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "asexualReproOvaries"; })>> + <<if _ofo != -1>> + <<set $completedOrgans.deleteAt(_ofo)>> + <<else>> + @@.red;Organ not found for deletion!@@ + <</if>> + <<if $activeSlave.preg < 0>> + <<set $activeSlave.preg = 0>> + <</if>> + <<set $activeSlave.eggType = "human">> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $activeSlave.ovaImplant = "asexual">> + <<set $surgeryType = "asexualReproOvaries">> + <</link>> + | + <<link "Discard" "Remote Surgery">> + <<set _ofo = $completedOrgans.findIndex(function(s) { return $activeSlave.ID == s.ID && s.type == "asexualReproOvaries"; })>> + <<if _ofo != -1>> + <<set $completedOrgans.deleteAt(_ofo)>> + <<else>> + @@.red;Organ not found for deletion!@@ + <</if>> + <</link>> + <</if>> <<case "prostate">> <<if $activeSlave.prostate != 0>> <br> diff --git a/src/pregmod/surrogacy.tw b/src/pregmod/surrogacy.tw index 19f79f6f502100ae879d3ee3686f514a4dc504eb..adb863de66896b47430810d09727d9e0908b6a6e 100644 --- a/src/pregmod/surrogacy.tw +++ b/src/pregmod/surrogacy.tw @@ -128,10 +128,11 @@ <<if ndef _babyDaddy>> <<set _babyDaddy = $slaveIndices[$donatrix.ID]>> <</if>> + <<run WombImpregnateClone($PC, 1, $donatrix, _babyDaddy, 1)>> <<else>> <<set _babyDaddy = $PC>> + <<run WombImpregnateClone($PC, 1, $PC, _babyDaddy, 1)>> <</if>> - <<run WombImpregnateClone($PC, 1, $donatrix, _babyDaddy, 1)>> <<run WombNormalizePreg($PC)>> <<else>> <<set $receptrix.pregKnown = 1>> @@ -140,10 +141,11 @@ <<if ndef _babyDaddy>> <<set _babyDaddy = $slaveIndices[$donatrix.ID]>> <</if>> + <<run WombImpregnateClone($receptrix, 1, $donatrix, _babyDaddy, 1)>> <<else>> <<set _babyDaddy = $PC>> + <<run WombImpregnateClone($receptrix, 1, $PC, _babyDaddy, 1)>> <</if>> - <<run WombImpregnateClone($receptrix, 1, $donatrix, _babyDaddy, 1)>> <<run WombNormalizePreg($receptrix)>> <<setLocalPronouns $receptrix>> <<if $receptrix.fetish == "mindbroken">> @@ -189,7 +191,7 @@ <<set _surr = $slaves.findIndex(function(s) { return s.ID == $receptrix.ID; })>> <<set $slaves[_surr] = $receptrix>> <</if>> - <<if $donatrix.ID != -1>> + <<if $donatrix.ID != -1 && $donatrix.ID != $receptrix.ID>> <<set _surr = $slaves.findIndex(function(s) { return s.ID == $donatrix.ID; })>> <<set $slaves[_surr] = $donatrix>> <</if>> diff --git a/src/pregmod/theBlackMarket.tw b/src/pregmod/theBlackMarket.tw index d4ac8e8c33d77a9df5e0674f5f824ce30374fd35..5271a6a654a7114881152dc09b91329465fc4b18 100644 --- a/src/pregmod/theBlackMarket.tw +++ b/src/pregmod/theBlackMarket.tw @@ -22,6 +22,20 @@ Once inside, you are able to fully absorb in the sights and sounds of the market <<elseif $PC.refreshmentType == 6>>//"Orally Dissolved" must fit into the following sentence: "I placed a tab of $PC.refreshment under my tongue" to fit events properly <</if>> +/* +<<if $arcologies[0].FSPaternalist != "unset">> + <br><br> + A convoy of scientists from the banned wetware CPU project are present and selling their leftover wares. + [[Browse CPUs|Slave Markets][$slaveMarket = "wetware", $slavesSeen += 1]] | + <<if $cash > _minimumFive>> + [[(x5)|Bulk Slave Generate][$slaveMarket = "wetware", $introType = "bulk", $numSlaves = 5]] | + <</if>> + <<if $cash > _minimumTen>> + [[(x10)|Bulk Slave Generate][$slaveMarket = "wetware", $introType = "bulk", $numSlaves = 10]] | + <</if>> +<</if>> +*/ + <br><br> The main draw, however, is the prominent stage to the rear of the building where the most desirable and less than legal slaves are auctioned off. Enslaved celebrities, kidnapped royalty, the daughters of warlords and all manner of slaves outlawed for sale in most arcologies frequently make appearances before the hungry crowd. It's usually not worth the added risk or the price to buy these girls yourself, however. @@ -177,6 +191,8 @@ Of all the wonders present, the thing that catches your eye the most is a shady <</if>> <<if $geneticMappingUpgrade == 0>> You lack the facilities required for such a treatment to be effective on specific individuals. + <<elseif $dispensaryUpgrade == 0>> + You lack the facilities required to produce complex gene-altering treatments. <<else>> <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 0>> <<if $cash >= 135000>> @@ -259,6 +275,8 @@ Of all the wonders present, the thing that catches your eye the most is a shady <br> <<if $geneticMappingUpgrade == 0>> You lack the facilities required for such a treatment to be effective on specific individuals. + <<elseif $dispensaryUpgrade == 0>> + You lack the facilities required to produce complex gene-altering treatments. <<else>> <<if $RapidCellGrowthFormula == 0>> <<if $cash >= 70000>> @@ -274,6 +292,54 @@ Of all the wonders present, the thing that catches your eye the most is a shady <</if>> <</if>> + <<if $thisWeeksIllegalWares[_bim] == "sympatheticOvaries">> + <br> + <<if $sympatheticOvaries == 0>> + <<if $seePreg == 1>> + <<if $ImplantProductionUpgrade == 1>> + <<if $cash >= 20000>> + [[Purchase schematics for implants that synchronize ova release|The Black Market][$cash -= 50000, $sympatheticOvaries = 1, _dump = $merchantIllegalWares.delete("sympatheticOvaries")]] //@@.yellowgreen;<<print cashFormat(50000)>>.@@// + <<else>> + You cannot afford the asking price of @@.red;<<print cashFormat(50000)>>@@ for implants that synchronize ova release. + <</if>> + "This pair of implants attaches directly to a girl's ovaries and uses signals to communicate with each other. When one releases an egg, the other is spurred to do the same -- in other words, guaranteed twins, always. Now, you're probably wondering why I have this for sale and not one of the big names, well what do you think happens when you mix fertility drugs, or hell just a girl prone to twins, and something that effectively doubles egg counts? That's right, she gets really, really pregnant, like dangerously so. Kind of boring compared to some of the other stuff I get in, to be honest. Though I sometimes wonder what would happen if you got multiple slaves with these implanted and kept them close to each other... Would one ovulating trigger every other implant to do the same?" + <<else>> + You lack the facilities needed to produce implants of this complexity, so schematics for implants that synchronize ova release are currently unobtainable. + <</if>> + <<else>> + You have no interest in research to support pregnancy. + <<set _dump = $merchantIllegalWares.delete("sympatheticOvaries")>> + <</if>> + <<else>> + You already possess schematics for implants that synchronize ova release. + <<set _dump = $merchantIllegalWares.delete("sympatheticOvaries")>> + <</if>> + <</if>> + + <<if $thisWeeksIllegalWares[_bim] == "asexualReproduction">> + <br> + <<if $asexualReproduction == 0>> + <<if $seePreg == 1>> + <<if $organFarmUpgrade > 0>> + <<if $cash >= 20000>> + [[Purchase designs for asexually reproducing ovaries|The Black Market][$cash -= 80000, $asexualReproduction = 1, _dump = $merchantIllegalWares.delete("asexualReproduction")]] //@@.yellowgreen;<<print cashFormat(80000)>>.@@// + <<else>> + You cannot afford the asking price of @@.red;<<print cashFormat(80000)>>@@ for asexually reproducing ovaries. + <</if>> + "Ever wanted kids but were too lazy to even try? Then this is the modification for you! Just replace your slave's existing ovaries with these bad girls and she'll never be without child again! Sure there might be a little but of inbreeding going on, given that she'd be both the mother and father and all that, and sure she might uncontrollably orgasm herself into a coma trying to fertilize her own eggs, but think of all the time you'd save not fucking her! Now why it was designed that way I couldn't tell you, but from what I hear it's quite the show to watch a girl squirming in constant orgasm as she impregnates herself." + <<else>> + You lack the facilities needed to grow organs, so methods of asexual reproduction are currently unobtainable. + <</if>> + <<else>> + You have no interest in research to support pregnancy. + <<set _dump = $merchantIllegalWares.delete("asexualReproduction")>> + <</if>> + <<else>> + You already possess methods of asexual reproduction. + <<set _dump = $merchantIllegalWares.delete("asexualReproduction")>> + <</if>> + <</if>> + <<if $farmyard>> <<if $thisWeeksIllegalWares[_bim] == "AnimalOrgans">> <br> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 72b8a37927de4523d42a3dfb76525448a1cbd410..6da2ce83bffb360fdfcf3340c56fff6f09319661 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -1071,12 +1071,14 @@ <<set $merchantFSWares = ["GenderRadicalistResearch", "TransformationFetishistResearch", "AssetExpansionistResearch", "SlimnessEnthusiastResearch", "YouthPreferentialistResearch", "HedonisticDecadenceResearch"]>> <</if>> <<if ndef $merchantIllegalWares>> - <<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack"]>> + <<set $merchantIllegalWares = ["childhoodFertilityInducedNCS", "UterineRestraintMesh", "RapidCellGrowthFormula", "PGHack", "sympatheticOvaries", "asexualReproduction"]>> <<elseif $merchantIllegalWares.length == 0>> <<set $merchantIllegalWares.push("childhoodFertilityInducedNCS")>> <<set $merchantIllegalWares.push("UterineRestraintMesh")>> <<set $merchantIllegalWares.push("RapidCellGrowthFormula")>> <<set $merchantIllegalWares.push("PGHack")>> + <<set $merchantIllegalWares.push("sympatheticOvaries")>> + <<set $merchantIllegalWares.push("asexualReproduction")>> <</if>> <<if ndef $arcologies[0].childhoodFertilityInducedNCSResearch>> <<set $arcologies[0].childhoodFertilityInducedNCSResearch = 0>> @@ -1202,9 +1204,18 @@ <<set $arcologyUpgrade.spire = ($AProsperityCap > 240) ? 1 : 0>> <</if>> -<<if def $AHelots>> - <<set $ASlaves += Math.trunc($AHelots / 2)>> - <<unset $AHelots>> +<<if def $AMenials>> + <<set $ASlaves += Math.trunc($AMenials / 2)>> + <<unset $AMenials>> +<</if>> + +<<if def $helots>> + <<set $menials = $helots>> + <<unset $helots>> +<</if>> +<<if def $TradeShowHelots>> + <<set $TradeShowMenials = $TradeShowHelots>> + <<unset $TradeShowHelots>> <</if>> <<if ndef $seeBuilding>> @@ -2773,7 +2784,7 @@ Setting missing global variables: <</if>> <<if ndef $NPCSlaves>> <<set $NPCSlaves = $ASlaves, - $ASlaves += $helots + $fuckdolls + $menialBioreactors>> + $ASlaves += $menials + $fuckdolls + $menialBioreactors>> <</if>> <<if def $ACitizenLimit || def $ASlaveLimit>> <<set $ACitizenLimit = "unset", diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index e82f85585e68d588812ad69e3d5e52cad1ad1d57..b39f08b2b4f086272575761803d43aace10b2f62 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -413,7 +413,7 @@ _topClassP = 1>> <<set _slavesSupLaw = 0, _slavesSupLaw += Math.trunc(($lowerClass + $middleClass + $upperClass) * 0.65), $NPCSlaves += Math.trunc(_slavesSupLaw * 0.7), - $helots += Math.trunc(_slavesSupLaw * 0.2), + $menials += Math.trunc(_slavesSupLaw * 0.2), $lowerClass = Math.trunc($lowerClass * 0.35), $middleClass = Math.trunc($middleClass * 0.35), $upperClass = Math.trunc($upperClass * 0.35), @@ -434,7 +434,7 @@ _topClassP = 1>> <<if $FSSubLawTrigger == 1 && $arcologies[0].FSSupremacistLawME < 1>> <<set _slavesSubLaw = Math.trunc(($lowerClass + $middleClass + $upperClass) * 0.2), $NPCSlaves += Math.trunc(_slavesSubLaw * 0.7), - $helots += Math.trunc(_slavesSubLaw * 0.2), + $menials += Math.trunc(_slavesSubLaw * 0.2), $lowerClass = Math.trunc($lowerClass * 0.8), $middleClass = Math.trunc($middleClass * 0.8), $upperClass = Math.trunc($upperClass * 0.8), @@ -548,16 +548,16 @@ _middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.sub <<if $arcologies[0].FSSupremacistLawME + $arcologies[0].FSSubjugationistLawME > 0>> <<set _citizenRetirementImpact *= 2 / 3>> <</if>> - <<set $lowerClass += Math.trunc(($NPCSlaves + $helots) * (0.05 + _citizenRetirementImpact)), - _helotsRetirement = Math.trunc($helots * (0.05 + _citizenRetirementImpact)), - $helots = Math.trunc($helots * (0.95 - _citizenRetirementImpact)), + <<set $lowerClass += Math.trunc(($NPCSlaves + $menials) * (0.05 + _citizenRetirementImpact)), + _menialsRetirement = Math.trunc($menials * (0.05 + _citizenRetirementImpact)), + $menials = Math.trunc($menials * (0.95 - _citizenRetirementImpact)), _ASlavesRetirement = Math.trunc($NPCSlaves * (0.05 + _citizenRetirementImpact)), $NPCSlaves = Math.trunc($NPCSlaves * (0.95 - _citizenRetirementImpact)), $citizenRetirementTrigger = 2>> You have enacted citizen retirement, the slaves of eligible age are granted freedom. - <<if _helotsRetirement > 1>> - @@.red;<<print _helotsRetirement>> of your menial slaves@@ were retired. - <<elseif _helotsRetirements > 0>> + <<if _menialsRetirement > 1>> + @@.red;<<print _menialsRetirement>> of your menial slaves@@ were retired. + <<elseif _menialsRetirements > 0>> @@.red;One of your menial slaves@@ was retired. <</if>> <<if _ASlavesRetirement > 1>> @@ -566,13 +566,13 @@ _middleClass *= 1 + ($TSS.subsidize + $GRI.subsidize + $SCP.subsidize + $LDE.sub <</if>> /*Slave expiration*/ -<<set _expirationPC = Math.trunc($helots * ($slaveExpiration * _expirationFS)), +<<set _expirationPC = Math.trunc($menials * ($slaveExpiration * _expirationFS)), _expirationFD = Math.trunc($fuckdolls * ($slaveExpiration * _expirationFS)), _expirationBR = Math.trunc($menialBioreactors * ($slaveExpiration * _expirationFS)), _expirationNPC = Math.trunc($NPCSlaves * ($slaveExpiration * _expirationFS)), _expiration = _expirationPC + _expirationNPC + _expirationFD + _expirationBR, $NPCSlaves -= _expirationNPC, -$helots -= _expirationPC, +$menials -= _expirationPC, $fuckdolls -= _expirationFD, $menialBioreactors -= _expirationBR>> <<if _expiration > 1>> @@ -650,7 +650,7 @@ $menialBioreactors -= _expirationBR>> <<set _enslavedPC = Math.trunc(_enslaved / 4), _enslavedNPC = _enslaved - _enslavedPC>> <</if>> - <<set $helots += _enslavedPC, + <<set $menials += _enslavedPC, $NPCSlaves += _enslavedNPC>> <</if>> <<if _enslaved > 1>> @@ -703,23 +703,23 @@ $visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) /*slaves*/ /*Slaves getting retired*/ <<if $citizenRetirementMenials == 1>> - <<set _weeklyRetiredHelots = $helots / (($customMenialRetirementAge - 15) * 52), + <<set _weeklyRetiredMenials = $menials / (($customMenialRetirementAge - 15) * 52), _weeklyRetiredNPCMenials = $NPCSlaves / (($customMenialRetirementAge - 15) * 52)>> /*This implies a minimum menial age of 15. Even if the player sets minimum ages lower, there's no point having a 3 year old menial slave. 15 seems alright while being nice and round. This also implies ages are distributed evenly, no easy way around that.*/ - <<if _weeklyRetiredHelots > 1>> - <<set _weeklyRetiredHelots = Math.trunc(_weeklyRetiredHelots)>> - <<if _weeklyRetiredHelots > 1>> - <br>@@.red;<<print _weeklyRetiredHelots>> of your menial slaves@@ retired as free citizens this week. + <<if _weeklyRetiredMenials > 1>> + <<set _weeklyRetiredMenials = Math.trunc(_weeklyRetiredMenials)>> + <<if _weeklyRetiredMenials > 1>> + <br>@@.red;<<print _weeklyRetiredMenials>> of your menial slaves@@ retired as free citizens this week. <<else>> <br>@@.red;One of your menial slaves@@ retired as a free citizen this week. <</if>> <<else>> - <<set _weeklyRetiredHelots *= 100, + <<set _weeklyRetiredMenials *= 100, _retirementChance = random(1,100)>> - <<if _weeklyRetiredHelots > _retirementChance>> - <<set _weeklyRetiredHelots = 1>> + <<if _weeklyRetiredMenials > _retirementChance>> + <<set _weeklyRetiredMenials = 1>> <br>@@.red;One of your menial slaves@@ retired as a free citizen this week. <<else>> - <<set _weeklyRetiredHelots = 0>> + <<set _weeklyRetiredMenials = 0>> <</if>> <</if>> <<if _weeklyRetiredNPCMenials > 1>> @@ -739,9 +739,9 @@ $visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) <<set _weeklyRetiredNPCMenials = 0>> <</if>> <</if>> - <<set $helots -= _weeklyRetiredHelots, + <<set $menials -= _weeklyRetiredMenials, $NPCSlaves -= _weeklyRetiredNPCMenials, - $lowerClass += _weeklyRetiredHelots + _weeklyRetiredNPCMenials>> + $lowerClass += _weeklyRetiredMenials + _weeklyRetiredNPCMenials>> <</if>> /*Demand for simple labor*/ <<set _LSCD = Math.trunc(($LSCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18)), @@ -762,8 +762,8 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <br>@@.red;One slave@@ was sold by your inhabitants. They've got more than enough of them already. <</if>> /*More slaves than there is work*/ - <<elseif $NPCSlaves > (_LSCD / ($slaveProductivity + _slaveProductivity)) - $helots + _SCD>> - <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $helots + _SCD), + <<elseif $NPCSlaves > (_LSCD / ($slaveProductivity + _slaveProductivity)) - $menials + _SCD>> + <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $menials + _SCD), $menialDemandFactor -= _NPCSlavesSold, $NPCSlaves = Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity))>> <<if _NPCSlavesSold > 1>> @@ -811,7 +811,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * /*Lower Class Citizens*/ /*Work left for lower class citizens*/ -<<set _LCD = Math.trunc((($LSCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + _lowerClass + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18) - ($NPCSlaves + $helots) * ($slaveProductivity + _slaveProductivity)) * $rentEffectL * _lowerClassP)>> +<<set _LCD = Math.trunc((($LSCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 4) + _lowerClass + (($middleClass + $visitors * 0.6) * 1.5) + (($upperClass + $visitors * 0.2) * 3.5) + ($topClass * 18) - ($NPCSlaves + $menials) * ($slaveProductivity + _slaveProductivity)) * $rentEffectL * _lowerClassP)>> <<if _LCD < 0>> <<set _LCD = 0>> <</if>> @@ -854,7 +854,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <<set _enslavedPC = Math.trunc(_enslaved / 4), _enslavedNPC = _enslaved - _enslavedPC>> <</if>> - <<set $helots += _enslavedPC, + <<set $menials += _enslavedPC, $NPCSlaves += _enslavedNPC>> <</if>> <<if _enslaved > 1>> @@ -930,7 +930,7 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * /*Top Class Citizens*/ /*Setting GDP depending on population*/ -<<set $GDP = Math.trunc((($NPCSlaves + $helots) * 0.35 * $slaveProductivity) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10>> +<<set $GDP = Math.trunc((($NPCSlaves + $menials) * 0.35 * $slaveProductivity) + ($lowerClass * 0.35) + ($middleClass * 0.75) + ($upperClass * 2) + ($topClass * 10)) / 10>> /*Top Class Interest in living in your arcology*/ <<if $eliteFailTimer > 0>> /*when you fail the eugenics elite and they leave this triggers*/ <<set _TCD = Math.trunc(($GDP / 15 + _topClass) * $rentEffectT * _topClassP + $TCBase - ($eliteFail / 15 * $eliteFailTimer)), @@ -967,9 +967,9 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <</if>> /*ends _weatherFreeze*/ <<if $secExp == 1>> - <<set $ASlaves = $NPCSlaves + $helots + $fuckdolls + $menialBioreactors + $secHelots + $slavesEmployedManpower>> + <<set $ASlaves = $NPCSlaves + $menials + $fuckdolls + $menialBioreactors + $secMenials + $slavesEmployedManpower>> <<else>> - <<set $ASlaves = $NPCSlaves + $helots + $fuckdolls + $menialBioreactors>> + <<set $ASlaves = $NPCSlaves + $menials + $fuckdolls + $menialBioreactors>> <</if>> <<set $ACitizens = $lowerClass + $middleClass + $upperClass + $topClass, _percACitizens = Math.trunc(($ACitizens / ($ACitizens + $ASlaves)) * 1000) / 10, @@ -1057,7 +1057,7 @@ _percTopClass = Math.trunc(($topClass / ($ACitizens + $ASlaves)) * 1000) / 10>> <<if $alternativeRents == 1>> /*A silly policy*/ Your citizens are allowed to pay their rents in slaves rather than cash and a few financially challenged individuals make use of this. <<set _rentMultiplier *= 0.95>> - <<set _movement = random(0,3), $helots += _movement, $NPCSlaves -= _movement>> + <<set _movement = random(0,3), $menials += _movement, $NPCSlaves -= _movement>> <</if>> <<if $discountMercenaries == 1>> Mercenaries willing to come to your arcology are given a discount on rent. @@ -1089,25 +1089,25 @@ This week, rents from $arcologies[0].name came to @@.yellowgreen;<<print cashFor <</if>> <</if>> -<<if $helots+$menialBioreactors+$fuckdolls > 0>> +<<if $menials+$menialBioreactors+$fuckdolls > 0>> <<set _earnings = 0>> You own -<<if $helots > 0>> - <<if $helots > Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD)>> +<<if $menials > 0>> + <<if $menials > Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD)>> <<set _earnings += Math.trunc((_LSCD / ($slaveProductivity + _slaveProductivity) - _SCD) * 10>> <br>@@.red;more menial slaves than there was work,@@ consider selling some. You own <<else>> - <<set _earnings += $helots*10>> + <<set _earnings += $menials*10>> <<if $Sweatshops > 0>> - <<if $Sweatshops*500 <= $helots>> + <<if $Sweatshops*500 <= $menials>> <<set _earnings += $Sweatshops*7000>> - <<set _earnings += ($helots-$Sweatshops*500)*10>> + <<set _earnings += ($menials-$Sweatshops*500)*10>> <<else>> - <<set _earnings += $helots*10>> + <<set _earnings += $menials*10>> <</if>> <</if>> <</if>> - <<if $helots > 1>> <<print commaNum($helots)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>> + <<if $menials > 1>> <<print commaNum($menials)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>> <</if>> <<if $menialBioreactors > 0>> <<set _earnings += $menialBioreactors*(10+(10*$arcologies[0].FSPastoralistLaw))>> @@ -1525,7 +1525,7 @@ The Hippolyta Academy have a <<if $HA.schoolProsperity > 4>>very prosperous<<els <br> Your ''business assistant'' manages the menial slave market. <<if _menialSlaveValue <= 900+$marketAssistantAggressiveness>>/* BUY */ - <<set _bulkMax = $PopCap-$helots-$fuckdolls-$menialBioreactors>> + <<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>> <<if _bulkMax <= 0>> There is no room in the parts of your arcology you own for more menial slaves. <<else>> @@ -1537,16 +1537,16 @@ Your ''business assistant'' manages the menial slave market. <<elseif ($arcologies[0].FSDegradationist != "unset")>> <<set $fuckdolls += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax)), $cash -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/((_menialSlaveValue+_menialBulkPremium)*2),0,_bulkMax))*((_menialSlaveValue+_menialBulkPremium)*2)>> <<else>> - <<set $helots += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $cash -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))>> + <<set $menials += Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+100),0,_bulkMax)), $menialSupplyFactor -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)), $cash -= Math.trunc(Math.clamp(($cash-$marketAssistantLimit)/(_menialSlaveValue+_menialBulkPremium),0,_bulkMax)*(_menialSlaveValue+_menialBulkPremium))>> <</if>> <</if>> <</if>> <<elseif _menialSlaveValue >= 1100-$marketAssistantAggressiveness>>/* SELL */ - <<if $helots+$fuckdolls+$menialBioreactors > 0>> + <<if $menials+$fuckdolls+$menialBioreactors > 0>> <<if $assistant == 0>>It<<else>>She<</if>> liquidates your chattel holdings, since it's a sellers' market. <</if>> - <<if $helots > 0>> - <<set $cash += $helots*(menialSlaveCost(-$helots)), $menialDemandFactor -= $helots, $helots = 0>> + <<if $menials > 0>> + <<set $cash += $menials*(menialSlaveCost(-$menials)), $menialDemandFactor -= $menials, $menials = 0>> <</if>> <<if $fuckdolls > 0>> <<set $cash += $fuckdolls*(menialSlaveCost(-$fuckdolls)*2), $menialDemandFactor -= $fuckdolls, $fuckdolls = 0>> diff --git a/src/uncategorized/buySlaves.tw b/src/uncategorized/buySlaves.tw index 6b455534295ca78ccb0ed0828f1eeadc8713615e..ab8b16b9b6eb808e0f8bbbdf8e403692baa01b26 100644 --- a/src/uncategorized/buySlaves.tw +++ b/src/uncategorized/buySlaves.tw @@ -302,12 +302,12 @@ __Menial Slaves__ The parts of your arcology you own can house a total of $PopCap menial slaves. <<set _menialPrice = menialSlaveCost()>> -<<set _bulkMax = $PopCap-$helots-$fuckdolls-$menialBioreactors>> +<<set _bulkMax = $PopCap-$menials-$fuckdolls-$menialBioreactors>> <br> -<<if $helots > 1>> - You own <<print commaNum(Math.trunc($helots))>> menial slaves. -<<elseif $helots > 0>> +<<if $menials > 1>> + You own <<print commaNum(Math.trunc($menials))>> menial slaves. +<<elseif $menials > 0>> You own one menial slave. <<else>> You do not own any menial slaves. @@ -315,55 +315,55 @@ The parts of your arcology you own can house a total of $PopCap menial slaves. The market price of menials is <<print cashFormat(_menialPrice)>>. <<set _optionsBreak = 0>> <<if _bulkMax > 0 && $cash > _menialPrice>> - [[Buy|Buy Slaves][$helots+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] + [[Buy|Buy Slaves][$menials+=1,$menialSupplyFactor-=1,$cash-=_menialPrice]] <<if $cash > (menialSlaveCost(10))*10>> - [[(x10)|Buy Slaves][$helots+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] + [[(x10)|Buy Slaves][$menials+=10,$menialSupplyFactor-=10,$cash-=(menialSlaveCost(10))*10]] <</if>> <<if $cash > (menialSlaveCost(100))*100>> - [[(x100)|Buy Slaves][$helots+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] + [[(x100)|Buy Slaves][$menials+=100,$menialSupplyFactor-=100,$cash-=(menialSlaveCost(100))*100]] <</if>> <<if $cash > (_menialPrice+1)*2>> <<set _menialBulkPremium = Math.trunc(1 + Math.clamp($cash/_menialPrice,0,_bulkMax)/400)>> - [[(max)|Buy Slaves][$helots+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax))*(_menialPrice+_menialBulkPremium)]] + [[(max)|Buy Slaves][$menials+=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$menialSupplyFactor-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax)),$cash-=Math.trunc(Math.clamp($cash/(_menialPrice+_menialBulkPremium),0,_bulkMax))*(_menialPrice+_menialBulkPremium)]] <</if>> //Bulk transactions may require offering a premium.// <<set _optionsBreak = 1>> <</if>> -<<if $helots >= 1>> +<<if $menials >= 1>> <<if _optionsBreak>>|<</if>> - [[Sell|Buy Slaves][$helots-=1,$menialDemandFactor-=1,$cash+=_menialPrice]] -<<if $helots >= 10>> - [[(x10)|Buy Slaves][$helots-=10,$menialDemandFactor-=10,$cash+=(menialSlaveCost(-10))*10]] -<<if $helots >= 100>> - [[(x100)|Buy Slaves][$helots-=100,$menialDemandFactor-=100,$cash+=(menialSlaveCost(-100))*100]] + [[Sell|Buy Slaves][$menials-=1,$menialDemandFactor-=1,$cash+=_menialPrice]] +<<if $menials >= 10>> + [[(x10)|Buy Slaves][$menials-=10,$menialDemandFactor-=10,$cash+=(menialSlaveCost(-10))*10]] +<<if $menials >= 100>> + [[(x100)|Buy Slaves][$menials-=100,$menialDemandFactor-=100,$cash+=(menialSlaveCost(-100))*100]] <</if>> <</if>> -[[(all)|Buy Slaves][$cash+=$helots*(menialSlaveCost(-$helots)),$menialDemandFactor-=$helots,$helots = 0]] +[[(all)|Buy Slaves][$cash+=$menials*(menialSlaveCost(-$menials)),$menialDemandFactor-=$menials,$menials = 0]] <<if $arcologies[0].FSPaternalist == "unset">> <<if $arcadeUpgradeFuckdolls == 1>> <<set _fconvertCost = 1000>> <<if _menialPrice >= 1100>> <<set _fconvertCost = (_menialPrice+100)>> <</if>> - <br> [[Convert to Fuckdoll|Buy Slaves][$helots-=1,$fuckdolls+=1,$cash-=(_fconvertCost)]] - <<if $helots >= 10>> - [[(x10)|Buy Slaves][$helots-=10,$fuckdolls+=10,$cash-=10*(_fconvertCost)]] - <<if $helots >= 100>> - [[(x100)|Buy Slaves][$helots-=100,$fuckdolls+=100,$cash-=100*(_fconvertCost)]] + <br> [[Convert to Fuckdoll|Buy Slaves][$menials-=1,$fuckdolls+=1,$cash-=(_fconvertCost)]] + <<if $menials >= 10>> + [[(x10)|Buy Slaves][$menials-=10,$fuckdolls+=10,$cash-=10*(_fconvertCost)]] + <<if $menials >= 100>> + [[(x100)|Buy Slaves][$menials-=100,$fuckdolls+=100,$cash-=100*(_fconvertCost)]] <</if>> <</if>> - [[(all)|Buy Slaves][$fuckdolls+=$helots,$cash-=(_fconvertCost)*($helots),$helots=0]] + [[(all)|Buy Slaves][$fuckdolls+=$menials,$cash-=(_fconvertCost)*($menials),$menials=0]] //Conversion costs <<print cashFormat(_fconvertCost)>> each// <</if>> <<if $dairyFeedersUpgrade > 0>> - <br> [[Convert to Bioreactor|Buy Slaves][$helots-=1,$menialBioreactors+=1,$cash-=500]] - <<if $helots >= 10>> - [[(x10)|Buy Slaves][$helots-=10,$menialBioreactors+=10,$cash-=5000]] - <<if $helots >= 100>> - [[(x100)|Buy Slaves][$helots-=100,$menialBioreactors+=100,$cash-=50000]] + <br> [[Convert to Bioreactor|Buy Slaves][$menials-=1,$menialBioreactors+=1,$cash-=500]] + <<if $menials >= 10>> + [[(x10)|Buy Slaves][$menials-=10,$menialBioreactors+=10,$cash-=5000]] + <<if $menials >= 100>> + [[(x100)|Buy Slaves][$menials-=100,$menialBioreactors+=100,$cash-=50000]] <</if>> <</if>> - [[(all)|Buy Slaves][$menialBioreactors+=$helots,$cash-=500*$helots,$helots=0]] + [[(all)|Buy Slaves][$menialBioreactors+=$menials,$cash-=500*$menials,$menials=0]] //Conversion costs <<print cashFormat(500)>> each// <</if>> <</if>> diff --git a/src/uncategorized/costsReport.tw b/src/uncategorized/costsReport.tw index 2139a14fc2127424ae31d092649afe3e6801ff05..9494db08f4a74ef728aa083afc247eda7e9574c3 100644 --- a/src/uncategorized/costsReport.tw +++ b/src/uncategorized/costsReport.tw @@ -104,9 +104,9 @@ your __personal living expenses__ are <<print cashFormat(Math.trunc($girls*(250+ <<if $citizenRetirementMenials == 1>> <br>__Menial Slave Retirement Premiums__: <<if $CitizenRetirement == 1>> - <<set _citizenRetirementMenialsCost = $helots * 2>> + <<set _citizenRetirementMenialsCost = $menials * 2>> <<else>> - <<set _citizenRetirementMenialsCost = ($helots + $slaves.length) * 2>> + <<set _citizenRetirementMenialsCost = ($menials + $slaves.length) * 2>> <</if>> <<set _archologyCosts += _citizenRetirementMenialsCost>> <<print cashFormat(_citizenRetirementMenialsCost)>> @@ -195,8 +195,8 @@ $nursery > 0 || $masterSuiteUpgradePregnancy > 0 || $incubator > 0 || <<set _archologyCosts += $propHubUpkeep>> <</if>> <<if $secHQ != 0>> - Security Headquarters: @@.yellowgreen;<<print cashFormat(($secHQUpkeep)+(20*$secHelots))>>@@ - <<set _archologyCosts += ($secHQUpkeep)+(20*$secHelots)>> + Security Headquarters: @@.yellowgreen;<<print cashFormat(($secHQUpkeep)+(20*$secMenials))>>@@ + <<set _archologyCosts += ($secHQUpkeep)+(20*$secMenials)>> <</if>> <<if $secBarracks != 0>> Barracks: @@.yellowgreen;<<print cashFormat($secBarracksUpkeep)>>@@ diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index d5644716d148bfbf698cec429f9230b91cd69b48..2c85a95329396ca676fe9ebe9523e038c8ae5b4b 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -322,28 +322,6 @@ Fertility Focused Pharmacology <</if>> <</if>> -<<if $geneticMappingUpgrade == 1>> - <br> - Gene Mods - <hr> - - <<if $dispensaryUpgrade == 0>> - //The fabricator must upgraded before it can produce treatments to alter genes// - <br> - <<else>> - The fabricator is capable of mapping a slave's genes, identifying abnormalities and producing treatments to correct them. - <br> - <<if $arcologies[0].childhoodFertilityInducedNCSResearch == 1>> - The fabricator is capable of producing treatments to induce NCS. - <br> - <</if>> - <<if $RapidCellGrowthFormula == 1>> - The fabricator is capable of producing treatments to accelerate cellular reproduction. - <br> - <</if>> - <</if>> -<</if>> - <br> Future Societies Research <hr> diff --git a/src/uncategorized/manufacturing.tw b/src/uncategorized/manufacturing.tw index 92d1a840d32878083a5cc43fa44504e6a45ff9bb..7a6ab7be92407a1f64a3ab3ef19a200f5d7e42f2 100644 --- a/src/uncategorized/manufacturing.tw +++ b/src/uncategorized/manufacturing.tw @@ -14,15 +14,15 @@ This is a space in the arcology's service areas, <br> <<if $sectors[$AS].type == "Sweatshops">> -<<if $helots > 0>> +<<if $menials > 0>> <br><br> - You own <<print commaNum($helots)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>, - <<if $helots > $Sweatshops*500>> + You own <<print commaNum($menials)>> menial slaves. All your sweatshops together can use only <<print $Sweatshops*500>>, + <<if $menials > $Sweatshops*500>> the remainder is assigned to various odd-jobs in the arcology. - <<elseif $helots == $Sweatshops*500>> + <<elseif $menials == $Sweatshops*500>> and your menials are fully staffing them. <<else>> - leaving space for <<print $Sweatshops*500-$helots>> more. + leaving space for <<print $Sweatshops*500-$menials>> more. <</if>> <</if>> <</if>> diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw index c05cdc741050493d74d361db326397d63e367a36..b7c932da40e7e77bebf19172ad1afe05ba8976c8 100644 --- a/src/uncategorized/multiImplant.tw +++ b/src/uncategorized/multiImplant.tw @@ -17,6 +17,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized foreskin: 0, ovaries: 0, freshOvaries: 0, + asexualReproOvaries: 0, prostate: 0, pigOvaries: 0, canineOvaries: 0, @@ -63,6 +64,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <<elseif $completedOrgans[_j].type == "freshOvaries">> <<set _slaveOrgans.freshOvaries = $completedOrgans[_j]>> <<set $completedOrgans.deleteAt(_j),_j-->> + <<elseif $completedOrgans[_j].type == "asexualReproOvaries">> + <<set _slaveOrgans.asexualReproOvaries = $completedOrgans[_j]>> + <<set $completedOrgans.deleteAt(_j),_j-->> <<elseif $completedOrgans[_j].type == "prostate">> <<set _slaveOrgans.prostate = $completedOrgans[_j]>> <<set $completedOrgans.deleteAt(_j),_j-->> @@ -278,6 +282,36 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized <<set $completedOrgans.push(_slaveOrgans.ovaries)>> <</if>> <</if>> + /* asexual reproduction modifiction */ + <<if _slaveOrgans.asexualReproOvaries != 0>> + <<if ($activeSlave.mpreg == 1 || $activeSlave.ovaries == 1)>> + <<set $cash -= $surgeryCost>> + <<set $activeSlave.eggType = "human">> + <<set $activeSlave.preg = 0>> + <<set $activeSlave.health -= 20>> + <<if $organFarmUpgrade == 2>> + <<set $activeSlave.chem += 20>> + <</if>> + <<if $activeSlave.pubertyXX == 0>> + <<if $precociousPuberty == 1>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyAgeXX = ($activeSlave.physicalAge+1)>> + <</if>> + <<else>> + <<if $activeSlave.physicalAge >= $fertilityAge>> + <<set $activeSlave.pubertyXX = 1>> + <</if>> + <</if>> + <</if>> + <<set $surgeryType = "asexualReproOvaries">> + <br><hr> + <<include "Surgery Degradation">> + <<else>> + <br><hr> + @@.red;Could not implant modified ovary in $activeSlave.slaveName: $he has no ovaries.@@ + <<set $completedOrgans.push(_slaveOrgans.asexualReproOvaries)>> + <</if>> + <</if>> /* pig ovaries */ <<if _slaveOrgans.pigOvaries != 0>> <<if ($activeSlave.ovaries == 0) && ($activeSlave.vagina >= 0) && ($activeSlave.mpreg == 0) && ($activeSlave.bellyImplant == -1)>> diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 149529aa261f7be0772ea1619f82734cfd77ff00..b72e7c03350db24b6bfbffdd6a21ad6b0d7eb20e 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -2706,7 +2706,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <<else>> delivers _prisoners menial slaves to you in payment for your past support. <</if>> - <<set $helots += _prisoners>> + <<set $menials += _prisoners>> <<elseif $peacekeepers.strength < 0>> @@.yellow;The peacekeeping force led by General $peacekeepers.generalName in the troubled area near the Free City has been withdrawn.@@ <<if $peacekeepers.undermining>> diff --git a/src/uncategorized/pInvasion.tw b/src/uncategorized/pInvasion.tw index 37c43186161204df64a2cb2209e416777eabfbd8..e3ae44b843b0d9517f0e1ccad70385cc55444c1b 100644 --- a/src/uncategorized/pInvasion.tw +++ b/src/uncategorized/pInvasion.tw @@ -105,7 +105,7 @@ The loose militia lately organized by the arcology owners has been called out to <<set _newSlaves.push($activeSlave)>> <</for>> -<<set $helots += 5>> +<<set $menials += 5>> <<set $desc = "a shot-torn flag of the failed nation whose militants attacked the Free City">> <<set $trinkets.push($desc)>> diff --git a/src/uncategorized/pPeacekeepersDeficit.tw b/src/uncategorized/pPeacekeepersDeficit.tw index 2151aa50c1a20029ebdbe0f57897faa6dade972c..03c3575e55bb2a26012f5c0af48a4b14945f1281 100644 --- a/src/uncategorized/pPeacekeepersDeficit.tw +++ b/src/uncategorized/pPeacekeepersDeficit.tw @@ -28,7 +28,7 @@ The singular solution to the two problems is obvious. It's equally obvious that Understanding that the general needs to couch the situation in a way he can justify in public, and perhaps in a way he can justify to himself, you offer to house the prisoners on a contract basis, with immediate payment to the general so he can meet his forces' immediate needs. Naturally, the prisoners will be kept busy while you keep them; menial labor seems appropriate. It's unlikely that the situation will ever stabilize to the point where they can be released, so for safety, they should all be detained indefinitely. And of course, each prisoner's individual detention will be available for resale. Just like any other slave's. <br><br> The general is unable to keep from smiling slightly when he hears that you understand perfectly and are willing and able to assist. There's some bitterness there, but not much. The two of you adjust the terms. The new menial slaves will be delivered immediately, several hundred of them; the general prefers to have this be a one-time transfer. After all, having an ongoing prisoner pipeline between his prisoner pens and the Free City might draw unwanted political attention. For now, he has the funds he needs, not to mention an empty prison camp. - <<set $peacekeepers.attitude += 5, $cash -= 100000, $helots += 200>> + <<set $peacekeepers.attitude += 5, $cash -= 100000, $menials += 200>> <</replace>> <</link>> //This will cost <<print cashFormat(100000)>> and provide a number of menial slaves// <<else>> diff --git a/src/uncategorized/pPeacekeepersInfluence.tw b/src/uncategorized/pPeacekeepersInfluence.tw index a4456a52a9da00dcb1140f3dad80d065bc1dfa9d..6e6a6f5f918e95da6b4bfff69efd5eeacaf23ab8 100644 --- a/src/uncategorized/pPeacekeepersInfluence.tw +++ b/src/uncategorized/pPeacekeepersInfluence.tw @@ -8,7 +8,7 @@ General $peacekeepers.generalName has successfully declared his independence fro <br><br> -You provided money to General $peacekeepers.generalName to help him through this difficult time of transition, making him an investment of yours. That investment has already shown a small return; the first regular tribute of slaves arrived this week, free of charge. General $peacekeepers.generalName seems determined to pay his debts properly, and he sent you good stock, healthy menials ready for <<if $helots>>work<<if $Sweatshops>>. They're already toiling away in $arcologies[0].name's sweatshops<</if>><<else>>resale<</if>>. Even better, it seems you can expect to receive a similar shipment in perpetuity. The number of downtrodden people living in the ruins of a small country dwarfs even a Free City's appetite for slaves. +You provided money to General $peacekeepers.generalName to help him through this difficult time of transition, making him an investment of yours. That investment has already shown a small return; the first regular tribute of slaves arrived this week, free of charge. General $peacekeepers.generalName seems determined to pay his debts properly, and he sent you good stock, healthy menials ready for <<if $menials>>work<<if $Sweatshops>>. They're already toiling away in $arcologies[0].name's sweatshops<</if>><<else>>resale<</if>>. Even better, it seems you can expect to receive a similar shipment in perpetuity. The number of downtrodden people living in the ruins of a small country dwarfs even a Free City's appetite for slaves. <br><br> diff --git a/src/uncategorized/pens.tw b/src/uncategorized/pens.tw index 46b09be4999a5187e410dbd491561e657fafc2b8..c4fe5c28bc193974851ad293916779a1b542f13d 100644 --- a/src/uncategorized/pens.tw +++ b/src/uncategorized/pens.tw @@ -6,11 +6,11 @@ This is a space in the arcology's service areas, designed to house hundreds of s <<SectorSell>> <br> -<<if $helots+$menialBioreactors+$fuckdolls > 0>> +<<if $menials+$menialBioreactors+$fuckdolls > 0>> <br><br> You own - <<if $helots > 0>> - <<if $helots > 1>><<print commaNum($helots)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>> + <<if $menials > 0>> + <<if $menials > 1>><<print commaNum($menials)>> menial slaves<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><<else>>one menial slave<<if ($menialBioreactors > 0) && ($fuckdolls == 0)>> and<<else>>,<</if>><</if>> <</if>> <<if $menialBioreactors > 0>> <<if $menialBioreactors > 1>><<print commaNum($menialBioreactors)>> standard bioreactors,<<else>>one standard bioreactor,<</if>> @@ -19,9 +19,9 @@ This is a space in the arcology's service areas, designed to house hundreds of s <<if $fuckdolls > 0>> <<if $fuckdolls > 1>><<print commaNum($fuckdolls)>> standard fuckdolls,<<else>>one fuckdoll,<</if>> <</if>> - <<if $helots+$menialBioreactors+$fuckdolls > 0>>partially<</if>> + <<if $menials+$menialBioreactors+$fuckdolls > 0>>partially<</if>> housed in this sector. - <<if $helots > 0>> + <<if $menials > 0>> <<if $Sweatshops>> The simple labor slaves toil in $arcologies[0].name's sweatshops, and only return here to sleep. <</if>> diff --git a/src/uncategorized/persBusiness.tw b/src/uncategorized/persBusiness.tw index 9aaf9a555e02d82550318bef6a5a976e220df0d7..55ff98ccf10e303464a4aaf2af193be18ed1c1d7 100644 --- a/src/uncategorized/persBusiness.tw +++ b/src/uncategorized/persBusiness.tw @@ -815,7 +815,7 @@ Routine upkeep of your demesne costs @@.yellow;<<print cashFormat($costs)>>.@@ <</if>> <<set _income = 0>> <<set _price = Math.trunc(Math.clamp(random(1,2) + ($arcologies[0].prosperity / 15) - ($week / 30), 2, 8))>> - <<set _factoryMod = Math.round(1 + ($weapProductivity + $weapLab) / 2 + ($weapHelots / 100))>> + <<set _factoryMod = Math.round(1 + ($weapProductivity + $weapLab) / 2 + ($weapMenials / 100))>> <<if $sellTo.citizen == 1>> <<if $weaponsLaw == 3>> Your lax regulations regarding weapons allows your citizens to buy much of what you are capable of producing. diff --git a/src/uncategorized/reShippingContainer.tw b/src/uncategorized/reShippingContainer.tw index 56ffa659c32afc427f5ce67e193c1ea41381fe67..0b1011cb80473269d1ff58e685aa97134ebf7c7b 100644 --- a/src/uncategorized/reShippingContainer.tw +++ b/src/uncategorized/reShippingContainer.tw @@ -15,7 +15,7 @@ <<set $activeSlave.health = -10>> <<set _newSlaves.push($activeSlave)>> <</for>> -<<set $helots += 25>> +<<set $menials += 25>> You receive an alert from $assistantName that there's a situation developing down in the shipping area at the base of the arcology. A shipping container arrived <<if $terrain == "urban">>through the vehicular arteries that connect the arcology to the city that surrounds it<<elseif $terrain == "rural">>via one of the transportation links that traverses the wilderness around the Free City<<elseif $terrain == "ravine">>via one of few cliffside roads leading down into the Free City<<else>>at the docks this morning<</if>>, without the proper documentation, or indeed any documentation at all. This is not uncommon in the rough and tumble world of Free Cities business; the automated handling systems scan such containers for dangerous material and then put them in a holding area until the matter can be untangled. They accumulate fees while there, and you're not infrequently able to confiscate the contents when those fees accumulate sufficiently. There are unusual reports about this container, though: citizens at the <<if $terrain == "urban">>shipping area<<elseif $terrain == "rural">>transport hub<<elseif $terrain == "ravine">>loading port<<else>>docks<</if>> are reporting that this particular container is shouting. With nothing else pressing, you decide to handle the situation personally. @@ -44,7 +44,7 @@ For now, the crowd around you is looking at the helpless human cargo with <<set $cash += $slaveCost>> <</for>> Allowing humor into your voice, you announce an auction, to be held immediately. The crowd appreciates the wit, and @@.green;appreciates it even more@@ when you conduct the auction yourself. It's always good to take an opportunity to show off your understanding of the slave market in public. You @@.yellowgreen;sell them all,@@ sex slaves and menials alike. Welcome to the Free Cities. - <<set $helots -= 25>> + <<set $menials -= 25>> <<set $cash += 25*_bonusCash>> <<set $rep += 100>> <</replace>> @@ -79,7 +79,7 @@ For now, the crowd around you is looking at the helpless human cargo with <<set $cash += $slaveCost>> <</for>> You hurry forward, beckoning the crowd to accompany you. The wretched slaves cringe with fear, but soon they're being comforted, offered water, and examined for injury. Once the most pressing needs are attended to, you call for everyone's attention. You pride yourself on knowing your citizens well, and you can pick good Paternalists out of the crowd at will. Calling them by name, you ask whether they'd be willing to take on one of these poor slaves. One by one, you pair slave and Master or Mistress, rewarding your best people with public approbation, not to mention a free slave. The initial gasps of surprise quickly grow into @@.green;thunderous applause.@@ Your people love you. Several of the slaves begin to cry, mostly from confusion or sheer exhaustion; they don't yet know how lucky they are. - <<set $helots -= 25>> + <<set $menials -= 25>> <<set $rep += 2500>> <</replace>> <</link>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 205335989d71ecd0f00e947f16e5086a6bfded40..2d52987874fee47295fb3c3099b5d365b1d0ea6e 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -860,58 +860,82 @@ Work on $his sex: [[Restore fertility|Surgery Degradation][$activeSlave.preg = 0,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "fert"]] <</if>> -<<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1) && ($activeSlave.preg < 1)>> - <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> - <<if ($activeSlave.pubertyXX == 0)>> +<<if ($activeSlave.ovaries == 1 || $activeSlave.mpreg == 1)>> + <br> + <<if ($activeSlave.pubertyXX == 0)>> + $He has ovaries but has not had $his first period. + <<else>> + $He has working ovaries<<if $activeSlave.mpreg>> and a womb attached to $his rectum<</if>>. + <</if>> + <<if $activeSlave.ovaImplant != 0>> + <br> + <<switch $activeSlave.ovaImplant>> + <<case "fertility">> + They have fertility implants attached to them. + [[Remove implants|Surgery Degradation][$activeSlave.ovaImplant = 0,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ovaImplant removed"]] + <<case "sympathy">> + They are linked via implants and ovulate in concert. + [[Remove implants|Surgery Degradation][$activeSlave.ovaImplant = 0,$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ovaImplant removed"]] + <<case "asexual">> + One has been replaced with a sperm producing analog for self-fertilization. + <</switch>> + <<else>> + <<if $sympatheticOvaries == 1>> <br> - $He has ovaries but has not had $his first period. - <<else>> + [[Install fertility implants|Surgery Degradation][$activeSlave.ovaImplant = "fertility",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ovaImplant added"]] + <</if>> + <<if $fertilityImplant == 1>> <br> - $He has working ovaries. + [[Install sympathetic ovulation implants|Surgery Degradation][$activeSlave.ovaImplant = "sympathy",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ovaImplant added"]] <</if>> - [[Oophorectomy|Surgery Degradation][$activeSlave.ovaries = 0,$activeSlave.wombImplant = "none",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ster"]] <</if>> -<</if>> -<<if $activeSlave.mpreg == 1>> - <<if $activeSlave.preg > 0>> - <br> - $His anal womb cannot be removed while $he is pregnant. - <<else>> - <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> + + <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> <br> - $He has a working set of ovaries and a womb attached to $his rectum. - [[Remove anal reproductive organs|Surgery Degradation][$activeSlave.mpreg = 0, $activeSlave.wombImplant = "none",$cash -= $surgeryCost, $activeSlave.health -= 30,$surgeryType = "mpreg removed"]] + <<if $activeSlave.ovaries == 1>> + <<if $activeSlave.preg > 0>> + $His ovaries and womb cannot be removed while $he is pregnant. + <<else>> + [[Oophorectomy|Surgery Degradation][$activeSlave.ovaries = 0,$activeSlave.ovaImplant = 0,$activeSlave.wombImplant = "none",$cash -= $surgeryCost, $activeSlave.health -= 10,$surgeryType = "ster"]] + <</if>> + <</if>> + <<if $activeSlave.mpreg == 1>> + <<if $activeSlave.preg > 0>> + $His anal womb cannot be removed while $he is pregnant. + <<else>> + [[Remove anal reproductive organs|Surgery Degradation][$activeSlave.mpreg = 0,$activeSlave.ovaImplant = 0, $activeSlave.wombImplant = "none",$cash -= $surgeryCost, $activeSlave.health -= 30,$surgeryType = "mpreg removed"]] + <</if>> <</if>> <</if>> -<</if>> -<<if $seeExtreme == 1 && $seeHyperPreg == 1 && $seePreg != 0 && $permaPregImplant == 1>> - <br> - <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>> - $His womb is already rented out for the production of calves. - <<else>> - <<if isFertile($activeSlave) && $activeSlave.ovaryAge <= 46>> - $He could be made into a broodmother. - <<elseif $activeSlave.broodmother > 0>> - $He has been made into a <<if $activeSlave.broodmother > 1>>hyper-<</if>>broodmother. - <<if $activeSlave.womb.length == 0 >> - [[Remove a pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]] - <<else>> - $He is pregnant right now, so $his broodmother implant can't be safely extracted. - <<if $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses == 1>> /*hack can be applied only one time, for type 1 broodmothers, and only if implant already present*/ - <br> - [[Hack the pregnancy generator|Surgery Degradation][$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 1,$surgeryType = "preg1hack"]] //This will trick the generator ova release logic, forcing it to release more than one ova each week. This is an untested override and can cause severe health problems.// - <<elseif $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses > 1>> - <br> - The implant firmware has already been adjusted. + <<if $seeExtreme == 1 && $seeHyperPreg == 1 && $seePreg != 0 && $permaPregImplant == 1>> + <br> + <<if $activeSlave.assignment == "work in the dairy" && $dairyPregSetting > 0>> + $His womb is already rented out for the production of calves. + <<else>> + <<if isFertile($activeSlave) && $activeSlave.ovaryAge <= 46>> + $He could be made into a broodmother. + <<elseif $activeSlave.broodmother > 0>> + $He has been made into a <<if $activeSlave.broodmother > 1>>hyper-<</if>>broodmother. + <<if $activeSlave.womb.length == 0 >> + [[Remove a pregnancy generator|Surgery Degradation][$activeSlave.preg = 0,$activeSlave.pregWeek = -2,$activeSlave.pregSource = 0,$activeSlave.pregWeek = 0,$activeSlave.pregKnown = 0,$activeSlave.pregType = 0,$activeSlave.broodmother = 0,$activeSlave.broodmotherFetuses = 0,$activeSlave.broodmotherOnHold = 0,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "pregRemove"]] + <<else>> + $He is pregnant right now, so $his broodmother implant can't be safely extracted. + <<if $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses == 1>> /*hack can be applied only one time, for type 1 broodmothers, and only if implant already present*/ + <br> + [[Hack the pregnancy generator|Surgery Degradation][$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 1,$surgeryType = "preg1hack"]] //This will trick the generator ova release logic, forcing it to release more than one ova each week. This is an untested override and can cause severe health problems.// + <<elseif $activeSlave.broodmother == 1 && $activeSlave.broodmotherFetuses > 1>> + <br> + The implant firmware has already been adjusted. + <</if>> <</if>> + <<else>> + $His body cannot support being a broodmother. <</if>> - <<else>> - $His body cannot support being a broodmother. - <</if>> - <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> - <<if isFertile($activeSlave)>> - [[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg = 1,$activeSlave.pregWeek = 1,$activeSlave.pregKnown = 1,$activeSlave.pregType = 1,$activeSlave.broodmother = 1,$activeSlave.broodmotherFetuses = 1,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "preg"]] //This will have severe effects on $his health and mind// + <<if $activeSlave.indentureRestrictions < 1 && ($activeSlave.breedingMark != 1 || $propOutcome == 0)>> + <<if isFertile($activeSlave)>> + [[Implant a pregnancy generator|Surgery Degradation][$activeSlave.preg = 1,$activeSlave.pregWeek = 1,$activeSlave.pregKnown = 1,$activeSlave.pregType = 1,$activeSlave.broodmother = 1,$activeSlave.broodmotherFetuses = 1,$cash -= $surgeryCost,$activeSlave.pregControl = "none",$activeSlave.health -= 10,$surgeryType = "preg"]] //This will have severe effects on $his health and mind// + <</if>> <</if>> <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index 0a7f0b5c2cc4cbd3bea7ee13200ca7c62b90d173..ce748e692a56c6e91f7610b0b07fcc815355dcc6 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -128,6 +128,21 @@ /* MENTAL DEVELOPMENT */ + <<if $slaves[$i].ovaImplant == "asexual" && canGetPregnant($slaves[$i])>> + The frequent internal ejaculations and accompanying climaxes brought about by $his ovarian modifications keeps $him sexually sated. + <<if ($slaves[$i].energy >= 10) && ($slaves[$i].attrXY >= 10 || $slaves[$i].attrXX >= 10)>> + However, the constant self-gratification @@.red;both damages what $he finds attractive and leaves sex less satisfying.@@ + <<set $slaves[$i].energy -= 10, $slaves[$i].attrXY = Math.clamp($slaves[$i].attrXY-10,0,100), $slaves[$i].attrXX = Math.clamp($slaves[$i].attrXX-10,0,100)>> + <<elseif ($slaves[$i].energy >= 10)>> + However, the constant self-gratification @@.red;leaves sex less satisfying.@@ + <<set $slaves[$i].energy -= 10>> + <<elseif ($slaves[$i].attrXY >= 10 || $slaves[$i].attrXX >= 10)>> + However, the constant self-gratification @@.red;twists what $he finds attractive.@@ + <<set $slaves[$i].attrXY = Math.clamp($slaves[$i].attrXY-10,0,100), $slaves[$i].attrXX = Math.clamp($slaves[$i].attrXX-10,0,100)>> + <</if>> + <<set $slaves[$i].need = 0>> + <</if>> + <<if ($slaves[$i].attrKnown == 1)>> <<if ($slaves[$i].attrXY <= 35)>> <<if ($slaves[$i].energy >= 20)>> @@ -3599,6 +3614,12 @@ <</if>> /* closes random chance and non-zero sex acts check */ <</switch>> /* closes assignment checks */ <</if>> /* closes all impregnation checks */ + + <<if $slaves[$i].ovaImplant == "asexual">> + <<= knockMeUp($slaves[$i], 100, 2, $slaves[$i].ID, 1)>> + Since $he is fertile and still not pregnant, the frequent orgasms caused by $his asexual reproduction modifications eventually leave $him @@.lime;pregnant with $his own child.@@ + <</if>> + <</if>> /* CLOSES CAN GET PREGNANT */ /* PREGNANCY TYPE SANITY CHECK (not for pregnancies started above) */ diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw index d7148fab546a49a02999c1f6583b091b5db16e83..4c1ae47a3efaf9da14f2c93480a71fd8cfafb5b2 100644 --- a/src/uncategorized/saRules.tw +++ b/src/uncategorized/saRules.tw @@ -3515,14 +3515,14 @@ <<if ($universalRulesConsent == 0)>> <<if ($slaves[$i].devotion <= 20)>> <<if ($slaves[$i].trust > -10)>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules and $his job, $he finds $himself constantly molested by other slaves, and lives $his life constantly @@.gold;afraid.@@ <<else>> Under the rules and $his job, $he is free game for other slaves to molest, and lives $his life constantly @@.gold;afraid@@ of the day you bring home more girls. <</if>> <<set $slaves[$i].trust -= 2>> <<else>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules and $his job, $he finds $himself constantly molested by other slaves, but $he's already in such constant terror it doesn't seriously affect $him. <<else>> Under the rules and $his job, $he will someday find $himself constantly molested by other slaves, but $he's already in such constant terror it that it doesn't cross $his mind. @@ -3534,7 +3534,7 @@ <</if>> <<else>> <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse, though it does nothing to stop them from using $him. <<else>> Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. Well, that and the fact your penthouse is rather empty. @@ -5323,14 +5323,14 @@ <<if ($universalRulesConsent == 0)>> <<if ($slaves[$i].devotion <= 20)>> <<if ($slaves[$i].trust > -10)>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules, $he finds $himself constantly molested by other slaves, and lives $his life constantly @@.gold;afraid.@@ <<else>> Under the rules, $he is free game for other slaves to molest, and lives $his life constantly @@.gold;afraid@@ of the day you bring home more girls. <</if>> <<set $slaves[$i].trust -= 2>> <<else>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules, $he finds $himself constantly molested by other slaves, but $he's already in such constant terror it doesn't seriously affect $him. <<else>> Under the rules, $he will someday find $himself constantly molested by other slaves, but $he's already in such constant terror it that it doesn't cross $his mind. @@ -5338,7 +5338,7 @@ <</if>> <<elseif ($slaves[$i].releaseRules != "restrictive")>> <<if ($slaves[$i].energy > 95)>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;adores@@ you for providing plentiful outlets for $his nymphomania. <<else>> Under the rules, $he's allowed to demand that other slaves get $him off, and $he @@.hotpink;eagerly awaits@@ the day you bring home more girls to get $him off. @@ -5346,14 +5346,14 @@ <<set $slaves[$i].devotion += 1>> <<elseif ($slaves[$i].fetishKnown == 1) && ($slaves[$i].fetishStrength > 60)>> <<if ($slaves[$i].fetish == "sadist")>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;adores@@ you for providing a whole penthouse of girls for $him to rape. <<else>> Under the rules, $he's allowed to sexually abuse other slaves, and $he @@.hotpink;eagerly awaits@@ the day you bring home more girls for $him to rape. <</if>> <<set $slaves[$i].devotion += 1>> <<elseif ($slaves[$i].fetish == "dom")>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;adores@@ you for providing a whole penthouse of girls for $him to dominate. <<else>> Under the rules, $he's allowed to force other slaves to have sex with $him, and $he @@.hotpink;eagerly awaits@@ the day you bring home more girls for $him to dominate. @@ -5364,7 +5364,7 @@ <</if>> <<else>> <<if ($slaves[$i].devotion <= 20) && ($slaves[$i].devotion >= -20)>> - <<if $slaves.length > 2 || $helots > 0>> + <<if $slaves.length > 2 || $menials > 0>> Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. <<else>> Since $he's low in the slave hierarchy, @@.mediumaquamarine;$he knows@@ that the rule that slaves must get consent before having sex with $him are all that protect $him from abuse. Well, that and the fact your penthouse is rather empty. diff --git a/src/uncategorized/seRetirement.tw b/src/uncategorized/seRetirement.tw index eac06dc83ba3cef22e75c300848383f7c0454b21..6500371f906b384ba672d9c080b279b601a45185 100644 --- a/src/uncategorized/seRetirement.tw +++ b/src/uncategorized/seRetirement.tw @@ -349,7 +349,7 @@ There are a thousand things a slave like $him can usefully do around the arcolog <br><br> You have @@.yellowgreen;gained a menial slave.@@ -<<set $helots += 1>> +<<set $menials += 1>> <</if>> diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw index aa363beeb8c35b8e93a174915d58841cc1ccd59a..6a14ef1baecd99fd9a199a547bb9983652f1a98f 100644 --- a/src/uncategorized/surgeryDegradation.tw +++ b/src/uncategorized/surgeryDegradation.tw @@ -585,6 +585,19 @@ As the remote surgery's long recovery cycle completes, $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen; it won't be clear to $him that menopause is not a concern for now. As with all surgery @@.red;$his health has been slightly affected.@@ <</if>> +<<case "ovaImplant added" "ovaImplant removed">> + It's not immediately apparent to $him what kind of surgery $he received, since all $he's left with is a terrible nonspecific ache in $his lower abdomen. + <<if ($activeSlave.devotion > 50)>> + $He's @@.hotpink;grateful@@ that you think $him worthy of surgically modifying. As with all surgery @@.red;$his health has been slightly affected.@@ + <<set $activeSlave.devotion += 4>> + <<elseif ($activeSlave.devotion >= -20)>> + $He understands the realities of $his life as a slave, but didn't expect to undergo a mysterious procedure like this. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body. + <<set $activeSlave.trust -= 5>> + <<else>> + $He does not understand the realities of $his life as a slave at a core level, so $he's @@.mediumorchid;terrified and angry@@ at what you could have possibly done to $him. As with all surgery @@.red;$his health has been slightly affected.@@ $He is @@.gold;sensibly fearful@@ of your total power over $his body. + <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> + <</if>> + <<case "mpreg">> $He leaves the surgery with a certain fullness in $his lower abdomen, $he knows that, despite lacking female reproductive organs, $he can now become pregnant. <<if $activeSlave.fetish == "mindbroken">> @@ -1917,34 +1930,52 @@ As the remote surgery's long recovery cycle completes, <<if $activeSlave.fetish == "mindbroken">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but lacks the mental faculties to realize that $he now has a chance to get pregnant. As with all surgery @@.red;$his health has been slightly affected.@@ <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "$He sold $himself to you in the hope of someday bearing children.">> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he now has a chance to get pregnant. $He is filled with joy whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He now places @@.mediumaquamarine;total faith@@ in your plans for $his body and @@.hotpink;adores you@@ for giving $him a gift $he once thought impossible. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he now has a chance to get pregnant. $He is filled with joy whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He now places @@.mediumaquamarine;total faith@@ in your plans for $his body and @@.hotpink;adores you@@ for giving $him a gift $he once thought impossible. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 10, $activeSlave.devotion += 10>> <<elseif ($activeSlave.devotion > 50)>> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman. $He is @@.mediumaquamarine;tremendously impressed@@ that you would devote such immense resources to altering $his body, and is more willing than ever to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman. $He is @@.mediumaquamarine;tremendously impressed@@ that you would devote such immense resources to altering $his body, and is more willing than ever to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 5, $activeSlave.devotion += 5>> <<elseif ($activeSlave.devotion >= -20)>> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, so much so that $he is now more willing to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, so much so that $he is now more willing to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust -= 5, $activeSlave.devotion += 5>> <<else>> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, and @@.mediumorchid;furious@@ at $his lack of control over $his own person. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, and @@.mediumorchid;furious@@ at $his lack of control over $his own person. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> +<<case "asexualReproOvaries">> + <<if $activeSlave.fetish == "mindbroken">> + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but lacks the mental faculties to realize that $he is now self-impregnating. As with all surgery @@.red;$his health has been slightly affected.@@ + <<elseif ($activeSlave.devotion > 50)>> + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to suspect that something has critically changed about $his reproductive system. $He is @@.mediumaquamarine;pleased@@ that you would go out of your way to alter $his body, and is more willing than ever to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ + <<set $activeSlave.trust += 5, $activeSlave.devotion += 5>> + <<elseif ($activeSlave.devotion >= -20)>> + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to shudder at the thought of just what could have possibly been put into $him. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, so much so that $he is now more willing to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ + <<set $activeSlave.trust -= 5, $activeSlave.devotion += 5>> + <<else>> + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to dread the discovery of what now resides inside $him. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, and @@.mediumorchid;furious@@ at $his lack of control over $his own person. As with all surgery @@.red;$his health has been slightly affected.@@ + <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> + <</if>> + <<if canGetPregnant($activeSlave)>> + <<= knockMeUp($activeSlave, 100, 2, $activeSlave.ID, 1)>><</if>> + $He doesn't even have the chance to reach the slave quarters before $his new reproductive system detects $his unprotected fertility and begins to internally cum. <<if canWalk($activeSlave)>>$He struggles to stand as wave after wave of pleasure radiates from inside $his self-fertilizing womb<<else>>The slave carrying $him struggles to keep their grip on the orgasm wracked $girl<</if>>. By the time $he is finised, $he is a sweat-soaked, panting mess with a womb @@.lime;<<if $activeSlave.pregType > 50>>stuffed full of fertilized eggs<<elseif $activeSlave.pregType > 20>>filled with new life<<elseif $activeSlave.pregType > 1>>housing several new lives<<else>>filled with seed and a new life<</if>>.@@ + <</if>> + /* TODO: these descriptions may need some more tweaking to sound more natural */ <<case "addAnimalOvaries">> <<if $activeSlave.fetish == "mindbroken">> $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but lacks the mental faculties to realize that $he now has a chance of carrying an animal baby to term. As with all surgery @@.red;$his health has been slightly affected.@@ <<elseif (($activeSlave.fetish == "pregnancy") && ($activeSlave.fetishStrength > 60) && ($activeSlave.fetishKnown == 1)) || $activeSlave.origin == "$He sold $himself to you in the hope of someday bearing children.">> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he now has a chance to get pregnant. $He is filled with joy whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He now places @@.mediumaquamarine;total faith@@ in your plans for $his body and @@.hotpink;adores you@@ for giving $him a gift $he once thought impossible. $He doesn't realize exactly what the surgery entailed, however -- the happiness $he felt at first will most likely be replaced with horror once $he realizes the babies in $his womb are not human. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he now has a chance to get pregnant. $He is filled with joy whenever $he thinks about the fact that feeling a life growing within $him is now, at last, a possibility. $He now places @@.mediumaquamarine;total faith@@ in your plans for $his body and @@.hotpink;adores you@@ for giving $him a gift $he once thought impossible. $He doesn't realize exactly what the surgery entailed, however -- the happiness $he felt at first will most likely be replaced with horror once $he realizes the babies in $his womb are not human. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 10, $activeSlave.devotion += 10>> <<elseif ($activeSlave.devotion > 50)>> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman -- at least, that's what $he believes. Little does $he know that $he is now capable of carrying animal babies in $his womb. $He is @@.mediumaquamarine;tremendously impressed@@ that you would devote such immense resources to altering $his body, and is more willing than ever to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman -- at least, that's what $he believes. Little does $he know that $he is now capable of carrying animal babies in $his womb. $He is @@.mediumaquamarine;tremendously impressed@@ that you would devote such immense resources to altering $his body, and is more willing than ever to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust += 5, $activeSlave.devotion += 5>> <<elseif ($activeSlave.devotion >= -20)>> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman -- at least, that's what $he believes. Little does $he know that $he is now capable of carrying animal babies in $his womb. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, so much so that $he is now more willing to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman -- at least, that's what $he believes. Little does $he know that $he is now capable of carrying animal babies in $his womb. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, so much so that $he is now more willing to @@.hotpink;submit to your plans@@ for $his future. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust -= 5, $activeSlave.devotion += 5>> <<else>> - $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the fabricator can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman -- at least, that's what $he believes. Little does $he know that $he is now capable of carrying animal babies in $his womb. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, and @@.mediumorchid;furious@@ at $his lack of control over $his own person. As with all surgery @@.red;$his health has been slightly affected.@@ + $He leaves the surgery with nothing but a nonspecific ache in $his lower abdomen, but $he has managed to catch enough slave rumors about what the organ farm can do to know that it means $he is now internally indistinguishable from a natural, unaltered woman -- at least, that's what $he believes. Little does $he know that $he is now capable of carrying animal babies in $his womb. $He is @@.gold;terrified@@ of your apparently untrammeled power over $his body, and @@.mediumorchid;furious@@ at $his lack of control over $his own person. As with all surgery @@.red;$his health has been slightly affected.@@ <<set $activeSlave.trust -= 5, $activeSlave.devotion -= 5>> <</if>> diff --git a/src/utility/descriptionWidgetsFlesh.tw b/src/utility/descriptionWidgetsFlesh.tw index 413e1fd9442178afd537a9c47d2e791b61379fbe..30f6ad06481ff0eab29047e9d05c2c53e0ce020e 100644 --- a/src/utility/descriptionWidgetsFlesh.tw +++ b/src/utility/descriptionWidgetsFlesh.tw @@ -4760,7 +4760,7 @@ $He's got a <<else>> $activeSlave.skin pussylips. <</if>> - + <<if ($activeSlave.vagina > -1)>> <<if ($activeSlave.vaginaLube == 0)>> <<if ($activeSlave.vagina > 0) && ($activeSlave.vaginalAccessory != "chastity belt")>> @@ -4877,6 +4877,17 @@ $He's got a <</if>> +<<if $activeSlave.ovaImplant != 0>> + <<switch $activeSlave.ovaImplant>> + <<case "fertility">> + $His ovaries have a pair of implants attached to them to encourage ovulation<<if $activeSlave.preg < -1>>, not that it does $him any good<</if>>. + <<case "sympathy">> + $His ovaries have a pair of linked implants attached to them so that when one releases an egg the other does so as well. + <<case "asexual">> + One of $his ovaries has been replaced with a fabricated sperm sack designed to fertilize any eggs $he makes. + <</switch>> +<</if>> + <<if $activeSlave.dick == 0 && $activeSlave.balls == 0 && $activeSlave.vagina < 0 && $arcologies[0].FSRestart > 60>> Society looks fondly on $his complete inability to reproduce. <</if>> @@ -4922,7 +4933,6 @@ $He's got a <</if>> <</if>> - <<if ($activeSlave.dick == 0)>> <<if ($activeSlave.clit > 0)>> <<if ($activeSlave.foreskin == 0)>> @@ -16062,7 +16072,9 @@ $He has <</if>> <</if>> <<if $activeSlave.pregKnown == 1 && $saleDescription == 0>> - <<if $activeSlave.preg > $activeSlave.pregData.normalBirth/8>> + <<if $activeSlave.pregSource == -7>> + $His womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many <</if>> modified children<<else>>a modified child<</if>> from the gene lab. + <<elseif $activeSlave.preg > $activeSlave.pregData.normalBirth/8>> <<if $activeSlave.pregSource == -1>> Tests show $his womb contains <<if $activeSlave.pregType > 1>><<if $activeSlave.pregType > 10>>many of <</if>>your growing children<<else>>your growing child<</if>>. <<elseif $activeSlave.pregSource == -2>>