From 43b47b65f7eff15c7c124bfb501ec8669e7dff72 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Fri, 29 Jun 2018 15:40:19 -0400
Subject: [PATCH] event work
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 ++
devNotes/twine JS | 3 +-
src/gui/Encyclopedia/encyclopedia.tw | 3 +-
src/uncategorized/RESS.tw | 92 ++++++++++++++------
4 files changed, 76 insertions(+), 29 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index 07cd44ce4e7..244c84c9154 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-0.4.x
+6/29/2018
+
+ 7
+ -more fixes to the RA
+ -other fixes and typos
+ -several widgets replaced with JS
+
6/27/2018
6
diff --git a/devNotes/twine JS b/devNotes/twine JS
index 86ee2bdcdb9..90e409224e7 100644
--- a/devNotes/twine JS
+++ b/devNotes/twine JS
@@ -14764,11 +14764,12 @@ window.rulesAssistantOptions = (function() {
window.rulesAutosurgery = (function() {
"use strict";
let V;
- let r = "";
+ let r;
return rulesAutoSurgery;
function rulesAutoSurgery(slave) {
V = State.variables;
+ r = "";
const surgeries = [];
const thisSurgery = ProcessHGTastes(slave);
if (slave.health > 20)
diff --git a/src/gui/Encyclopedia/encyclopedia.tw b/src/gui/Encyclopedia/encyclopedia.tw
index c325b90b05d..758dbc5cf57 100644
--- a/src/gui/Encyclopedia/encyclopedia.tw
+++ b/src/gui/Encyclopedia/encyclopedia.tw
@@ -2576,13 +2576,14 @@ LORE: INTERVIEWS
<br>''anon'' for master slaving's multi slave training.
<br>''Faraen'' for a full vector art variant.
<br>''anon'' for more hair vectors for the external art.
- <br>''Vas'' for massive JS work.
+ <br>''Vas'' for massive JS work and completely redoing the RA.
<br>''deepmurk'' for a massive expansion in conjunction with Nox to the original embedded vector art. Also more hairs, shoes and clothes. Overhauled skin colors too.
<br>''Channel8'' for FCTV content (and likely giving the spellCheck an aneurysm).
<br>''Channel13'' for FCTV content.
<br>''kidkinster'' for slave management ui stuff and induced NCS.
<br>''editoranon'' for cleaning text and drafting up bodyswap reactions.
<br>''anon'' for the wetware CPU market.
+ <br>''Autistic Boi'' for Mediterranean market preset.
<br>''git contributors lost to time'' for their submissions and work through pregmod's git.
<br>''Bane70'' optimized huge swaths of code with notable professionalism.
<br>''Circle Tritagonist'' provided several new collars and outfits.
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index 59c1a5496af..d5eacfe332a 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -4976,36 +4976,41 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<case "waistline woes">>
-<<link "Send her to the gym">>
+<<link "Yes">>
<<EventNameDelink $activeSlave>>
- Her face <<if $activeSlave.behavioralQuirk == "fitness">>brightens<<else>>sours<</if>> as you instruct her to spend her free time on the treadmill if she is so bothered by it, <<if $activeSlave.behavioralQuirk == "fitness">>and by week's end, she's @@.hotpink;in a fantastic mood.@@<<else>>but by week's end, she's singing a different tune.<</if>> Not only is she @@.lime;several sizes smaller@@ than her expectations, but she @@.mediumaquamarine;looks and feels great,@@ something she just can't help but @@.hotpink;show off@@ as she struts past your office.
- <<if $activeSlave.behavioralQuirk == "fitness">>
- <<set $activeSlave.devotion += 10, $activeSlave.trust += 10>>
+ <<if ($activeSlave.diet == "fattening" || $activeSlave.dietMilk > 0) && $activeSlave.intelligence > 0>>
+ <<if canTalk($activeSlave)>>
+ "<<S>>o the diet i<<s>> working well, <<Master>>? That'<<s>> good, I <<s>>uppo<<s>>e. I'm ju<<s>>t a bit <<sh>>ocked at how hone<<s>>t you were, people u<<s>>ually try to dodge that que<<s>>tion or outright lie."
+ <<else>>
+ She smiles before explaining she knows you want her plumper and that she accepts it, but is surprised by your honesty to such a question.
+ <</if>>
+ She leaves your office @@.mediumaquamarine;slightly more trusting@@ for someone who's life is now entirely out of their hands.
+ <<set $activeSlave.trust++>>
+ <<elseif $activeSlave.behavioralFlaw == "gluttonous">>
+ <<if canTalk($activeSlave)>>
+ Her eyes begin to water as she struggles not to sob. "But... I can't help it, why would you <<s>>ay that?" She breaks done completely and hastily flees your sight, likely to the cafeteria, jiggling in all the wrong places.
+ <<else>>
+ Her eyes begin to water as she struggles not to sob but she quickly loses composure and hastily flees your gaze, likely to the cafeteria.
+ <</if>>
+ She may have run out of your office @@.gold;in tears,@@ but she'll quickly come to terms with all that matters is @@.hotpink;you think, not her.@@ Even more so when she realizes the resuliting stress eating only @@.lime;filled her out more.@@
+ <<set $activeSlave.devotion += 7, $activeSlave.trust -= 5, $activeSlave.weight += 5>>
+ <<elseif $activeSlave.behavioralFlaw == "anorexic">>
+ <<if canTalk($activeSlave)>>
+ "I'm <<s>>o di<<s>>gu<<s>>ting, <<Master>>, I'm glad you <<s>>ee it too. I was <<s>>o <<c>>ertain you'd lie to me... <<S>>orry to have wa<<s>>ted your time." She
+ <<else>>
+ Her face lightens at your words. It seems you told her just what she wanted to hear. She gives her thanks and
+ <</if>>
+ leaves your office @@.hotpink;slightly more faith@@ in her <<WrittenMaster>>.
+ <<set $activeSlave.trust += 5>>
<<else>>
- <<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
+ <<if canTalk($activeSlave)>>
+ Her eyes begin to water as she struggles not to sob. "But... But... I'm not... Why would you <<s>>ay that?" She breaks done completely and hastily flees your sight, jiggling in all the wrong places.
+ <<else>>
+ Her eyes begin to water as she struggles not to sob but she quickly loses composure and hastily flees your gaze.
+ <</if>>
+ She may have run out of your office @@.gold;in tears,@@ but she'll quickly come to terms with all that matters is @@.hotpink;you think, not her.@@
+ <<set $activeSlave.devotion += 5, $activeSlave.trust -= 5>>
<</if>>
- <<set $activeSlave.weight -= 10>>
- <<replace "#result">>
- <</replace>>
-<</link>>
-<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
- <br><<link "Help her burn some calories">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- <</replace>>
- <</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
-<</if>>
-/*
-<<if canPenetrate($activeSlave) && $PC.belly < 1500 && (($activeSlave.height >= $PC.height*1.5) || $activeSlave.muscles > 70)>>
- <br><<link "Take her for a jog">>
- <<EventNameDelink $activeSlave>>
- <<replace "#result">>
- <</replace>> //This option will penetrate you//
- <</link>>
-<</if>>
-*/
-<br><<link "Encourage her">>
- <<EventNameDelink $activeSlave>>
<<replace "#result">>
<</replace>>
<</link>>
@@ -5042,6 +5047,39 @@ May I plea<<s>>e try out <<s>>omething <<s>>kimpier today?"
<<replace "#result">>
<</replace>>
<</link>>
+<br><<link "You look fine">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ <</replace>>
+<</link>>
+<br><<link "Send her to the gym">>
+ <<EventNameDelink $activeSlave>>
+ Her face <<if $activeSlave.behavioralQuirk == "fitness">>brightens<<else>>sours<</if>> as you instruct her to spend her free time on the treadmill if she is so bothered by it, <<if $activeSlave.behavioralQuirk == "fitness">>and by week's end, she's @@.hotpink;in a fantastic mood.@@<<else>>but by week's end, she's singing a different tune.<</if>> Not only is she @@.lime;several sizes smaller@@ than her expectations, but she @@.mediumaquamarine;looks and feels great,@@ something she just can't help but @@.hotpink;show off@@ as she struts past your office.
+ <<if $activeSlave.behavioralQuirk == "fitness">>
+ <<set $activeSlave.devotion += 10, $activeSlave.trust += 10>>
+ <<else>>
+ <<set $activeSlave.devotion += 5, $activeSlave.trust += 5>>
+ <</if>>
+ <<set $activeSlave.weight -= 10>>
+ <<replace "#result">>
+ <</replace>>
+<</link>>
+<<if canDoAnal($activeSlave) || canDoVaginal($activeSlave)>>
+ <br><<link "Help her burn some calories">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ <</replace>>
+ <</link>><<if canDoVaginal($activeSlave) && ($activeSlave.vagina == 0)>>//This option will take virginity//<<elseif !canDoVaginal($activeSlave) && ($activeSlave.anus == 0)>> //This option will take anal virginity//<</if>>
+<</if>>
+/*
+<<if canPenetrate($activeSlave) && $PC.belly < 1500 && (($activeSlave.height >= $PC.height*1.5) || $activeSlave.muscles > 70)>>
+ <br><<link "Take her for a jog">>
+ <<EventNameDelink $activeSlave>>
+ <<replace "#result">>
+ <</replace>> //This option will penetrate you//
+ <</link>>
+<</if>>
+*/
<br><<link "Send her on her way">>
<<EventNameDelink $activeSlave>>
<<replace "#result">>
--
GitLab