diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index 6874c6c0b626aa61075d559a5e732763124bedf0..1da57f59bcbfb85ac882f274cd4ebf6f12a6a8a7 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -4,6 +4,13 @@ 1/27/18 + 300 + -anon's corp tweaks + -fixed the upgraded dispensary giving 50% off the reduced value instead of the original + + 299.2 + -and now they are nuns and priests + 299.1 -clergy capture slaves are now virgins diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index 6a4da7aeb448b69b8a95ddf977977ef7d44eb757..761840a67de55c61d1c563ec05156f36a7a78486 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -19,34 +19,29 @@ <<set $corpProfit = Math.trunc( 6666666 / (1 + Math.exp(-0.8 * (Math.log($corpValue) - 22))) ) - random(666, 6666)>> /* formula caps at 6666666, reaches 6.5 million at corpValue of 10 to the 12th power */ <<set $corpCash = Math.trunc($corpCash + $corpProfit)>> Your corporation was valued at <<print cashFormat($corpValue)>> and made a profit of <<print cashFormat($corpProfit)>> last week. +<<set _addedSlaves = Math.ceil(Math.log($captureAssets+$entrapmentAssets))>> <<if $mercenariesHelpCorp > 0>> The $mercenariesTitle assist it with difficult enslavement targets. Otherwise, it - <<set $slaveAssets += $mercenaries*random(66,666)>> - <<set $corpPeopleEnslaved += $mercenaries>> + <<set _addedSlaves = Math.ceil(_addedSlaves * (1 + .04 * $mercenaries))>> /* increase by 12-20% ($mercenaries == 3 - 5) */ <<else>> It <</if>> <<if _roll > 90>> was an outstanding week for corporate enslavement; - <<set $slaveAssets += Math.ceil(900*Math.log($captureAssets+$entrapmentAssets)/Math.log(10))>> - <<set $corpPeopleEnslaved += Math.ceil(Math.log($captureAssets+$entrapmentAssets)/Math.log(10)*5)>> + <<set _addedSlaves *= 5>> <<elseif _roll > 60>> was a great week for enslavement; - <<set $slaveAssets += Math.ceil(800*Math.log($captureAssets+$entrapmentAssets)/Math.log(10))>> - <<set $corpPeopleEnslaved += Math.ceil(Math.log($captureAssets+$entrapmentAssets)/Math.log(10)*4)>> + <<set _addedSlaves *= 4>> <<elseif _roll > 40>> was a good week for enslavement; - <<set $slaveAssets += Math.ceil(700*Math.log($captureAssets+$entrapmentAssets)/Math.log(10))>> - <<set $corpPeopleEnslaved += Math.ceil(Math.log($captureAssets+$entrapmentAssets)/Math.log(10)*3)>> + <<set _addedSlaves *= 3>> <<elseif _roll > 20>> was a mediocre week for enslavement; - <<set $slaveAssets += Math.ceil(600*Math.log($captureAssets+$entrapmentAssets)/Math.log(10))>> - <<set $corpPeopleEnslaved += Math.ceil(Math.log($captureAssets+$entrapmentAssets)/Math.log(10)*2)>> + <<set _addedSlaves *= 2>> <<else>> was a bad week for enslavement; - <<set $slaveAssets += Math.ceil(500*Math.log($captureAssets+$entrapmentAssets)/Math.log(10))>> - <<set $corpPeopleEnslaved += Math.ceil(Math.log($captureAssets+$entrapmentAssets)/Math.log(10))>> <</if>> +<<set $corpPeopleEnslaved += _addedSlaves, $slaveAssets += 500 * _addedSlaves>> in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> people. <<if $slaveAssets < ($trainingAssets+$surgicalAssets+$drugAssets)>> The corporation has enough training and medical assets to rapidly improve its human holdings. @@ -57,8 +52,8 @@ in total, the corporation has enslaved <<print commaNum($corpPeopleEnslaved)>> p <<else>> The corporation has only enough training and medical assets to maintain the value of its human holdings. <</if>> -/* model weekly corporate expenses as random 3-5% reduction in all asset types (including cash) ... except slaves, whose value is tied to $slaveCostFactor (which the corporation does not affect) */ -<<set $trainingAssets = Math.ceil($trainingAssets * random(95,97)/100), $surgicalAssets = Math.ceil($surgicalAssets * random(95,97)/100), $drugAssets = Math.ceil($drugAssets * random(95,97)/100), $generalAssets = Math.ceil($generalAssets * random(95,97)/100), $entrapmentAssets = Math.ceil($entrapmentAssets * random(95,97)/100), $captureAssets = Math.ceil($captureAssets * random(95,97)/100), $corpCash = Math.ceil($corpCash * random(95,97)/100)>> +/* model weekly corporate expenses as random 1-3% reduction in all asset types (including cash) ... except slaves, whose value is tied to $slaveCostFactor (which the corporation does not affect) */ +<<set $trainingAssets = Math.ceil($trainingAssets * random(97,99)/100), $surgicalAssets = Math.ceil($surgicalAssets * random(97,99)/100), $drugAssets = Math.ceil($drugAssets * random(97,99)/100), $generalAssets = Math.ceil($generalAssets * random(97,99)/100), $entrapmentAssets = Math.ceil($entrapmentAssets * random(97,99)/100), $captureAssets = Math.ceil($captureAssets * random(97,99)/100), $corpCash = Math.ceil($corpCash * random(97,99)/100)>> <<if $corpMarket>> <<if $rep > 5000>> <<set $slaveAssets += Math.ceil(Math.log($slaveAssets)/Math.log(10)*(($rep-5000)/15000))>> diff --git a/src/uncategorized/dispensary.tw b/src/uncategorized/dispensary.tw index 3b40707860b4672c546f932ad08cd3162b6507af..5ee145e056854558e41dc6fd14750f281941d7d7 100644 --- a/src/uncategorized/dispensary.tw +++ b/src/uncategorized/dispensary.tw @@ -15,7 +15,7 @@ The Dispensary <<if ($dispensaryUpgrade == 0)>> <<if ($rep > 5000)>> - [[Upgrade the pharmaceutical fabricator|Dispensary][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $dispensaryUpgrade = 1, $drugsCost = $drugsCost/2]] + [[Upgrade the pharmaceutical fabricator|Dispensary][$cash -= Math.trunc(30000*$upgradeMultiplierArcology), $dispensaryUpgrade = 1, $drugsCost = (($drugsCost*2)/3)]] //Costs <<print cashFormat(Math.trunc(30000*$upgradeMultiplierArcology))>>// <br> //Will improve production efficiency further decreasing costs.// <br>