diff --git a/src/pregmod/csec.tw b/src/pregmod/csec.tw index c36faeb356f693fa047670fa8946efa9b4bc5b29..fa303a024ed9cd634df1e616b998d0ae460ec64e 100644 --- a/src/pregmod/csec.tw +++ b/src/pregmod/csec.tw @@ -418,7 +418,7 @@ Performing a cesarean section is trivial for the remote surgery to carry out. $a For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@ <<set $activeSlave.trust -= 30, $activeSlave.devotion -= 30>> <</if>> - <<set $cash += _curBabies*(50+_babyCost)>> + <<run cashX(_curBabies*(50+_babyCost), "babyTransfer")>> <</switch>> <<else>> <<set $nextButton = "Back">><<UpdateNextButton>> /* unlock Continue button */ diff --git a/src/pregmod/widgets/seBirthWidgets.tw b/src/pregmod/widgets/seBirthWidgets.tw index 27544f126205122840ebeff5c6e43448bf991fd3..7c4c3a2f50ea03db0c0620ef3c72689f23d2d9f5 100644 --- a/src/pregmod/widgets/seBirthWidgets.tw +++ b/src/pregmod/widgets/seBirthWidgets.tw @@ -1051,7 +1051,8 @@ All in all, For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even think of trusting such a person.@@ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>> <</if>> - <<set $cash += _curBabies*(50+_babyCost), $slaveOrphanageTotal -= _count>> + <<set $slaveOrphanageTotal -= _count>> + <<run cashX(_curBabies*(50+_babyCost), "babyTransfer")>> <</replace>> <</link>> <<else>> @@ -1072,7 +1073,8 @@ All in all, For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even think of trusting such a person.@@ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>> <</if>> - <<set $cash += _curBabies*(50+_babyCost), $slaveOrphanageTotal -= _count>> + <<set $slaveOrphanageTotal -= _count>> + <<run cashX(_curBabies*(50+_babyCost), "babyTransfer")>> <</replace>> <</link>> <</if>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 1bce093e79a7a3ec59872e081b766590fdb006a6..cae3c29e7120250bcd4a0df65676254147f42e15 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -162,7 +162,7 @@ $He has normal ears. <<elseif $activeSlave.earShape == "damaged">> damaged ears. - | [[Repair|Surgery Degradation][$activeSlave.earShape = "normal", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earRestore"]] + | [[Repair|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earRestore"]] <<elseif $activeSlave.earShape == "pointy">> small elfin ears. <<elseif $activeSlave.earShape == "elven">> @@ -179,11 +179,11 @@ $He has //$His indenture forbids elective surgery// <<else>> <<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none">> - [[Restore to normal|Surgery Degradation][$activeSlave.earShape = "normal", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earRestore"]] + [[Restore to normal|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earRestore"]] <</if>> <<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> | <</if>> <<if $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> - [[Remove them|Surgery Degradation][$activeSlave.earShape = "none", $cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "earGone"]] + [[Remove them|Surgery Degradation][$activeSlave.earShape = "none", cashX(forceNeg($surgeryCost), $activeSlave.health -= 20, $surgeryType = "earGone"]] <</if>> <<if $activeSlave.earShape == "none">> <<if $activeSlave.hears != -2 && $activeSlave.earImplant != 1>> @@ -194,14 +194,14 @@ $He has <</if>> <<else>> <<if $activeSlave.earShape != "pointy">> - | [[Reshape into small elfin ears|Surgery Degradation][$activeSlave.earShape = "pointy", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMinor"]] + | [[Reshape into small elfin ears|Surgery Degradation][$activeSlave.earShape = "pointy", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMinor"]] <</if>> <<if $surgeryUpgrade == 1>> <<if $activeSlave.earShape != "elven">> - | [[Reshape into long elf ears|Surgery Degradation][$activeSlave.earShape = "elven", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into long elf ears|Surgery Degradation][$activeSlave.earShape = "elven", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earShape != "ushi">> - | [[Reshape into bovine ears|Surgery Degradation][$activeSlave.earShape = "ushi", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into bovine ears|Surgery Degradation][$activeSlave.earShape = "ushi", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <</if>> <</if>> @@ -230,29 +230,29 @@ $He has //$His indenture forbids elective surgery// <<else>> <<if $activeSlave.earT != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> - [[Remove them|Surgery Degradation][$activeSlave.earT = "none", $cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "earGone"]] + [[Remove them|Surgery Degradation][$activeSlave.earT = "none", cashX(forceNeg($surgeryCost), $activeSlave.health -= 20, $surgeryType = "earGone"]] <</if>> <<if $activeSlave.earT == "normal">> <<if $activeSlave.earT != "neko">> - | [[Reshape into cat Ears|Surgery Degradation][$activeSlave.earT = "neko", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into cat Ears|Surgery Degradation][$activeSlave.earT = "neko", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earT != "inu">> - | [[Reshape into dog Ears|Surgery Degradation][$activeSlave.earT = "inu", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into dog Ears|Surgery Degradation][$activeSlave.earT = "inu", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earT != "kit">> - | [[Reshape into fox Ears|Surgery Degradation][$activeSlave.earT = "kit", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into fox Ears|Surgery Degradation][$activeSlave.earT = "kit", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earT != "tanuki">> - | [[Reshape into tanuki Ears|Surgery Degradation][$activeSlave.earT = "tanuki", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into tanuki Ears|Surgery Degradation][$activeSlave.earT = "tanuki", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<else>> <br> <<if $activeSlave.earTColor == "hairless">> They are completely bald. - [[Implant hair mimicking fibers|Surgery Degradation][$activeSlave.earTColor = $activeSlave.hColor, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMinor"]] + [[Implant hair mimicking fibers|Surgery Degradation][$activeSlave.earTColor = $activeSlave.hColor, cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMinor"]] <<else>> They are covered by a multitude of implanted $activeSlave.earTColor fibers mimicking hair. - [[Remove them|Surgery Degradation][$activeSlave.earTColor = "hairless", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMinor"]] + [[Remove them|Surgery Degradation][$activeSlave.earTColor = "hairless", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMinor"]] <</if>> <</if>> <</if>> @@ -297,20 +297,20 @@ $He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if <<if $activeSlave.indentureRestrictions >= 2>> //$His indenture forbids elective surgery// <<elseif $activeSlave.horn != "none">> - [[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "hornGone"]]<</if>> + [[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "hornGone"]]<</if>> Give $him: <<if $activeSlave.horn != "curved succubus horns">> - [[Succubus horns|Surgery Degradation][$activeSlave.horn = "curved succubus horns", $activeSlave.hornColor = "jet black", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + [[Succubus horns|Surgery Degradation][$activeSlave.horn = "curved succubus horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "backswept horns">> - | [[Backswept horns|Surgery Degradation][$activeSlave.horn = "backswept horns", $activeSlave.hornColor = "jet black", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[Backswept horns|Surgery Degradation][$activeSlave.horn = "backswept horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "cow horns">> - | [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "one long oni horn">> - | [[an oni horn|Surgery Degradation][$activeSlave.horn = "one long oni horn", $activeSlave.hornColor = $activeSlave.skin, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[an oni horn|Surgery Degradation][$activeSlave.horn = "one long oni horn", $activeSlave.hornColor = $activeSlave.skin, cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "two long oni horns">> - | [[2 oni horns|Surgery Degradation][$activeSlave.horn = "two long oni horns", $activeSlave.hornColor = $activeSlave.skin, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[2 oni horns|Surgery Degradation][$activeSlave.horn = "two long oni horns", $activeSlave.hornColor = $activeSlave.skin, cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "small horns">> - | [[Small horns|Surgery Degradation][$activeSlave.horn = "small horns", $activeSlave.hornColor = "ivory", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[Small horns|Surgery Degradation][$activeSlave.horn = "small horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <br> $He has diff --git a/src/uncategorized/seBirth.tw b/src/uncategorized/seBirth.tw index caaadf74ce28e957bc12f141302666863bd93c2f..c252a44894e4e6118d503ab4de4ef8d88f2a1ac8 100644 --- a/src/uncategorized/seBirth.tw +++ b/src/uncategorized/seBirth.tw @@ -115,7 +115,7 @@ I need to break single passage to several widgets, as it's been overcomplicated For a moment, $he saw a glimmer of good in you; @@.mediumorchid;$he was clearly wrong.@@ $His mind struggles to comprehend @@.gold;why $he could ever even thing of trusting such a person.@@ <<set $slaves[$i].trust -= 30, $slaves[$i].devotion -= 30>> <</if>> - <<set $cash += _curBabies*(50+_babyCost)>> + <<run cashX(_curBabies*(50+_babyCost), "babyTransfer")>> <</switch>> <</if>> <<seBirthPostpartum>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index e2f8e5f5ac3bed31ad9661ecccdf337d017a72ec..681062bdccf01cb13eb901fc892f19c52eb4c0a0 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -686,7 +686,7 @@ This experience <<elseif def $args[1]>> [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, State.variables[$args[1]] = 1, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>// <<elseif $args[0] == "FSRestart">> - [[Customize the exterior of the arcology to support this goal and fully establish the Societal Elite|Future Society][$arcologies[0].FSRestartDecoration = 100, $upgradeMultiplierArcology = upgradeMultiplierArcology(), $upgradeMultiplierMedicine = upgradeMultiplierMedicine(), $cash -= 75000]] //Costs <<print cashFormat(75000)>> and may dilute your control over the arcology// + [[Customize the exterior of the arcology to support this goal and fully establish the Societal Elite|Future Society][$arcologies[0].FSRestartDecoration = 100, $upgradeMultiplierArcology = upgradeMultiplierArcology(), $upgradeMultiplierMedicine = upgradeMultiplierMedicine(), cashX(-75000, "capEx")]] //Costs <<print cashFormat(75000)>> and may dilute your control over the arcology// <<else>> [[Customize the exterior of the arcology to support this goal|Future Society][$arcologies[0][_FSDecoration] = 100, cashX(-20000, "capEx")]] //Costs <<print cashFormat(20000)>>// <</if>>