From 688bb694dc83a56c115768ef6fd76447ec228417 Mon Sep 17 00:00:00 2001
From: Arkerthan <arkerthan@gmail.com>
Date: Mon, 24 Jun 2019 00:01:40 +0200
Subject: [PATCH] fixes
---
devTools/dictionary_wholeWords.txt | 1 -
devTools/javaSanityCheck/ignoredVariables | 5 ++---
src/uncategorized/costsBudget.tw | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/devTools/dictionary_wholeWords.txt b/devTools/dictionary_wholeWords.txt
index a16f94e0b94..f1763e84572 100644
--- a/devTools/dictionary_wholeWords.txt
+++ b/devTools/dictionary_wholeWords.txt
@@ -1692,7 +1692,6 @@ Godounov#Godunov
goign#going
gonig#going
Gothenberg#Gothenburg
-Gottleib#Gottlieb
gouvener#governor
govement#government
govenment#government
diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables
index 7c373d5de1f..eb8c25aa113 100644
--- a/devTools/javaSanityCheck/ignoredVariables
+++ b/devTools/javaSanityCheck/ignoredVariables
@@ -59,7 +59,6 @@ raw
minDomActionDelay
Categorizer
rest
-new
upgrade
W;O;L
FSCummunismDecoration;FSIncestFetishistDecoration;FSGenderFundamentalistResearch;FSPaternalistResearch;FSDegradationistResearch;FSBodyPuristResearch;FSMaturityPreferentialistResearch;FSPastoralistResearch;FSPhysicalIdealistResearch;FSRepopulationFocusResearch;FSRestartResearchPassed
@@ -69,7 +68,6 @@ mixedraceNationalities
nationalityPoolSelector
bimboSlaveNames
ArcologyNamesIntellectualDependency;ArcologyNamesSlaveProfessionalism;ArcologyNamesPetiteAdmiration;ArcologyNamesStatuesqueGlorification
-IntellectualDependency;SlaveProfessionalism;PetiteAdmiration;StatuesqueGlorification
Him
anCup
linkHandlers
@@ -81,10 +79,11 @@ childSurname;nurseryOldID;nurseryUpgrade
facilityRemove
boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant
assign;commit;sizingProcedures;Agent;thigh;breast;mouth
-normalRandInt
Std
neutral
htmlFor
+call
+storedButton
#
# ...foo variables - maybe fixed later
otherChoices
diff --git a/src/uncategorized/costsBudget.tw b/src/uncategorized/costsBudget.tw
index 8241dc87680..d498355ed04 100644
--- a/src/uncategorized/costsBudget.tw
+++ b/src/uncategorized/costsBudget.tw
@@ -161,7 +161,7 @@ for (var i = 0; i < State.variables.lastWeeksCashIncome.length; i++){
<<print budgetLine("masterSuite", "<<if $masterSuite>>[[Master Suite][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>Master Suite<</if>> ($masterSuiteSlaves slaves)")>>
- <<print budgetLine("school", "<<if $school>>[[$schoolroomNameCaps|Schoolroom][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$schoolroomNameCaps<</if>> ($schoolroomSlaves slaves)")>>
+ <<print budgetLine("school", "<<if $schoolroom>>[[$schoolroomNameCaps|Schoolroom][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$schoolroomNameCaps<</if>> ($schoolroomSlaves slaves)")>>
<<print budgetLine("spa", "<<if $spa>>[[$spaNameCaps|Spa][$nextButton = \"Back to Budget\", $nextLink = \"Costs Budget\"]]<<else>>$spaNameCaps<</if>> ($spaSlaves slaves)")>>
--
GitLab