goat (#55870)

Co-authored-by: Jianxiang Wang (王健翔) <[email protected]>
CleverRaven · Mar 8, 2022 · 1954c2b · 1954c2b
1 parent debe92d
commit 1954c2b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -208,6 +208,7 @@
       { "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "28 days", "pack_size": [ 1, 6 ] },
       { "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "90 days", "pack_size": [ 1, 6 ] },
       { "monster": "mon_sheep", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
+      { "monster": "mon_goat", "weight": 25, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "3 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "7 days", "pack_size": [ 1, 5 ] },
       { "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "28 days", "pack_size": [ 1, 5 ] },
@@ -277,6 +278,7 @@
       { "monster": "mon_horse", "weight": 10 },
       { "monster": "mon_pig", "weight": 10 },
       { "monster": "mon_sheep", "weight": 10 },
+      { "monster": "mon_goat", "weight": 10 },
       { "monster": "mon_lemming", "weight": 10 }
     ]
   },

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -2314,7 +2314,7 @@
     "id": "mon_sheep_lamb",
     "type": "MONSTER",
     "name": { "str": "lamb" },
-    "description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated.  Its body is covered in a thick layer of wool, and the males have long, spiraling horns.",
+    "description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated.  Its body is covered in a thick layer of wool.",
     "default_faction": "herbivore",
     "bodytype": "dog",
     "categories": [ "WILDLIFE" ],
@@ -2376,6 +2376,39 @@
     "petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you!  It lets you pat its head and seems friendly." },
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ]
   },
+  {
+    "id": "mon_goat_kid",
+    "type": "MONSTER",
+    "name": { "ctxt": "goat", "str": "kid" },
+    "copy-from": "mon_sheep_lamb",
+    "description": "A hooved browsing mammal known for climbing and eating just about anything.  The young are famously cute and cuddly.",
+    "symbol": "g",
+    "looks_like": "mon_goat",
+    "dodge": 3,
+    "upgrades": { "age_grow": 240, "into": "mon_goat" },
+    "//": "Puberty reached in 6-9 months."
+  },
+  {
+    "id": "mon_goat",
+    "type": "MONSTER",
+    "name": { "str": "goat" },
+    "copy-from": "mon_sheep",
+    "description": "A hooved browsing mammal known for climbing and eating just about anything.  Either gender can have horns.",
+    "volume": "75 L",
+    "weight": "75 kg",
+    "hp": 80,
+    "speed": 200,
+    "symbol": "g",
+    "color": "white",
+    "dodge": 3,
+    "shearing": [ { "result": "wool_staple", "amount": 5 } ],
+    "harvest": "mammal_large_wool",
+    "reproduction": { "baby_monster": "mon_goat_kid", "baby_count": 1, "baby_timer": 275 },
+    "//": "Timer copied from sheep",
+    "baby_flags": [ "SPRING" ],
+    "special_attacks": [ [ "EAT_CROP", 100 ] ],
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE", "CLIMBS" ]
+  },
   {
     "id": "mon_squirrel",
     "type": "MONSTER",