diff --git a/devTools/dictionary_phrases.txt b/devTools/dictionary_phrases.txt index f2f8f72cac958d3252fd01b259a49971f7964114..aba155077cdb2e8a653f7a4f4045fd9ec7e235bb 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 b5ca91de97c92400226a0e60679ca9d2141a0bf3..7bdbb1beb0b9e8a520b2b6da4726cae3a0ddb6a5 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 459c47cba32830c0cd44b78b3a2dff1d6e0da477..f47666e085ad5cf69751eede6294385a905ca051 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 40469054b761c799c9bf10a2f274e2878e09d36f..8762c0b4ebf4a717e1e289ed81120399eb18ddbc 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 b1732eb71e32834a372579d65b74ea23f4a9ff62..0a9bd1061f0c3aa6ccd870c856e54d6bca8fbc42 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 9448be1bf4dd14fd364a4b12eb786b6d168391e6..1b8d080f8d0891be945ce7dc557d5754167523f7 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 = []>>