Define save descriptions uniformly for the entire game, instead of using...

Define save descriptions uniformly for the entire game, instead of using nonsense everywhere that's not the main page.
Patch Sugarcube to skip creating passage excerpts (which can be expensive) when descriptions are predefined.

devNotes/sugarcube stuff/important for updating sugarcube.txt

@@ -82,3 +82,18 @@ CHANGE 6: FCHost storage support
 ===========================
 
 If you intend to run in FCHost and need to rebuild Sugarcube, then in addition to the other FreeCities patches, you need to add the FCHost.Storage.js module, supplied in this folder, to Sugarcube's src\lib\simplestore\adapters, and add a line in Sugarcube's build.js for 'src/lib/simplestore/adapters/FCHost.Storage.js' immediately BEFORE 'src/lib/simplestore/adapters/webstorage.js' (order is important).
+
+
+CHANGE 7: Don't generate passage excerpts if they aren't going to be used
+===========================
+
+	// Update the excerpt cache to reflect the rendered text.
+	this._excerpt = Passage.getExcerptFromNode(passageEl);
+	
+	into
+	
+	// Update the excerpt cache to reflect the rendered text, if we need it for the passage description
+	if (Config.passages.descriptions == null) {
+		this._excerpt = Passage.getExcerptFromNode(passageEl);
+	}
+	
\ No newline at end of file

devNotes/sugarcube stuff/sugarcube-fc-changes.patch

-diff -r e026486d7e79 -r 483bafde4107 build.js
---- a/build.js	Thu Jun 27 16:09:52 2019 -0500
-+++ b/build.js	Wed Aug 07 00:33:43 2019 -0700
+diff -r 3892fa22d6fa -r c5e783614ccf build.js
+--- a/build.js	Thu Jun 27 16:10:07 2019 -0500
++++ b/build.js	Sun Aug 18 19:09:49 2019 -0700
 @@ -29,6 +29,7 @@
  			'src/lib/jquery-plugins.js',
  			'src/lib/util.js',
@@ -9,9 +9,9 @@ diff -r e026486d7e79 -r 483bafde4107 build.js
  			'src/lib/simplestore/adapters/webstorage.js',
  			'src/lib/simplestore/adapters/cookie.js',
  			'src/lib/debugview.js',
-diff -r e026486d7e79 -r 483bafde4107 src/lib/jquery-plugins.js
---- a/src/lib/jquery-plugins.js	Thu Jun 27 16:09:52 2019 -0500
-+++ b/src/lib/jquery-plugins.js	Wed Aug 07 00:33:43 2019 -0700
+diff -r 3892fa22d6fa -r c5e783614ccf src/lib/jquery-plugins.js
+--- a/src/lib/jquery-plugins.js	Thu Jun 27 16:10:07 2019 -0500
++++ b/src/lib/jquery-plugins.js	Sun Aug 18 19:09:49 2019 -0700
 @@ -43,14 +43,9 @@
  		return function () {
  			const $this = jQuery(this);
@@ -42,9 +42,9 @@ diff -r e026486d7e79 -r 483bafde4107 src/lib/jquery-plugins.js
  		};
  	}
  
-diff -r e026486d7e79 -r 483bafde4107 src/lib/simplestore/adapters/FCHost.Storage.js
+diff -r 3892fa22d6fa -r c5e783614ccf src/lib/simplestore/adapters/FCHost.Storage.js
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/lib/simplestore/adapters/FCHost.Storage.js	Wed Aug 07 00:33:43 2019 -0700
++++ b/src/lib/simplestore/adapters/FCHost.Storage.js	Sun Aug 18 19:09:49 2019 -0700
 @@ -0,0 +1,171 @@
 +/***********************************************************************************************************************
 +
@@ -217,9 +217,9 @@ diff -r e026486d7e79 -r 483bafde4107 src/lib/simplestore/adapters/FCHost.Storage
 +		create : { value : adapterCreate }
 +	}));
 +})());
-diff -r e026486d7e79 -r 483bafde4107 src/lib/simplestore/adapters/webstorage.js
---- a/src/lib/simplestore/adapters/webstorage.js	Thu Jun 27 16:09:52 2019 -0500
-+++ b/src/lib/simplestore/adapters/webstorage.js	Wed Aug 07 00:33:43 2019 -0700
+diff -r 3892fa22d6fa -r c5e783614ccf 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 Aug 18 19:09:49 2019 -0700
 @@ -189,11 +189,11 @@
  		}
  
@@ -234,9 +234,9 @@ diff -r e026486d7e79 -r 483bafde4107 src/lib/simplestore/adapters/webstorage.js
  		}
  	}
  
-diff -r e026486d7e79 -r 483bafde4107 src/markup/wikifier.js
---- a/src/markup/wikifier.js	Thu Jun 27 16:09:52 2019 -0500
-+++ b/src/markup/wikifier.js	Wed Aug 07 00:33:43 2019 -0700
+diff -r 3892fa22d6fa -r c5e783614ccf src/markup/wikifier.js
+--- a/src/markup/wikifier.js	Thu Jun 27 16:10:07 2019 -0500
++++ b/src/markup/wikifier.js	Sun Aug 18 19:09:49 2019 -0700
 @@ -212,7 +212,7 @@
  		}
  
@@ -246,9 +246,25 @@ diff -r e026486d7e79 -r 483bafde4107 src/markup/wikifier.js
  		}
  
  		/*
-diff -r e026486d7e79 -r 483bafde4107 src/state.js
---- a/src/state.js	Thu Jun 27 16:09:52 2019 -0500
-+++ b/src/state.js	Wed Aug 07 00:33:43 2019 -0700
+diff -r 3892fa22d6fa -r c5e783614ccf src/passage.js
+--- a/src/passage.js	Thu Jun 27 16:10:07 2019 -0500
++++ b/src/passage.js	Sun Aug 18 19:09:49 2019 -0700
+@@ -266,8 +266,10 @@
+ 				}
+ 			});
+ 
+-			// Update the excerpt cache to reflect the rendered text.
+-			this._excerpt = Passage.getExcerptFromNode(passageEl);
++			// Update the excerpt cache to reflect the rendered text, if we need it for the passage description
++			if (Config.passages.descriptions == null) {
++				this._excerpt = Passage.getExcerptFromNode(passageEl);
++			}
+ 
+ 			return passageEl;
+ 		}
+diff -r 3892fa22d6fa -r c5e783614ccf src/state.js
+--- a/src/state.js	Thu Jun 27 16:10:07 2019 -0500
++++ b/src/state.js	Sun Aug 18 19:09:49 2019 -0700
 @@ -104,7 +104,7 @@
  		}
  
@@ -258,9 +274,9 @@ diff -r e026486d7e79 -r 483bafde4107 src/state.js
  		}
  
  		if (_prng !== null) {
-diff -r e026486d7e79 -r 483bafde4107 src/ui.js
---- a/src/ui.js	Thu Jun 27 16:09:52 2019 -0500
-+++ b/src/ui.js	Wed Aug 07 00:33:43 2019 -0700
+diff -r 3892fa22d6fa -r c5e783614ccf src/ui.js
+--- a/src/ui.js	Thu Jun 27 16:10:07 2019 -0500
++++ b/src/ui.js	Sun Aug 18 19:09:49 2019 -0700
 @@ -334,6 +334,7 @@
  				if (saves.slots[i]) {
  					// Add the load button.

src/002-config/sugarCubeConfig.js

@@ -4,6 +4,15 @@
 /* Change the starting passage from the default 'start' to 'Alpha disclaimer'. */
 Config.passages.start = "init";
 
+/* Set description used by Save, for all passages, to give some decent information about game state. */
+Config.passages.descriptions = function () {
+    let sv = State.variables;
+    if (sv.arcologies === undefined || sv.arcologies.length === 0)
+        return "New Game Setup, Week 0"; // no arcology yet...
+    else
+        return sv.arcologies[0].name + ", Week " + sv.week + ", " + sv.slaves.length + " Slaves, " + cashFormat(sv.cash);
+};
+
 /* Disable forward/back buttons in panel. */
 Config.history.controls = false;
 

src/uncategorized/main.tw

@@ -78,9 +78,6 @@
 	<<set $PC.customTitle = undefined, $PC.customTitleLisp = undefined>>
 <</if>>
 
-/* Saves use the first eight printed words to make the "file name", the below line cheats and makes saves here nicer named. */
-@@font-size: 0; $arcologies[0].name, Week $week, $slaves.length Slaves, <<print cashFormat($cash)>> … … … @@
-
 <<if $newModelUI == 1>><<DisplayBuilding>><</if>>
 <<if $seeArcology == 1>>&nbsp;&nbsp;&nbsp;&nbsp;<<include "Arcology Description">> | [[Hide|Main][$seeArcology = 0]]<br><</if>>