diff --git a/src/pregmod/manageCorporation.tw b/src/pregmod/manageCorporation.tw index 58ecba5315d0ec03499d8c260be007fcd157926c..61be792df67275f9c5e4df1e825bfd0b6d0dac49 100644 --- a/src/pregmod/manageCorporation.tw +++ b/src/pregmod/manageCorporation.tw @@ -28,24 +28,26 @@ __Incorporation__ <br>A focus on offering menial services. <<print cashFormat(300000)>> [[Menial Services|Manage Corporation][$corpIncorporated = 1, cashX(forceNeg(300000), "stocksTraded"), $corpDiv = 1, $corpDivMenial = 1, $corpDivMenialDev = 20, $corpDivMenialSlaves = 20, $corpDivMenialFromMarket = 1, $corpCash = 20000, $personalShares = 2000, $publicShares = 1000, $corpDividend = 0, $dividendTimer = 13, $corpRev = 0, $corpRevOld = 0, $corpAssetsSlaveOld = 300000, $corpAssetsSlave = 0, $corpAssetsDevOld = 130000, $corpAssetsDev = 0]] <<if $cash > 340000>> <br>A focus on whoring out slaves. <<print cashFormat(340000)>> [[Escort Service|Manage Corporation][$corpIncorporated = 1, cashX(forceNeg(340000), "stocksTraded"), $corpDiv = 1, $corpDivWhore = 1, $corpDivWhoreDev = 10, $corpDivWhoreSlaves = 10, $corpDivWhoreFromMarket = 1, $corpCash = 50000, $personalShares = 2000, $publicShares = 1000, $corpDividend = 0, $dividendTimer = 13, $corpRev = 0, $corpRevOld = 0, $corpAssetsSlaveOld = 260000, $corpAssetsSlave = 0, $corpAssetsDevOld = 200000, $corpAssetsDev = 0]] + <<else>> + You lack the funds for the final option. You need @@.yellowgreen;<<print cashFormat(340000)>>@@ for it. <</if>> <<else>> - You lack the funds for the final option. + You lack the funds for some options. You need at least @@.yellowgreen;<<print cashFormat(300000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(340000)>>.@@ <</if>> <<else>> - You lack the funds for some options. + You lack the funds for some options. You need at least @@.yellowgreen;<<print cashFormat(270000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(340000)>>.@@ <</if>> <<else>> - You lack the funds for some options. + You lack the funds for some options. You need at least @@.yellowgreen;<<print cashFormat(250000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(340000)>>.@@ <</if>> <<else>> - You lack the funds for many options. + You lack the funds for many options. You need at least @@.yellowgreen;<<print cashFormat(210000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(340000)>>.@@ <</if>> <<else>> - You lack the funds for most options. + You lack the funds for most options. You need at least @@.yellowgreen;<<print cashFormat(200000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(340000)>>.@@ <</if>> <<else>> - You lack the funds to found a slave corporation. + You lack the funds to found a slave corporation. You need at least @@.yellowgreen;<<print cashFormat(150000)>>@@ and at most @@.yellowgreen;<<print cashFormat(340000)>>.@@ <</if>> <br>[[8-7 Share Split|Manage Corporation][$vanillaShareSplit = 0]] <<else>> /*8/7 split on the shares instead of 2/1*/ @@ -66,24 +68,26 @@ __Incorporation__ <br>A focus on offering menial services. <<print cashFormat(240000)>> [[Menial Services|Manage Corporation][$corpIncorporated = 1, cashX(forceNeg(240000), "stocksTraded"), $corpDiv = 1, $corpDivMenial = 1, $corpDivMenialDev = 20, $corpDivMenialSlaves = 20, $corpDivMenialFromMarket = 1, $corpCash = 20000, $personalShares = 8000, $publicShares = 7000, $corpDividend = 0, $dividendTimer = 13, $corpRev = 0, $corpRevOld = 0, $corpAssetsSlaveOld = 300000, $corpAssetsSlave = 0, $corpAssetsDevOld = 130000, $corpAssetsDev = 0]] <<if $cash > 272000>> <br>A focus on whoring out slaves. <<print cashFormat(272000)>> [[Escort Service|Manage Corporation][$corpIncorporated = 1, cashX(forceNeg(272000), "stocksTraded"), $corpDiv = 1, $corpDivWhore = 1, $corpDivWhoreDev = 10, $corpDivWhoreSlaves = 10, $corpDivWhoreFromMarket = 1, $corpCash = 50000, $personalShares = 8000, $publicShares = 7000, $corpDividend = 0, $dividendTimer = 13, $corpRev = 0, $corpRevOld = 0, $corpAssetsSlaveOld = 260000, $corpAssetsSlave = 0, $corpAssetsDevOld = 200000, $corpAssetsDev = 0]] + <<else>> + You lack the funds for the final option. You need @@.yellowgreen;<<print cashFormat(272000)>>@@ for it. <</if>> <<else>> - You lack the funds for the final option. + You lack the funds for some options. You need at least @@.yellowgreen;<<print cashFormat(240000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(272000)>>.@@ <</if>> <<else>> - You lack the funds for some options. + You lack the funds for some options. You need at least @@.yellowgreen;<<print cashFormat(216000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(272000)>>.@@ <</if>> <<else>> - You lack the funds for some options. + You lack the funds for some options. You need at least @@.yellowgreen;<<print cashFormat(200000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(272000)>>.@@ <</if>> <<else>> - You lack the funds for many options. + You lack the funds for many options. You need at least @@.yellowgreen;<<print cashFormat(168000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(272000)>>.@@ <</if>> <<else>> - You lack the funds for most options. + You lack the funds for most options. You need at least @@.yellowgreen;<<print cashFormat(160000)>>@@ for the next option and at most @@.yellowgreen;<<print cashFormat(272000)>>.@@ <</if>> <<else>> - You lack the funds to found a slave corporation. + You lack the funds to found a slave corporation. You need at least @@.yellowgreen;<<print cashFormat(120000)>>@@ and at most @@.yellowgreen;<<print cashFormat(272000)>>.@@ <</if>> <br>[[2-1 Share Split|Manage Corporation][$vanillaShareSplit = 1]] <</if>> @@ -480,7 +484,7 @@ __Division Management__ Auto send slaves to undergo surgery <<link "Stop Auto Send">><<unset $corpDivBreakToSurgery>><<goto "Manage Corporation">><</link>> <</if>> | - <<if ndef $corpDivBreakToTrain>> + <<if def $corpDivBreakToTrain>> <<unset $corpDivBreakToTrain>> <</if>> <<elseif $corpDivTrain > 0>> @@ -539,7 +543,7 @@ __Division Management__ _corpDivSurgeryCostPU = Math.trunc(_corpDivSurgeryCost / ($corpDivSurgerySlaves * 0.5)), _corpDivSurgeryRev = menialSlaveCost() * 23, _corpDivSurgeryProc = Math.trunc($corpDivSurgeryDev * 0.5)>> - <br>The corporation has a pysical slave modification division. + <br>The corporation has a physical slave modification division. <br>It can modify an average of @@.green;<<print _corpDivSurgeryProc>> slaves@@ each week when filled to capacity ($corpDivSurgeryDev). <br>It costs @@.yellowgreen;<<print cashFormat(_corpDivSurgeryCost)>>@@ to run. On average that is @@.yellowgreen;<<print cashFormat(_corpDivSurgeryCostPU)>>@@ per slave. <br>The improved slaves can be sold for @@.yellowgreen;<<print cashFormat(_corpDivSurgeryRev)>>@@ each. @@ -1174,6 +1178,7 @@ __Division Management__ <<goto "Manage Corporation">> <</link>> <</if>> + <br> <</if>> <<if $corpDivWhore == 0>> @@ -1433,7 +1438,7 @@ __Slave specialization__ <br>Slaves are given [[No Education|Manage Corporation][$corpSpecEducation == 0, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Basic Education|Manage Corporation][$corpSpecEducation = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] <</if>> <<if ndef $corpSpecImplants && $corpDivSurgery > 0>> /*This used to be $surgicalUpgradeImplants, it is the surgery specialization*/ - <br>Slave implants are [[Applied|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] + <br>Slave implants are [[Applied|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Not Applied|Manage Corporation][$corpSpecImplants = 0, $corpSpecTimer = 2]] <</if>> <<if ndef $corpSpecGenitalia && $corpDivSurgery > 100>> /*This used to be $surgicalUpgradeGenitalia, it is the surgery specialization*/ <br>Slaves get their genitalia reconfigured [[Add Pussy|Manage Corporation][$corpSpecPussy = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Pussy|Manage Corporation][$corpSpecPussy = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Add Dick|Manage Corporation][$corpSpecDick = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Dick|Manage Corporation][$corpSpecDick = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Add Balls|Manage Corporation][$corpSpecBalls = 1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | [[Remove Balls|Manage Corporation][$corpSpecBalls = -1, $corpSpecGenitalia = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] @@ -1955,6 +1960,11 @@ __Slave specialization__ <<if $corpSpecTimer == 0>> [[Tasteful Implants|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken += 1, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecImplants>><<set $corpSpecToken += 2, $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>> <</if>> + <<elseif $corpSpecImplants == 0>> + <br>The corporation keeps their slaves entirely implant free. + <<if $corpSpecTimer == 0 && $corpSpecToken > 0>> + [[Tasteful Implants|Manage Corporation][$corpSpecImplants = 1, $corpSpecToken -= 1, $corpSpecTimer = 2]] | <<link "No Focus">><<unset $corpSpecImplants>><<set $corpSpecTimer = 2>><<goto "Manage Corporation">><</link>> + <</if>> <</if>> <<if ndef $corpSpecPussy && ndef $corpSpecDick && ndef $corpSpecBalls && $corpSpecGenitalia == 1>> <<set ndef $corpSpecGenitalia, diff --git a/src/uncategorized/neighborsDevelopment.tw b/src/uncategorized/neighborsDevelopment.tw index 28e88254bd3570bf6c23b3bdcc6003a0090eb9cb..1ca6964a9ef8f5b02954aa531a0e5e475aab4dd4 100644 --- a/src/uncategorized/neighborsDevelopment.tw +++ b/src/uncategorized/neighborsDevelopment.tw @@ -1107,7 +1107,7 @@ has an estimated GSP of @@.yellowgreen;<<print cashFormat(Math.trunc((0.1*$arcol <</if>> <<if $arcologies[$i].FSBodyPurist != "unset">> <<if $corpIncorporated == 1>> - <<if def $corpSpecImplants>> + <<if $corpSpecImplants == 0>> <<if $corpSpecAmputee != 1>> It's a @@.lightgreen;good market@@ for your corporation's implant-free slaves, improving sales and helping social progress. <<set $arcologies[$i].FSBodyPurist += 1>> diff --git a/src/utility/slaveCreationWidgets.tw b/src/utility/slaveCreationWidgets.tw index ff9547df7b9ea89cb2ed257ad0d0a4794e0228c2..1d855bc7a0c23266ece9d0dc6bfb3d564002cc0c 100644 --- a/src/utility/slaveCreationWidgets.tw +++ b/src/utility/slaveCreationWidgets.tw @@ -1896,7 +1896,7 @@ <<set $activeSlave.health = random(25,50)>> <<if $corpSpecDevotion > 0>> - <<set $activeSlave.devotion = random(-120,-90) * $corpSpecDevotion * 30>> + <<set $activeSlave.devotion = random(-120,-90) + $corpSpecDevotion * 30>> <<if $corpSpecDevotion == 1>> It does everything it can to make trainees furious. <<elseif $corpSpecDevotion == 2>>