diff --git a/src/cheats/PCCheatMenu.tw b/src/cheats/PCCheatMenu.tw index 0693f9c91473b1c67d88564d22fc3b78dbd1945b..e89ecc7f8c756c5115ca34dda7df7d661f8b9a01 100644 --- a/src/cheats/PCCheatMenu.tw +++ b/src/cheats/PCCheatMenu.tw @@ -7,9 +7,12 @@ <br><br> -Title: ''<<if $tempSlave.title == 0>>Master<<else>>Mistress<</if>>'' -<br><<radiobutton "$tempSlave.title" 0>> Master - <<radiobutton "$tempSlave.title" 1>> Mistress +Title: ''<<if $tempSlave.title == 1>>Master<<else>>Mistress<</if>>'' +<br><<radiobutton "$tempSlave.title" 1>> Master + <<radiobutton "$tempSlave.title" 0>> Mistress +Sex: ''$tempSlave.genes'' +<br><<radiobutton "$tempSlave.genes" "XY">> XY + <<radiobutton "$tempSlave.genes" "XX">> XX <br>''Name'': <<textbox "$tempSlave.name" $tempSlave.name>> <br>''Surname'': <<textbox "$tempSlave.surname" $tempSlave.surname>> <br>''Custom Title'': <<textbox "$tempSlave.customTitle" $tempSlave.customTitle>> diff --git a/src/uncategorized/arcmgmt.tw b/src/uncategorized/arcmgmt.tw index 2d5450e8054c2af7f1e124b17b992c812da9a399..b39f08b2b4f086272575761803d43aace10b2f62 100644 --- a/src/uncategorized/arcmgmt.tw +++ b/src/uncategorized/arcmgmt.tw @@ -692,7 +692,12 @@ $menialBioreactors -= _expirationBR>> <<if $arcologies[0].honeymoon > 0>> <<set _honeymoon = 10 * $arcologies[0].honeymoon>> <</if>> -<<set $visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * ($localEcon / 100))>> +<<set $oldVisitors = $visitors, +$visitors = Math.trunc((($arcologies[0].prosperity + _FSScore * 5 + _honeymoon) * _transportHub * _terrain * _crime) * ($localEcon / 100))>> +<<if isNaN($visitors)>> + <br>@@.red;Visitors is NaN, report this issue!@@ + <<set $visitors = $oldVisitors>> +<</if>> <br>@@.green;<<print $visitors>> traders and tourists@@ visited your arcology this week. /*slaves*/ @@ -719,7 +724,7 @@ $menialBioreactors -= _expirationBR>> <</if>> <<if _weeklyRetiredNPCMenials > 1>> <<set _weeklyRetiredNPCMenials = Math.trunc(_weeklyRetiredNPCMenials)>> - <<if _weeklyREtiredNPCMenials > 1>> + <<if _weeklyRetiredNPCMenials > 1>> <br>@@.red;<<print _weeklyRetiredNPCMenials>> menial slaves@@ were retired as free citizens by other slave owners in your arcology this week. <<else>> <br>@@.red;One menial slave@@ was retired as a free citizen by another slave owner in your arcology this week. @@ -742,60 +747,65 @@ $menialBioreactors -= _expirationBR>> <<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)), /*Demand for owning slaves*/ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * ($slaveDemandT + _slaveDemandT)))>> -/*More slaves than they know what to do with*/ -<<if $NPCSlaves > _SCD * 1.6>> - <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_SCD * 1.6), - $menialDemandFactor -= _NPCSlavesSold, - $NPCSlaves = Math.trunc(_SCD * 1.6)>> - <<if _NPCSlavesSold > 1>> - <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. They've got more than enough of them already. - <<elseif _NPCSlavesSold > 0>> - <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)) - $menials + _SCD>> - <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $menials + _SCD), - $menialDemandFactor -= _NPCSlavesSold, - $NPCSlaves = Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity))>> - <<if _NPCSlavesSold > 1>> - <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. There was so little work that they failed to earn their keep. - <<elseif _NPCSlavesSold > 0>> - <br>@@.red;One slave was sold by your inhabitants. There was so little work that it failed to earn its keep. - <</if>> -/*Cutting back on slaves*/ -<<elseif $NPCSlaves > _SCD * 1.4>> - <<if $slaveCostFactor > 0.95>> - <<set _NPCSlavesSold = Math.trunc(($NPCSlaves - _SCD) * 0.4), +<<if isNaN(_LSCD)>> + <br>@@.red;LSCD is NaN, report this issue!@@ +<<elseif isNaN(_SCD)>> + <br>@@.red;SCD is NaN, report this issue!@@ +<<else>> /*More slaves than they know what to do with*/ + <<if $NPCSlaves > _SCD * 1.6>> + <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_SCD * 1.6), $menialDemandFactor -= _NPCSlavesSold, - $NPCSlaves -= _NPCSlavesSold>> + $NPCSlaves = Math.trunc(_SCD * 1.6)>> <<if _NPCSlavesSold > 1>> - <br>@@.red;<<print _NPCSlavesSold>> slaves were sold by your inhabitants. They've got more than enough of them already. + <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. They've got more than enough of them already. <<elseif _NPCSlavesSold > 0>> - <br>@@.red;One slave was sold by your inhabitants. They've got more than enough of them already. + <br>@@.red;One slave@@ was sold by your inhabitants. They've got more than enough of them already. <</if>> - <</if>> -/*Selling excess slaves for profit*/ -<<elseif $NPCSlaves > _SCD * 1.2>> - <<if $slaveCostFactor > 1.1>> - <<set _NPCSlavesSold = Math.trunc(($NPCSlaves - _SCD) * 0.4), + /*More slaves than there is work*/ + <<elseif $NPCSlaves > (_LSCD / ($slaveProductivity + _slaveProductivity)) - $menials + _SCD>> + <<set _NPCSlavesSold = $NPCSlaves - Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity) - $menials + _SCD), $menialDemandFactor -= _NPCSlavesSold, - $NPCSlaves -= _NPCSlavesSold>> + $NPCSlaves = Math.trunc(_LSCD / ($slaveProductivity + _slaveProductivity))>> <<if _NPCSlavesSold > 1>> - <br>@@.red;<<print _NPCSlavesSold>> slaves were sold by your inhabitants. They saw an opportunity for profit. + <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. There was so little work that they failed to earn their keep. <<elseif _NPCSlavesSold > 0>> - <br>@@.red;One slave was sold by your inhabitants. They saw an opportunity for profit. + <br>@@.red;One slave@@ was sold by your inhabitants. There was so little work that it failed to earn its keep. + <</if>> + /*Cutting back on slaves*/ + <<elseif $NPCSlaves > _SCD * 1.4>> + <<if $slaveCostFactor > 0.95>> + <<set _NPCSlavesSold = Math.trunc(($NPCSlaves - _SCD) * 0.4), + $menialDemandFactor -= _NPCSlavesSold, + $NPCSlaves -= _NPCSlavesSold>> + <<if _NPCSlavesSold > 1>> + <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. They've got more than enough of them already. + <<elseif _NPCSlavesSold > 0>> + <br>@@.red;One slave@@ was sold by your inhabitants. They've got more than enough of them already. + <</if>> + <</if>> + /*Selling excess slaves for profit*/ + <<elseif $NPCSlaves > _SCD * 1.2>> + <<if $slaveCostFactor > 1.1>> + <<set _NPCSlavesSold = Math.trunc(($NPCSlaves - _SCD) * 0.4), + $menialDemandFactor -= _NPCSlavesSold, + $NPCSlaves -= _NPCSlavesSold>> + <<if _NPCSlavesSold > 1>> + <br>@@.red;<<print _NPCSlavesSold>> slaves@@ were sold by your inhabitants. They saw an opportunity for profit. + <<elseif _NPCSlavesSold > 0>> + <br>@@.red;One slave@@ was sold by your inhabitants. They saw an opportunity for profit. + <</if>> <</if>> <</if>> -<</if>> -/*Buying slaves because they are really cheap*/ -<<if $slaveCostFactor < 0.8>> - <<if $NPCSlaves < _SCD * 1.5>> - <<set _NPCSlavesBought = Math.trunc(_SCD * 0.05), - $menialSupplyFactor -= _NPCSlavesBought, - $NPCSlaves += _NPCSlavesBought>> - <<if _NPCSlavesBought > 1>> - <br>@@.green;<<print _NPCSlavesBought>> slaves were bought by your inhabitants. They were too cheap to pass up on. - <</if>> /*there's no way this ever ends up needing a 1 slave version*/ + /*Buying slaves because they are really cheap*/ + <<if $slaveCostFactor < 0.8>> + <<if $NPCSlaves < _SCD * 1.5>> + <<set _NPCSlavesBought = Math.trunc(_SCD * 0.05), + $menialSupplyFactor -= _NPCSlavesBought, + $NPCSlaves += _NPCSlavesBought>> + <<if _NPCSlavesBought > 1>> + <br>@@.green;<<print _NPCSlavesBought>> slaves@@ were bought by your inhabitants. They were too cheap to pass up on. + <</if>> /*there's no way this ever ends up needing a 1 slave version*/ + <</if>> <</if>> <</if>> @@ -805,107 +815,116 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <<if _LCD < 0>> <<set _LCD = 0>> <</if>> -/*Changing population depending on work available*/ -<<if $lowerClass < _LCD>> - <<set _LCImmigration = Math.trunc((_LCD - $lowerClass) * (0.3 * _terrain)) + 1, - $lowerClass += _LCImmigration>> - <<if _LCImmigration > 1>> - <br>@@.green;<<print _LCImmigration>> lower class citizens@@ moved to your arcology. - <<elseif _LCImmigration > 0>> - <br>@@.green;One lower class citizen@@ moved to your arcology. - <</if>> -<<elseif $lowerClass > _LCD>> - <<set _LCEmigration = Math.trunc(($lowerClass - _LCD) * 0.6) + 1>> - <<if $citizenRetirementMenials == 1>> - <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance * (0.05 + _banishedRatio))>> - <<else>> - <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance)>> - <</if>> - <<set $lowerClass -= _LCEmigration, - _enslaved += _enslavedEmigrants>> - <<if _LCEmigration > 1>> - <br>@@.red;<<print _LCEmigration>> lower class citizens@@ had no work and tried to leave your arcology. - <<if _enslavedEmigrants > 1>> - @@.green;<<print _enslavedEmigrants>> of them were enslaved instead.@@ - <<elseif _enslavedEmigrants > 0>> - @@.green;One of them was enslaved instead.@@ +<<if isNaN(_LCD)>> + <br>@@.red;LCD is NaN, report this issue!@@ +<<else>>/*Changing population depending on work available*/ + <<if $lowerClass < _LCD>> + <<set _LCImmigration = Math.trunc((_LCD - $lowerClass) * (0.3 * _terrain)) + 1, + $lowerClass += _LCImmigration>> + <<if _LCImmigration > 1>> + <br>@@.green;<<print _LCImmigration>> lower class citizens@@ moved to your arcology. + <<elseif _LCImmigration > 0>> + <br>@@.green;One lower class citizen@@ moved to your arcology. + <</if>> + <<elseif $lowerClass > _LCD>> + <<set _LCEmigration = Math.trunc(($lowerClass - _LCD) * 0.6) + 1>> + <<if $citizenRetirementMenials == 1>> + <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance * (0.05 + _banishedRatio))>> + <<else>> + <<set _enslavedEmigrants = Math.trunc((($lowerClass - _LCD) * 0.6) * $enslaveChance)>> + <</if>> + <<set $lowerClass -= _LCEmigration, + _enslaved += _enslavedEmigrants>> + <<if _LCEmigration > 1>> + <br>@@.red;<<print _LCEmigration>> lower class citizens@@ had no work and tried to leave your arcology. + <<if _enslavedEmigrants > 1>> + @@.green;<<print _enslavedEmigrants>> of them were enslaved instead.@@ + <<elseif _enslavedEmigrants > 0>> + @@.green;One of them was enslaved instead.@@ + <</if>> + <<elseif _LCEmigration > 0>> + <br>@@.red;One lower class citizen@@ left your arcology due to a lack of work. <</if>> - <<elseif _LCEmigration > 0>> - <br>@@.red;One lower class citizen@@ left your arcology due to a lack of work. <</if>> -<</if>> -<<if _enslaved > 0>> - <<if _enslaved < 4>> - <<set _enslavedPC = 1, - _enslavedNPC = _enslaved - 1>> - <<else>> - <<set _enslavedPC = Math.trunc(_enslaved / 4), - _enslavedNPC = _enslaved - _enslavedPC>> + <<if _enslaved > 0>> + <<if _enslaved < 4>> + <<set _enslavedPC = 1, + _enslavedNPC = _enslaved - 1>> + <<else>> + <<set _enslavedPC = Math.trunc(_enslaved / 4), + _enslavedNPC = _enslaved - _enslavedPC>> + <</if>> + <<set $menials += _enslavedPC, + $NPCSlaves += _enslavedNPC>> <</if>> - <<set $menials += _enslavedPC, - $NPCSlaves += _enslavedNPC>> -<</if>> -<<if _enslaved > 1>> - <br>In total @@.green;<<print _enslaved>> lower class citizens@@ were enslaved for failing to pay their debts. - <br>@@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>. -<<elseif _enslaved > 0>> - <br>@@.green;As arcology owner you claimed the slave.@@ -<</if>> -/*Need more slaves still*/ -<<if $NPCSlaves < _SCD>> - <<set _NPCSlavesBought = Math.trunc((_SCD - $NPCSlaves) * 0.75) + 1, - $menialSupplyFactor -= _NPCSlavesBought, - $NPCSlaves += _NPCSlavesBought>> - <<if _NPCSlavesBought > 1>> - <br>@@.green;<<print _NPCSlavesBought>> slaves@@ were bought by your inhabitants. They did not have enough of them to satisfy their needs. - <<elseif _NPCSlavesBought > 0>> - <br>@@.green;One slave@@ was bought by your inhabitants. They did not quite have enough of them to satisfy their needs. + <<if _enslaved > 1>> + <br>In total @@.green;<<print _enslaved>> lower class citizens@@ were enslaved for failing to pay their debts. + <br>@@.green;You enslaved <<print _enslavedPC>>@@ of them while other debtholders in the arcology enslaved the remaining <<print _enslavedNPC>>. + <<elseif _enslaved > 0>> + <br>@@.green;As arcology owner you claimed the slave.@@ + <</if>> + /*Need more slaves still*/ + <<if $NPCSlaves < _SCD>> + <<set _NPCSlavesBought = Math.trunc((_SCD - $NPCSlaves) * 0.75) + 1, + $menialSupplyFactor -= _NPCSlavesBought, + $NPCSlaves += _NPCSlavesBought>> + <<if _NPCSlavesBought > 1>> + <br>@@.green;<<print _NPCSlavesBought>> slaves@@ were bought by your inhabitants. They did not have enough of them to satisfy their needs. + <<elseif _NPCSlavesBought > 0>> + <br>@@.green;One slave@@ was bought by your inhabitants. They did not quite have enough of them to satisfy their needs. + <</if>> <</if>> <</if>> /*Middle Class Citizens*/ /*Demand for Middle Class*/ <<set _MCD = Math.trunc((($MCBase * ($localEcon / 100)) + $arcologies[0].prosperity + _middleClass + ($NPCSlaves * 0.15) + ($lowerClass * 0.1) + (($upperClass + $visitors * 0.2) * 0.5) + ($topClass * 2.5)) * $rentEffectM * _middleClassP)>> -/*Middle Class Citizens immigrating*/ -<<if $middleClass < _MCD>> - <<set _MCImmigration = Math.trunc((_MCD - $middleClass) * (0.3 * _terrain)) + 1, - $middleClass += _MCImmigration>> - <<if _MCImmigration > 1>> - <br>@@.green;<<print _MCImmigration>> middle class citizens@@ moved to your arcology. - <<elseif _MCImmigration > 0>> - <br>@@.green;One middle class citizen@@ moved to your arcology. - <</if>> -/*Middle Class Citizens emigrating*/ -<<elseif $middleClass > _MCD>> - <<set _MCEmigration = Math.trunc(($middleClass - _MCD) * 0.6), - $middleClass -= _MCEmigration>> - <<if _MCEmigration > 1>> - <br>@@.red;<<print _MCEmigration>> middle class citizens@@ left your arcology. - <<elseif _MCEmigration > 0>> - <br>@@.red;One middle class citizen@@ left your arcology. +<<if isNaN(_MCD)>> + <br>@@.red;MCD is NaN, report this issue!@@ +<<else>> /*Middle Class Citizens immigrating*/ + <<if $middleClass < _MCD>> + <<set _MCImmigration = Math.trunc((_MCD - $middleClass) * (0.3 * _terrain)) + 1, + $middleClass += _MCImmigration>> + <<if _MCImmigration > 1>> + <br>@@.green;<<print _MCImmigration>> middle class citizens@@ moved to your arcology. + <<elseif _MCImmigration > 0>> + <br>@@.green;One middle class citizen@@ moved to your arcology. + <</if>> + /*Middle Class Citizens emigrating*/ + <<elseif $middleClass > _MCD>> + <<set _MCEmigration = Math.trunc(($middleClass - _MCD) * 0.6), + $middleClass -= _MCEmigration>> + <<if _MCEmigration > 1>> + <br>@@.red;<<print _MCEmigration>> middle class citizens@@ left your arcology. + <<elseif _MCEmigration > 0>> + <br>@@.red;One middle class citizen@@ left your arcology. + <</if>> <</if>> <</if>> /*Upper Class Citizens*/ /*Demand for Upper Class*/ <<set _UCD = Math.trunc((($UCBase * ($localEcon / 100)) + ($arcologies[0].prosperity * 0.2) + _upperClass + ($NPCSlaves * 0.02) + ($lowerClass * 0.025) + (($middleClass + $visitors * 0.6) * 0.05) + ($topClass * 0.3)) * $rentEffectU * _upperClassP)>> -/*Upper Class Citizens immigrating*/ -<<if $upperClass < _UCD>> - <<set _UCImmigration = Math.trunc((_UCD - $upperClass) * (0.3 * _terrain)) + 1, - $upperClass += _UCImmigration>> - <<if _UCImmigration > 1>> - <br>@@.green;<<print _UCImmigration>> upper class citizens@@ moved to your arcology. - <<elseif _UCImmigration > 0>> - <br>@@.green;One upper class citizen@@ moved to your arcology. - <</if>> -/*Upper Class Citizens Emigrating*/ -<<elseif $upperClass > _UCD>> - <<set _UCEmigration = Math.trunc(($upperClass - _UCD) * 0.6), - $upperClass -= _UCEmigration>> - <<if _UCEmigration > 1>> - <br>@@.red;<<print _UCEmigration>> upper class citizens@@ left your arcology. - <<elseif _UCEmigration > 0>> - <br>@@.red;One upper class citizen@@ left your arcology. +<<if isNaN(_UCD)>> + <br>@@.red;UCD is NaN, report this issue!@@ +<<else>> /*Upper Class Citizens immigrating*/ + <<if $upperClass < _UCD>> + <<set _UCImmigration = Math.trunc((_UCD - $upperClass) * (0.3 * _terrain)) + 1, + $upperClass += _UCImmigration>> + <<if _UCImmigration > 1>> + <br>@@.green;<<print _UCImmigration>> upper class citizens@@ moved to your arcology. + <<elseif _UCImmigration > 0>> + <br>@@.green;One upper class citizen@@ moved to your arcology. + <</if>> + /*Upper Class Citizens Emigrating*/ + <<elseif $upperClass > _UCD>> + <<set _UCEmigration = Math.trunc(($upperClass - _UCD) * 0.6), + $upperClass -= _UCEmigration>> + <<if _UCEmigration > 1>> + <br>@@.red;<<print _UCEmigration>> upper class citizens@@ left your arcology. + <<elseif _UCEmigration > 0>> + <br>@@.red;One upper class citizen@@ left your arcology. + <</if>> <</if>> <</if>> @@ -922,26 +941,31 @@ _SCD = Math.trunc(($upperClass * ($slaveDemandU + _slaveDemandU)) + ($topClass * <<if _TCD < 15>> <<set _TCD = 15>> <</if>> -/*Top Class Citizens immigrating*/ -<<if $topClass < _TCD>> - <<set _TCImmigration = Math.trunc((_TCD - $topClass) * (0.3 * _terrain)) + 1, - $topClass += _TCImmigration>> - <<if _TCImmigration > 1>> - <br>@@.green;<<print _TCImmigration>> millionaires@@ moved to your arcology. /*Fat Cat? One-Percenter?*/ - <<elseif _TCImmigration > 0>> - <br>@@.green;One millionaire@@ moved to your arcology. - <</if>> -/*Top Class Citizens emigrating*/ -<<elseif $topClass > _TCD>> - <<set _TCEmigration = Math.trunc(($topClass - _TCD) * 0.6) + 1, - $topClass -= _TCEmigration>> - <<if _TCEmigration > 1>> - <br>@@.red;<<print _TCEmigration>> millionaires@@ left your arcology. - <<elseif _TCEmigration > 0>> - <br>@@.red;One millionaire@@ left your arcology. +<<if isNaN(_TCD)>> + <br>@@.red;TCD is NaN, report this issue!@@ +<<else>> /*Top Class Citizens immigrating*/ + <<if $topClass < _TCD>> + <<set _TCImmigration = Math.trunc((_TCD - $topClass) * (0.3 * _terrain)) + 1, + $topClass += _TCImmigration>> + <<if _TCImmigration > 1>> + <br>@@.green;<<print _TCImmigration>> millionaires@@ moved to your arcology. /*Fat Cat? One-Percenter?*/ + <<elseif _TCImmigration > 0>> + <br>@@.green;One millionaire@@ moved to your arcology. + <</if>> + /*Top Class Citizens emigrating*/ + <<elseif $topClass > _TCD>> + <<set _TCEmigration = Math.trunc(($topClass - _TCD) * 0.6) + 1, + $topClass -= _TCEmigration>> + <<if _TCEmigration > 1>> + <br>@@.red;<<print _TCEmigration>> millionaires@@ left your arcology. + <<elseif _TCEmigration > 0>> + <br>@@.red;One millionaire@@ left your arcology. + <</if>> <</if>> <</if>> + <</if>> /*ends _weatherFreeze*/ + <<if $secExp == 1>> <<set $ASlaves = $NPCSlaves + $menials + $fuckdolls + $menialBioreactors + $secMenials + $slavesEmployedManpower>> <<else>>