From 66c14ace4e23498f0450422d29cc40bc33c8d97f Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 13 Apr 2018 02:46:34 -0400
Subject: [PATCH] sanityCheck fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++++
devNotes/twine JS | 4 ++--
src/gui/Encyclopedia/encyclopedia.tw | 2 +-
src/uncategorized/REFI.tw | 10 +++++-----
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 9864775ae63..ceb11e3a587 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.1.x
+4/13/2018
+
+ 44
+ -bunch of new shoes and stockings by Deepmurk
+ -code cleanup
+ -partial REFI work (merge conflict forced push)
+
4/12/2018
43
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 6dbdf259a41..00ae60427b7 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -7816,9 +7816,9 @@ window.todaysShoes = function(slave) {
if(slave.fetish == 'mindbroken') {
if(slave.amp != 1 && slave.heels == 1) {
- shoes.push({text: "She finds she can inexplicably walk if she wears heels; a daily lesson for her, as she forgets shortly after leaving.", shoes: jsEither(["heels", "extreme heels", "boots"])});
+ shoes.push({text: "She finds she can inexplicably walk if she wears heels; a daily lesson for her, as she forgets shortly after leaving.", shoes: jsEither(["heels", "heels with short stockings", "heels with long stockings", "pumps", "pumps with short stockings", "pumps with long stockings", "extreme heels", "boots"])});
}
- shoes.push({text: "She vaguely remembers putting things on her feet, so she does.", shoes: jsEither(["heels", "extreme heels", "boots", "flats"])});
+ shoes.push({text: "She vaguely remembers putting things on her feet, so she does.", shoes: jsEither(["heels", "heels with short stockings", "heels with long stockings", "pumps", "pumps with short stockings", "pumps with long stockings", "extreme heels", "boots", "flats", "flats with short stockings", "flats with long stockings"])});
shoes.push({text: "She entered without shoes, and will leave the same.", shoes: "none"});
} else if(slave.devotion <= 20) {
if(slave.heels == 0) {
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index fb5e539ba5c..2fddbabb4ad 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -327,7 +327,7 @@ BEING IN CHARGE
chattel.
<br><br>The player character's sexual energy can have gameplay effects. Though of course all slaves are at the <<if $PC.title == 1>>Master's<<else>>Mistress's<</if>> sexual beck and call, some assignments and training methods involve close sexual attention by the player character. If a large number of slaves are subject to this, the player character's attention will be somewhat diluted, and the effects on each slave will be reduced. Slaves assigned to be __fucktoys__ and serve in the __master suite__ count towards a hidden estimation of the player character's sexual foci. With two or fewer such slaves, the player character's sexual attention on these slaves will be intense and have intense effects. With five or more, the player character may have some difficulty in using every slave every day, diluting the mental effects of being the
- <<if $PC.title == 1>
+ <<if $PC.title == 1>>
Master's
<<else>>
Mistress's
diff --git a/src/uncategorized/REFI.tw b/src/uncategorized/REFI.tw
index 46da11a28d2..f7713b537a0 100644
--- a/src/uncategorized/REFI.tw
+++ b/src/uncategorized/REFI.tw
@@ -70,7 +70,7 @@
<<case "masochist">>
<<set _refi = $slaves.findIndex(function(s) { return s.ID == $masochistID; })>>
-<<if canDoAnal($slaves[_refi]) && slaves[_refi].anus > 0>>
+<<if canDoAnal($slaves[_refi]) && $slaves[_refi].anus > 0>>
<<set $slaves[_refi].analCount++, $analTotal++>>
<<if $PC.dick == 1 && $slaves[_refi].eggType == "human" && canGetPregnant($slaves[_refi])>>
<<KnockMeUp $slaves[_refi] 5 1 -1 1>>
@@ -171,9 +171,9 @@ It seems she passed by while you were beating $subSlave.slaveName and found the
<<case "pregnancy">>
<<set _refi = $slaves.findIndex(function(s) { return s.ID == $pregnancyID; })>>
-<<if $slaves[_refi].mpreg == 0 && canDoVaginal($slaves[_refi]) && slaves[_refi].vagina > 0>>
+<<if $slaves[_refi].mpreg == 0 && canDoVaginal($slaves[_refi]) && $slaves[_refi].vagina > 0>>
<<set $slaves[_refi].vaginalCount++, $vaginalTotal++>>
-<<elseif canDoAnal($slaves[_refi]) && slaves[_refi].anus > 0 && $slaves[_refi].mpreg == 1>>
+<<elseif canDoAnal($slaves[_refi]) && $slaves[_refi].anus > 0 && $slaves[_refi].mpreg == 1>>
<<set $slaves[_refi].analCount++, $analTotal++>>
<</if>>
@@ -477,7 +477,7 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl
<</if>>
You shove her
<<if $activeSlave.belly >= 300000>>
- over her _belly <if $activeSlave.bellyPreg >= 2000>>pregnant <</if>> belly,
+ over her _belly <<if $activeSlave.bellyPreg >= 2000>>pregnant <</if>> belly,
<<elseif $activeSlave.belly >= 1500>>
onto her knees,
<<else>>
@@ -508,7 +508,7 @@ You have $subSlave.slaveName pinned up against a railing on a balcony that overl
She hasn't recovered before she feels the still more urgent pain of rough anal,
<</if>>
<<AnalVCheck>>
- <<else canDoVaginal($activeSlave)>>
+ <<elseif canDoVaginal($activeSlave)>>
<<if $activeSlave.vagina == 0>>
She hasn't recovered before she feels the still more urgent pain of <<if $PC.dick == 1>>your dick brutally @@.lime;stripping her of her virginity@@<<else>>an enormous dildo @@.lime;stealing her virgninty@@<</if>>, followed by rough sex,
<<set $activeSlave.vagina = 1>>
--
GitLab