Merge pull request #76090 from Karol1223/destroy-generic-egg

Remove generic bird egg, replace its role with chicken egg
CleverRaven · Sep 1, 2024 · 0527e71 · 0527e71
2 parents 2b4fa4b + f862808
commit 0527e71
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 99 deletions.
diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json
@@ -1,11 +1,11 @@
 [
   {
     "type": "COMESTIBLE",
-    "id": "egg_bird",
-    "name": { "str": "bird egg" },
+    "id": "egg_chicken",
+    "name": { "str": "chicken egg" },
     "weight": "50 g",
     "color": "brown",
-    "spoils_in": "10 days",
+    "spoils_in": "11 days",
     "comestible_type": "FOOD",
     "symbol": "o",
     "quench": 4,
@@ -17,24 +17,14 @@
     "volume": "50 ml",
     "fun": -8,
     "flags": [ "FREEZERBURN", "RAW" ],
-    "rot_spawn": "GROUP_EGG_BIRD_WILD",
-    "vitamins": [ [ "iron", "900 μg" ], [ "calcium", "28 mg" ], [ "egg_allergen", 1 ] ],
-    "rot_spawn_chance": 50
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_chicken",
-    "name": { "str": "chicken egg" },
-    "spoils_in": "11 days",
-    "copy-from": "egg_bird",
     "rot_spawn": "GROUP_EGG_CHICKEN",
+    "vitamins": [ [ "iron", "900 μg" ], [ "calcium", "28 mg" ], [ "egg_allergen", 1 ] ],
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_bird_unfert",
-    "copy-from": "egg_bird",
-    "looks_like": "egg_bird",
+    "copy-from": "egg_chicken",
     "name": { "str": "unfertilized bird egg" },
     "description": "A nutritious egg laid by a bird.  This one is unfertilized and probably from a farm.",
     "rot_spawn_chance": 0
@@ -978,7 +968,7 @@
   {
     "type": "COMESTIBLE",
     "id": "rehydrated_eggs",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "name": { "str_sp": "rehydrated egg" },
     "color": "yellow",
     "symbol": "%",

diff --git a/data/json/monstergroups/eggs.json b/data/json/monstergroups/eggs.json
@@ -1,23 +1,4 @@
 [
-  {
-    "name": "GROUP_EGG_BIRD_WILD",
-    "type": "monstergroup",
-    "default": "mon_grouse_chick",
-    "monsters": [
-      { "monster": "mon_grouse_chick", "weight": 50 },
-      { "monster": "mon_chicken_chick", "weight": 100 },
-      { "monster": "mon_turkey_chick", "weight": 250 },
-      { "monster": "mon_pheasant_chick", "weight": 250 },
-      { "monster": "mon_duck_chick", "weight": 150 },
-      { "monster": "mon_crow_chick", "weight": 40 },
-      { "monster": "mon_raven_chick", "weight": 40 },
-      { "monster": "mon_bluejay_chick", "weight": 15 },
-      { "monster": "mon_cardinal_chick", "weight": 15 },
-      { "monster": "mon_sparrow_chick", "weight": 15 },
-      { "monster": "mon_goose_canadian_chick", "weight": 100 },
-      { "monster": "mon_goose_chick", "weight": 100 }
-    ]
-  },
   {
     "name": "GROUP_EGG_CHICKEN",
     "type": "monstergroup",

diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json
@@ -70,7 +70,6 @@
     "//": "All of the different bird eggs",
     "components": [
       [
-        [ "egg_bird", 1 ],
         [ "egg_bird_unfert", 1 ],
         [ "egg_chicken", 1 ],
         [ "egg_grouse", 1 ],

diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json
@@ -3,7 +3,7 @@
     "type": "COMESTIBLE",
     "id": "egg_dino",
     "name": "dinosaur egg",
-    "looks_like": "egg_bird",
+    "looks_like": "egg_chicken",
     "weight": "2 kg",
     "color": "green",
     "spoils_in": "32 days",
@@ -58,7 +58,7 @@
     "type": "COMESTIBLE",
     "id": "egg_dino_theropod",
     "name": "dinosaur egg",
-    "looks_like": "egg_bird",
+    "looks_like": "egg_chicken",
     "weight": "2 kg",
     "color": "green",
     "spoils_in": "32 days",
@@ -82,7 +82,7 @@
     "id": "egg_dino_theropod_small",
     "name": "small dinosaur egg",
     "copy-from": "egg_dino_small",
-    "looks_like": "egg_bird",
+    "looks_like": "egg_chicken",
     "comestible_type": "FOOD",
     "description": "Pale, football-shaped egg laid by a smaller dinosaur.",
     "material": [ "egg" ],
@@ -94,7 +94,7 @@
     "id": "egg_dino_theropod_large",
     "name": "large dinosaur egg",
     "copy-from": "egg_dino",
-    "looks_like": "egg_bird",
+    "looks_like": "egg_chicken",
     "weight": "4 kg",
     "comestible_type": "FOOD",
     "calories": 5200,
@@ -752,21 +752,21 @@
     "type": "COMESTIBLE",
     "id": "egg_dimorphodon",
     "name": "dimorphodon egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_dimorphodon"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_pteranodon",
     "name": "pteranodon egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_pteranodon"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_quetzalcoatlus",
     "name": "quetzalcoatlus egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_quetzalcoatlus"
   },
   {

diff --git a/data/mods/Megafauna/items/animal_products.json b/data/mods/Megafauna/items/animal_products.json
@@ -22,7 +22,7 @@
     "type": "COMESTIBLE",
     "id": "egg_auk",
     "name": { "str": "great auk egg" },
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "An egg laid by a great auk.  Prized for its big, nutritious yolk.",
     "quench": 9,
     "calories": 140,
@@ -33,7 +33,7 @@
     "type": "COMESTIBLE",
     "id": "egg_titanis_walleri",
     "name": { "str": "titanis walleri egg" },
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "A large egg laid by a titanis walleri.  Prized for its big, nutritious yolk.",
     "quench": 14,
     "calories": 2100,

diff --git a/data/mods/MindOverMatter/recipes/recipe_requirements.json b/data/mods/MindOverMatter/recipes/recipe_requirements.json
@@ -83,33 +83,6 @@
   {
     "id": "eggs_bird",
     "type": "requirement",
-    "//": "All of the different bird eggs. Extended from the original, requirements don't support \"copy-from\" without throwing a minor error on game loading.",
-    "components": [
-      [
-        [ "egg_bird", 1 ],
-        [ "egg_bird_unfert", 1 ],
-        [ "egg_chicken", 1 ],
-        [ "egg_grouse", 1 ],
-        [ "egg_crow", 1 ],
-        [ "egg_raven", 1 ],
-        [ "egg_bluejay", 1 ],
-        [ "egg_cardinal", 1 ],
-        [ "egg_robin", 1 ],
-        [ "egg_sparrow", 2 ],
-        [ "egg_duck", 1 ],
-        [ "egg_goose_canadian", 1 ],
-        [ "egg_turkey", 1 ],
-        [ "egg_pheasant", 1 ],
-        [ "egg_cockatrice", 1 ],
-        [ "egg_goose", 1 ],
-        [ "egg_goose_golden", 1 ],
-        [ "egg_hummingbird", 5 ],
-        [ "egg_woodpecker", 5 ],
-        [ "egg_coot", 1 ],
-        [ "egg_cormorant", 1 ],
-        [ "egg_moorhen", 1 ],
-        [ "egg_grebe", 1 ]
-      ]
-    ]
+    "extend": { "components": [ [ [ "egg_cockatrice", 1 ] ] ] }
   }
 ]
diff --git a/data/mods/TEST_DATA/items.json b/data/mods/TEST_DATA/items.json
@@ -1740,9 +1740,7 @@
     "fun": -8,
     "//": "Omitting the RAW flag so calories will be taken at face value.",
     "flags": [ "FREEZERBURN" ],
-    "rot_spawn": "GROUP_EGG_BIRD_WILD",
-    "vitamins": [ [ "calcium", 3 ], [ "iron", 4 ], [ "egg_allergen", 1 ] ],
-    "rot_spawn_chance": 98
+    "vitamins": [ [ "calcium", 3 ], [ "iron", 4 ], [ "egg_allergen", 1 ] ]
   },
   {
     "type": "COMESTIBLE",

diff --git a/data/mods/TropiCataclysm/items/comestibles/egg.json b/data/mods/TropiCataclysm/items/comestibles/egg.json
@@ -3,7 +3,7 @@
     "type": "COMESTIBLE",
     "id": "egg_guinea_fowl",
     "name": "guinea fowl egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_GUINEA_FOWL",
     "rot_spawn_chance": 70
   },
@@ -73,95 +73,95 @@
     "type": "COMESTIBLE",
     "id": "egg_tinamou",
     "name": "tinamou egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_TINAMOU",
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_seriema",
     "name": "seriema egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_SERIEMA",
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_chachalaca",
     "name": "chachalaca egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_CHACHALACA",
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_guan",
     "name": "guan egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_GUAN",
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_curassow",
     "name": "curassow egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "rot_spawn": "GROUP_EGG_CURASSOW",
     "rot_spawn_chance": 70
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_constrictor",
     "name": "snake egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The egg of a tropical snake.",
     "rot_spawn": "GROUP_EGG_CONSTRICTOR"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_lizard",
     "name": "lizard egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The egg of a tropical lizard.",
     "rot_spawn": "GROUP_EGG_LIZARD"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_monitor",
     "name": "varanid egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The egg of a monitor lizard.",
     "rot_spawn": "GROUP_EGG_MONITOR"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_iguana",
     "name": "iguana egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The egg of an iguana.",
     "rot_spawn": "GROUP_EGG_IGUANA"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_turtle",
     "name": "turtle egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The round egg of a turtle.  It is covered in leaves.",
     "rot_spawn": "GROUP_EGG_TURTLE"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_snapper",
     "name": "iguana egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The round egg of a snapping turtle.  It is covered in mud.",
     "rot_spawn": "GROUP_EGG_IGUANA"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_tortoise",
     "name": "iguana egg",
-    "copy-from": "egg_bird",
+    "copy-from": "egg_chicken",
     "description": "The round egg of a tortoise.  It is covered in dirt.",
     "rot_spawn": "GROUP_EGG_IGUANA"
   },

diff --git a/data/mods/TropiCataclysm/monstergroups/eggs.json b/data/mods/TropiCataclysm/monstergroups/eggs.json
@@ -1,14 +1,4 @@
 [
-  {
-    "name": "GROUP_EGG_BIRD_WILD",
-    "type": "monstergroup",
-    "default": "mon_guinea_fowl_chick",
-    "monsters": [
-      { "monster": "mon_guinea_fowl_chick", "weight": 1 },
-      { "monster": "mon_quail_chick", "weight": 2 },
-      { "monster": "mon_rhea_chick", "weight": 5 }
-    ]
-  },
   {
     "name": "GROUP_EGG_GUINEA_FOWL",
     "type": "monstergroup",