From 099924773d36dcde1b6d358bce9ebf3df9cea12d Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 30 Sep 2017 16:00:27 -0400
Subject: [PATCH] fixes
---
src/uncategorized/arcadeReport.tw | 24 ++++++++++---------
src/uncategorized/randomIndividualEvent.tw | 7 ++++--
.../securityForceNamingColonel.tw | 2 +-
src/utility/raWidgets.tw | 2 +-
4 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/src/uncategorized/arcadeReport.tw b/src/uncategorized/arcadeReport.tw
index 5cc377ca823..d99a3142344 100644
--- a/src/uncategorized/arcadeReport.tw
+++ b/src/uncategorized/arcadeReport.tw
@@ -185,19 +185,21 @@
<<set $activeSlave = 0, _Age = -1, _FD = -1, _MB = -1, _Con = -1>>
<<for _dI = 0; _dI < _DL; _dI++>>
<<set $i = $slaveIndices[$ArcadeiIDs[_dI]]>>
- <<if ($slaves[$i].fetish == "mindbroken")>>
- <<if ($slaves[$i].fuckdoll == 0)>>
- <<if ($slaves[$i].physicalAge > 35)>>
- <<set _Age = $i>>
- <<break>>
- <<elseif _FD == -1>>
- <<set _FD = $i>>
+ <<if $slaves[$i].sentence == 0>> /* lets not convert slaves we are punishing into fuckdolls */
+ <<if ($slaves[$i].fetish == "mindbroken")>>
+ <<if ($slaves[$i].fuckdoll == 0)>>
+ <<if ($slaves[$i].physicalAge > 35)>>
+ <<set _Age = $i>>
+ <<break>>
+ <<elseif _FD == -1>>
+ <<set _FD = $i>>
+ <</if>>
+ <<elseif _MB == -1>>
+ <<set _MB = $i>>
<</if>>
- <<elseif _MB == -1>>
- <<set _MB = $i>>
+ <<elseif _Con == -1>>
+ <<set _Con = $i>>
<</if>>
- <<elseif _Con == -1>>
- <<set _Con = $i>>
<</if>>
<</for>>
<<if _Age > -1>>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 96521db99de..43545c97476 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -617,8 +617,7 @@
<<if ($eventSlave.slaveName != $eventSlave.birthName)>>
<<if ($eventSlave.devotion <= 20)>>
<<if ($eventSlave.trust > -20)>>
-<<if ($eventSlave.vagina != 0)>>
-<<if ($eventSlave.anus > 0)>>
+<<if ($eventSlave.anus > 0 && canDoAnal($eventSlave))>>
<<set $RESSevent.push("not my name")>>
<</if>>
<</if>>
@@ -862,12 +861,14 @@
<<if $arcade != 0>>
<<if $eventSlave.trust > -20>>
<<if $eventSlave.devotion > 50>>
+<<if $eventSlave.belly < 300000>>
<<set $RESSevent.push("arcade sadist")>>
<</if>>
<</if>>
<</if>>
<</if>>
<</if>>
+<</if>>
<<if $eventSlave.dick == 0>>
<<if $eventSlave.vagina == -1>>
@@ -1357,6 +1358,7 @@
<<if ($eventSlave.devotion <= 50)>>
<<if ($eventSlave.trust < -50)>>
<<if ($eventSlave.anus > 0)>>
+<<if canDoAnal($eventSlave)>>
<<set $RESSevent.push("resistant gelding")>>
<</if>>
<</if>>
@@ -1364,6 +1366,7 @@
<</if>>
<</if>>
<</if>>
+<</if>>
<<if isFertile($eventSlave)>>
<<if ($eventSlave.devotion > 50)>>
diff --git a/src/uncategorized/securityForceNamingColonel.tw b/src/uncategorized/securityForceNamingColonel.tw
index 6bbb87fb7b9..68722bf570a 100644
--- a/src/uncategorized/securityForceNamingColonel.tw
+++ b/src/uncategorized/securityForceNamingColonel.tw
@@ -76,7 +76,7 @@ You close the link to the communication system and read a message from your assi
<</link>>
</span>
<<if $ColonelCore == 1>>You have already guessed her core<<elseif $ColonelCore == 0>>you have yet to try and guess her core.<</if>>
- <<nobr>>
+ <</nobr>>
She strides in, stopping in front of your desk, not bothering to put on even the semi-military air (complete with salute) that most mercenaries tend to adopt when meeting new clients. She's very tall and wearing the pants, boots, gloves, and tank top of a female combat armour under-suit. Her bare arms and upper body are corded with muscle, and through the tank top's thin fabric you can see both the shape of her muscled abdomen and the curves of her small but perky breasts, complete with what your experience tells you are barbell nipple piercings. Her eyes are alive with intelligence, and you can see her scanning your office, clearly impressed by its opulence. Her hair is shaved close to the scalp, and her ears and nose are heavily pierced. You can make out three long, ugly scars running over top of the mottled tissue of a previous, severe burn along one side of her face, as well as numerous smaller scars and burns on her bare arms. She's been disarmed prior to meeting you, and you see, in addition to an empty pistol holster on her hip, at least three empty knife holsters.
diff --git a/src/utility/raWidgets.tw b/src/utility/raWidgets.tw
index 27b97216a1b..754cb625fc8 100644
--- a/src/utility/raWidgets.tw
+++ b/src/utility/raWidgets.tw
@@ -3255,7 +3255,7 @@ Your brand design is ''$brandDesign.''
<<if (def _combinedRule.bellyAccessory) && (_combinedRule.bellyAccessory !== "no default setting")>>
<<if ($args[0].bellyAccessory !== _combinedRule.bellyAccessory)>>
- <<if (visibleBelly($args[0]) || $args[0].weight > 130) && setup.fakeBellies.includes(_combinedRule.bellyAccessory)>>
+ <<if ($args[0].belly >= 1500 || $args[0].weight > 130) && setup.fakeBellies.includes(_combinedRule.bellyAccessory)>>
<br>$args[0].slaveName's natural belly is too big to properly wear an empathy belly.
<<else>>
<<set $args[0].bellyAccessory = _combinedRule.bellyAccessory>>
--
GitLab