From e3730c623d24271881aba00e07b12d5fa408f09b Mon Sep 17 00:00:00 2001
From: Blank_Alt <12406-Blank_Alt@users.noreply.gitgud.io>
Date: Wed, 23 Oct 2019 13:13:52 -0700
Subject: [PATCH] Fix lisping issues
---
devTools/DL-Loop.sh | 2 +-
devTools/PreCompile.sh | 1 +
src/002-config/fc-version.js | 4 ++--
src/events/intro/introSummary.tw | 8 ++++----
src/uncategorized/BackwardsCompatibility.tw | 14 +++++++++++---
src/uncategorized/options.tw | 18 +++++++++---------
6 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/devTools/DL-Loop.sh b/devTools/DL-Loop.sh
index 62de8ace871..73bfbe22164 100755
--- a/devTools/DL-Loop.sh
+++ b/devTools/DL-Loop.sh
@@ -22,7 +22,7 @@ fi
if [[ $varname4 == 1 ]];then
echo "https://gitgud.io/$varname2/fc-pregmod/raw/$varname3/"
else
- for ((i=0; i<=$#; i++))
+ for ((i=1; i<=$#; i++))
do
if [[ $varname1 == 0 ]]; then
wget -q -P /tmp/ https://gitgud.io/$varname2/fc-pregmod/raw/$varname3/${!i}
diff --git a/devTools/PreCompile.sh b/devTools/PreCompile.sh
index 1bfd07daf31..d6fc3694d1e 100755
--- a/devTools/PreCompile.sh
+++ b/devTools/PreCompile.sh
@@ -1,5 +1,6 @@
#!/bin/ksh
mega-login $1 $2 #U=$1 P=$2 rDir=$3 lDir=$4 repo=$5 Reqs:MEGAcmd,git
+if [ -z "$5" ];then 5='https://gitgud.io/pregmodfan/fc-pregmod.git';fi
while true;do gen=0;cd $4;
if [[ `echo $?` -gt 0 ]];then mkdir -p $4&&git clone -q --depth 1 $5 $4&&cd $4
if [[ ! `mega-ls $3|cut -c21-24|paste -sd,` =~ `git log|head -1|cut -c8-11` ]];then gen=1;fi #stackoverflow.com/a/15394738
diff --git a/src/002-config/fc-version.js b/src/002-config/fc-version.js
index d958221f8f4..2629627ea76 100644
--- a/src/002-config/fc-version.js
+++ b/src/002-config/fc-version.js
@@ -1,7 +1,7 @@
App.Version = {
- base: "0.10.7.1",
+ base: "0.10.7.1", // The vanilla version the mod is based off of, this should never be changed.
pmod: "2.9.X",
- release: 1054,
+ release: 1055,
};
/* Use release as save version */
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 16dff05382a..8b787f4af70 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -259,10 +259,10 @@ __''General slave settings''__
/% Begin mod section: toggle whether slaves lisp. %/
<<options $disableLisping>>
-<<option 1 "Enable Lisping">>
- Lisping: ''slaves with fat lips or heavy oral piercings will lisp''.
-<<option 0 "Disable Lisping">>
- Lisping: ''slaves will not lisp''.
+ <<option 0 "Enable Lisping">>
+ Lisping: ''slaves with fat lips or heavy oral piercings will lisp''.
+ <<option 1 "Disable Lisping">>
+ Lisping: ''slaves will not lisp''.
<</options>>
/% End mod section: toggle whether slaves lisp. %/
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 604ace82835..d7ec71a84fe 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -7,6 +7,14 @@
<<set $releaseID = 1022>>
<</if>>
+<<if $releaseID < 1055>>
+ <<if $disableLisping == 0>>
+ <<set $disableLisping = 1>>
+ <<else>>
+ <<set $disableLisping = 0>>
+ <</if>>
+<</if>>
+
<<if Array.isArray($nationalities)>>
<<set $nationalities = weightedArray2HashMap($nationalities)>>
<</if>>
@@ -1431,13 +1439,13 @@
<</if>>
<<if def $year>>
- <<unset $year>>
+ <<unset $year>>
<</if>>
<<if def $day>>
- <<unset $day>>
+ <<unset $day>>
<</if>>
<<if def $month>>
- <<unset $month>>
+ <<unset $month>>
<</if>>
<<if ndef $arcologies>>
diff --git a/src/uncategorized/options.tw b/src/uncategorized/options.tw
index e0fe64044d7..e4a082b4f67 100644
--- a/src/uncategorized/options.tw
+++ b/src/uncategorized/options.tw
@@ -169,13 +169,13 @@ This save was created using FC version $ver build $releaseID.
<<option 0 "Disabled">>
<</options>>
- <<options $verticalizeArcologyLinks>>
- Penthouse Facility Display
- <<option 3 "Triple Column">>
- <<option 2 "Double Column">>
- <<option 1 "Single Column">>
- <<option 0 "Collapsed">>
- <</options>>
+ <<options $verticalizeArcologyLinks>>
+ Penthouse Facility Display
+ <<option 3 "Triple Column">>
+ <<option 2 "Double Column">>
+ <<option 1 "Single Column">>
+ <<option 0 "Collapsed">>
+ <</options>>
<<options $seeArcology>>
Main menu arcology description
@@ -467,8 +467,8 @@ This save was created using FC version $ver build $releaseID.
<<options $disableLisping>>
Slaves with fat lips or heavy oral piercings can lisp
- <<option 1 "Enabled">>
- <<option 0 "Disabled">>
+ <<option 1 "False">>
+ <<option 0 "True">>
<</options>>
<<options $diversePronouns>>
--
GitLab