diff --git a/devTools/dictionary_wholeWords.txt b/devTools/dictionary_wholeWords.txt index 7bdbb1beb0b9e8a520b2b6da4726cae3a0ddb6a5..b5ca91de97c92400226a0e60679ca9d2141a0bf3 100644 --- a/devTools/dictionary_wholeWords.txt +++ b/devTools/dictionary_wholeWords.txt @@ -2558,6 +2558,7 @@ 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 60475b3f5518e152f0e1e9122160721101981545..459c47cba32830c0cd44b78b3a2dff1d6e0da477 100644 --- a/devTools/javaSanityCheck/htmlTags +++ b/devTools/javaSanityCheck/htmlTags @@ -31,6 +31,7 @@ html;1 i;1 img;0 input;0 +label;1 li;1 option;1 script;1 diff --git a/devTools/javaSanityCheck/ignoredVariables b/devTools/javaSanityCheck/ignoredVariables index 2e6547ebe5adcc84b611b2c086615b5eb07abc65..40469054b761c799c9bf10a2f274e2878e09d36f 100644 --- a/devTools/javaSanityCheck/ignoredVariables +++ b/devTools/javaSanityCheck/ignoredVariables @@ -15,7 +15,6 @@ STEWARD MILKMAID TEACHER MASTER -CONCUBINE BABY penthousePositions REST @@ -67,7 +66,6 @@ linkHandlers caption op unborn -currentEmployee childSurname;nurseryUpgrade facilityRemove boobsWombVolume;emptyDefaultRule;rule;removeImplant;changeImplant @@ -78,6 +76,13 @@ htmlFor call Possessive;PossessivePronoun generic;whip;burn;cutting;chain;exotic +CustomSlaveTrade +childNodes;margin +hArgs;firstChild +true +selector +missingLegs;missingArms;missingEyes +toy # # ...foo variables - maybe fixed later otherChoices diff --git a/devTools/javaSanityCheck/twineTags b/devTools/javaSanityCheck/twineTags index eade30ae2386169dc731f52152618fe4dc360f06..abcfaca173f3d8e270a1a4317d9f7355f44f8efa 100644 --- a/devTools/javaSanityCheck/twineTags +++ b/devTools/javaSanityCheck/twineTags @@ -7,6 +7,7 @@ # #twine tags capture;1 +click;1 continue;0 for;1 foreach;1 diff --git a/src/npc/fAbuse.tw b/src/npc/fAbuse.tw index 1fafed26dd3d5e526d87cbc620d8228c6be7f421..f4b419b4a610f8de078d53fcb9bd0c2b55aa418f 100644 --- a/src/npc/fAbuse.tw +++ b/src/npc/fAbuse.tw @@ -84,6 +84,7 @@ <<if !hasAnyArms($activeSlave)>> <<if $activeSlave.clothes != "no clothing">> You don't have the patience for $him to squirm $his way out of $his clothing, so you roughly extract $him from it, making sure that to treat $his clothes better than you do $him. + <</if>> <<else>> <<if $activeSlave.clothes != "no clothing" || $activeSlave.bellyAccessory != "none">> You tell $him $he has ten seconds to get naked. diff --git a/src/uncategorized/reShelterInspection.tw b/src/uncategorized/reShelterInspection.tw index 0ef82aa21a2e496985beaf9155663fc293bf196f..5b305171756e384d4508724aeacf6f9c7d94ef83 100644 --- a/src/uncategorized/reShelterInspection.tw +++ b/src/uncategorized/reShelterInspection.tw @@ -130,7 +130,21 @@ Not waiting to be greeted, the inspector looks up at the nearest camera and dema <<if $Bodyguard != 0 || $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>> <br><<link "Escort _him2 off your property">> <<replace "#result">> - You along with <<if $Bodyguard != 0>> your bodyguard <<print SlaveFullName($Bodyguard)>> <<if $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>> and<</if>> <<if mercenaries > 1 && ($SF.Toggle && $SF.Active >= 1)>>a squad of both $mercenariesTitle and $SF.Lower<<elseif $($SF.Toggle && $SF.Active >= 1)>>a squad of $SF.Lower<<elseif $mercenaries > 1>>a squad of $mercenariesTitle<</if>> forcefully escort the inspector off your property. You barely make it back to the penthouse before the message deeming you permanently banned from the Slave Shelter arrives. + You along with + <<if $Bodyguard != 0>> + your bodyguard <<print SlaveFullName($Bodyguard)>> + <<if $mercenaries > 1 || ($SF.Toggle && $SF.Active >= 1)>> + and + <</if>> + <</if>> + <<if mercenaries > 1 && ($SF.Toggle && $SF.Active >= 1)>> + a squad of both $mercenariesTitle and $SF.Lower + <<elseif $($SF.Toggle && $SF.Active >= 1)>> + a squad of $SF.Lower + <<elseif $mercenaries > 1>> + a squad of $mercenariesTitle + <</if>> + forcefully escort the inspector off your property. You barely make it back to the penthouse before the message deeming you permanently banned from the Slave Shelter arrives. <<set $shelterAbuse += 100>> <<set $nextButton = "Continue">><<UpdateNextButton>> /* unlock Continue button */ <</replace>> diff --git a/src/utility/descriptionWidgetsStyle.tw b/src/utility/descriptionWidgetsStyle.tw index 9882dbf7671909de0bbdb07543f6f1d04577915e..4f83cc1c722b6600c9810cb25ad19d173bca0cbb 100644 --- a/src/utility/descriptionWidgetsStyle.tw +++ b/src/utility/descriptionWidgetsStyle.tw @@ -904,7 +904,7 @@ $activeSlave.slaveName is <<else>> thong. <</if>> - + <<case "a courtesean dress">> with exposed shoulders, @@ -5005,9 +5005,9 @@ $His <<case "a courtesan dress">> <<switch $activeSlave.shoes>> <<case "flats">> - a elegant pair of dancing slippers. + an elegant pair of dancing slippers. <<case "boots">> - a elegant pair of heeled booties. + an elegant pair of heeled booties. <<case "heels">> an elegant pair of heels. <<case "pumps">>