From ff72f9f23d6b4cb4c7ed3d2748ddbaef6fe4bf91 Mon Sep 17 00:00:00 2001
From: lowercasedonkey <lowercasedonkey@gmail.com>
Date: Tue, 4 Aug 2020 23:26:00 -0400
Subject: [PATCH] snatch
---
src/events/reSnatchAndGrabFollowup.tw | 2 +-
src/js/eventSelectionJS.js | 4 ++--
src/uncategorized/nonRandomEvent.tw | 2 +-
src/uncategorized/pSnatchAndGrab.tw | 4 ++--
src/uncategorized/pSnatchAndGrabResult.tw | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/events/reSnatchAndGrabFollowup.tw b/src/events/reSnatchAndGrabFollowup.tw
index 1291d4e388b..775a5eea49c 100644
--- a/src/events/reSnatchAndGrabFollowup.tw
+++ b/src/events/reSnatchAndGrabFollowup.tw
@@ -1,6 +1,6 @@
:: RE snatch and grab followup [nobr]
-<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $PSnatch = 2>>
+<<set $nextButton = "Continue", $nextLink = "AS Dump", $returnTo = "RIE Eligibility Check", $eventResults.snatch = 2>>
<<set _slave = $activeSlave = $eventSlave>>
<<setLocalPronouns _slave>>
diff --git a/src/js/eventSelectionJS.js b/src/js/eventSelectionJS.js
index fc2516dde2e..ef1ae891249 100644
--- a/src/js/eventSelectionJS.js
+++ b/src/js/eventSelectionJS.js
@@ -1435,7 +1435,7 @@ globalThis.generateRandomEventPoolStandard = function(eventSlave) {
}
}
- if (V.PSnatch === 0 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
+ if (V.eventResults.snatch === 0 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
if (V.geneticMappingUpgrade === 2 && eventSlave.health.condition > 25 && eventSlave.devotion > 50 && V.cash > V.surgeryCost*4) {
/* only one slave ever qualifies, so give it a bit more weight */
V.events.push("RE snatch and grab followup");
@@ -2305,7 +2305,7 @@ globalThis.generateRandomEventPoolServant = function(eventSlave) {
}
}
- if (V.PSnatch === 0 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
+ if (V.eventResults.snatch === 0 && eventSlave.origin === "$He is your share of a raid on an illegal laboratory by your mercenaries." && eventSlave.newGamePlus === 0) {
if (V.geneticMappingUpgrade === 2 && eventSlave.health.condition > 25 && eventSlave.devotion > 50 && V.cash > V.surgeryCost*4) {
/* only one slave ever qualifies, so give it a bit more weight */
V.events.push("RE snatch and grab followup");
diff --git a/src/uncategorized/nonRandomEvent.tw b/src/uncategorized/nonRandomEvent.tw
index e870e3fdc3b..711174c1ba3 100644
--- a/src/uncategorized/nonRandomEvent.tw
+++ b/src/uncategorized/nonRandomEvent.tw
@@ -160,7 +160,7 @@
<<elseif ($eventResults.shoot == 1)>>
<<set $Event = "shoot result">>
<<goto "Generic Plot Events">>
-<<elseif ($PSnatch == 1)>>
+<<elseif ($eventResults.snatch == 1)>>
<<goto "P snatch and grab result">>
<<elseif ($PRaid == 1)>>
<<goto "P raid result">>
diff --git a/src/uncategorized/pSnatchAndGrab.tw b/src/uncategorized/pSnatchAndGrab.tw
index df0e7f12b74..4e9bb2b484f 100644
--- a/src/uncategorized/pSnatchAndGrab.tw
+++ b/src/uncategorized/pSnatchAndGrab.tw
@@ -3,7 +3,7 @@
<<set $nextButton = "Continue">>
<<set $nextLink = "Random Nonindividual Event">>
-<<set $PSnatch = 0>>
+<<set $eventResults.snatch = 0>>
<<setAssistantPronouns>>
<<= capFirstChar($assistant.name)>> forwards a discreet message from the leader of your mercenaries.
@@ -59,7 +59,7 @@
<<replace "#result">>
You receive no response whatsoever. Twenty minutes later, however, a liaison VTOL aircraft that the mercenaries sometimes hire arrives, loads a party of armed men and women, and leaves.
<<run cashX(-10000, "slaveTransfer")>>
- <<set $PSnatch = 1>>
+ <<set $eventResults.snatch = 1>>
<</replace>>
<</link>>
<br><<link "Politely decline">>
diff --git a/src/uncategorized/pSnatchAndGrabResult.tw b/src/uncategorized/pSnatchAndGrabResult.tw
index 55247d219b9..b05d0ffc006 100644
--- a/src/uncategorized/pSnatchAndGrabResult.tw
+++ b/src/uncategorized/pSnatchAndGrabResult.tw
@@ -1,6 +1,6 @@
:: P snatch and grab result [nobr]
-<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event", $PSnatch = 0>>
+<<set $nextButton = "Continue", $nextLink = "Random Nonindividual Event", $returnTo = "Random Nonindividual Event", $eventResults.snatch = 0>>
<<if $pedo_mode == 1>>
--
GitLab