From 4473e771047dead92a2f2e545b2240cb7d7014b5 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 27 Sep 2017 13:24:53 -0400
Subject: [PATCH] Fixes

---
 src/cheats/mod_EditSlaveCheat.tw                | 6 +++++-
 src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw | 1 +
 src/cheats/mod_editSlaveCheatNew.tw             | 8 +++++++-
 src/uncategorized/randomIndividualEvent.tw      | 6 +++---
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/cheats/mod_EditSlaveCheat.tw b/src/cheats/mod_EditSlaveCheat.tw
index 924aaadcd13..6b4bf3c8861 100644
--- a/src/cheats/mod_EditSlaveCheat.tw
+++ b/src/cheats/mod_EditSlaveCheat.tw
@@ -690,8 +690,10 @@ Normal. |
 Big. |
 <<elseif $activeSlave.clit == 2>>
 Huge. |
-<<else>>
+<<elseif $activeSlave.clit == 3>>
 Enormous. |
+<<else>>
+Dick-like. |
 <</if>>
 <<textbox "$activeSlave.clit" $activeSlave.clit>>
 <br>
@@ -699,6 +701,8 @@ Enormous. |
 <<radiobutton "$activeSlave.clit" 1>> Large
 <<radiobutton "$activeSlave.clit" 2>> Huge
 <<radiobutton "$activeSlave.clit" 3>> Enormous
+<<radiobutton "$activeSlave.clit" 4>> Gigantic
+<<radiobutton "$activeSlave.clit" 5>> That's no dick!
 &nbsp;&nbsp;&nbsp;&nbsp;
 
 <br>
diff --git a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
index 58972bf8369..efc16e45a97 100644
--- a/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
+++ b/src/cheats/mod_EditSlaveCheatDatatypeCleanup.tw
@@ -58,6 +58,7 @@
 <<set $activeSlave.attrXY = Number($activeSlave.attrXY) || 0>>
 <<set $activeSlave.attrXX = Number($activeSlave.attrXX) || 0>>
 <<set $activeSlave.energy = Number($activeSlave.energy) || 0>>
+<<set $activeSlave.clit = Number($activeSlave.clit) || 0>>
 <<SetBellySize $activeSlave>>
 
 You perform the dark rituals, pray to the dark gods and sold your soul for the power to change and mold slaves to your will.
diff --git a/src/cheats/mod_editSlaveCheatNew.tw b/src/cheats/mod_editSlaveCheatNew.tw
index 6bbbafca9d1..0eed353c0c8 100644
--- a/src/cheats/mod_editSlaveCheatNew.tw
+++ b/src/cheats/mod_editSlaveCheatNew.tw
@@ -1699,13 +1699,19 @@
 		@@.yellow;Big@@. |
 	<<elseif $tempSlave.clit == 2>>
 		@@.yellow;Huge@@. |
-	<<else>>
+	<<elseif $tempSlave.clit == 3>>
 		@@.yellow;Enormous@@. |
+	<<elseif $tempSlave.clit == 4>>
+		@@.yellow;Dick-like@@. |
+	<<else>>
+		@@.yellow;Might as well be a big dick@@. |
 	<</if>>
 	<<radiobutton "$tempSlave.clit" 0>> Normal
 	<<radiobutton "$tempSlave.clit" 1>> Large
 	<<radiobutton "$tempSlave.clit" 2>> Huge
 	<<radiobutton "$tempSlave.clit" 3>> Enormous
+	<<radiobutton "$tempSlave.clit" 4>> Dick-like
+	<<radiobutton "$tempSlave.clit" 5>> Like a huge dick
 	&nbsp;&nbsp;&nbsp;&nbsp;
 
 	<br>
diff --git a/src/uncategorized/randomIndividualEvent.tw b/src/uncategorized/randomIndividualEvent.tw
index 963e286309d..3d168981741 100644
--- a/src/uncategorized/randomIndividualEvent.tw
+++ b/src/uncategorized/randomIndividualEvent.tw
@@ -389,7 +389,7 @@
 <<if ($weatherToday.severity <= 1)>>
 <<if ($eventSlave.trust > 50)>>
 <<if ($eventSlave.devotion > 20)>>
-<<if ($eventSlave.anus != 0) && canDoAnal($activeSlave)>>
+<<if ($eventSlave.anus != 0) && canDoAnal($eventSlave)>>
 <<if ($eventSlave.vagina != 0)>>
 	<<set $RESSevent.push("confident tanning")>>
 <</if>>
@@ -437,7 +437,7 @@
 	<<set $RESSevent.push("devoted nympho")>>
   <</if>>
   <<if $eventSlave.releaseRules == "permissive">>
-  <<if ($eventSlave.dickAccessory != "chastity") || ($eventSlave.dick == 0)>>
+  <<if !["chastity", "combined chastity"].includes($eventSlave.dickAccessory) || ($eventSlave.dick == 0)>>
 	<<set $RESSevent.push("permitted masturbation")>>
   <</if>>
   <</if>>
@@ -1671,7 +1671,7 @@
 <</if>>
 
 <<if ($eventSlave.releaseRules != "restrictive")>>
-<<if $activeSlave.belly < 300000>>
+<<if $eventSlave.belly < 300000>>
 <<if ($eventSlave.anus > 2)>>
 <<if ($eventSlave.fetish == "buttslut") || ($eventSlave.energy > 95)>>
 <<if ($eventSlave.fetish != "none")>>
-- 
GitLab