From 8f79faedea7a6a499c1ee7f7641c1d974adf6efe Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Tue, 15 Aug 2017 02:03:30 -0400
Subject: [PATCH] fixes
---
src/uncategorized/neighborDescription.tw | 2 +-
src/uncategorized/randomIndividualEvent.tw | 18 ++++++++++++++++++
src/uncategorized/slaveSummary.tw | 2 +-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/uncategorized/neighborDescription.tw b/src/uncategorized/neighborDescription.tw
index e14c932fc87..dbd47e097f6 100644
--- a/src/uncategorized/neighborDescription.tw
+++ b/src/uncategorized/neighborDescription.tw
@@ -30,7 +30,7 @@
Its leadership has control of approximately @@.orange;<<print Math.trunc(($arcologies[$i].ownership*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ of the arcology<<if $arcologies[$i].minority > $arcologies[$i].ownership-10>>, a dangerously narrow margin over competition with a @@.tan;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.
<</if>>
<</if>>
-<<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if>>.<</if>>
+<<if $arcologies[$i].PCminority > 0>>You own @@.lime;$arcologies[$i].PCminority%@@ of this arcology<</if>><<if ($arcologies[$i].government == "your trustees") || ($arcologies[$i].government == "your agent")>><<if $arcologies[$i].minority > $arcologies[$i].PCminority-10>>, a dangerously narrow margin over competition with a @.red;<<print Math.trunc(($arcologies[$i].minority*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>%@@ share<</if><</if>>.
<<set $economicUncertainty -= 2*$assistantPower>>
The arcology has an estimated GSP of @@.yellowgreen;¤<<print Math.trunc((0.1*$arcologies[$i].prosperity*random(100-$economicUncertainty,100+$economicUncertainty))/100)>>m,@@
<<if Math.abs($arcologies[$i].prosperity - $averageProsperity) < 5>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 33d3b227bfd..4500153e089 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -881,6 +881,24 @@
<</if>> /* closes mute exempt */
+/*
+<<if ($PC.Vagina == 1)>>
+<<if ($eventSlave.devotion <= 20)>>
+<<if (($eventSlave.trust > -20 && $eventSlave.behavioralFlaw == "arrogant") || ($eventSlave.trust > 20))>>
+<<if ($eventSlave.health > 20)>>
+<<if ($eventSlave.enery > 50)>>
+<<if canAchieveErection($eventSlave)>>
+<<if ($Bodyguard == 0)>>
+ <<set $RESSevent.push("mutinery attempt")>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+<</if>>
+*/
+
<<if ($eventSlave.devotion >= 20)>>
<<if ($eventSlave.collar == "ball gag" || $eventSlave.collar == "bit gag" || $eventSlave.collar == "dildo gag")>>
<<set $RESSTRevent.push("gagged slave")>>
diff --git a/src/uncategorized/slaveSummary.tw b/src/uncategorized/slaveSummary.tw
index d15bcc7d56e..1b85b1da4b7 100644
--- a/src/uncategorized/slaveSummary.tw
+++ b/src/uncategorized/slaveSummary.tw
@@ -60,7 +60,7 @@
($Flag == 0 && s.assignment != "be confined in the arcade")
|| ($Flag != 0 && s.assignment == "be confined in the arcade"))),
"Pit": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
- ($Flag == 0 && !$fighterIDs.includes(s.ID) && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2 || canWalk(s)))
+ ($Flag == 0 && !$fighterIDs.includes(s.ID) && (s.assignment != "guard you") && (s.assignment != "work in the dairy" || $dairyRestraintsSetting < 2 || canWalk(s)))
|| ($Flag != 0 && $fighterIDs.includes(s.ID)))),
"Coursing Association": s => (s.assignmentVisible == 1 && s.fuckdoll == 0 && (
($Flag == 0 && canWalk(s) && $Lurcher.ID != s.ID)
--
GitLab