From 9bd58293638673ed25cff3f3f20d70555397891a Mon Sep 17 00:00:00 2001
From: klorpa <30924131+klorpa@users.noreply.github.com>
Date: Thu, 11 Jul 2019 12:17:19 -0500
Subject: [PATCH] SCFix
---
.../sugarcube stuff/sugarcube-fc-changes.patch | 18 +++++++++---------
src/SpecialForce/SpecialForce.js | 4 ++--
src/js/slaveListing.js | 2 +-
src/pregmod/seFCTVshows.tw | 2 +-
src/uncategorized/RESS.tw | 2 +-
src/uncategorized/rulesSlaveSelect.tw | 2 +-
src/uncategorized/saHormoneEffects.tw | 2 +-
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/devNotes/sugarcube stuff/sugarcube-fc-changes.patch b/devNotes/sugarcube stuff/sugarcube-fc-changes.patch
index 5210e155841..3a81ee0593e 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/SpecialForce/SpecialForce.js b/src/SpecialForce/SpecialForce.js
index 5e7b662baf9..665326be65e 100644
--- a/src/SpecialForce/SpecialForce.js
+++ b/src/SpecialForce/SpecialForce.js
@@ -1149,7 +1149,7 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`)
text += `\nIn the territory surrounding the Free City itself, there are several scenic and very innocent-looking campsites established, complete with folding chairs & tables, food & drink coolers, colorful tents, clotheslines, and port-a-johns. They sometimes even have impromptu campfires if the Firebase scouts occupying them have returned from their field exercises. These campsites act as listening posts that monitor incoming and outgoing traffic concerning the arcology, and if attacked, they can be abandoned and later replaced very quickly and easily.\n`;
}
if (textDisplay === 90 && V.SF.FS[FS_OPTIONS[i]].lv >= textDisplay) {
- text += `\nThe soldiers of the Firebase are generally both idealistic and hot blooded; always looking for a fight, with each soldier very assured of their own 'awesomeness'. Gossip and constant comparison between troopers is rife, a every soldier is vested in their interest in the latest 'tacti-cool' fashions, footwear, and equipment. Younger soldiers are prized for their mileage and potential, and given special care and attention when they first enlist. Those youngsters that show any special talent or unique ability are promoted and fast tracked as much as feasibly possible.\n`;
+ text += `\nThe soldiers of the Firebase are generally both idealistic and hot blooded; always looking for a fight, with each soldier very assured of their own 'awesomeness'. Gossip and constant comparison between troopers is rife, and every soldier is vested in their interest in the latest 'tacti-cool' fashions, footwear, and equipment. Younger soldiers are prized for their mileage and potential, and given special care and attention when they first enlist. Those youngsters that show any special talent or unique ability are promoted and fast tracked as much as feasibly possible.\n`;
}
if (textDisplay === 100 && V.SF.FS[FS_OPTIONS[i]].lv >= textDisplay) {
text += `\nYouth Preferentialism: The Colonel looks much younger thanks to some advanced age treatment therapy she's gotten. She's got a bit more bounce in her step too, if that's possible. Everyday she's proving that her age is just a number.\n`;
@@ -2209,7 +2209,7 @@ App.SF.fsIntegration = function(input = 'Menu', textDisplay = 100, text = `\n`)
V.trinkets.push("The Colonel's canteen");
r += `Finally weary of your constant intrusions into her territory and crew, The Colonel gathers up her people for a full scale liquidation and dispersal of personnel and assets throughout the Free City itself; they are going to discreetly sell off the majority of their military hardware, assume new identities and melt into the fabric of the Free City's wider population. Gone are the days of plunder and dominion, as this retirement plan will make many of them some of the wealthiest tenants in the entire Free City, and they will no longer need to break their backs living the lives of soldiers. With the liquidation complete and the money distributed, the army moves on to the net stage of the plan.`;
r += `\nAt midnight, the lights are the first thing the Colonel's forces disable, as they still have the excellent night vision equipment you purchased for them. Some of your citizens panic almost immediately at the sudden blackout; this is very reminiscent of the Daughters of Liberty attack that still haunts many of their memories. Her army moves fast and quietly throughout the arcology and the streets outside of it, slipping through your security units and drones with an ease that stinks of months of careful planning and study. Most disturbingly, your penthouse's communications networks are all but destroyed, and your PA has been unreachable, seemingly hacked by some obscure technology you figure only the Colonel's contacts and few others could provide.`;
- r += `\nOutside, her many aircraft escape the local airspace to patrol the Arcology outskirts, evading recon scans, the monitoring systems of your secured penthouse, and the feeble attempts of your sentries to shoot them down. A great many of them will be escaping by air, it seems. Many are escaping by land too: Swarms of personnel carriers and utility trucks are driving off to neighboring arcologies or even neighboring Free Cities by the dozens for retirement, as the remainder of her army purchase new apartments and properties in various arcologies nearby while being dressed in civilian clothing. After just a few days, the entire army has essentially disappeared, hopelessly obscured by mountains of digital noise, detailed fake backstories, lavish fake identities, and lots of bribes and carefully destroyed digital and physical records. Your special force has gone completely AWOL and there is nothing you or anyone can do about it. It seems your experienced former warriors have a eye for deception too.`;
+ r += `\nOutside, her many aircraft escape the local airspace to patrol the Arcology outskirts, evading recon scans, the monitoring systems of your secured penthouse, and the feeble attempts of your sentries to shoot them down. A great many of them will be escaping by air, it seems. Many are escaping by land too: Swarms of personnel carriers and utility trucks are driving off to neighboring arcologies or even neighboring Free Cities by the dozens for retirement, as the remainder of her army purchase new apartments and properties in various arcologies nearby while being dressed in civilian clothing. After just a few days, the entire army has essentially disappeared, hopelessly obscured by mountains of digital noise, detailed fake backstories, lavish fake identities, and lots of bribes and carefully destroyed digital and physical records. Your special force has gone completely AWOL and there is nothing you or anyone can do about it. It seems your experienced former warriors have an eye for deception too.`;
r += `\nYou are trapped inside your Penthouse by the electricity-cutting digital virus that has kept you inside and communicatively isolated for the past week. Probably with the goal of keeping you in the dark, figuratively and literally, so that you could not intervene in The Colonel's total assimilation into the Free Cities. The lazy bitch did not want to cooperate with your Future Societies plans, so she and her men decided to stop being soldiers altogether, and live off of their savings. Your only relief comes at the midnight of the seventh day, when the virus self-terminates and the arcology's electricity, PA, and communications lines return to full functioning.`;
r += `\nYour arcology is once more yours, but your people will never forget the troubling week they spent in total darkness and lockdown, or the sudden mass desertion and disappearance of the army that you convinced them to allow, or the fact that there was nothing you could do to prevent or mitigate any of it.`;
break;
diff --git a/src/js/slaveListing.js b/src/js/slaveListing.js
index 7e8f527d4f7..703b93773a4 100644
--- a/src/js/slaveListing.js
+++ b/src/js/slaveListing.js
@@ -289,7 +289,7 @@ App.UI.SlaveList.render = function() {
/*
* we want <div id="list_index3" class=" hidden">...
*/
- const listIndex = makeElement(res, "div", undefined, "hidden");
+ const listIndex = makeElement(res, "div", undefined, "hidden");
listIndex.id = `list_index${listID}`;
for (const _ssii of indices) {
diff --git a/src/pregmod/seFCTVshows.tw b/src/pregmod/seFCTVshows.tw
index 6340aa7e5de..5aa2d046628 100644
--- a/src/pregmod/seFCTVshows.tw
+++ b/src/pregmod/seFCTVshows.tw
@@ -1747,7 +1747,7 @@
<br> "Then we just run this one up heeere" Katie waves the tip of the other tube in her face. Cloud shudders but keeps her mouth shut. "Oh, but you are so <i>thirsty</i>, right? Well, we had to do this for a man that damn near died to a mountain lion. Slept for three weeks before he started healing." Kate coats the tip in pitch again and then shoves it far up Cloud's nose. Cloud frantically dances at the discomfort as some of the pressure below is released, but freezes a moment later as an <i>extremely</i> unpleasant flavor arrives in her throat.
- <br>Kate deliberately kinks the hose to shut off the flow for the moment and presses the kink into Cloud's hand, before wrapping her fingers around it. "Up to her now where she wants it," Kate explains. "It's important to give a patient choices, don't you think?" The gagging Indian tries to use her new grip on the hose to pull it out, but Kate bends her fingers painfully further shut. "Uh-uh. Nope." Kate firmly knots another rawhide band around the hose, and then ties the strip around Cloud's wrist, keeping her from reeling in the hose with her fingers. With her arms themselves bound, she can't move around enough to tear out the hose either. "Medicine goes up or down, not out!"
+ <br>Kate deliberately kinks the hose to shut off the flow for the moment and presses the kink into Cloud's hand, before wrapping her fingers around it. "Up to her now where she wants it," Kate explains. "It's important to give a patient choices, don't you think?" The gagging Indian tries to use her new grip on the hose to pull it out, but Kate bends her fingers painfully further shut. "Uh-uh. Nope." Kate firmly knots another rawhide band around the hose, and then ties the strip around Cloud's wrist, keeping her from reeling in the hose with her fingers. With her arms themselves bound, she can't move around enough to tear out the hose either. "Medicine goes up or down, not out!"
<br><br> At this point, her stomach is so distended that the black pitch is showing around individual feathers. Annie and Dakota lock eyes and giggle, while Kate moves to where the noose is tied.
<br> "Ready?" They ask the girl. She can barely open her eyes and doesn't move her head. "Ok then, here we go!"
diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw
index bdbdb755348..60dc9ab0c3a 100644
--- a/src/uncategorized/RESS.tw
+++ b/src/uncategorized/RESS.tw
@@ -8346,7 +8346,7 @@ brought in to you. This time <<EventNameLink>> has been sent to deliver it. $He
<<case "preggololi">>
young voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, you know it'll be fun!"
<<case "angel">>
- harmonous voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, it'll be over soon."
+ harmonious voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, it'll be over soon."
<<case "cherub">>
cheerful voice of your assistant's avatar can also be heard, encouraging $activeSlave.slaveName to "relax, it'll feel better if you do!"
<<case "incubus">>
diff --git a/src/uncategorized/rulesSlaveSelect.tw b/src/uncategorized/rulesSlaveSelect.tw
index 7b72d51ff14..f2b09265de9 100644
--- a/src/uncategorized/rulesSlaveSelect.tw
+++ b/src/uncategorized/rulesSlaveSelect.tw
@@ -25,7 +25,7 @@
s => ruleSlaveSelected(s, $currentRule),
(s, i) => {
let l = App.UI.DOM.passageLink(SlaveFullName(s), 'Rules Slave Deselect Workaround',
- () => { App.Utils.setActiveSlaveByIndex(i); });
+ () => { App.Utils.setActiveSlaveByIndex(i); });
l.classList.add("emphasizedSlave");
return l;
}
diff --git a/src/uncategorized/saHormoneEffects.tw b/src/uncategorized/saHormoneEffects.tw
index b2002fe4cf5..bdcb9a3b3c8 100644
--- a/src/uncategorized/saHormoneEffects.tw
+++ b/src/uncategorized/saHormoneEffects.tw
@@ -560,7 +560,7 @@
<<if ($slaves[$i].geneMods.NCS == 0)>>
<<if $slaves[$i].faceImplant < 5>>
- <<if $slaves[$i].geneticQuirks.androgyny != 2>>
+ <<if $slaves[$i].geneticQuirks.androgyny != 2>>
<<if ($slaves[$i].faceShape == "androgynous")>>
Hormonal effects cause @@.orange;$his face to harden into masculinity.@@
<<set $slaves[$i].faceShape = "masculine">>
--
GitLab