diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt index f7e6e51ea1c7d97225ef32c9d422c47162d09923..541910f5ca7556a30ad448d9c882ce6e826a3168 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 b42678e08523059e055b58eb064fbb5ff43051ab..df6f8441de14e822ca7fbcb30f1f26355c47af39 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 60cfa7f1cf7e3699f4a7409b94028660331ced6e..3b5bdc33909b093f755e12263700892d3dc9c1fb 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 2d76cf48861aadef6bc2ece6ce86739dc16ea5d5..cca5ef70bf305a851c2eeb73649c900ab48acfe9 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");