From d7199faf8678ced063421a688f457144168a3a1a Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Wed, 19 Sep 2018 20:04:05 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 3 +++
devNotes/twine JS.txt | 2 +-
src/js/DefaultRules.tw | 2 +-
src/pregmod/saInflation.tw | 6 +++---
src/uncategorized/options.tw | 4 ++--
src/uncategorized/saRules.tw | 2 --
src/uncategorized/surgeryDegradation.tw | 4 ++--
7 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 11705d3457d..31dd6ccb043 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,9 @@
9/19/2018
+ 36
+ -fixes
+
35
-more vector work from Deepmurk
-tweaks to special slave prices and how the catalogue works
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index c9b04cc0807..7e7e4a92f88 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -13620,7 +13620,7 @@ window.DefaultRules = (function() {
SetBellySize(slave);
} else if ((rule.inflationType === "curative" && slave.health > 90) || (rule.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
} else {
- r += `<br>${slave.slaveName}'s current enema regimen has been set to ${slave.inflationType}.`;
+ r += `<br>${slave.slaveName}'s current enema regimen has been set to ${rule.inflationType}.`;
slave.inflation = 1;
slave.inflationType = rule.inflationType;
slave.inflationMethod = 2;
diff --git a/src/js/DefaultRules.tw b/src/js/DefaultRules.tw
index 919e2a8d7b0..bbe376cf1fd 100644
--- a/src/js/DefaultRules.tw
+++ b/src/js/DefaultRules.tw
@@ -1333,7 +1333,7 @@ window.DefaultRules = (function() {
SetBellySize(slave);
} else if ((rule.inflationType === "curative" && slave.health > 90) || (rule.inflationType === "tightener" && slave.anus <= 1 && slave.vagina <= 1)) {
} else {
- r += `<br>${slave.slaveName}'s current enema regimen has been set to ${slave.inflationType}.`;
+ r += `<br>${slave.slaveName}'s current enema regimen has been set to ${rule.inflationType}.`;
slave.inflation = 1;
slave.inflationType = rule.inflationType;
slave.inflationMethod = 2;
diff --git a/src/pregmod/saInflation.tw b/src/pregmod/saInflation.tw
index 38f05f4c0b7..124afd98410 100644
--- a/src/pregmod/saInflation.tw
+++ b/src/pregmod/saInflation.tw
@@ -112,7 +112,7 @@
<<set $slaves[$i].trust += 1>>
<</if>>
<<if $slaves[$i].health >= 90>>
- $He is as healthy as $him can be. @@.yellow;$His enema regimen has been ended.@@
+ $He is as healthy as $him can be. @@.yellow;$His curative enema regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<</if>>
<<set $slaves[$i].chem += 2, $slaves[$i].health += $curativeUpgrade*6>>
@@ -182,9 +182,9 @@
<</if>>
<<if $slaves[$i].anus <= 1 && $slaves[$i].vagina <= 1>>
<<if ["serve in the club", "work in the brothel"].includes($slaves[$i].assignment)>>
- $His hole<<if $slaves[$i].vagina >= 0>>s are<<else>> is<</if>> as tight as the drugs can get <<if $slaves[$i].vagina >= 0>>them<<else>>it<</if>>, but given $his assignment, $he is likely to be stretched out again so $his enema regimen continues.
+ $His hole<<if $slaves[$i].vagina >= 0>>s are<<else>> is<</if>> as tight as the drugs can get <<if $slaves[$i].vagina >= 0>>them<<else>>it<</if>>, but given $his assignment, $he is likely to be stretched out again so $his tightening enema regimen continues.
<<else>>
- $His hole<<if $slaves[$i].vagina >= 0>>s are<<else>> is<</if>> as tight as the drugs can get <<if $slaves[$i].vagina >= 0>>them<<else>>it<</if>>. @@.yellow;$His enema regimen has been ended.@@
+ $His hole<<if $slaves[$i].vagina >= 0>>s are<<else>> is<</if>> as tight as the drugs can get <<if $slaves[$i].vagina >= 0>>them<<else>>it<</if>>. @@.yellow;$His tightening enema regimen has been ended.@@
<<set $slaves[$i].inflation = 0, $slaves[$i].inflationType = "none", $slaves[$i].inflationMethod = 0, SetBellySize($slaves[$i])>>
<</if>>
<</if>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 227201a2c28..fd0bc85ba9a 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -342,8 +342,8 @@ Extreme content like amputation is currently @@.cyan;ENABLED@@. [[Disable|Option
<<if ($seeBestiality == 0)>>
Bestiality related content is currently @@.red;DISABLED@@. [[Enable|Options][$seeBestiality = 1]]
<<else>>
-Bestiality related content is currently @@.cyan;ENABLED@@. [[Disable|Options][$seeBestiality = 0]]
-<</if>> //Will not remove existing facilities, but will block content from appearing.//
+Bestiality related content is currently @@.cyan;ENABLED@@. [[Disable|Options][$seeBestiality = 0]] //Will not remove existing facilities, but will block content from appearing.//
+<</if>>
<br>
<<if ($seePreg == 0)>>
diff --git a/src/uncategorized/saRules.tw b/src/uncategorized/saRules.tw
index a8d1186842c..642b522e905 100644
--- a/src/uncategorized/saRules.tw
+++ b/src/uncategorized/saRules.tw
@@ -1072,8 +1072,6 @@
$He's @@.hotpink;rewarded@@ with
<<if $slaves[$i].clitPiercing >= 3>>
sustained orgasm from $his <<if $slaves[$i].dick == 0>>clit<<else>>dick<</if>> piercing,
- <<elseif $Nurse != 0>>
- a quick orgasm courtesy of $Nurse.slaveName,
<<else>>
a quick climax from a vibrator,
<</if>>
diff --git a/src/uncategorized/surgeryDegradation.tw b/src/uncategorized/surgeryDegradation.tw
index fb4e606bff5..3d743e017eb 100644
--- a/src/uncategorized/surgeryDegradation.tw
+++ b/src/uncategorized/surgeryDegradation.tw
@@ -973,12 +973,12 @@ As the remote surgery's long recovery cycle completes,
The inner ear surgery is brief, with @@.red;nothing more than minor health effects.@@ As soon as $he is allowed to open $his eyes and look around, $he begins to glance back and forth frantically, not immediately understanding that this muffled world is $his new reality.
<<if $activeSlave.fetish != "mindbroken" && $activeSlave.fuckdoll == 0>>
<<if ($activeSlave.devotion > 50)>>
- When $he finally figures it out, $he begins to weep, not understanding why it's necessary that $he not be able to see clearly. After a short cry that trails off into a few sniffles, $he carries on.
+ When $he finally figures it out, $he begins to weep, not understanding why it's necessary that $he not be able to hear clearly. After a short cry that trails off into a few sniffles, $he carries on.
<<elseif ($activeSlave.devotion > 20)>>
When $he finally figures it out, $he begins to bawl, not understanding what $he did to earn this. After a short expurgation of @@.gold;grief and terror,@@ $he takes a deep breath and visibly suppresses $his emotions.
<<set $activeSlave.trust -= 5>>
<<else>>
- When $he realizes what's happened, $his face @@.mediumorchid;clouds with rage.@@ Reflexively, $he begins to peer around, looking for the source of $his woes. $He finally understands the true import of blurred vision when $he has trouble telling if anyone's close, and begins to @@.gold;shake with fear.@@
+ When $he realizes what's happened, $his face @@.mediumorchid;clouds with rage.@@ Reflexively, $he begins to peer around, looking for the source of $his woes. $He finally understands the true import of muffled hearing when your hands grab him from behind, and begins to @@.gold;shake with fear.@@
<<set $activeSlave.trust -= 10, $activeSlave.devotion -= 10>>
<</if>>
<</if>>
--
GitLab