From 1c7494cd8e64f88107ff9e6585a04f9b977286ba Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sun, 8 Jul 2018 00:42:32 -0400
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 4 ++++
devNotes/twine JS.txt | 7 ++++---
src/SecExp/secExpSmilingMan.tw | 2 +-
src/js/eventSelectionJS.tw | 6 ++++--
4 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index f7e6e51ea1c..541910f5ca7 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -4,6 +4,10 @@
7/07/2018
+ 20
+ -fixes
+ -more widget to JS conversion
+
19
-various little fixes and tweaks
-incubator slaves take longer to learn languages now
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index b42678e0852..df6f8441de1 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -4751,8 +4751,10 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.corpIncorporated != 0) {
State.variables.RESSevent.push("shift sleep");
}
- if(eventSlave.releaseRules == "permissive" || eventSlave.releaseRules == "masturbation") {
- State.variables.RESSevent.push("shift masturbation");
+ if(canWalk(eventSlave)) {
+ if(eventSlave.releaseRules == "permissive" || eventSlave.releaseRules == "masturbation") {
+ State.variables.RESSevent.push("shift masturbation");
+ }
}
if(eventSlave.entertainSkill >= 60) {
State.variables.RESSevent.push("shift doorframe");
@@ -15225,7 +15227,6 @@ window.rulesAutosurgery = (function() {
r = "";
const surgeries = [];
const thisSurgery = ProcessHGTastes(slave);
- console.log(thisSurgery);
if (slave.health > 20)
CommitSurgery(slave, thisSurgery, surgeries);
if (surgeries.length > 0)
diff --git a/src/SecExp/secExpSmilingMan.tw b/src/SecExp/secExpSmilingMan.tw
index 60cfa7f1cf7..3b5bdc33909 100644
--- a/src/SecExp/secExpSmilingMan.tw
+++ b/src/SecExp/secExpSmilingMan.tw
@@ -241,7 +241,7 @@
<br>
The day has come to finally put an end to this story. Your men are ready to go, waiting only on your signal. You quickly don your protective gear and proceed down the busy streets of your arcology.
You carefully planned the day so that nothing could exit the arcology without being scanned at least three times and poked twice. The Smiling Man has no escape.
- <br>After a short walk you are in front of the criminal's lair, an rundown old apartment in a scarcely populated part of the arcology. You give the order to breach and your men rush inside without problems.
+ <br>After a short walk you are in front of the criminal's lair, a rundown old apartment in a scarcely populated part of the arcology. You give the order to breach and your men rush inside without problems.
After a couple of seconds pass without a single noise coming from the apartment, you begin to worry. Then you hear the captain calling you inside.
<br>"So it was you to find me first.
<<if $relationshipLM > 2>>
diff --git a/src/js/eventSelectionJS.tw b/src/js/eventSelectionJS.tw
index 2d76cf48861..cca5ef70bf3 100644
--- a/src/js/eventSelectionJS.tw
+++ b/src/js/eventSelectionJS.tw
@@ -1355,8 +1355,10 @@ if(eventSlave.fetish != "mindbroken") {
if(State.variables.corpIncorporated != 0) {
State.variables.RESSevent.push("shift sleep");
}
- if(eventSlave.releaseRules == "permissive" || eventSlave.releaseRules == "masturbation") {
- State.variables.RESSevent.push("shift masturbation");
+ if(canWalk(eventSlave)) {
+ if(eventSlave.releaseRules == "permissive" || eventSlave.releaseRules == "masturbation") {
+ State.variables.RESSevent.push("shift masturbation");
+ }
}
if(eventSlave.entertainSkill >= 60) {
State.variables.RESSevent.push("shift doorframe");
--
GitLab