From 01682732dc11a3e3ec2eef4de5729de5820f9b0f Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Mon, 14 Oct 2019 13:17:09 +0200
Subject: [PATCH] sanity fixes

---
 devTools/dictionary_phrases.txt           |  1 +
 devTools/dictionary_wholeWords.txt        |  1 -
 devTools/javaSanityCheck/htmlTags         |  3 +++
 devTools/javaSanityCheck/ignoredVariables | 11 ++++++-----
 src/Corporation/manageCorporation.tw      |  2 +-
 src/uncategorized/remMerger.tw            |  6 +++---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/devTools/dictionary_phrases.txt b/devTools/dictionary_phrases.txt
index f2f8f72cac9..aba155077cd 100644
--- a/devTools/dictionary_phrases.txt
+++ b/devTools/dictionary_phrases.txt
@@ -32,3 +32,4 @@ can not#cannot
 Coca Cola#Coca-Cola
 dosen't#doesn't
 aircrafts'#aircraft's
+outift#outfit
diff --git a/devTools/dictionary_wholeWords.txt b/devTools/dictionary_wholeWords.txt
index b5ca91de97c..7bdbb1beb0b 100644
--- a/devTools/dictionary_wholeWords.txt
+++ b/devTools/dictionary_wholeWords.txt
@@ -2558,7 +2558,6 @@ otehr#other
 oublisher#publisher
 ouevre#oeuvre
 oustanding#outstanding
-outift#outfit
 overshaddowed#overshadowed
 overthere#over there
 overwelming#overwhelming
diff --git a/devTools/javaSanityCheck/htmlTags b/devTools/javaSanityCheck/htmlTags
index 459c47cba32..f47666e085a 100644
--- a/devTools/javaSanityCheck/htmlTags
+++ b/devTools/javaSanityCheck/htmlTags
@@ -34,14 +34,17 @@ input;0
 label;1
 li;1
 option;1
+p;1
 script;1
 select;1
 span;1
 strong;1
 style;1
 table;1
+tbody;1
 td;1
 th;1
+thead;1
 tr;1
 tt;1
 u;1
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index 40469054b76..8762c0b4ebf 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -2,7 +2,6 @@
 #
 defaultColorMap
 clamp
-MAX
 MIN
 SCHOOL
 CLINIC
@@ -43,9 +42,7 @@ marriages
 weeksLeft
 normalOvaMin
 normalOvaMax
-V
 rejects
-transfer
 jobsNames
 expCheck
 interactionLink
@@ -69,20 +66,24 @@ unborn
 childSurname;nurseryUpgrade
 facilityRemove
 boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant
-assign;commit;sizingProcedures;Agent;thigh;breast;mouth
+assign;commit;Agent;thigh;breast;mouth
 Std
 neutral
 htmlFor
 call
 Possessive;PossessivePronoun
 generic;whip;burn;cutting;chain;exotic
-CustomSlaveTrade
 childNodes;margin
 hArgs;firstChild
 true
 selector
 missingLegs;missingArms;missingEyes
 toy
+base;pmod
+# corporation
+canFoundCorporation;startingPrice;maintenanceSlaves;room;slaveRevenue;divisionLedger;freeDevelopment;developmentCost;maintenanceCategory;corporate;easyMode;roll;divisionCategories;divisionCategoriesList;getStored;setStored;endweek;corpDivSurgeryFounded;hasDividend;hasPayout;perUnit
+# corporation - newgame+
+corpAssetsDev;corpAssetsDevOld;corpAssetsSlave;corpAssetsSlaveOld;corpDivArcadeFromMarket;corpDivArcadeSlaves;corpDivBreakFromMarket;corpDivBreakSlaves;corpDivBreakSlaves2;corpDivBreakToMarket;corpDivBreakToMenial;corpDivBreakToSurgery;corpDivBreakToTrain;corpDivDairyFromMarket;corpDivDairySlaves;corpDivExtraSlaves;corpDivExtraToArcade;corpDivExtraToBreak;corpDivExtraToMarket;corpDividend;corpDivLegalSlaves;corpDivLegalToMarket;corpDivLegalToMenial;corpDivLegalToSurgery;corpDivLegalToTrain;corpDivMenialFromMarket;corpDivMenialSlaves;corpDivSurgeryFromMarket;corpDivSurgerySlaves;corpDivSurgerySlaves2;corpDivSurgeryToDairy;corpDivSurgeryToMarket;corpDivSurgeryToTrain;corpDivTrainFromMarket;corpDivTrainSlaves;corpDivTrainSlaves2;corpDivTrainToMarket;corpDivTrainToWhore;corpDivWhoreFromMarket;corpDivWhoreSlaves;corpOpCostOld;corpOverheadOld;corpProfitOld;corpRev;corpRevOld;
 #
 # ...foo variables - maybe fixed later
 otherChoices
diff --git a/src/Corporation/manageCorporation.tw b/src/Corporation/manageCorporation.tw
index b1732eb71e3..0a9bd1061f0 100644
--- a/src/Corporation/manageCorporation.tw
+++ b/src/Corporation/manageCorporation.tw
@@ -66,7 +66,7 @@
 <<CorporateLedger _ledger _lastWeek>>
 
 <h1>Division Management</h1>
-<<for _div range App.Corporate.divisionList.filter(x=>x.founded)>>
+<<for _div range App.Corporate.divisionList.filter(x => x.founded)>>
     <h2><<= _div.name>> Division</h2>
     <<if _div.foundedDate != 0>>
     <div class="founding">Founded on <<= asDateString(_div.foundedDate)>></div>
diff --git a/src/uncategorized/remMerger.tw b/src/uncategorized/remMerger.tw
index 9448be1bf4d..1b8d080f8d0 100644
--- a/src/uncategorized/remMerger.tw
+++ b/src/uncategorized/remMerger.tw
@@ -4,10 +4,10 @@
 <<set $nextLink = "RIE Eligibility Check">>
 
 <<set _slaveCompany = App.Corporate.divisionList
-                                   .filter(div=>div.founded && div.hasMergers)
-                                   .map   (div=>div.mergerChoices.map((merger, index)=>({merger, index, division:div})))
+                                   .filter(div => div.founded && div.hasMergers)
+                                   .map   (div => div.mergerChoices.map((merger, index) => ({merger, index, division:div})))
                                    .flat  ()>>
-<<set _maxCompanies = Math.trunc(Math.log2(App.Corporate.divisionList.filter(div=>div.founded).length)) + 1>>
+<<set _maxCompanies = Math.trunc(Math.log2(App.Corporate.divisionList.filter(div => div.founded).length)) + 1>>
 <<set _numCompanies = random(1, _maxCompanies)>>
 
 <<set _companies = []>>
-- 
GitLab