From 931660ce873ffd1af543ecf32dfa464f2f08aa06 Mon Sep 17 00:00:00 2001 From: DCoded <dcoded@live.com> Date: Mon, 10 Dec 2018 21:18:28 -0500 Subject: [PATCH] Setup for zoo facility --- src/facilities/farmyard/zoo.tw | 5 +++++ src/init/storyInit.tw | 2 ++ src/pregmod/beastFucked.tw | 2 +- src/uncategorized/BackwardsCompatibility.tw | 4 ++++ src/uncategorized/markets.tw | 6 ++++++ 5 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 src/facilities/farmyard/zoo.tw diff --git a/src/facilities/farmyard/zoo.tw b/src/facilities/farmyard/zoo.tw new file mode 100644 index 00000000000..b481bcba112 --- /dev/null +++ b/src/facilities/farmyard/zoo.tw @@ -0,0 +1,5 @@ +:: Zoo [nobr] + +<<set $nextButton = "Back", $nextLink = "Main">> + +//This is still WIP// \ No newline at end of file diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw index d6554c0ba41..79c9caf74b7 100644 --- a/src/init/storyInit.tw +++ b/src/init/storyInit.tw @@ -591,6 +591,8 @@ DairyRestraintsSetting($dairyRestraintsSetting) <<set $farmyardName = "the Farmyard">> <<set $farmyardNameCaps = "The Farmyard">> +<<set $zoo = 0>> + <<set $HGSuite = 0>> <<set $HGSuiteSlaves = 0>> <<set $HGSuiteSurgery = 1>> diff --git a/src/pregmod/beastFucked.tw b/src/pregmod/beastFucked.tw index eaa5c784785..c519fa1ef39 100644 --- a/src/pregmod/beastFucked.tw +++ b/src/pregmod/beastFucked.tw @@ -40,7 +40,7 @@ <</if>> <<if canWalk($activeSlave)>> - You call $him over and tell $him you want to watch $him <<switch _sexAct>><<case "vaginal" "anal">>get fucked by<<case "oral">>suck off<</switch>> a _animal.species. + You call $him over and tell $him you want to watch $him <<switch _sexAct>><<case "vaginal" "anal">>get fucked by<<case "oral">>suck off<</switch>> a _animal.species. /* TODO: this WILL cause grammatical errors with animal species that begin with a vowel */ <<else>> You order another slave to bring $activeSlave.slaveName over. Once $he is situated, you tell $him that you want to watch $him <<switch _sexAct>><<case "vaginal" "anal">>get fucked by<<case "oral">>suck off<</switch>> a _animal.species. <</if>> diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw index 490a8f183aa..7ce200db08d 100644 --- a/src/uncategorized/BackwardsCompatibility.tw +++ b/src/uncategorized/BackwardsCompatibility.tw @@ -888,6 +888,10 @@ <<unset $boughtTigers>> <</if>> +<<if ndef $zoo>> + <<set $zoo = 0>> +<</if>> + <<if ndef $clinicUpgradePurge>> <<set $clinicUpgradePurge = 0>> diff --git a/src/uncategorized/markets.tw b/src/uncategorized/markets.tw index 1b6ff9a4f07..f07e34e4384 100644 --- a/src/uncategorized/markets.tw +++ b/src/uncategorized/markets.tw @@ -18,6 +18,12 @@ This is an area of the concourse occupied by large stores and markets, many of w //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// <</if>> +<<if $zoo == 0 && $farmyard > 0>> + <br> + [[Construct a zoo to house and show off exotic animals|Main][$cash -= Math.trunc(10000*upgradeMultiplierArcology), $zoo = 5, $sectors[$AS].type = "Zoo"]] + //Costs <<print cashFormat(Math.trunc(10000*$upgradeMultiplierArcology))>>// +<</if>> + <<if $secExp == 1 && $transportHub == 0>> <br> [[Centralize and modernize the transport hub|Main][$cash -= Math.trunc(10000*$upgradeMultiplierArcology), $transportHub = 1, $sectors[$AS].type = "transportHub", $docks = 1, $railway = 1, $airport = 1]] -- GitLab