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

Merge branch 'pregmod-dev' into 'pregmod-master' 

Cleaned up ears/horns remoteSurgery.tw text and added ears to multiImplant.tw

See merge request pregmodfan/fc-pregmod!3844
parents 0131103a a862dd5c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/uncategorized/multiImplant.tw
+ 25
− 0
View file @ fc82eb7e
......@@ -24,6 +24,7 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
horseOvaries: 0,
cowOvaries: 0,
eyes: 0,
ears: 0,
cochleae: 0,
voicebox: 0,
mpreg: 0,
......@@ -85,6 +86,9 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<elseif $completedOrgans[_j].type == "eyes">>
<<set _slaveOrgans.eyes = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "ears">>
<<set _slaveOrgans.ears = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
<<elseif $completedOrgans[_j].type == "cochleae">>
<<set _slaveOrgans.cochleae = $completedOrgans[_j]>>
<<set $completedOrgans.deleteAt(_j),_j-->>
......@@ -146,6 +150,27 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<set $completedOrgans.push(_slaveOrgans.eyes)>>
<</if>>
<</if>>
/* ears */
<<if _slaveOrgans.ears != 0>>
<<if $activeSlave.earShape == "none">>
<<run cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)>>
<<set $activeSlave.earShape = "normal">>
<<if $activeSlave.hears == -1>>
<<set $activeSlave.hears = 0>>
<</if>>
<<set $activeSlave.health -= 15>>
<<if $organFarmUpgrade == 2>>
<<set $activeSlave.chem += 20>>
<</if>>
<<set $surgeryType = "earMinor">>
<br><hr>
<<include "Surgery Degradation">>
<<else>>
<br><hr>
@@.red;Could not implant ears on $activeSlave.slaveName: $he already has them. Additional options available under individual surgery.@@
<<set $completedOrgans.push(_slaveOrgans.ears)>>
<</if>>
<</if>>
/* cochleae */
<<if _slaveOrgans.cochleae != 0>>
<<if ($activeSlave.hears == -2) && $activeSlave.earImplant != 1>>
......
src/uncategorized/remoteSurgery.tw
+ 47
− 47
View file @ fc82eb7e
......@@ -193,67 +193,67 @@ $He has
<<set $activeSlave.brand = 0>>
<</if>>
<<else>>
<br>Give $him:
<<if $activeSlave.earShape != "pointy">>
[[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", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMinor"]]
<</if>>
<<if $surgeryUpgrade == 1>>
<<if $activeSlave.earShape != "elven">>
| [[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", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
<</if>>
<<if $activeSlave.earShape != "ushi">>
| [[Bovine Ears|Surgery Degradation][$activeSlave.earShape = "ushi", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
| [[Reshape into bovine ears|Surgery Degradation][$activeSlave.earShape = "ushi", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
<</if>>
<</if>>
<</if>>
<</if>>
/*Top Ears*/
<br>&nbsp;&nbsp;&nbsp;&nbsp;
$He has
<<if $activeSlave.earT == "none">>
<<if $activeSlave.earShape != "none">>only one set of ears<<else>>no secondary ears<</if>>.
<<elseif $activeSlave.earT == "normal">>
<<if $activeSlave.earShape != "none">>a second pair of ears grafted to $his head<<else>>a pair of ears grafted to the top of $his head<</if>>.
<<elseif $activeSlave.earT == "neko">>
a pair of cat ears adorning $his head.
<<elseif $activeSlave.earT == "inu">>
a pair of dog ears adorning $his head.
<<elseif $activeSlave.earT == "kit">>
a pair of fox ears adorning $his head.
<<elseif $activeSlave.earT == "tanuki">>
a pair of tanuki ears adorning $his head.
<<else>>
You done goofed. //Report This//
<</if>>
<<if $activeSlave.indentureRestrictions >= 2>>
//$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"]]
<<if $activeSlave.earT != "none">>
<br>&nbsp;&nbsp;&nbsp;&nbsp;
$He has
<<if $activeSlave.earT == "none">>
<<if $activeSlave.earShape != "none">>only one set of ears<<else>>no secondary ears<</if>>.
<<elseif $activeSlave.earT == "normal">>
<<if $activeSlave.earShape != "none">>a second pair of ears grafted to $his head<<else>>a pair of ears grafted to the top of $his head<</if>>.
<<elseif $activeSlave.earT == "neko">>
a pair of cat ears adorning $his head.
<<elseif $activeSlave.earT == "inu">>
a pair of dog ears adorning $his head.
<<elseif $activeSlave.earT == "kit">>
a pair of fox ears adorning $his head.
<<elseif $activeSlave.earT == "tanuki">>
a pair of tanuki ears adorning $his head.
<<else>>
You done goofed. //Report This//
<</if>>
<<if $activeSlave.earT == "normal">>
<br>Reshape them:
<<if $activeSlave.earT != "neko">>
[[Cat Ears|Surgery Degradation][$activeSlave.earT = "neko", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
<</if>>
<<if $activeSlave.earT != "inu">>
| [[Dog Ears|Surgery Degradation][$activeSlave.earT = "inu", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
<</if>>
<<if $activeSlave.earT != "kit">>
| [[Fox Ears|Surgery Degradation][$activeSlave.earT = "kit", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
<</if>>
<<if $activeSlave.earT != "tanuki">>
| [[Tanuki Ears|Surgery Degradation][$activeSlave.earT = "tanuki", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "earMajor"]]
<<if $activeSlave.indentureRestrictions >= 2>>
//$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"]]
<</if>>
<<elseif $activeSlave.earT != "none">>
<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"]]
<<if $activeSlave.earT == "normal">>
<<if $activeSlave.earT != "neko">>
| [[Reshape into cat Ears|Surgery Degradation][$activeSlave.earT = "neko", $cash -= $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"]]
<</if>>
<<if $activeSlave.earT != "kit">>
| [[Reshape into fox Ears|Surgery Degradation][$activeSlave.earT = "kit", $cash -= $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"]]
<</if>>
<<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"]]
<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"]]
<<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"]]
<</if>>
<</if>>
<</if>>
<</if>>
......@@ -295,7 +295,7 @@ $He has
<br>&nbsp;&nbsp;&nbsp;&nbsp;
$He has <<if $activeSlave.horn == "none">>no horns<<else>>$activeSlave.horn<</if>>.
<<if $activeSlave.horn != "none">>
[[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", $cash -= $surgeryCost, $activeSlave.health -= 10, $surgeryType = "hornGone"]]<</if>><br>
[[Remove them|Surgery Degradation][$activeSlave.horn = "none", $activeSlave.hornColor = "none", $cash -= $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>>
......
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