diff --git a/SanityCheck.jar b/SanityCheck.jar index 42a086d8c043eb99010faa0dfcca5dc778ad0e1d..1cb9790d50fd09037c2cbb81229ed229ad171df0 100644 Binary files a/SanityCheck.jar and b/SanityCheck.jar differ diff --git a/devTools/javaSanityCheck/excluded b/devTools/javaSanityCheck/excluded index 1b1e091323a74b93ccf8bfc7861906b967c6439e..28ff834dcbab00ca86653880aa605a6a64163fd2 100644 --- a/devTools/javaSanityCheck/excluded +++ b/devTools/javaSanityCheck/excluded @@ -12,5 +12,5 @@ src/uncategorized/costsBudget.tw src/uncategorized/initRules.tw src/uncategorized/slaveAssignmentsReport.tw src/uncategorized/storyCaption.tw -# -#reincluded later: +src/cheats/ +src/pregmod/customizeSlaveTrade.tw diff --git a/devTools/javaSanityCheck/htmlTags b/devTools/javaSanityCheck/htmlTags index c306acc52dd6141ea7b38abdf51725ce483645b0..608a30a5ff6648b7c873d6c41f6f6d794afbc757 100644 --- a/devTools/javaSanityCheck/htmlTags +++ b/devTools/javaSanityCheck/htmlTags @@ -1,6 +1,7 @@ #Allowed HTML tags #Effectively everything that is allowed in one of these statements like this: -#<tag>, <tag ???> or </tag> +#<tag> or <tag ???> +#when ;1 is specified it expects a matching closing tag like this: </tag> #Do not add Twine Tags here. #Characters outside of ASCII scope are not supported. # @@ -8,37 +9,37 @@ !-- http://www.gnu.org/licenses/ #html tags -a -b -blockquote -body -br -button -caption -center -dd -div -dl -dt -h1 -h2 -h3 -h4 -hr -html -i -img -input -li -option -script -select -span -strong -style -table -td -th -tr -tt -ul +a;1 +b;1 +blockquote;1 +body;1 +br;0 +button;1 +caption;1 +center;1 +dd;1 +div;1 +dl;1 +dt;1 +h1;1 +h2;1 +h3;1 +h4;1 +hr;1 +html;1 +i;1 +img;1 +input;1 +li;1 +option;1 +script;1 +select;1 +span;1 +strong;1 +style;1 +table;1 +td;1 +th;1 +tr;1 +tt;1 +ul;1 diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw index 84c46326557d1a0e48a88b846e0610fedf7e9e83..b44ac1f37449d5c9c73970c43d2728e1ae0fcbd5 100644 --- a/src/facilities/farmyard/farmyard.tw +++ b/src/facilities/farmyard/farmyard.tw @@ -105,7 +105,7 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and <br>It can support $farmyard farmhands. Currently there <<if $farmyardSlaves == 1>>is<<else>>are<</if>> $farmyardSlaves farmhand<<if $farmyardSlaves != 1>>s<</if>> at $farmyardName. [[Expand the farmyard|Farmyard][cashX(forceNeg(_Tmult0), "capEx"), $farmyard += 5, $PC.engineering += .1]] //Costs <<print cashFormat(_Tmult0)>> and will increase upkeep costs// -<span id="menials" +<span id="menials"> <br><br><br> <<if $farmMenials > 0>> Assigned here are $farmMenials slaves working to produce as much food as possible. diff --git a/src/uncategorized/RESS.tw b/src/uncategorized/RESS.tw index 871191a570e0d4f77e33e15235d9a198d3bec5c4..2a0980014e0d9b365d2d94388eb8d9724c3509dd 100644 --- a/src/uncategorized/RESS.tw +++ b/src/uncategorized/RESS.tw @@ -18460,7 +18460,7 @@ You tell $him kindly that you understand, and that $he'll be trained to address <<case "be the Schoolteacher">>($his office in $schoolroomName, where $he'll decide today's lesson), <<case "be the Stewardess">>($his office in $servantsQuartersName, where $he'll divvy out today's tasks), <<case "be the Milkmaid">>($dairyName, to check on the cattle), - <<case "be the Farmer">><<($farmyardName, to tend to the crops), + <<case "be the Farmer">>($farmyardName, to tend to the crops), <<case "be the Wardeness">>($cellblockName, to oversee the inmates), <<case "be your Concubine">>(your bed), <<case "be the Nurse">>($clinicName, to check on the patients),