From 99e97424c80528c6e5246ef81c517d165e92bc57 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Sat, 8 Jun 2019 15:59:18 +0200
Subject: [PATCH] jsanity fixes
---
devTools/javaSanityCheck/ignoredVariables | 9 ++++++++-
sanityCheck.sh | 2 +-
src/SpecialForce/Firebase.tw | 12 ++++++------
3 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index a3895cf0a90..7c373d5de1f 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -67,6 +67,9 @@ FSCummunismDecoration;FSIncestFetishistDecoration;FSGenderFundamentalistResearch
maleSurnamePoolSelector
mixedraceNationalities
nationalityPoolSelector
+bimboSlaveNames
+ArcologyNamesIntellectualDependency;ArcologyNamesSlaveProfessionalism;ArcologyNamesPetiteAdmiration;ArcologyNamesStatuesqueGlorification
+IntellectualDependency;SlaveProfessionalism;PetiteAdmiration;StatuesqueGlorification
Him
anCup
linkHandlers
@@ -77,7 +80,11 @@ currentEmployee
childSurname;nurseryOldID;nurseryUpgrade
facilityRemove
boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant
-assign;commit;sizingProcedures;Agent;thigh;boy;breast;mouth
+assign;commit;sizingProcedures;Agent;thigh;breast;mouth
+normalRandInt
+Std
+neutral
+htmlFor
#
# ...foo variables - maybe fixed later
otherChoices
diff --git a/sanityCheck.sh b/sanityCheck.sh
index 0c85e178983..d8482d10def 100755
--- a/sanityCheck.sh
+++ b/sanityCheck.sh
@@ -60,7 +60,7 @@ fi
# Check for too many >>>. e.g.: <</if>>>
$GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets"
# Check for wrong capitalization on 'activeslave' and other common typos
-$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeChild\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\|activeCanine\|activeHooved\|activeFeline\)" -- "src/*" | myprint "WrongCapitilization"
+$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeChild\|activeArcology\|activeStandard\|activeOrgan\|activeLimbs\|activeUnits\|activeCanine\|activeHooved\|activeFeline\|activeLurcher\)" -- "src/*" | myprint "WrongCapitilization"
if [[ ! "$java" ]]; then
$GREP "\(csae\|[a-z] She \|attepmts\|youreslf\|advnaces\|canAcheive\|setBellySize\|SetbellySize\|setbellySize\|bellypreg\|pregBelly\|bellyimplant\|bellyfluid\|pronounCaps\|carress\|hormonebalance\|fetishknown\)" -- 'src/*' | myprint "SpellCheck"
$GREP "\(recieve\|recieves\)" -- 'src/*' | myprint "PregmodderCannotSpellReceive"
diff --git a/src/SpecialForce/Firebase.tw b/src/SpecialForce/Firebase.tw
index 6bb61d65d92..2b2bb81c715 100644
--- a/src/SpecialForce/Firebase.tw
+++ b/src/SpecialForce/Firebase.tw
@@ -45,22 +45,22 @@
<<if $SF.UC.Lock < 1>> <br>
<<switch $SF.UC.Assign>>
<<case 0>>
- <br>No soldiers are working undercover, which would primarly advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
+ <br>No soldiers are working undercover, which would primarily advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
<br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
<<case 1>>
- <br>A small section of soldiers are working undercover, which will primarly advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
+ <br>A small section of soldiers are working undercover, which will primarily advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
<br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
<<case 2>>
- <br>A large section of soldiers are working undercover, which will primarly advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
+ <br>A large section of soldiers are working undercover, which will primarily advance your cultural goals. [[Full time assignment|Firebase][$SF.UC.Lock = 1]]
<br>[[Reassign soldiers|Firebase][$SF.UC.Assign = -1]]
<<default>>
- <br>Would you like to assign soldiers to undercover duty, which will primarly advance your cultural goals?
+ <br>Would you like to assign soldiers to undercover duty, which will primarily advance your cultural goals?
<br>[[Do not assign soldiers to work undercover|Firebase][$SF.UC.Assign = 0]]
<br>[[Assign a small section of soldiers to work undercover|Firebase][$SF.UC.Assign = 1]]
<br>[[Assign a large section of soldiers to work undercover|Firebase][$SF.UC.Assign = 2]]
<</switch>>
<<else>>
- <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work, which will primarly advance your cultural goals. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]]
+ <br> <<if $SF.UC.Assign < 1>>''Zero''<<elseif $SF.UC.Assign < 2>>A ''small'' section<<else>>A ''large'' section<</if>> of the special force is assigned to undercover work, which will primarily advance your cultural goals. [[Re-allocate the units|Firebase][$SF.UC.Lock = 0]]
<</if>>
<<if $SF.Squad.Firebase > 5 && $secExp > 0 && $SFSupportLevel >= 4 && $maxUnits === 16 && $readiness <= 10>>
@@ -184,4 +184,4 @@
<<= App.SF.UnitText('AC')>> <<= App.SF.UnitText('Sub')>> <<= App.SF.UnitText('HAT')>>
<</if>>
<</if>>
-<</if>>
\ No newline at end of file
+<</if>>
--
GitLab