Skip to content
Snippets Groups Projects
Commit 7e065b38 authored by Pregmodder's avatar Pregmodder
Browse files

Merge branch 'fixes' into 'pregmod-master' 

Fixes

Closes #600

See merge request !4027
parents 0094931e 7123ea4a
No related branches found
No related tags found
1 merge request!4027Fixes
Hide whitespace changes
Inline Side-by-side
src/SecExp/securityReport.tw
+ 3
− 3
View file @ 7e065b38
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<strong>Security</strong>: <strong>Security</strong>:
<<if $terrain === "oceanic">> <<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>> <<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>> <</if>>
the luxury of focusing excusively on internal matters.<br> the luxury of focusing exclusively on internal matters.<br>
<<if $secMenials > 0>> <<if $secMenials > 0>>
<<print num($secMenials)>> slaves work to improve the security of your arcology, <<print num($secMenials)>> slaves work to improve the security of your arcology,
<<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>> <<if $mercenaries >= 1 && $arcologyUpgrade.drones == 1>>
......
src/uncategorized/remoteSurgery.tw
+ 20
− 20
View file @ 7e065b38
...@@ -162,7 +162,7 @@ $He has ...@@ -162,7 +162,7 @@ $He has
normal ears. normal ears.
<<elseif $activeSlave.earShape == "damaged">> <<elseif $activeSlave.earShape == "damaged">>
damaged ears. 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">> <<elseif $activeSlave.earShape == "pointy">>
small elfin ears. small elfin ears.
<<elseif $activeSlave.earShape == "elven">> <<elseif $activeSlave.earShape == "elven">>
...@@ -179,11 +179,11 @@ $He has ...@@ -179,11 +179,11 @@ $He has
//$His indenture forbids elective surgery// //$His indenture forbids elective surgery//
<<else>> <<else>>
<<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none">> <<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>>
<<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> | <</if>> <<if $activeSlave.earShape != "normal" && $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> | <</if>>
<<if $activeSlave.earShape != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> <<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>>
<<if $activeSlave.earShape == "none">> <<if $activeSlave.earShape == "none">>
<<if $activeSlave.hears != -2 && $activeSlave.earImplant != 1>> <<if $activeSlave.hears != -2 && $activeSlave.earImplant != 1>>
...@@ -194,14 +194,14 @@ $He has ...@@ -194,14 +194,14 @@ $He has
<</if>> <</if>>
<<else>> <<else>>
<<if $activeSlave.earShape != "pointy">> <<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>>
<<if $surgeryUpgrade == 1>> <<if $surgeryUpgrade == 1>>
<<if $activeSlave.earShape != "elven">> <<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>>
<<if $activeSlave.earShape != "ushi">> <<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>> <</if>>
<</if>> <</if>>
...@@ -230,29 +230,29 @@ $He has ...@@ -230,29 +230,29 @@ $He has
//$His indenture forbids elective surgery// //$His indenture forbids elective surgery//
<<else>> <<else>>
<<if $activeSlave.earT != "none" && $seeExtreme == 1 && $activeSlave.indentureRestrictions < 1>> <<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>>
<<if $activeSlave.earT == "normal">> <<if $activeSlave.earT == "normal">>
<<if $activeSlave.earT != "neko">> <<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>>
<<if $activeSlave.earT != "inu">> <<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>>
<<if $activeSlave.earT != "kit">> <<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>>
<<if $activeSlave.earT != "tanuki">> <<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>> <</if>>
<<else>> <<else>>
<br> <br>
<<if $activeSlave.earTColor == "hairless">> <<if $activeSlave.earTColor == "hairless">>
They are completely bald. 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>> <<else>>
They are covered by a multitude of implanted $activeSlave.earTColor fibers mimicking hair. 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>> <</if>>
<</if>> <</if>>
...@@ -297,20 +297,20 @@ $He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if ...@@ -297,20 +297,20 @@ $He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if
<<if $activeSlave.indentureRestrictions >= 2>> <<if $activeSlave.indentureRestrictions >= 2>>
//$His indenture forbids elective surgery// //$His indenture forbids elective surgery//
<<elseif $activeSlave.horn != "none">> <<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: Give $him:
<<if $activeSlave.horn != "curved succubus horns">> <<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">> <<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">> <<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">> <<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">> <<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">> <<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>&nbsp;&nbsp;&nbsp;&nbsp; <br>&nbsp;&nbsp;&nbsp;&nbsp;
$He has $He has
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment