diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw index 6ab665cbe8c1c61220bbcbdd69ddfdd56ad0e4c9..48c23339cded5e907628cea2690aaf26c23c177b 100644 --- a/src/interaction/prostheticConfig.tw +++ b/src/interaction/prostheticConfig.tw @@ -156,7 +156,7 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a $He currently has a tail attached, if you wish to change it you will first need to detach it.<br> [[Detach|Prosthetics Configuration][$prostheticsConfig = "detachTail",$nextButton = "Continue", $nextLink = "Prosthetics Configuration"]] <<else>><br> - <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "modT"}) != -1>> + <<if isProstheticAvailable($activeSlave, "modT")}) != -1>> Attach a modular tail designed to look like a:<br> [[Cat's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "neko", $activeSlave.tailColor = $activeSlave.hColor]] | [[Dog's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailShape = "inu", $activeSlave.tailColor = $activeSlave.hColor]] @@ -166,10 +166,10 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a | [[Cow's Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "mod", $activeSlave.tailColor = "ushi", $activeSlave.tailColor = $activeSlave.hColor]] <br> <</if>> - <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "combatT"}) != -1>> + <<if isProstheticAvailable($activeSlave, "combatT"))>> [[Attach Combat Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "combat", $activeSlave.tailColor = "jet black"]] <</if>> - <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "sexT"}) != -1>> + <<if isProstheticAvailable($activeSlave, "sexT")>> | [[Attach Pleasure Tail|Prosthetics Configuration][$prostheticsConfig = "attachTail", $activeSlave.tail = "sex", $activeSlave.tailColor = "pink"]] <</if>> <</if>> @@ -233,7 +233,7 @@ Fit prosthetics to $him: <div class="full">//Already being fitted to $him.//</div> <<elseif setup.prosthetics[_p].level > $prostheticsUpgrade>> <div class="full">//Better contracts needed to buy this.//</div> - <<elseif $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == _p}) != -1>> + <<elseif isProstheticAvailable($activeSlave, _p)>> <div class="full">//Completed.//</div> <<else>> <<capture _p>> @@ -411,7 +411,7 @@ Fit prosthetics to $him: <span id="attach"> <<set _first = 1>> /*TODO save .legsTat and .armsTat / link them to prosthetic*/ -/* <<if getLeftArmID($activeSlave) !== 2 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "basicL"}) != -1>> +/* <<if getLeftArmID($activeSlave) !== 2 && isProstheticAvailable($activeSlave, "basicL")) != -1>> <<if _first>> <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br> <<set _first = 0>> @@ -422,7 +422,7 @@ Fit prosthetics to $him: <</link>> <br> <</if>> - <<if getLeftArmID($activeSlave) !== 3 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "sexL"}) != -1>> + <<if getLeftArmID($activeSlave) !== 3 && isProstheticAvailable($activeSlave, "sexL"))>> <<if _first>> <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br> <<set _first = 0>> @@ -433,7 +433,7 @@ Fit prosthetics to $him: <</link>> <br> <</if>> - <<if getLeftArmID($activeSlave) !== 4 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "beautyL"}) != -1>> + <<if getLeftArmID($activeSlave) !== 4 && isProstheticAvailable($activeSlave, "beautyL")>> <<if _first>> <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br> <<set _first = 0>> @@ -444,7 +444,7 @@ Fit prosthetics to $him: <</link>> <br> <</if>> - <<if getLeftArmID($activeSlave) !== 5 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "combatL"}) != -1>> + <<if getLeftArmID($activeSlave) !== 5 && isProstheticAvailable($activeSlave, "combatL")>> <<if _first>> <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br> <<set _first = 0>> @@ -455,7 +455,7 @@ Fit prosthetics to $him: <</link>> <br> <</if>> - <<if getLeftArmID($activeSlave) !== 6 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "cyberneticL"}) != -1>> + <<if getLeftArmID($activeSlave) !== 6 && isProstheticAvailable($activeSlave, "cyberneticL")>> <<if $activeSlave.PLimb == 2>> <<if _first>> <br><br>Since you already have prepared limbs for $him you might as well attach them while you are working on $him:<br> diff --git a/src/uncategorized/remoteSurgery.tw b/src/uncategorized/remoteSurgery.tw index 8a87314d014c1cdac7ea965898980321ee821eaa..c9981dfe7a897ffc7f8c1f464e1ba8bb25c0b76f 100644 --- a/src/uncategorized/remoteSurgery.tw +++ b/src/uncategorized/remoteSurgery.tw @@ -156,7 +156,7 @@ $His $activeSlave.faceShape face is | [[Remove eyes|Surgery Degradation][$activeSlave.eyes = -4, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "remove eyes"]] <<if ($activeSlave.eyes > -2)>>//This will greatly restrict $him//<</if>> <</if>> - <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "ocular"}) != -1>> + <<if isProstheticAvailable($activeSlave, "ocular")>> | [["Give " + $him + " ocular implants"|Surgery Degradation][$activeSlave.eyesImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "ocular implant"]] <</if>> <</if>> @@ -290,7 +290,7 @@ $He has <<if ($activeSlave.hears > -2)>> | [[Deafen|Surgery Degradation][$activeSlave.hears = -2,cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10,$surgeryType = "deafen"]] <</if>> - <<if $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "cochlear"}) != -1>> + <<if isProstheticAvailable($activeSlave, "cochlear")>> | [["Give " + $him + " cochlear implants"|Surgery Degradation][$activeSlave.earImplant = 1, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "cochlear implant"]] <</if>> <</if>> @@ -460,7 +460,7 @@ $He has <<if $seeExtreme == 1>> | [[Remove vocal cords|Surgery Degradation][surgeryAmp($activeSlave, "voicebox"), $surgeryType = "mute", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave)]] <</if>> - <<elseif $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "electrolarynx"}) != -1>> + <<elseif isProstheticAvailable($activeSlave, "electrolarynx")>> [["Give " + $him + " an electrolarynx"|Surgery Degradation][$activeSlave.electrolarynx = 1, $activeSlave.voice = 2, cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 20, $surgeryType = "electrolarynx"]] <</if>> <</if>> @@ -1796,7 +1796,7 @@ Work on $him structurally: <br> <<if $activeSlave.PTail == 1>> $He has a neural interface allowing attachment of tails. -<<elseif $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "interfaceTail"}) != -1>> +<<elseif isProstheticAvailable($activeSlave, "interfaceTail")>> $He lacks a neural interface allowing attachment of tails. [[Implant interface|Surgery Degradation][$activeSlave.PTail = 1, $activeSlave.tail = "none", $activeSlave.tailColor = "none", cashX(forceNeg($surgeryCost), "slaveSurgery", $activeSlave), $activeSlave.health -= 10, $surgeryType = "tailInterface"]] <<else>>