From ceaf090e729a2b0416dc122b0197ef3711023f98 Mon Sep 17 00:00:00 2001
From: kopareigns <kopareigns@gmail.com>
Date: Sat, 24 Nov 2018 01:17:25 -0500
Subject: [PATCH] Deadliness widget conversion
---
devNotes/twine JS.txt | 138 ++++++++++++++++++++++++++++
src/js/assayJS.tw | 138 ++++++++++++++++++++++++++++
src/uncategorized/pePitFight.tw | 2 +-
src/uncategorized/saGuardsYou.tw | 2 +-
src/uncategorized/seLethalPit.tw | 4 +-
src/uncategorized/seNonlethalPit.tw | 4 +-
src/uncategorized/slaveInteract.tw | 2 +-
src/utility/assayWidgets.tw | 138 ----------------------------
8 files changed, 283 insertions(+), 145 deletions(-)
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index 51814bb243d..1fd0c022fe6 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -9236,6 +9236,144 @@ window.faceIncrease = function faceIncrease(slave, amount) {
return r;
};
+window.Deadliness = function Deadliness(slave) {
+ const V = State.variables;
+ let deadliness = 2;
+
+ if (slave.combatSkill > 0) {
+ deadliness += 2;
+ }
+
+ if (setup.bodyguardCareers.includes(slave.career)) {
+ deadliness += 1;
+ } else if (slave.skillBG >= V.masteredXP) {
+ deadliness += 1;
+ }
+
+ if (slave.muscles > 30 && slave.muscles <= 95) {
+ deadliness += 1;
+ } else if (slave.muscles > 95 && slave.height >= 185) {
+ deadliness += 2;
+ } else if (slave.muscles > 95) {
+ deadliness -= 1;
+ } else if (slave.muscles < -95) {
+ deadliness -= 20;
+ } else if (slave.muscles < -30) {
+ deadliness -= 7;
+ } else if (slave.muscles < -5) {
+ deadliness -= 3;
+ }
+
+ if (slave.height >= 170) {
+ deadliness += 1;
+ }
+
+ if (slave.health > 50) {
+ deadliness += 1;
+ }
+
+ if (slave.boobs > 4000) {
+ deadliness -= 2;
+ } else if (slave.boobs > 2000) {
+ deadliness -= 1;
+ }
+
+ if (slave.butt > 6) {
+ deadliness -= 1;
+ }
+
+ if (slave.hips > 2) {
+ deadliness -= 1;
+ }
+
+ if (slave.weight > 190) {
+ deadliness -= 20;
+ } else if (slave.weight > 160) {
+ deadliness -= 10;
+ } else if (slave.weight > 130) {
+ deadliness -= 3;
+ } else if (slave.weight > 30 || slave.weight < -10) {
+ deadliness -= 1;
+ }
+
+ if (slave.health < -50) {
+ deadliness -= 1;
+ }
+
+ if (slave.bellyFluid >= 10000) {
+ deadliness -= 3;
+ } else if (slave.bellyFluid >= 5000) {
+ deadliness -= 2;
+ } else if (slave.bellyFluid >= 2000) {
+ deadliness -= 1;
+ }
+
+ if (slave.pregKnown === 1 || slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500) {
+ if (slave.belly >= 750000) {
+ deadliness -= 50;
+ } else if (slave.belly >= 600000) {
+ deadliness -= 25;
+ } else if (slave.belly >= 450000) {
+ deadliness -= 15;
+ } else if (slave.belly >= 300000) {
+ deadliness -= 10;
+ } else if (slave.belly >= 150000) {
+ deadliness -= 8;
+ } else if (slave.belly >= 100000) {
+ deadliness -= 7;
+ } else if (slave.belly >= 10000) {
+ deadliness -= 3;
+ } else if (slave.belly >= 5000) {
+ deadliness -= 2;
+ } else {
+ deadliness -= 1;
+ }
+ }
+
+ if (slave.labor === 1) {
+ deadliness -= 15;
+ } else if (slave.preg >= 40 && slave.pregControl !== "labor supressors") {
+ deadliness -= 5;
+ }
+
+ if (slave.balls >= 15) {
+ deadliness -= 1;
+ }
+
+ if (slave.dick >= 10) {
+ deadliness -= 1;
+ }
+
+ if (slave.amp === 0) {
+ if (!canWalk(slave)) {
+ deadliness -= 20;
+ }
+ } else if (slave.amp === 1) {
+ deadliness -= 20;
+ } else if (slave.amp === -5) {
+ deadliness += 10;
+ } else if (slave.amp === -4) {
+ deadliness += 5;
+ } else {
+ deadliness -= 1;
+ }
+
+ if (!canSee(slave)) {
+ deadliness -= 8;
+ } else if ((slave.eyes === -1 && !["corrective glasses", "corrective contacts"].includes(slave.eyewear)) || (slave.eyes === 1 && ["blurring glasses", "blurring contacts"].includes(slave.eyewear))) {
+ deadliness -= 1;
+ }
+
+ if (!canHear(slave)) {
+ deadliness -= 4;
+ } else if ((slave.hears == -1 && slave.earwear !== "hearing aids") || (slave.hears == 0 && slave.earwear === "muffling ear plugs")) {
+ deadliness -= 1;
+ }
+
+ deadlines = Math.max(deadliness, 1);
+ V.deadliness = deadliness;
+};
+
/*:: relationshipChecks [script]*/
window.rivalryTerm = function(id) {
if (id.rivalry === 1) {
diff --git a/src/js/assayJS.tw b/src/js/assayJS.tw
index cfcec7dce76..177703e6472 100644
--- a/src/js/assayJS.tw
+++ b/src/js/assayJS.tw
@@ -1989,3 +1989,141 @@ window.faceIncrease = function faceIncrease(slave, amount) {
if (slave.face > 95) slave.face = 100;
return r;
};
+
+window.Deadliness = function Deadliness(slave) {
+ const V = State.variables;
+ let deadliness = 2;
+
+ if (slave.combatSkill > 0) {
+ deadliness += 2;
+ }
+
+ if (setup.bodyguardCareers.includes(slave.career)) {
+ deadliness += 1;
+ } else if (slave.skillBG >= V.masteredXP) {
+ deadliness += 1;
+ }
+
+ if (slave.muscles > 30 && slave.muscles <= 95) {
+ deadliness += 1;
+ } else if (slave.muscles > 95 && slave.height >= 185) {
+ deadliness += 2;
+ } else if (slave.muscles > 95) {
+ deadliness -= 1;
+ } else if (slave.muscles < -95) {
+ deadliness -= 20;
+ } else if (slave.muscles < -30) {
+ deadliness -= 7;
+ } else if (slave.muscles < -5) {
+ deadliness -= 3;
+ }
+
+ if (slave.height >= 170) {
+ deadliness += 1;
+ }
+
+ if (slave.health > 50) {
+ deadliness += 1;
+ }
+
+ if (slave.boobs > 4000) {
+ deadliness -= 2;
+ } else if (slave.boobs > 2000) {
+ deadliness -= 1;
+ }
+
+ if (slave.butt > 6) {
+ deadliness -= 1;
+ }
+
+ if (slave.hips > 2) {
+ deadliness -= 1;
+ }
+
+ if (slave.weight > 190) {
+ deadliness -= 20;
+ } else if (slave.weight > 160) {
+ deadliness -= 10;
+ } else if (slave.weight > 130) {
+ deadliness -= 3;
+ } else if (slave.weight > 30 || slave.weight < -10) {
+ deadliness -= 1;
+ }
+
+ if (slave.health < -50) {
+ deadliness -= 1;
+ }
+
+ if (slave.bellyFluid >= 10000) {
+ deadliness -= 3;
+ } else if (slave.bellyFluid >= 5000) {
+ deadliness -= 2;
+ } else if (slave.bellyFluid >= 2000) {
+ deadliness -= 1;
+ }
+
+ if (slave.pregKnown === 1 || slave.bellyPreg >= 1500 || slave.bellyImplant >= 1500) {
+ if (slave.belly >= 750000) {
+ deadliness -= 50;
+ } else if (slave.belly >= 600000) {
+ deadliness -= 25;
+ } else if (slave.belly >= 450000) {
+ deadliness -= 15;
+ } else if (slave.belly >= 300000) {
+ deadliness -= 10;
+ } else if (slave.belly >= 150000) {
+ deadliness -= 8;
+ } else if (slave.belly >= 100000) {
+ deadliness -= 7;
+ } else if (slave.belly >= 10000) {
+ deadliness -= 3;
+ } else if (slave.belly >= 5000) {
+ deadliness -= 2;
+ } else {
+ deadliness -= 1;
+ }
+ }
+
+ if (slave.labor === 1) {
+ deadliness -= 15;
+ } else if (slave.preg >= 40 && slave.pregControl !== "labor supressors") {
+ deadliness -= 5;
+ }
+
+ if (slave.balls >= 15) {
+ deadliness -= 1;
+ }
+
+ if (slave.dick >= 10) {
+ deadliness -= 1;
+ }
+
+ if (slave.amp === 0) {
+ if (!canWalk(slave)) {
+ deadliness -= 20;
+ }
+ } else if (slave.amp === 1) {
+ deadliness -= 20;
+ } else if (slave.amp === -5) {
+ deadliness += 10;
+ } else if (slave.amp === -4) {
+ deadliness += 5;
+ } else {
+ deadliness -= 1;
+ }
+
+ if (!canSee(slave)) {
+ deadliness -= 8;
+ } else if ((slave.eyes === -1 && !["corrective glasses", "corrective contacts"].includes(slave.eyewear)) || (slave.eyes === 1 && ["blurring glasses", "blurring contacts"].includes(slave.eyewear))) {
+ deadliness -= 1;
+ }
+
+ if (!canHear(slave)) {
+ deadliness -= 4;
+ } else if ((slave.hears == -1 && slave.earwear !== "hearing aids") || (slave.hears == 0 && slave.earwear === "muffling ear plugs")) {
+ deadliness -= 1;
+ }
+
+ deadlines = Math.max(deadliness, 1);
+ V.deadliness = deadliness;
+};
diff --git a/src/uncategorized/pePitFight.tw b/src/uncategorized/pePitFight.tw
index f329299d421..4bab85562f7 100644
--- a/src/uncategorized/pePitFight.tw
+++ b/src/uncategorized/pePitFight.tw
@@ -5,7 +5,7 @@
<<set $activeSlave = $Bodyguard>>
<<setLocalPronouns $activeSlave>>
-<<Deadliness $activeSlave>>
+<<run Deadliness($activeSlave)>>
<<set $PPit = 0>>
diff --git a/src/uncategorized/saGuardsYou.tw b/src/uncategorized/saGuardsYou.tw
index b96c36df19b..7f5ffe142c7 100644
--- a/src/uncategorized/saGuardsYou.tw
+++ b/src/uncategorized/saGuardsYou.tw
@@ -6,7 +6,7 @@ carries arms in your defense.
<<set $slaves[$i].livingRules = "luxurious">>
<</if>>
-<<Deadliness $slaves[$i]>>
+<<run Deadliness($slaves[$i])>>
<<if $slaves[$i].combatSkill > 0>>
$His combat skills greatly increase $his deadliness.
diff --git a/src/uncategorized/seLethalPit.tw b/src/uncategorized/seLethalPit.tw
index e6a8efe6fdd..5760f6d8fbe 100644
--- a/src/uncategorized/seLethalPit.tw
+++ b/src/uncategorized/seLethalPit.tw
@@ -47,7 +47,7 @@ You review the rules - the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>>
<br><br>
-<<Deadliness _fighterOne>>
+<<run Deadliness(_fighterOne)>>
<<set _fighterOneDeadliness = $deadliness>>
<<if _fighterOne.fetish == "mindbroken">>
@@ -200,7 +200,7 @@ You review the rules - the <<if $pitAnimal == 0>>combatants<<else>>slave<</if>>
<br><br>
<<if $pitAnimal == 0>>
- <<Deadliness _fighterTwo>>
+ <<run Deadliness(_fighterTwo)>>
<<set _fighterTwoDeadliness = $deadliness>>
<<if _fighterTwo.fetish == "mindbroken">>
diff --git a/src/uncategorized/seNonlethalPit.tw b/src/uncategorized/seNonlethalPit.tw
index a2392a2ed6f..350541bfc2c 100644
--- a/src/uncategorized/seNonlethalPit.tw
+++ b/src/uncategorized/seNonlethalPit.tw
@@ -60,7 +60,7 @@
<br><br>
- <<Deadliness _fighterOne>>
+ <<run Deadliness(_fighterOne)>>
<<set _fighterOneDeadliness = $deadliness>>
<<if _fighterOneDeadliness > 5>>
@@ -197,7 +197,7 @@
<br><br>
- <<Deadliness _fighterTwo>>
+ <<run Deadliness(_fighterTwo)>>
<<set _fighterTwoDeadliness = $deadliness>>
<<if _fighterTwoDeadliness > 5>>
diff --git a/src/uncategorized/slaveInteract.tw b/src/uncategorized/slaveInteract.tw
index f1b9fee3190..314f2e1bf97 100644
--- a/src/uncategorized/slaveInteract.tw
+++ b/src/uncategorized/slaveInteract.tw
@@ -223,7 +223,7 @@
<</if>>
<</if>>
<<if $cheatMode == 1>>
- | <<link "Check $his deadliness @@.red;FOR TESTING@@">><<replace "#miniscene">><<include "Deadliness">><br> <</replace>><</link>>
+ | <<link "Check $his deadliness @@.red;FOR TESTING@@">><<replace "#miniscene">><<run Deadliness($activeSlave)>>$deadliness<br> <</replace>><</link>>
<</if>>
| <<link "Abuse $him">><<replace "#miniscene">><<include "FAbuse">><</replace>><</link>>
<<if $familyTesting == 1>>
diff --git a/src/utility/assayWidgets.tw b/src/utility/assayWidgets.tw
index e60df9b0e13..da82c24ebda 100644
--- a/src/utility/assayWidgets.tw
+++ b/src/utility/assayWidgets.tw
@@ -1,143 +1,5 @@
:: assay widgets [widget nobr]
-<<widget "Deadliness">>
-
-<<set $deadliness = 2>>
-
-<<if $args[0].combatSkill > 0>>
- <<set $deadliness += 2>>
-<</if>>
-
-<<if setup.bodyguardCareers.includes($Bodyguard.career)>>
- <<set $deadliness += 1>>
-<<elseif $Bodyguard.skillBG >= $masteredXP>>
- <<set $deadliness += 1>>
-<</if>>
-
-<<if ($args[0].muscles > 30) && ($args[0].muscles <= 95)>>
- <<set $deadliness += 1>>
-<<elseif ($args[0].muscles > 95) && ($args[0].height >= 185)>>
- <<set $deadliness += 2>>
-<<elseif ($args[0].muscles > 95)>>
- <<set $deadliness -= 1>>
-<<elseif ($args[0].muscles < -95)>>
- <<set $deadliness -= 20>>
-<<elseif ($args[0].muscles < -30)>>
- <<set $deadliness -= 7>>
-<<elseif ($args[0].muscles < -5)>>
- <<set $deadliness -= 3>>
-<</if>>
-
-<<if $args[0].height >= 170>>
- <<set $deadliness += 1>>
-<</if>>
-
-<<if $args[0].health > 50>>
- <<set $deadliness += 1>>
-<</if>>
-
-<<if $args[0].boobs > 4000>>
- <<set $deadliness -= 2>>
-<<elseif $args[0].boobs > 2000>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].butt > 6>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].hips > 2>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].weight > 190>>
- <<set $deadliness -= 20>>
-<<elseif $args[0].weight > 160>>
- <<set $deadliness -= 10>>
-<<elseif $args[0].weight > 130>>
- <<set $deadliness -= 3>>
-<<elseif $args[0].weight > 30 || $args[0].weight < -10>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].health < -50>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].bellyFluid >= 10000>>
- <<set $deadliness -= 3>>
-<<elseif $args[0].bellyFluid >= 5000>>
- <<set $deadliness -= 2>>
-<<elseif $args[0].bellyFluid >= 2000>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].pregKnown == 1 || $args[0].bellyPreg >= 1500 || $args[0].bellyImplant >= 1500>>
- <<if $args[0].belly >= 750000>>
- <<set $deadliness -= 50>>
- <<elseif $args[0].belly >= 600000>>
- <<set $deadliness -= 25>>
- <<elseif $args[0].belly >= 450000>>
- <<set $deadliness -= 15>>
- <<elseif $args[0].belly >= 300000>>
- <<set $deadliness -= 10>>
- <<elseif $args[0].belly >= 150000>>
- <<set $deadliness -= 8>>
- <<elseif $args[0].belly >= 100000>>
- <<set $deadliness -= 7>>
- <<elseif $args[0].belly >= 10000>>
- <<set $deadliness -= 3>>
- <<elseif $args[0].belly >= 5000>>
- <<set $deadliness -= 2>>
- <<else>>
- <<set $deadliness -= 1>>
- <</if>>
-<</if>>
-<<if $args[0].labor == 1>>
- <<set $deadliness -= 15>>
-<<elseif $args[0].preg >= 40 && $args[0].pregControl != "labor supressors">>
- <<set $deadliness -= 5>>
-<</if>>
-
-<<if $args[0].balls >= 15>>
- <<set $deadliness -= 1>>
-<</if>>
-<<if $args[0].dick >= 10>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $args[0].amp == 0>>
- <<if !canWalk($args[0])>>
- <<set $deadliness -= 20>>
- <</if>>
-<<elseif $args[0].amp == 1>>
- <<set $deadliness -= 20>>
-<<elseif $args[0].amp == -5>>
- <<set $deadliness += 10>>
-<<elseif $args[0].amp == -4>>
- <<set $deadliness += 5>>
-<<else>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if !canSee($args[0])>>
- <<set $deadliness -= 8>>
-<<elseif ($args[0].eyes == -1 && !["corrective glasses", "corrective contacts"].includes($args[0].eyewear)) || ($args[0].eyes == 1 && ["blurring glasses", "blurring contacts"].includes($args[0].eyewear))>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if !canHear($args[0])>>
- <<set $deadliness -= 4>>
-<<elseif ($args[0].hears == -1 && !["hearing aids"].includes($args[0].earwear)) || ($args[0].hears == 0 && ["muffling ear plugs"].includes($args[0].earwear))>>
- <<set $deadliness -= 1>>
-<</if>>
-
-<<if $deadliness < 1>>
- <<set $deadliness = 1>>
-<</if>>
-
-<</widget>>
-
<<widget "slaveCost">>
<<run Beauty($args[0])>>
--
GitLab