diff --git a/src/SecExp/securityReport.tw b/src/SecExp/securityReport.tw index a1c906116d818a35461c71b87114bdbb3c0efab9..fbf23c814c13e3067e5e48d4629b37c89b8d67fd 100644 --- a/src/SecExp/securityReport.tw +++ b/src/SecExp/securityReport.tw @@ -22,11 +22,11 @@ <strong>Security</strong>: <<if $terrain === "oceanic">> - Due to the @@.green;massive econimc and logisical infesability@@ of attacking a ocenic arcology, your security force(s) has + Due to the @@.green;massive economic and logistical challenges@@ of attacking an oceanic arcology, your security force(s) has <<else>> - The @@.red;econimc and logisical fesability@@ of attacking a $terrain arcology, ensures that your security force(s) do not + The @@.red;economic and logistical challenges@@ of attacking a $terrain arcology, ensures that your security force(s) do not <</if>> - the luxury of focusing excusively on internal matters.<br> + the luxury of focusing exclusively on internal matters.<br> <<if $secMenials > 0>> <<print num($secMenials)>> slaves work to improve the security of your arcology, <<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 97e847e6ddb0a9a5549c4ca52f4d61e2ab3352a0..5837a7eb75681de66aee4cffdbabd87bfdbb66d0 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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earRestore"]] + | [[Repair|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earRestore"]] + [[Restore to normal|Surgery Degradation][$activeSlave.earShape = "normal", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 20, $surgeryType = "earGone"]] + [[Remove them|Surgery Degradation][$activeSlave.earShape = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMinor"]] + | [[Reshape into small elfin ears|Surgery Degradation][$activeSlave.earShape = "pointy", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earMinor"]] <</if>> <<if $surgeryUpgrade == 1>> <<if $activeSlave.earShape != "elven">> - | [[Reshape into long elf ears|Surgery Degradation][$activeSlave.earShape = "elven", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into long elf ears|Surgery Degradation][$activeSlave.earShape = "elven", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earShape != "ushi">> - | [[Reshape into bovine ears|Surgery Degradation][$activeSlave.earShape = "ushi", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into bovine ears|Surgery Degradation][$activeSlave.earShape = "ushi", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 20, $surgeryType = "earGone"]] + [[Remove them|Surgery Degradation][$activeSlave.earT = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "earGone"]] <</if>> <<if $activeSlave.earT == "normal">> <<if $activeSlave.earT != "neko">> - | [[Reshape into cat Ears|Surgery Degradation][$activeSlave.earT = "neko", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into cat Ears|Surgery Degradation][$activeSlave.earT = "neko", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earT != "inu">> - | [[Reshape into dog Ears|Surgery Degradation][$activeSlave.earT = "inu", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into dog Ears|Surgery Degradation][$activeSlave.earT = "inu", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earT != "kit">> - | [[Reshape into fox Ears|Surgery Degradation][$activeSlave.earT = "kit", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into fox Ears|Surgery Degradation][$activeSlave.earT = "kit", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "earMajor"]] <</if>> <<if $activeSlave.earT != "tanuki">> - | [[Reshape into tanuki Ears|Surgery Degradation][$activeSlave.earT = "tanuki", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMajor"]] + | [[Reshape into tanuki Ears|Surgery Degradation][$activeSlave.earT = "tanuki", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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, cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMinor"]] + [[Implant hair mimicking fibers|Surgery Degradation][$activeSlave.earTColor = $activeSlave.hColor, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "earMinor"]] + [[Remove them|Surgery Degradation][$activeSlave.earTColor = "hairless", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "hornGone"]]<</if>> + [[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + [[Succubus horns|Surgery Degradation][$activeSlave.horn = "curved succubus horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "backswept horns">> - | [[Backswept horns|Surgery Degradation][$activeSlave.horn = "backswept horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[Backswept horns|Surgery Degradation][$activeSlave.horn = "backswept horns", $activeSlave.hornColor = "jet black", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "cow horns">> - | [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[Bovine horns|Surgery Degradation][$activeSlave.horn = "cow horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $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, cashX(forceNeg($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), "slaveSurgery", $activeSlave), $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, cashX(forceNeg($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), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <<if $activeSlave.horn != "small horns">> - | [[Small horns|Surgery Degradation][$activeSlave.horn = "small horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> + | [[Small horns|Surgery Degradation][$activeSlave.horn = "small horns", $activeSlave.hornColor = "ivory", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "horn"]]<</if>> <br> $He has