From 3583d4e992d8f31fbd1b083313e1e4ce80d78f16 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 30 May 2019 19:55:40 -0500
Subject: [PATCH] AmpSwitches
---
src/interaction/prostheticConfig.tw | 18 +++++++++---------
src/uncategorized/multiImplant.tw | 10 +++++-----
src/uncategorized/sellSlave.tw | 2 +-
src/uncategorized/slaveSold.tw | 2 +-
src/uncategorized/universalRules.tw | 4 ++--
src/utility/descriptionWidgetsStyle.tw | 2 +-
6 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/interaction/prostheticConfig.tw b/src/interaction/prostheticConfig.tw
index e0685eeebe2..4e4ee3f6280 100644
--- a/src/interaction/prostheticConfig.tw
+++ b/src/interaction/prostheticConfig.tw
@@ -173,32 +173,32 @@ This room is lined with shelves and cabinets, it could be easily mistaken for a
/*TODO save .legsTat and .armsTat / link them to prosthetic*/
<<if $activeSlave.amp != -1 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "basicL"}) != -1>>
<<link "Attach <<= addA(setup.prosthetics.basicL.name)>>" "Prosthetics Config">>
- <<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
+ <<set $activeSlave.amp = -1, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "basicPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -2 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "sexL"}) != -1>>
<<link "Attach <<= addA(setup.prosthetics.sexL.name)>>" "Prosthetics Config">>
- <<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
+ <<set $activeSlave.amp = -2, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "sexPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -3 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "beautyL"}) != -1>>
<<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>" "Prosthetics Config">>
- <<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
+ <<set $activeSlave.amp = -3, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "beautyPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -4 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "combatL"}) != -1>>
<<link "Attach <<= addA(setup.prosthetics.combatL.name)>>" "Prosthetics Config">>
- <<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
+ <<set $activeSlave.amp = -4, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "combatPLimbs">>
<</link>>
<br>
<</if>>
<<if $activeSlave.amp != -5 && $activeSlave.readyProsthetics.findIndex(function(p) {return p.id == "cyberneticL"}) != -1>>
<<if $activeSlave.PLimb == 2>>
<<link "Attach <<= addA(setup.prosthetics.cyberneticL.name)>>" "Prosthetics Config">>
- <<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
+ <<set $activeSlave.amp = -5, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "cyberPLimbs">>
<</link>>
<<else>>
// $He must have <<= addA(setup.prosthetics.interfaceP2.name)>> installed to attach <<= addA(setup.prosthetics.cyberneticL.name)>>. //
@@ -458,7 +458,7 @@ Fit prosthetics to $him:
<<set _first = 0>>
<</if>>
<<link "Attach <<= addA(setup.prosthetics.basicL.name)>>">>
- <<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
+ <<set $activeSlave.amp = -1, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "basicPLimbs">>
<<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
@@ -469,7 +469,7 @@ Fit prosthetics to $him:
<<set _first = 0>>
<</if>>
<<link "Attach <<= addA(setup.prosthetics.sexL.name)>>">>
- <<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
+ <<set $activeSlave.amp = -2, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "sexPLimbs">>
<<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
@@ -480,7 +480,7 @@ Fit prosthetics to $him:
<<set _first = 0>>
<</if>>
<<link "Attach <<= addA(setup.prosthetics.beautyL.name)>>">>
- <<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
+ <<set $activeSlave.amp = -3, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "beautyPLimbs">>
<<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
@@ -491,7 +491,7 @@ Fit prosthetics to $him:
<<set _first = 0>>
<</if>>
<<link "Attach <<= addA(setup.prosthetics.combatL.name)>>">>
- <<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
+ <<set $activeSlave.amp = -4, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "combatPLimbs">>
<<replace #attach>><br><br><<include "Prosthetics Config">><<set $nextLink = "Remote Surgery">><</replace>>
<</link>>
<br>
diff --git a/src/uncategorized/multiImplant.tw b/src/uncategorized/multiImplant.tw
index 0027bb18bfd..fe22ce909ad 100644
--- a/src/uncategorized/multiImplant.tw
+++ b/src/uncategorized/multiImplant.tw
@@ -1046,35 +1046,35 @@ You head down to your <<if $surgeryUpgrade == 1>>heavily upgraded and customized
<<else>>
<<if _p.id == "basicL">>
<<if $activeSlave.amp > 0>>
- <<set $activeSlave.amp = -1, $prostheticsConfig = "basicPLimbs">>
+ <<set $activeSlave.amp = -1, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "basicPLimbs">>
<<include "Prosthetics Config">>
<<else>>
//Since $he already has more advanced prosthetic limbs attached the <<= setup.prosthetics.basicL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "sexL">>
<<if $activeSlave.amp >= -1>>
- <<set $activeSlave.amp = -2, $prostheticsConfig = "sexPLimbs">>
+ <<set $activeSlave.amp = -2, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "sexPLimbs">>
<<include "Prosthetics Config">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.sexL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "beautyL">>
<<if $activeSlave.amp >= -1>>
- <<set $activeSlave.amp = -3, $prostheticsConfig = "beautyPLimbs">>
+ <<set $activeSlave.amp = -3, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "beautyPLimbs">>
<<include "Prosthetics Config">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.beautyL.name>> will be put into storage.//
<</if>>
<<elseif _p.id == "combatL">>
<<if $activeSlave.amp >= -1>>
- <<set $activeSlave.amp = -4, $prostheticsConfig = "combatPLimbs">>
+ <<set $activeSlave.amp = -4, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "combatPLimbs">>
<<include "Prosthetics Config">>
<<else>>
//Since $he already has advanced prosthetic limbs attached the <<= setup.prosthetics.combatL.name>> will be put into storage.//
<</if>>
<<else>>
<<if $activeSlave.PLimb == 2>>
- <<set $activeSlave.amp = -5, $prostheticsConfig = "cyberPLimbs">>
+ <<set $activeSlave.amp = -5, $activeSlave.missingArms = 0, $activeSlave.missingLegs = 0, $prostheticsConfig = "cyberPLimbs">>
<<include "Prosthetics Config">>
<<else>>
//Since $he must have <<= addA(setup.prosthetics.interfaceP2.name)>> installed to attach cybernetic limbs the <<= setup.prosthetics.cyberneticL.name>> will be put into storage.//
diff --git a/src/uncategorized/sellSlave.tw b/src/uncategorized/sellSlave.tw
index f9a406e46f5..9bcd238a0a2 100644
--- a/src/uncategorized/sellSlave.tw
+++ b/src/uncategorized/sellSlave.tw
@@ -1239,7 +1239,7 @@ __Bids Received__
<<if $activeSlave.devotion > 20>>
<<if $activeSlave.fetish == "cumslut">>
<<if $activeSlave.lips > 30>>
- <<if $activeSlave.amp == 0>>
+ <<if $activeSlave.missingArms == != 3 && $activeSlave.missingLegs == != 3>>
<<if $activeSlave.skill.oral > 50>>
<<if random(1,100) > 60>>
<br>''<<print cashFormat(500*Math.trunc(($slaveCost*1.35)/500))>>'' from a prominent citizen who's looking for a fresh, skilled pair of lips eager to wrap around a thick cock.
diff --git a/src/uncategorized/slaveSold.tw b/src/uncategorized/slaveSold.tw
index 1a1921f8ee6..e7da6acf28c 100644
--- a/src/uncategorized/slaveSold.tw
+++ b/src/uncategorized/slaveSold.tw
@@ -980,7 +980,7 @@
<</for>>
<<case "D oral servants">>
- $activeSlave.slaveName is an occasional sight around the arcology; $he's never seen outside the company of $his new slave superior. This is one of $his new master's more favored slaves. $He has a huge cock, and $activeSlave.slaveName usually crouches down, hugging one of $his superior's legs and keeping $his mouth obediently near that dick.
+ $activeSlave.slaveName is an occasional sight around the arcology; $he's never seen outside the company of $his new slave superior. This is one of $his new master's more favored slaves. $He has a huge cock, and $activeSlave.slaveName is usually crouching down, hugging one of $his superior's legs and keeping $his mouth obediently near that dick.
<<for _ss = 0; _ss < $slaves.length; _ss++>>
<<if ($slaves[_ss].fetishKnown == 1)>>
<<if ($slaves[_ss].fetish == "cumslut")>>
diff --git a/src/uncategorized/universalRules.tw b/src/uncategorized/universalRules.tw
index f763623fe2c..f870178b6e9 100644
--- a/src/uncategorized/universalRules.tw
+++ b/src/uncategorized/universalRules.tw
@@ -103,14 +103,14 @@ Choose a default site for slaves to be branded. Current site is ''$brandTarget.
| [[Cheeks|Universal Rules][$brandTarget.secondary = "cheek"]]
| [[Shoulders|Universal Rules][$brandTarget.secondary = "shoulder"]]
| [[Breasts|Universal Rules][$brandTarget.secondary = "breast"]]
- /*<<if $activeSlave.amp == 0>>
+ /*<<if $activeSlave.amp == 0 && $activeSlave.missingArms != 3>>
| [[Arm, upper|Universal Rules][$brandTarget.secondary = "upper arm"]]
| [[Arm, lower|Universal Rules][$brandTarget.secondary = "lower arm"]]
| [[Wrist|Universal Rules][$brandTarget.secondary = "wrist"]]
| [[Hand|Universal Rules][$brandTarget.secondary = "hand"]]
<</if>>*/
| [[Buttocks|Universal Rules][$brandTarget.secondary = "buttock"]]
- /*<<if $activeSlave.amp == 0>>
+ /*<<if $activeSlave.amp == 0&& $activeSlave.missingLegs != 3>>
| [[Thigh|Universal Rules][$brandTarget.secondary = "thigh"]]
| [[Calf|Universal Rules][$brandTarget.secondary = "calve"]]
| [[Ankle|Universal Rules][$brandTarget.secondary = "ankle"]]
diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw
index c59679d2a12..1b297d8052d 100644
--- a/src/utility/descriptionWidgetsStyle.tw
+++ b/src/utility/descriptionWidgetsStyle.tw
@@ -911,7 +911,7 @@ $activeSlave.slaveName is
so $his nude body is on display.
<<if ($activeSlave.amp == 1)>>
In fact, $he's devoid even of limbs.
- <<else>>
+ <<elseif ($activeSlave.missingLegs != 3)>>
$He is wearing
<<footwearDescription>>
<</if>>
--
GitLab