diff --git a/devNotes/sugarcube stuff/sugarcube-fc-changes.patch b/devNotes/sugarcube stuff/sugarcube-fc-changes.patch
index 3a81ee0593ea1fe863814f74fb1ecc3986e17233..5210e155841db173f221e738b8674290eb52f993 100644
--- a/devNotes/sugarcube stuff/sugarcube-fc-changes.patch
+++ b/devNotes/sugarcube stuff/sugarcube-fc-changes.patch
@@ -4,7 +4,7 @@ diff -r 3892fa22d6fa src/lib/jquery-plugins.js
@@ -43,14 +43,9 @@
return function () {
const $this = jQuery(this);
-
+
- // Exit if the element is disabled.
- //
- // NOTE: This should only be necessary for elements which are not disableable
@@ -16,11 +16,11 @@ diff -r 3892fa22d6fa src/lib/jquery-plugins.js
+ const dataPassage = $this.attr('data-passage');
+ const initialDataPassage = window && window.SugarCube && window.SugarCube.State && window.SugarCube.State.passage;
+ const savedYOffset = window.pageYOffset;
-
+
// Toggle "aria-pressed" status, if the attribute exists.
if ($this.is('[aria-pressed]')) {
@@ -59,6 +54,11 @@
-
+
// Call the true handler.
fn.apply(this, arguments);
+
@@ -30,35 +30,35 @@ diff -r 3892fa22d6fa src/lib/jquery-plugins.js
+ window.lastDataPassageLink = dataPassage;
};
}
-
+
diff -r 3892fa22d6fa src/lib/simplestore/adapters/webstorage.js
--- a/src/lib/simplestore/adapters/webstorage.js Thu Jun 27 16:10:07 2019 -0500
+++ b/src/lib/simplestore/adapters/webstorage.js Sun Jul 07 22:52:13 2019 +0200
@@ -189,11 +189,11 @@
}
-
+
static _serialize(obj) {
- return LZString.compressToUTF16(JSON.stringify(obj));
+ return JSON.stringify(obj);
}
-
+
static _deserialize(str) {
- return JSON.parse(LZString.decompressFromUTF16(str));
+ return JSON.parse((!str || str[0] == "{") ? str : LZString.decompressFromUTF16(str));
}
}
-
+
diff -r 3892fa22d6fa src/state.js
--- a/src/state.js Thu Jun 27 16:10:07 2019 -0500
+++ b/src/state.js Sun Jul 07 22:52:13 2019 +0200
@@ -104,7 +104,7 @@
}
-
+
if (_expired.length > 0) {
- stateObj.expired = [..._expired];
+ stateObj.expired = [];
}
-
+
if (_prng !== null) {
diff -r 3892fa22d6fa src/ui.js
--- a/src/ui.js Thu Jun 27 16:10:07 2019 -0500
diff --git a/src/js/assayJS.js b/src/js/assayJS.js
index 15d5e0cde48d8a0877d0184b8bdd1be60c152e93..ff99abc802571d6e9d02b85bdde168db6031393c 100644
--- a/src/js/assayJS.js
+++ b/src/js/assayJS.js
@@ -216,7 +216,7 @@ window.newSlave = function newSlave(slave) {
}
}
}
-
+
generatePronouns(slave);
SetBellySize(slave);
addSlave(slave);
diff --git a/src/pregmod/widgets/pregmodWidgets.tw b/src/pregmod/widgets/pregmodWidgets.tw
index 24e43d46db4061b4932ac890a28043140d35334d..71a889cca533c48920b80060d79c1b1094a6a5dc 100644
--- a/src/pregmod/widgets/pregmodWidgets.tw
+++ b/src/pregmod/widgets/pregmodWidgets.tw
@@ -251,6 +251,7 @@
<<set _himselfLisp = lispReplace($himself)>>
<<set _daughterLisp = lispReplace($daughter)>>
<<set _sisterLisp = lispReplace($sister)>>
+ <<set _loliLisp = lispReplace($loli)>>
<<set _HeLisp = lispReplace($He)>>
<<set _HisLisp = lispReplace($His)>>
@@ -258,6 +259,7 @@
<<set _HimselfLisp = lispReplace($Himself)>>
<<set _DaughterLisp = lispReplace($Daughter)>>
<<set _SisterLisp = lispReplace($Sister)>>
+ <<set _LoliLisp = lispReplace($Loli)>>
<<if def _he2>>
<<set _secondarySlaveLisp = SlaveStatsChecker.checkForLisp($args[1])>>
@@ -268,6 +270,7 @@
<<set _himself2Lisp = lispReplace(_himself2)>>
<<set _daughter2Lisp = lispReplace(_daughter2)>>
<<set _sister2Lisp = lispReplace(_sister2)>>
+ <<set _loli2Lisp = lispReplace(_loli2)>>
<<set _He2Lisp = lispReplace(_He2)>>
<<set _His2Lisp = lispReplace(_His2)>>
@@ -275,6 +278,7 @@
<<set _Himself2Lisp = lispReplace(_Himself2)>>
<<set _Daughter2Lisp = lispReplace(_Daughter2)>>
<<set _Sister2Lisp = lispReplace(_Sister2)>>
+ <<set _Loli2Lisp = lispReplace(_Loli2)>>
<</if>>
<</widget>>
@@ -287,6 +291,7 @@
<<set _himselfPLisp = lispReplace(_himselfP)>>
<<set _daughterPLisp = lispReplace(_daughterP)>>
<<set _sisterPLisp = lispReplace(_sisterP)>>
+ <<set _loliPLisp = lispReplace(_loliP)>>
<<set _HePLisp = lispReplace(_HeP)>>
<<set _HisPLisp = lispReplace(_HisP)>>
@@ -294,6 +299,7 @@
<<set _HimselfPLisp = lispReplace(_HimselfP)>>
<<set _DaughterPLisp = lispReplace(_DaughterP)>>
<<set _SisterPLisp = lispReplace(_SisterP)>>
+ <<set _LoliPLisp = lispReplace(_LoliP)>>
<</widget>>
<<widget "PCAgeImplantAdjustmentUp">>
diff --git a/src/uncategorized/RETS.tw b/src/uncategorized/RETS.tw
index 82c354755853050d48964fa83684dc103374237e..3900d1b053410831cf4f638db45d9b8e997e4f6e 100644
--- a/src/uncategorized/RETS.tw
+++ b/src/uncategorized/RETS.tw
@@ -335,7 +335,7 @@ After you complete your weekly inspection of <<EventNameLink>>, the $desc asks i
As you approach your office as you return from an unexpected but minor matter, you hear the unmistakable sounds of sexual congress. Reviewing your schedule as you cover the last few <<if $showInches == 2>>feet<<else>>meters<</if>> on your way there, you see that indeed, <<EventNameLink>> is due to be inspected. It seems likely that while waiting for your return, $he called a fellow slave who was passing your office in to keep $him company. And as you enter, you see that this is true.
<br><br>
-$He's sitting on the end of the couch, though only $his legs, crotch and hands are immediately visible. This is because $he has $subSlave.slaveName on top of $him, impaled on <<if canPenetrate($activeSlave)>>$his cock<<else>>a strap-on $he's wearing<</if>>. $subSlave.slaveName is bent almost double. $activeSlave.slaveName has $his $activeSlave.skin hands up on the backs of $subSlave.slaveName's $subSlave.skin knees, holding _his2 legs<<if $activeSlave.belly >= 5000>> to either side of _his2 <<if ($activeSlave.preg > $activeSlave.pregData.normalBirth/8)>>pregnancy<<else>>belly<</if>>,<</if>> up against _his2 <<if $subSlave.boobs > 2000>>inconveniently big boobs<<else>>shoulders<</if>>. $subSlave.slaveName is completely helpless, and _he2's being fucked hard:
+$He's sitting on the end of the couch, though only $his legs, crotch, and hands are immediately visible. This is because $he has $subSlave.slaveName on top of $him, impaled on <<if canPenetrate($activeSlave)>>$his cock<<else>>a strap-on $he's wearing<</if>>. $subSlave.slaveName is bent almost double. $activeSlave.slaveName has $his $activeSlave.skin hands up on the backs of $subSlave.slaveName's $subSlave.skin knees, holding _his2 legs<<if $activeSlave.belly >= 5000>> to either side of _his2 <<if ($activeSlave.preg > $activeSlave.pregData.normalBirth/8)>>pregnancy<<else>>belly<</if>>,<</if>> up against _his2 <<if $subSlave.boobs > 2000>>inconveniently big boobs<<else>>shoulders<</if>>. $subSlave.slaveName is completely helpless, and _he2's being fucked hard:
<<if canPenetrate($activeSlave)>>
<<if ($activeSlave.dick - $subSlave.anus > 2)>>
$activeSlave.slaveName's cock is very big, <<if $subSlave.anus > 2>>even for $subSlave.slaveName's loose anus<<elseif $subSlave.anus > 1>>even for $subSlave.slaveName's experienced anus<<else>>especially for $subSlave.slaveName's tight anus<</if>>, so $activeSlave.slaveName is bouncing $his anal bottom up and down only a little way, allowing $him to do so fast.
diff --git a/src/uncategorized/reNickname.tw b/src/uncategorized/reNickname.tw
index 9cae3e23148b2e87b19de06207e86fc842d37028..67f4dbed1c645ba8a237ce518fb4a08f3903ac9f 100644
--- a/src/uncategorized/reNickname.tw
+++ b/src/uncategorized/reNickname.tw
@@ -1003,7 +1003,7 @@
<<set $nickname = either("'Aegis'", "'Amazon'", "'Athena'", "'Battle'", "'Bloody'", "'Body Armor'", "'Bodyguard'", "'Diana'", "'Guard'", "'Gunsmoke'", "'Hired Gun'", "'Mercenary'", "'Officer'", "'Paladin'", "'Protection'", "'Secret Service'", "'Security'", "'Soldier'", "'Terminatrix'", "'Threat Neutralizer'", "'Warrior'", "'Widow'")>>
<<set $situationDesc = "divides your other slaves. $He is a physically intimidating sight, wearing normal slave attire and obviously sexually available, but also carrying a sword across $his back and an automatic weapon at $his hip. Some revere $his unique position of responsibility, while others mock how far $he steps outside the bounds of sexual slavery.">>
<<set $applyDesc = "knew a while ago that $he was likely to spend some time shadowing your every move. But now, $he understands that not only is your life in $his hands, it is going to remain so. $He is almost awed by the responsibility.">>
- <<set $notApplyDesc = "realizes to $his apprehension that $he may someday be a simple sex slave again, respected for $his holes rather than $his swordswomanship.">>
+ <<set $notApplyDesc = "realizes to $his apprehension that $he may someday be a simple sex slave again, respected for $his holes rather than $his swords<<= $woman>>ship.">>
<<case "server">>
<<set $nickname = either("'Bedwarmer'", "'Bottom Rung'", "'Bottom'", "'Doormat'", "'Girltoy'", "'Group Whore'", "'House Slave'", "'Kick Me'", "'Lovergirl'", "'Please No'", "'Rapebait'", "'Servant'", "'Server'", "'Servile'", "'Slave Slut'", "'Sub'", "'Submissive'")>>
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index 2aae7456e7cec4dd70017db04f538a7dc75e35a7..b2002fe4cf5670e6ba439688257293d8d8b5bd19 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -83,7 +83,7 @@
<<set _normBreasts = Math.trunc((100 + ($slaves[$i].weight + 100)*5 + 2*$slaves[$i].lactationAdaptation)*(0.85+$slaves[$i].hormoneBalance/400)*_gigantomastiaMod)>>
<<set _normButt = (($slaves[$i].weight + 100)*.025*(0.9+$slaves[$i].hormoneBalance/600)*(_rearQuirk/2 + 1))>>
<</if>>
-
+
<<if $slaves[$i].hormoneBalance >= 350>>
<<if ($slaves[$i].geneMods.NCS == 1)>>