From 615652066ee8af9f816755ca03e22cc67b87e3f6 Mon Sep 17 00:00:00 2001
From: DCoded <dcoded@live.com>
Date: Mon, 21 Jan 2019 23:31:11 -0500
Subject: [PATCH] Removed majority of old animals, added bulls and pigs
---
src/facilities/farmyard/farmyard.tw | 51 +-----------------
src/facilities/farmyard/farmyardAnimals.tw | 60 +++++++++++++++------
src/init/storyInit.tw | 2 +-
src/uncategorized/BackwardsCompatibility.tw | 2 +-
4 files changed, 47 insertions(+), 68 deletions(-)
diff --git a/src/facilities/farmyard/farmyard.tw b/src/facilities/farmyard/farmyard.tw
index 277aa7b0bb2..9cf58943067 100644
--- a/src/facilities/farmyard/farmyard.tw
+++ b/src/facilities/farmyard/farmyard.tw
@@ -74,55 +74,8 @@ $farmyardNameCaps is an oasis of growth in the midst of the jungle of steel and
$Farmer.slaveName is alone in $farmyardName, and has nothing to do but look after the animals and crops.
<<else>>
$farmyardNameCaps is empty and quiet. <<link "Decommission the Farmyard" "Main">>
- <<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardShows = 0, $farmyardBreeding = 0, $farmyardUpgrade = {
- pump: 0,
- fertilizer: 0,
- hydroponics: 0,
- machinery: 0,
- seeds: 0,
- lab: 0
- }, $farmyardLab = 0, $farmyardLabUpgrades = {
- animalOvaries: 0,
- animalTesticles: 0,
- animalMpreg: 0
- }, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = 0, $activeHooved = 0, $activeFeline = 0, $animalsBought = {
- canines: 0,
- hooved: 0,
- felines: 0,
- labradorRetrievers: 0,
- germanShepherds: 0,
- goldenRetrievers: 0,
- frenchBulldogs: 0,
- bulldogs: 0,
- beagles: 0,
- poodles: 0,
- rottweilers: 0,
- yorkshireTerriers: 0,
- siberianHuskies: 0,
- horses: 0,
- siameses: 0,
- persians: 0,
- maineCoons: 0,
- ragdolls: 0,
- bengals: 0,
- abbysinians: 0,
- birmans: 0,
- orientalShorthairs: 0,
- sphynxes: 0,
- russianBlues: 0,
- wolves: 0,
- foxes: 0,
- jackals: 0,
- dingos: 0,
- zebras: 0,
- cougars: 0,
- jaguars: 0,
- pumas: 0,
- lynx: 0,
- leopards: 0,
- lions: 0,
- tigers: 0
- }, $pitAnimal = 0, $pitAnimalType = 0, $canines = [], $hooved = [], $felines = []>>
+ <<set $farmyardName = "the Farmyard", $farmyard = 0, $farmyardSlaves = 0, $farmyardDecoration = "standard", $farmyardShows = 0, $farmyardBreeding = 0, $farmyardUpgrade = {pump: 0, fertilizer: 0, hydroponics: 0, machinery: 0, seeds: 0, lab: 0}, $farmyardLab = 0, $farmyardLabUpgrades = {animalOvaries: 0, animalTesticles: 0, animalMpreg: 0
+ }, $farmyardCrops = 0, $farmyardKennels = 0, $farmyardStable = 0, $farmyardCages = 0, $activeCanine = 0, $activeHooved = 0, $activeFeline = 0, $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, bulls: 0, pigs: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}, $pitAnimal = 0, $pitAnimalType = 0, $canines = [], $hooved = [], $felines = []>>
<<set _far = $sectors.findIndex(function(s) { return s.type == "Farmyard"; })>>
<<if _far != -1>>
<<set $sectors[_far].type = "Manufacturing">>
diff --git a/src/facilities/farmyard/farmyardAnimals.tw b/src/facilities/farmyard/farmyardAnimals.tw
index 18e327357b7..6488ae6678e 100644
--- a/src/facilities/farmyard/farmyardAnimals.tw
+++ b/src/facilities/farmyard/farmyardAnimals.tw
@@ -15,10 +15,10 @@
Dogs:
<br><br>
<<if $animalsBought.labradorRetrievers == 0>>
- <<link "Purchase Labrador Retrievers" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.labradorRetrievers = 1, $animalsBought.canines += 1, $canines.push("Labrador Retrievers")>><</link>>
+ <<link "Purchase dogs" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.labradorRetrievers = 1, $animalsBought.canines += 1, $canines.push("Labrador Retrievers")>><</link>>
<br>
<<elseif $animalsBought.labradorRetrievers == 1>>
- Labrador Retrievers
+ Dogs
<<if $activeCanine.breed != "Labrador Retriever">>
[[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dog", speciesCap: "Dog", speciesPlural: "dogs", breed: "Labrador Retriever", type: "canine", dickSize: "big", ballType: "dog"}]]
<<else>>
@@ -26,6 +26,7 @@
<</if>>
<br>
<</if>>
+ /*
<<if $animalsBought.germanShepherds == 0>>
<<link "Purchase German Shepherds" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.germanShepherds = 1, $animalsBought.canines += 1, $canines.push("German Shepherds")>><</link>>
<br>
@@ -135,7 +136,7 @@
<br>
<</if>>
<</if>>
-
+*/
<<if $farmyardStable > 0>>
<br>
@@ -150,11 +151,33 @@
<<else>>
//Set as active hooved//
<</if>>
+ <br>
+ <</if>>
+ <<if $animalsBought.bulls == 0>>
+ <<link "Purchase bulls" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.bulls = 1, $animalsBought.hooved += 1, $hooved.push("bulls")>><</link>>
+ <<elseif $animalsBought.bulls == 1>>
+ Bulls
+ <<if $activeHooved.species != "bull">>
+ [[Set as active hooved|FarmyardAnimals][$activeHooved = {species: "bull", speciesCap: "Bull", speciesPlural: "bulls", type: "hooved", dickSize: "huge", ballType: "horse"}]]
+ <<else>>
+ //Set as active hooved//
+ <</if>>
+ <br>
+ <</if>>
+ <<if $animalsBought.pigs == 0>>
+ <<link "Purchase pigs" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.pigs = 1, $animalsBought.hooved += 1, $hooved.push("pigs")>><</link>>
+ <<elseif $animalsBought.pigs == 1>>
+ Pigs
+ <<if $activeHooved.species != "pig">>
+ [[Set as active hooved|FarmyardAnimals][$activeHooved = {species: "pig", speciesCap: "Pig", speciesPlural: "pigs", type: "hooved", dickSize: "huge", ballType: "horse"}]]
+ <<else>>
+ //Set as active hooved//
+ <</if>>
+ <br>
<</if>>
- <br>
<</if>>
-
+/*
<<if $farmyardCages > 0>>
<br>
Cats:
@@ -281,14 +304,14 @@
<</if>>
<</if>>
<</if>>
-
+*/
<<if $farmyardKennels > 1 || $farmyardStable > 1 || $farmyardCages > 1>>
<br>
''Exotic Animals''
<hr>
-
+/*
<<if $farmyardKennels > 1>>
<br>
Canines:
@@ -297,7 +320,7 @@
<<link "Purchase wolves" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.wolves = 1, $animalsBought.canines += 1, $canines.push("wolves")>><</link>>
<br>
<<elseif $animalsBought.wolves == 1>>
- /*A couple of adult wolves are lounging about in their kennels.(OLD)*/
+ /*A couple of adult wolves are lounging about in their kennels.(OLD)*//*
Wolves
<<if $activeCanine.species != "wolf">>
[[Set as active canine|FarmyardAnimals][$activeCanine = {species: "wolf", speciesCap: "Wolf", speciesPlural: "wolves", type: "canine", dickSize: "large", ballType: "wolf"}]]
@@ -310,7 +333,7 @@
<<link "Purchase foxes" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.foxes = 1, $animalsBought.canines += 1, $canines.push("foxes")>><</link>>
<br>
<<elseif $animalsBought.foxes == 1>>
- /*Red foxes play in one corner of their kennels, chasing one another.(OLD)*/
+ /*Red foxes play in one corner of their kennels, chasing one another.(OLD)*//*
Foxes
<<if $activeCanine.species != "fox">>
[[Set as active canine|FarmyardAnimals][$activeCanine = {species: "fox", speciesCap: "Fox", speciesPlural: "foxes", type: "canine", dickSize: "large", ballType: "fox"}]]
@@ -323,7 +346,7 @@
<<link "Purchase jackals" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.jackals = 1, $animalsBought.canines += 1, $canines.push("jackals")>><</link>>
<br>
<<elseif $animalsBought.jackals == 1>>
- /*A group of male jackals are fighting over a potential mate, causing quite a ruckus.(OLD)*/
+ /*A group of male jackals are fighting over a potential mate, causing quite a ruckus.(OLD)*//*
Jackals
<<if $activeCanine.species != "jackal">>
[[Set as active canine|FarmyardAnimals][$activeCanine = {species: "jackal", speciesCap: "Jackal", speciesPlural: "jackals", type: "canine", dickSize: "large", ballType: "jackal"}]]
@@ -336,7 +359,7 @@
<<link "Purchase dingos" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(20000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.dingos = 1, $animalsBought.canines += 1, $canines.push("dingos")>><</link>>
<br>
<<elseif $animalsBought.dingos == 1>>
- /*The dingos are eating their meal, growling at each other when one gets to close to another's food.(OLD)*/
+ /*The dingos are eating their meal, growling at each other when one gets to close to another's food.(OLD)*//*
Dingos
<<if $activeCanine.species != "dingo">>
[[Set as active canine|FarmyardAnimals][$activeCanine = {species: "dingo", speciesCap: "Dingo", speciesPlural: "dingos", type: "canine", dickSize: "large", ballType: "dingo"}]]
@@ -364,17 +387,18 @@
<</if>>
<br>
<</if>>
-
+*/
<<if $farmyardCages > 1>>
<br>
Felines
<br><br>
+ /*
<<if $animalsBought.cougars == 0>>
<<link "Purchase cougars" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.cougars = 1, $animalsBought.felines += 1, $felines.push("cougars")>><</link>>
<br>
<<elseif $animalsBought.cougars == 1>>
- /*The cougars are sleeping, their lean bodies scattered around under trees. (OLD)*/
+ /*The cougars are sleeping, their lean bodies scattered around under trees. (OLD)*//*
Cougars
<<if $activeFeline.species != "cougar">>
[[Set as active feline|FarmyardAnimals][$activeFeline = {species: "cougar", speciesCap: "Cougar", speciesPlural: "cougars", type: "feline", dickSize: "large", ballType: "cougar"}]]
@@ -387,7 +411,7 @@
<<link "Purchase jaguars" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.jaguars = 1, $animalsBought.felines += 1, $felines.push("jaguars")>><</link>>
<br>
<<elseif $animalsBought.jaguars == 1>>
- /*You can see a few jaguars laying around in the trees in their enclosure. (OLD)*/
+ /*You can see a few jaguars laying around in the trees in their enclosure. (OLD)*//*
Jaguars
<<if $activeFeline.species != "jaguar">>
[[Set as active feline|FarmyardAnimals][$activeFeline = {species: "jaguar", speciesCap: "Jaguar", speciesPlural: "jaguars", type: "feline", dickSize: "large", ballType: "jaguar"}]]
@@ -400,7 +424,7 @@
<<link "Purchase lynxs" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.lynx = 1, $animalsBought.felines += 1, $felines.push("lynx")>><</link>>
<br>
<<elseif $animalsBought.lynx == 1>>
- /*The lynxes are playfully running around their enclosure. (OLD)*/
+ /*The lynxes are playfully running around their enclosure. (OLD)*//*
Lynx
<<if $activeFeline.species != "lynx">>
[[Set as active feline|FarmyardAnimals][$activeFeline = {species: "lynx", speciesCap: "Lynx", speciesPlural: "lynx", type: "feline", dickSize: "large", ballType: "lynx"}]]
@@ -413,7 +437,7 @@
<<link "Purchase leopards" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.leopards = 1, $animalsBought.felines += 1, $felines.push("leopards")>><</link>>
<br>
<<elseif $animalsBought.leopards == 1>>
- /*The leopards are lazing about in the trees in their enclosure. (OLD)*/
+ /*The leopards are lazing about in the trees in their enclosure. (OLD)*//*
Leopards
<<if $activeFeline.species != "leopard">>
[[Set as active feline|FarmyardAnimals][$activeFeline = {species: "leopard", speciesCap: "Leopard", speciesPlural: "leopards", type: "feline", dickSize: "large", ballType: "leopard"}]]
@@ -422,6 +446,7 @@
<</if>>
<br>
<</if>>
+ */
<<if $animalsBought.lions == 0>>
<<link "Purchase lions" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.lions = 1, $animalsBought.felines += 1, $felines.push("lions")>><</link>>
<br>
@@ -435,11 +460,12 @@
<</if>>
<br>
<</if>>
+ /*
<<if $animalsBought.tigers == 0>>
<<link "Purchase tigers" "FarmyardAnimals">><<set cashX(forceNeg(Math.trunc(30000*$upgradeMultiplierArcology)), "farmyard"), $animalsBought.tigers = 1, $animalsBought.felines += 1, $felines.push("tigers")>><</link>>
<br>
<<elseif $animalsBought.tigers == 1>>
- /*Some of the tigers are swimming, and the ones that aren't are lazing about. (OLD)*/
+ /*Some of the tigers are swimming, and the ones that aren't are lazing about. (OLD)*//*
Tigers
<<if $activeFeline.species != "tiger">>
[[Set as active feline|FarmyardAnimals][$activeFeline = {species: "tiger", speciesCap: "Tiger", speciesPlural: "tigers", type: "feline", dickSize: "large", ballType: "tiger"}]]
diff --git a/src/init/storyInit.tw b/src/init/storyInit.tw
index b844bc7ee67..8796b5143e6 100644
--- a/src/init/storyInit.tw
+++ b/src/init/storyInit.tw
@@ -620,7 +620,7 @@ DairyRestraintsSetting($dairyRestraintsSetting)
animalTesticles: 0,
animalMpreg: 0
}>>
-<<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
+<<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, bulls: 0, pigs: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
<<set $canines = []>>
<<set $hooved = []>>
<<set $felines = []>>
diff --git a/src/uncategorized/BackwardsCompatibility.tw b/src/uncategorized/BackwardsCompatibility.tw
index 2def6610b48..6b9929fa46d 100644
--- a/src/uncategorized/BackwardsCompatibility.tw
+++ b/src/uncategorized/BackwardsCompatibility.tw
@@ -841,7 +841,7 @@
}>>
<</if>>
<<if ndef $animalsBought>>
- <<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
+ <<set $animalsBought = {canines: 0, hooved: 0, felines: 0, labradorRetrievers: 0, germanShepherds: 0, goldenRetrievers: 0, frenchBulldogs: 0, bulldogs: 0, beagles: 0, poodles: 0, rottweilers: 0, yorkshireTerriers: 0, siberianHuskies: 0, horses: 0, bulls: 0, pigs: 0, siameses: 0, persians: 0, maineCoons: 0, ragdolls: 0, bengals: 0, abbysinians: 0, birmans: 0, orientalShorthairs: 0, sphynxes: 0, russianBlues: 0, wolves: 0, foxes: 0, jackals: 0, dingos: 0, zebras: 0, cougars: 0, jaguars: 0, pumas: 0, lynx: 0, leopards: 0, lions: 0, tigers: 0}>>
<</if>>
<<if ndef $canines>>
<<set $canines = []>>
--
GitLab