diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index dd79e7f1f8569a4e6536c64e30024bfcdf522d5d..5d5f622d9a32d6354d7bc66c6365e202775a1d97 100644 --- a/devNotes/VersionChangeLog-Premod+LoliMod.txt +++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt @@ -1,5 +1,14 @@ Pregmod +0.10.7.1-0.3.x + +5/30/2018 + + 1 + -prosthetic limb rework (mutually exclusive with cybermod - backwards compatibility will allow switching between them) + -various fixes + + 0.10.7.1-0.2.x 5/29/2018 diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index f071a19358119346081ad6c01ae762f427acf2c4..aa54eb4dfa1c3edce89b504c4f74c98c35e4e2f0 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", $releaseID = 1023>> -<<if ndef $releaseID>><<set $releaseID = 1023>><</if>> +<<set $ver = "0.10.7", $releaseID = 1024>> +<<if ndef $releaseID>><<set $releaseID = 1024>><</if>> /* This needs to be broken down into individual files that can be added to StoryInit instead. */ diff --git a/src/uncategorized/dairyReport.tw b/src/uncategorized/dairyReport.tw index 0d0cba597f692a0f99423564348d69c480a406d4..0cd3ccc4fc753c4ecb20a15874c4a14dadb582de 100644 --- a/src/uncategorized/dairyReport.tw +++ b/src/uncategorized/dairyReport.tw @@ -413,11 +413,13 @@ <<set _growth = 50>> <<elseif ($slaves[$i].boobs < 10000)>> <<set _growth = 25>> + <<else>> + <<set _growth = 0>> + <</if>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> - <<set $slaves[$i].boobs += _growth>> + <<set $slaves[$i].boobs += _growth>> <</if>> <<if $slaves[$i].prostate == 1>> <<set $slaves[$i].prostate = 2, $slaves[$i].health -= 10, $cash -= $surgeryCost>> @@ -458,10 +460,10 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> - <<set $slaves[$i].boobs += _growth>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> + <<set $slaves[$i].boobs += _growth>> <<else>> <<set $slaves[$i].boobs = 50000>> <</if>> @@ -481,9 +483,9 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> <<set $slaves[$i].boobs += _growth>> <</if>> <<elseif $dairyFeedersSetting > 1>> @@ -502,9 +504,9 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> <<set $slaves[$i].boobs += _growth>> <</if>> <<else>> @@ -523,9 +525,9 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> <<set $slaves[$i].boobs += _growth>> <</if>> <</if>> @@ -590,13 +592,11 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<else>> - <<set _growth = 50000>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> + <<set $slaves[$i].boobs += _growth>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> - <<set $slaves[$i].boobs += _growth>> <<elseif $dairyFeedersSetting > 0>> <<if $slaves[$i].boobs < 25000>> <<if $arcologies[0].FSAssetExpansionistResearch == 1>> @@ -613,9 +613,9 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> <<set $slaves[$i].boobs += _growth>> <</if>> <<else>> @@ -634,9 +634,9 @@ <<if $slaves[$i].boobs <= 20000 && $slaves[$i].boobs+_growth > 20000>> <<set _boobtacular++>> <</if>> - <<if ($slaves[$i].inducedNCS == 1)>> - <<set _growth = Math.trunc(_growth/2)>> - <</if>> + <<if ($slaves[$i].inducedNCS == 1)>> + <<set _growth = Math.trunc(_growth/2)>> + <</if>> <<set $slaves[$i].boobs += _growth>> <</if>> <</if>> diff --git a/src/uncategorized/saLongTermEffects.tw b/src/uncategorized/saLongTermEffects.tw index f7d535404ea8fb6ab46a385ca1ac9e06e99ddf11..450e513a83a85e2f4cfd3f360ac80e604a70842f 100644 --- a/src/uncategorized/saLongTermEffects.tw +++ b/src/uncategorized/saLongTermEffects.tw @@ -6565,10 +6565,10 @@ $possessiveCap breasts are far, far beyond what $possessive body can sustain without industrial intervention, and they @@.orange;naturally lose mass.@@ <<set $slaves[$i].boobs -= 50>> <</if>> - <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>> - This effect is massively compounded by $possessive @@.orange;NCS.@@ - <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> - <</if>> + <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>> + This effect is massively compounded by $possessive @@.orange;NCS.@@ + <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> + <</if>> <</if>> <</if>> <</if>> @@ -6629,7 +6629,7 @@ <</if>> <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>> This effect is compounded by $possessive @@.orange;NCS.@@ - <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> + <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> <</if>> <</if>> <</if>> @@ -6700,7 +6700,7 @@ <</if>> <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>> This effect is compounded by $possessive @@.orange;NCS.@@ - <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> + <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> <</if>> <</if>> <</if>> @@ -6771,7 +6771,7 @@ <</if>> <<if (($slaves[$i].inducedNCS == 1) && (random(1,100) > 50))>> This effect is compounded by $possessive @@.orange;NCS.@@ - <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> + <<set $slaves[$i].boobs -= Math.round($slaves[$i].boobs * .1)>> <</if>> <</if>> <</if>>