From 938e8a16efc3630a061dc5074eea17a4da7048e5 Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Tue, 23 Apr 2019 17:00:22 -0500
Subject: [PATCH] NotReallyOverpoweringAnyway
---
src/js/storyJS.js | 16 ------------
src/pregmod/pRaped.tw | 18 ++++++-------
src/uncategorized/RESS.tw | 45 ++++++++++++++++----------------
src/uncategorized/costsBudget.tw | 2 +-
4 files changed, 32 insertions(+), 49 deletions(-)
diff --git a/src/js/storyJS.js b/src/js/storyJS.js
index 38ff9921af1..2c925ed0511 100644
--- a/src/js/storyJS.js
+++ b/src/js/storyJS.js
@@ -405,22 +405,6 @@ window.overpowerCheck = /** @param {App.Entity.SlaveState} slave */ function (sl
} else {
strength = 40;
}
- switch (PC.career) {
- case "mercenary":
- strength += 25;
- break;
- case "gang":
- strength += 15;
- break;
- case "slaver":
- strength += 8;
- break;
- case "escort":
- strength += 2;
- break;
- default:
- break;
- }
strength += (185-slave.height);
strength -= (PC.belly/1000);
strength += (PC.warfare/3);
diff --git a/src/pregmod/pRaped.tw b/src/pregmod/pRaped.tw
index 4351875166e..4b13238863a 100644
--- a/src/pregmod/pRaped.tw
+++ b/src/pregmod/pRaped.tw
@@ -29,16 +29,14 @@
While returning from a meeting with a prospective investor, an unfortunate wrong turn has led you into a rather seedy area of your arcology. You feel distinctly uncomfortable for some reason.
-<<if overpowerCheck($activeSlave, $PC) >= random(1,100)>>
- <<if $PC.career == "mercenary" || $PC.warfare >= 85>>
- The moment you hear the sound of the knife unsheathe your reflexes take over. With a single strike, the man tailing you lies in a heap on the ground.
- <<elseif $PC.career == "slaver" || $PC.warfare >= 45>>
- The moment you notice an arm coming around from behind you does your training kick in. You quickly disarm the assailant and knock them to the floor before placing them in a chokehold. Once they are subdued, you stand back to decide what to do next.
- <<elseif $PC.career == "gang">>
- The moment you hear the sound of the knife unsheathe your reflexes take over. With a single stab, your own shiv is buried in his chest, incapacitating him.
- <<else>>
- The moment you feel someone grab your arm you your instincts kick in. You quickly break free from your assailant's grip, spin around, and punch him square in the face. It's a lucky strike; you manage to knock him unconscious in one hit.
- <</if>>
+<<if $PC.career == "mercenary" || $PC.warfare >= 85>>
+ The moment you hear the sound of the knife unsheathe your reflexes take over. With a single strike, the man tailing you lies in a heap on the ground.
+ <<set $raped = 0>>
+<<elseif $PC.career == "slaver" || $PC.warfare >= 45>>
+ The moment you notice an arm coming around from behind you does your training kick in. You quickly disarm the assailant and knock them to the floor before placing them in a chokehold. Once they are subdued, you stand back to decide what to do next.
+ <<set $raped = 0>>
+<<elseif $PC.career == "gang">>
+ The moment you hear the sound of the knife unsheathe your reflexes take over. With a single stab, your own shiv is buried in his chest, incapacitating him.
<<set $raped = 0>>
<<else>>
You stifle a scream when you feel your arm grabbed and the knife pressed to your throat, knowing that it will only end badly for you in this place.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 3070ab1332f..92d9cf411eb 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -201,31 +201,32 @@ $He was mindbroken, but seems to have snapped out of it due to a deep love of yo
<<set $mutinery = 1>>
Finishing your work, you lean back for a well-deserved break. Your peace is quickly disturbed by several loud smashes from down the penthouse hall. As you get up from your desk, you hear somebody running down the hallway, and before you know it, <<EventNameLink>> is inside. $He is looking quite treacherous and <<if $activeSlave.skill.combat > 0>>relatively confident<<else>>somewhat unsure<</if>>. $He quickly reaches in to grab you,
-<<if overpowerCheck($activeSlave, $PC) >= random(1,100)>>
- <<if ($PC.career == "gang")>>
- <<if ($personalArms != 0)>>
- but when you point your handgun towards $him, $he stutters back with $his hands pointing upwards.
- <<else>>
- but you just have to reach for your trusty handgun to make the slave step back in fear.
- <</if>>
- <<elseif ($PC.career == "mercenary")>>
- <<if ($personalArms != 0)>>
- but you quickly draw the weapon you always keep close at hand, forcing the slave to put $his hands on the back of $his head.
- <<else>>
- but you quickly grab $his arm, pull it towards you and lock it in $his back, pushing $him over the desk.
- <</if>>
- <<elseif ($PC.career == "escort")>>
- but you simply give $him a kick to the groin; $he wouldn't be the first person to try this shit on you.
- <<elseif ($PC.career == "slaver") || $PC.slaving >= 20>>
- but you simply give $him a kick to the groin, a little trick you remember from your early days on how to deal with rebellious slaves.
- <<elseif ($PC.warfare >= 20)>>
- but you have no problem grabbing $him and pushing $him to the ground, grabbing both $his arms to make sure $he doesn't try to step up.
- <<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
- but you are far stronger, easily lifting $him into the air and slamming $him back to the ground.
+<<if ($PC.career == "gang")>>
+ <<if ($personalArms != 0)>>
+ but when you point your handgun towards $him, $he stutters back with $his hands pointing upwards.
+ <<else>>
+ but you just have to reach for your trusty handgun to make the slave step back in fear.
+ <</if>>
+ <<set $mutinery = 0>>
+<<elseif ($PC.career == "mercenary")>>
+ <<if ($personalArms != 0)>>
+ but you quickly draw the weapon you always keep close at hand, forcing the slave to put $his hands on the back of $his head.
<<else>>
- but you quickly and simply strike $him in the head with a nearby paperweight, disorienting $him long enough for you to subdue $him.
+ but you quickly grab $his arm, pull it towards you and lock it in $his back, pushing $him over the desk.
<</if>>
<<set $mutinery = 0>>
+<<elseif ($PC.career == "escort")>>
+ but you simply give $him a kick to the groin; $he wouldn't be the first person to try this shit on you.
+ <<set $mutinery = 0>>
+<<elseif ($PC.career == "slaver") || $PC.slaving >= 20>>
+ but you simply give $him a kick to the groin, a little trick you remember from your early days on how to deal with rebellious slaves.
+ <<set $mutinery = 0>>
+<<elseif ($PC.warfare >= 20)>>
+ but you have no problem grabbing $him and pushing $him to the ground, grabbing both $his arms to make sure $he doesn't try to step up.
+ <<set $mutinery = 0>>
+<<elseif $arcologies[0].FSPhysicalIdealist != "unset">>
+ but you are far stronger, easily lifting $him into the air and slamming $him back to the ground.
+ <<set $mutinery = 0>>
<<else>>
and despite your attempts at fighting $him off, $he manages to get a hold on your body.
<</if>>
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 32419af2e4c..107b728f9f8 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -306,7 +306,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("mercenaries",
"Security: <<if $barracks>>[[$mercenariesTitle|Barracks][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]
<<else>>Mercenaries<br>//@@.red;Cost increased by the lack of an armory to house them.@@//<</if>>
- <<if ($PC.warfare >= 100) || ($PC.career == "arcology owner")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
+ <<if ($PC.warfare >= 100) || ($PC.career == \"arcology owner\")>><br>//Cost reduced by your @@.springgreen;mercenary contacts.@@//<</if>>
")>>
<<print budgetLine("securityExpansion", "Security expansion")>>
--
GitLab