From 48e8f3bc819b9795d30f61c5c0128d1053a3ac81 Mon Sep 17 00:00:00 2001
From: Pregmodder <pregmodder@gmail.com>
Date: Sat, 1 Dec 2018 16:31:34 -0500
Subject: [PATCH] fixes
---
devNotes/VersionChangeLog-Premod+LoliMod.txt | 7 +++++++
.../important for updating sugarcube.txt | 10 ++++++++--
devNotes/twine JS.txt | 1 +
src/SecExp/SecExpBackwardCompatibility.tw | 2 +-
src/uncategorized/options.tw | 2 +-
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/devNotes/VersionChangeLog-Premod+LoliMod.txt b/devNotes/VersionChangeLog-Premod+LoliMod.txt
index e47c942fe83..98242f8176c 100644
--- a/devNotes/VersionChangeLog-Premod+LoliMod.txt
+++ b/devNotes/VersionChangeLog-Premod+LoliMod.txt
@@ -2,6 +2,13 @@
0.10.7.1-1.1.x
+12/01/2018
+
+ 5
+ -fixes
+ -QoL improvements
+ -possible performance boost
+
11/30/2018
4
diff --git a/devNotes/sugarcube stuff/important for updating sugarcube.txt b/devNotes/sugarcube stuff/important for updating sugarcube.txt
index 8aae5403d66..dc87ab303be 100644
--- a/devNotes/sugarcube stuff/important for updating sugarcube.txt
+++ b/devNotes/sugarcube stuff/important for updating sugarcube.txt
@@ -11,12 +11,18 @@ Edit the sugarcube header and change:
...
return Object.freeze
+
+ {return LZString.compressToUTF16(JSON.stringify(e))}},{key:"_deserialize",value:function(e){return JSON.parse(LZString.decompressFromUTF16(e))}}]),e}();
+
+
Into this
[{key:"_serialize",value:function(e)
+
/* look here for changes */
{return JSON.stringify(e)}},{key:"_deserialize",value:function(e){return JSON.parse((!e || e[0]=="{")?e:LZString.decompressFromUTF16(e))}}]),e}();
/* changes end here */
+
return Object.freeze
@@ -43,8 +49,8 @@ This uses two separate methods to detect if we are returning to the same page.
no harm in this approach either.
-CHANGE 3: Possible long term improvement?
-=========================================
+CHANGE 3: Ignore expired array
+==============================
return e?t.history=clone(W):t.delta=A(W),V.length>0&&(t.expired=[].concat(_toConsumableArray(V))),null!==F&&(t.seed=F.seed),t}function a(e,t){
diff --git a/devNotes/twine JS.txt b/devNotes/twine JS.txt
index b912fd3013c..34ef147e642 100644
--- a/devNotes/twine JS.txt
+++ b/devNotes/twine JS.txt
@@ -1,5 +1,6 @@
config.history.maxStates = 1; /* If you remove this, I will fucking yell at you. Stop. Doing. It. */
config.saves.autosave = "autosave";
+State.expired.disable;
/*:: StoryJS [script]*/
diff --git a/src/SecExp/SecExpBackwardCompatibility.tw b/src/SecExp/SecExpBackwardCompatibility.tw
index 7e471b4611a..8d485753311 100644
--- a/src/SecExp/SecExpBackwardCompatibility.tw
+++ b/src/SecExp/SecExpBackwardCompatibility.tw
@@ -208,7 +208,7 @@
<<if ndef $pharaonTradition>>
<<set $pharaonTradition = 0>>
<</if>>
-<<if ndef $weaponsLaw || $wasToggledBefore == 1>>
+<<if ndef $weaponsLaw>>
<<set $weaponsLaw = 3>>
<</if>>
<<if ndef $soldierWages>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index 96c76990055..e01f4d3f8d2 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -45,7 +45,7 @@ End of week autosaving is currently @@.cyan;ENABLED@@. [[Disable|Options][$autos
<br>
''COLOR CONTROL''
<br>
-<<link "flip lighting">><<run flipColors(setup.lightColorMap)>><</link>> //Currently a WIP, use at own risk.//
+<<link "flip lighting">><<run flipColors(setup.lightColorMap)>><</link>>
<br>
''IMAGES''
--
GitLab