diff --git a/sanityCheck.sh b/sanityCheck.sh index 9544ffe99889ef97cf08607fc96ca843184fb3fa..5de0388b504975009010087fde7938da592bfc9c 100755 --- a/sanityCheck.sh +++ b/sanityCheck.sh @@ -40,7 +40,7 @@ $GREP -e "<<.*[(][^<>)]*[(][^<>)]*)\?[^<>)]*>>" -- "src/*" | myprint "MissingClo # Check for too many >>>. e.g.: <</if>>> $GREP "<<[^<>]*[<>]\?[^<>]*>>>" -- "src/*.tw" | myprint "TooManyAngleBrackets" # Check for wrong capitalization on 'activeslave' and other common typos -$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeChild\|activeArcology\|activeOrgan\|activeLimbs\|activeUnits\|activeLurcher\)" -- "src/*" | myprint "WrongCapitalization" +$GREP -e "\$act" --and --not -e "\$\(activeSlave\|activeChild\|activeArcology\|activeOrgan\|activeLimbs\|activeUnits\|activeLurcher\|active\\.)" -- "src/*" | myprint "WrongCapitalization" # Check for strange spaces e.g. $slaves[$i]. lips $GREP "\$slaves\[\$i\]\. " -- 'src/*' | myprint "MissingPropertyAfterSlaves" # Check using refreshmentType instead of refreshment diff --git a/src/facilities/pit/pit.tw b/src/facilities/pit/pit.tw index b85be64c08069d22452909ce0e6495d6a4115bb9..e0ebcece67db665fb8dac13416878ac687a4265e 100644 --- a/src/facilities/pit/pit.tw +++ b/src/facilities/pit/pit.tw @@ -1,237 +1,3 @@ :: Pit [nobr jump-to-safe jump-from-safe] <<includeDOM App.Facilities.Pit.pit()>> - -/* - <<if $activeCanine != 0 || $activeHooved != 0 || $activeFeline != 0>> - - <<switch $activeCanine.breed>> - <<case "Beagle" "French Bulldog" "Poodle" "Yorkshire Terrier">> - <<set _animalEligible = 0>> - <<default>> - <<set _animalEligible = 1>> - <</switch>> - - <<if $pit.animalFights == 1>> - <br> - <<if $pit.lethal == 1>> - <<if $pit.animalType == $activeCanine.type>> - <<if $activeCanine.species != "dog">> - Your slave will fight a ''$activeCanine.species''. - $activeCanine.speciesCap - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]]<</if>> - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <</if>> - <<else>> - <<if _animalEligible == 1>> - Your slave will fight a ''$activeCanine.breed''. - $activeCanine.breed - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]]<</if>> - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <</if>> - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]]<</if>> - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <</if>> - <</if>> - <</if>> - <<elseif $pit.animalType == $activeHooved.type>> - Your slave will fight a ''$activeHooved.species''. - <<if _CL > 0>> - <<if $activeCanine.species != "dog">> - [["" + $activeCanine.speciesCap + ""|Pit][$pit.animalType = "canine"]] | - <<else>> - <<if _animalEligible == 1>> - [["" + $activeCanine.breed + ""|Pit][$pit.animalType = "canine"]] | - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// | - <</if>> - <</if>> - <</if>> - $activeHooved.speciesCap - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <</if>> - <<elseif $pit.animalType == $activeFeline.type>> - <<if $activeFeline.species != "cat">> - Your slave will fight a ''$activeFeline.species''. - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <<if _CL > 0>> - <<if $activeCanine.species != "dog">> - [["" + $activeCanine.speciesCap + ""|Pit][$pit.animalType = "canine"]] - <<else>> - <<if _animalEligible == 1>> - [["" + $activeCanine.breed + ""|Pit][$pit.animalType = "canine"]] - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// - <</if>> - <</if>> - <</if>> - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]] | <</if>> - <<if $activeFeline.species != "cat">> - $activeFeline.speciesCap - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <<else>> - Select an animal for your slave to fight. - <<if _CL > 0>> - <<if $activeCanine.species != "dog">> - [["" + $activeCanine.speciesCap + ""|Pit][$pit.animalType = "canine"]] - <<else>> - <<if _animalEligible == 1>> - [["" + $activeCanine.breed + ""|Pit][$pit.animalType = "canine"]] - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// - <</if>> - <</if>> - <</if>> - <<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>> - <<if _HL > 0>> - [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]] - <</if>> - <<if (_HL > 0 && _FL > 0)>> | <</if>> - <<if _FL > 0>> - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small for your slave to fight// - <</if>> - <</if>> - - <</if>> - <<elseif $pit.lethal == 0>> - <<if $pit.animalType == $activeCanine.type>> - <<if $activeCanine.species != "dog">> - Your slave will try to avoid being used by a ''$activeCanine.species''. - $activeCanine.speciesCap - <<else>> - <<if _animalEligible == 1>> - Your slave will try to avoid being used by a ''$activeCanine.breed''. - $activeCanine.breed - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]]<</if>> - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small to use your slave// - <</if>> - <</if>> - <<else>> - //<<print $activeCanine.breed>>s are too small to use your slave// - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]]<</if>> - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small to use your slave// - <</if>> - <</if>> - <</if>> - <</if>> - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]]<</if>> - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small to use your slave// - <</if>> - <</if>> - <<elseif $pit.animalType == $activeHooved.type>> - Your slave will try to avoid being used by a ''$activeHooved.species''. - <<if _CL > 0>> - <<if $activeCanine.species != "dog">> - [["" + $activeCanine.speciesCap + ""|Pit][$pit.animalType = "canine"]] | - <<else>> - <<if _animalEligible == 1>> - [["" + $activeCanine.breed + ""|Pit][$pit.animalType = "canine"]] | - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// | - <</if>> - <</if>> - <</if>> - $activeHooved.speciesCap - <<if _FL > 0>> | - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small to use your slave// - <</if>> - <</if>> - <<elseif $pit.animalType == $activeFeline.type>> - <<if $activeFeline.species != "cat">> - Your slave will try to avoid being used by a ''$activeFeline.species''. - <<else>> - //House cats are too small to use your slave// - <</if>> - <<if _CL > 0>> - <<if $activeCanine.species != "dog">> - [["" + $activeCanine.speciesCap + ""|Pit][$pit.animalType = "canine"]] - <<else>> - <<if _animalEligible == 1>> - [["" + $activeCanine.breed + ""|Pit][$pit.animalType = "canine"]] - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// - <</if>> - <</if>> - <</if>> - <<if _HL > 0>> | [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]] | <</if>> - <<if $activeFeline.species != "cat">> - $activeFeline.speciesCap - <<else>> - //House cats are too small to use your slave// - <</if>> - <<else>> - Select an animal for your slave to try to avoid. - <<if _CL > 0>> - <<if $activeCanine.species != "dog">> - [["" + $activeCanine.speciesCap + ""|Pit][$pit.animalType = "canine"]] - <<else>> - <<if _animalEligible == 1>> - [["" + $activeCanine.breed + ""|Pit][$pit.animalType = "canine"]] - <<else>> - //<<print $activeCanine.breed>>s are too small for your slave to fight// - <</if>> - <</if>> - <</if>> - <<if (_CL > 0 && _HL > 0) || (_CL > 0 && _FL > 0) || (_HL > 0 && _FL > 0)>> | <</if>> - <<if _HL > 0>> - [["" + $activeHooved.speciesCap + ""|Pit][$pit.animalType = "hooved"]] - <</if>> - <<if (_HL > 0 && _FL > 0)>> | <</if>> - <<if _FL > 0>> - <<if $activeFeline.species != "cat">> - [["" + $activeFeline.speciesCap + ""|Pit][$pit.animalType = "feline"]] - <<else>> - //House cats are too small to use your slave// - <</if>> - <</if>> - <</if>> - <</if>> - <<else>> - <<set $pit.animalType = 0>> - <</if>> - <</if>> -*/