From 4b7fed6f5b2277bc401b12c4060e24b00498c86e Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Tue, 11 Aug 2020 18:52:46 +0200
Subject: [PATCH] fix sanity issues
---
devTools/javaSanityCheck/ignoredVariables | 17 +++++++----------
src/Mods/SecExp/attackOptions.tw | 2 +-
src/events/intro/introSummary.tw | 6 ++----
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index 9a6ea16e497..1bb832c5d30 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -4,7 +4,6 @@ AGrowth
#
cumSale
fluidSale
-clamp
MIN
brokenSlaves
DL
@@ -16,8 +15,6 @@ CopyDate
self
setBaseAndExtent
opera
-styleSheets
-cssRules
toString
toFixed
LivingRule
@@ -44,12 +41,11 @@ op
unborn
facilityRemove
boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant
-assign;commit;thigh;breast;mouth
+assign;commit;mouth
Std
htmlFor
Possessive;PossessivePronoun
whip;burn;cutting;chain;exotic
-childNodes;margin
firstChild
true
missingLegs;missingArms;
@@ -69,7 +65,6 @@ attendingClasses;confinement;gloryHole;milking;publicService;sexualServitude;ser
cx
menialTrades;menialTransfer;fuckdollsTransfer;menialBioreactorsTransfer;menialRetirement;slaveMod;slaveSurgery;school;citizenOrphanage;environment;privateOrphanage;schoolBacking;personalLivingExpenses;PCtraining;PCmedical;PCskills;stocksTraded;fines;stocks;concubine;slavesViewOfPC;vignette;prestigiousSlave;publicServantClub;architecture;PCappearance;PCactions;PCRelationships;SlaveRelationships;multiplier
REReductionCheckinIDs
-rulesAssistant;assigned
modestClothes
gangCriminalPool;militaryCriminalPool;whiteCollarCriminalPool;pettyCriminalPool
multiple;selectedOptions;
@@ -86,13 +81,10 @@ royalNationalities
hostageGiveIn
facilityHeads
r
-lightColorMap
SlaveSummaryFiler
sacrificeType
cellName;BaseCell;cellPath;Section;Building;ground;code
location
-totalEmployeesCount
-Theme
Upkeep;SexSlaveCount;GSP;Rep
debugModeCustomFunction
societyChanged
@@ -102,6 +94,11 @@ dinnerParty
showAppraisal
IntroSummary
two
+totalMerc
+hasFoughtOnce;hasFoughtMajorBattleOnce;hasRebelledOnce
+barren
+RESSMuscles
+bodySuits
# PC
criticalDamage
marriage
@@ -115,7 +112,7 @@ hates
loathes
obsession
# corporation
-canFoundCorporation;startingPrice;maintenanceSlaves;room;slaveRevenue;divisionLedger;freeDevelopment;developmentCost;maintenanceCategory;corporate;roll;divisionCategories;divisionCategoriesList;getStored;setStored;endweek;hasDividend;hasPayout;perUnit;acquire
+canFoundCorporation;startingPrice;maintenanceSlaves;room;slaveRevenue;divisionLedger;freeDevelopment;developmentCost;maintenanceCategory;corporate;roll;divisionCategories;divisionCategoriesList;getStored;setStored;endweek;hasDividend;hasPayout;perUnit;acquire;DivLegal;DivWhoreDev
# porn
focusedViewershipFactor
unfocusedViewershipFactor
diff --git a/src/Mods/SecExp/attackOptions.tw b/src/Mods/SecExp/attackOptions.tw
index 3e801d3899f..8035e16a72b 100644
--- a/src/Mods/SecExp/attackOptions.tw
+++ b/src/Mods/SecExp/attackOptions.tw
@@ -141,7 +141,7 @@ approximately <strong><<print _estimatedMen>> men</strong> are coming, they seem
<hr>__Battle Plan__:<br>
<<set _leaderFound = 1>>
<<if $leadingTroops === "bodyguard" && $BodyguardID === 0 || $leadingTroops === "headGirl" && $HeadGirlID === 0>>
- @@.red;Chosen leader $leadingTroops cannot be found, please select another.@@
+ @@.warning;Chosen leader $leadingTroops cannot be found be found, please select another.@@
<<set _leaderFound = 0>>
<</if>>
<<switch $leadingTroops>>
diff --git a/src/events/intro/introSummary.tw b/src/events/intro/introSummary.tw
index 69cb6862bae..cdee2894d68 100644
--- a/src/events/intro/introSummary.tw
+++ b/src/events/intro/introSummary.tw
@@ -355,14 +355,12 @@ You may review your settings before clicking "Continue" to begin.<br>
<<run _options.addOption("The Special Force Mod is", "Toggle", $SF)
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("<div>This mod is initially from anon1888 but expanded by SFanon offers a lategame special (started out as security but changed to special in order to try and reduce confusion with CrimeAnon's separate Security Expansion (SecExp) mod) force, that is triggered after week 72.</div>
- <div>It is non-canon where it conflicts with canonical updates to the base game.</div>")
- >>
+ <div>It is non-canon where it conflicts with canonical updates to the base game.</div>")>>
<<run _options.addOption("The Security Expansion Mod is", "secExpEnabled")
.addValue("Enabled", 1).on().addValue("Disabled", 0).off()
.addComment("<div>This mod introduces security and crime in the arcology, as well as attacks and battles.</div>
- <div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.</div>")
- >>
+ <div>The mod can be activated in any moment, but it may result in unbalanced gameplay if activated very late in the game.</div>")>>
<<includeDOM _options.render()>>
</div>
--
GitLab