diff --git a/src/pregmod/killedSlave.tw b/src/pregmod/killedSlave.tw index 4b9622c3e53cc6ec38fa090f4332eec982156215..3adcc8763aa30a06da358386c631db7c39557599 100644 --- a/src/pregmod/killedSlave.tw +++ b/src/pregmod/killedSlave.tw @@ -170,6 +170,6 @@ <</if>> //This scene is currently unfinished.// - /*TODO: Connect this to the Pit, have a end-of-week event between the Bodyguard and the slave*/ + /*TODO: Connect this to the Pit, have an end-of-week event between the Bodyguard and the slave*/ <</if>> \ No newline at end of file diff --git a/src/uncategorized/corporationDevelopments.tw b/src/uncategorized/corporationDevelopments.tw index e44f1cace713a96b2949c075b00a254da256a43d..e2dd544a3baebe5ada418dc6837e8344d4ba25ec 100644 --- a/src/uncategorized/corporationDevelopments.tw +++ b/src/uncategorized/corporationDevelopments.tw @@ -401,7 +401,7 @@ You hold <<print commaNum($personalShares)>> shares valued at @@.yellowgreen;<<p <</replace>> <</link>> <<if $publicShares > 5000 && $corpCash >= $sharePrice*5000>> - | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95)>>@@">> + | <<link "<<print commaNum(5000)>> valued at @@.yellowgreen;<<print cashFormat(Math.ceil(($sharePrice*5000)*.95))>>@@">> <<set $publicShares -= 5000>> <<set $corpCash -= Math.ceil(($sharePrice*5000)*.95)>> <<set $sharePrice = (Math.trunc($sharePrice*either(101,102)))/100>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 9e29d2504e1b26317503a327ae74c49f48b08585..ac3eabd2b8a2d44526f064ed1671a3d363dbc4b1 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -291,7 +291,7 @@ $He has <</if>> <</if>> <<if ($activeSlave.indentureRestrictions < 1) && ($activeSlave.electrolarynx != 1)>> - <<if $activeSlave.voice != 0 && ($cyberMod == 0 || $activeSlave.electrolarynx == 0)>> + <<if $activeSlave.voice != 0>> <<if $activeSlave.voice < 3>> [[Perform surgery to raise voice|Surgery Degradation][$activeSlave.voice += 1, $activeSlave.voiceImplant += 1, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "voice"]] <</if>> @@ -304,7 +304,7 @@ $He has <<if $seeExtreme == 1>> | [[Remove vocal cords|Surgery Degradation][$activeSlave.voice = 0, $activeSlave.voiceImplant = 0, $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "mute"]] <</if>> - <<elseif $activeSlave.voice == 0 && $cyberMod == 1 && $activeSlave.electrolarynx == 0 && $stockpile.electrolarynx > 0>> + <<elseif $activeSlave.voice == 0 && $cyberMod == 1 && $stockpile.electrolarynx > 0>> [["Give " + $him + " an electrolarynx"|Surgery Degradation][$activeSlave.electrolarynx = 1, $activeSlave.voice = 2, $stockpile.electrolarynx--, $cash -= $surgeryCost, $activeSlave.health -= 20, $surgeryType = "electrolarynx"]] <</if>> <</if>> diff --git a/src/utility/miscWidgets.tw b/src/utility/miscWidgets.tw index af9d7fe1eb1bdb73233537e9b5e7bd7614358347..acf791b0c400bd644ec47bdd9800ed890ceea59f 100644 --- a/src/utility/miscWidgets.tw +++ b/src/utility/miscWidgets.tw @@ -677,7 +677,7 @@ <<widget "he">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_heLisp<<else>>$he<</if>><<else>><<if _primarySlaveLisp>>_he2Lisp<<else>>_he2<</if>><</if>><</widget>> <<widget "his">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_hisLisp<<else>>$his<</if>><<else>><<if _primarySlaveLisp>>_his2Lisp<<else>>_his2<</if>><</if>><</widget>> <<widget "hers">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_hersLisp<<else>>$hers<</if>><<else>><<if _primarySlaveLisp>>_hers2Lisp<<else>>_hers2<</if>><</if>><</widget>> -<<widget "himself">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_himselfLisp<<else>>$himselfLisp<</if>><<else>><<if _primarySlaveLisp>>_himself2Lisp<<else>>_himself2<</if>><</if>><</widget>> +<<widget "himself">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_himselfLisp<<else>>$himself<</if>><<else>><<if _primarySlaveLisp>>_himself2Lisp<<else>>_himself2<</if>><</if>><</widget>> <<widget "He">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HeLisp<<else>>$He<</if>><<else>><<if _primarySlaveLisp>>_He2Lisp<<else>>_He2<</if>><</if>><</widget>> <<widget "His">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HisLisp<<else>>$His<</if>><<else>><<if _primarySlaveLisp>>_His2Lisp<<else>>_His2<</if>><</if>><</widget>> <<widget "Hers">><<if ndef $args[0]>><<if _secondarySlaveLisp>>_HersLisp<<else>>$Hers<</if>><<else>><<if _primarySlaveLisp>>_Hers2Lisp<<else>>_Hers2<</if>><</if>><</widget>>