diff --git a/CHANGELOG.md b/CHANGELOG.md index e5957a7b35e7a4b796e76cc53d84b09881a7455c..b8a8735080a92bd31c65478ad56152de6c847f04 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) ## Unreleased +* MOD secExp oceanic battles enabled + ## 0.10.7.1-4.0.0-alpha.2 - 2021-05-23 * more fixes diff --git a/src/events/RESS/restrictedSmart.js b/src/events/RESS/restrictedSmart.js index 350908126d26be317c7f2b57435545d0986c77c2..d6cbd90c815f04522250c7ea47d7835624dd0dfc 100644 --- a/src/events/RESS/restrictedSmart.js +++ b/src/events/RESS/restrictedSmart.js @@ -7,9 +7,8 @@ App.Events.RESSRestrictedSmart = class RESSRestrictedSmart extends App.Events.Ba return [ [ // single event slave s => s.fetish !== "mindbroken", - hasAnyArms, - hasAnyLegs, canTalk, + canHear, s => s.assignment !== Job.QUARTER, s => s.rules.speech === "restrictive", s => s.intelligence > 15, @@ -43,7 +42,7 @@ App.Events.RESSRestrictedSmart = class RESSRestrictedSmart extends App.Events.Ba } else { r.push(`limblessly`); } - } else if (!canWalk(eventSlave)) { + } else if (!canStand(eventSlave)) { r.push(`kneeling`); } else { r.push(`standing`); @@ -87,6 +86,8 @@ App.Events.RESSRestrictedSmart = class RESSRestrictedSmart extends App.Events.Ba r.push(`As you get ${his} helpless form into position,`); } else if (eventSlave.belly >= 300000) { r.push(`As ${he} struggles to get into position with ${his} ${belly} stomach in the way,`); + } else if (!canStand(eventSlave)) { + r.push(`As ${he} shifts into position,`); } else if (eventSlave.belly >= 10000) { r.push(`As ${he} gently lowers ${his}`); if (eventSlave.bellyPreg >= 3000) { @@ -118,6 +119,8 @@ App.Events.RESSRestrictedSmart = class RESSRestrictedSmart extends App.Events.Ba r = []; if (isAmputee(eventSlave)) { r.push(`You lay ${his} fuckpuppet torso across`); + } else if (!canStand(eventSlave)) { + r.push(`You help ${him} lie back on`); } else if (eventSlave.belly >= 5000) { r.push(`You tip ${his}`); if (eventSlave.bellyPreg >= 3000) { @@ -181,6 +184,8 @@ App.Events.RESSRestrictedSmart = class RESSRestrictedSmart extends App.Events.Ba r = []; if (isAmputee(eventSlave)) { r.push(`You lay ${his} fuckpuppet torso across`); + } else if (!canStand(eventSlave)) { + r.push(`You help ${him} lie back on`); } else if (eventSlave.belly >= 5000) { r.push(`You tip ${his}`); if (eventSlave.bellyPreg >= 3000) {