Replace "canned pet food" with proper pet food in a can. (#32924)

CleverRaven · Aug 12, 2019 · aebf676 · aebf676
1 parent 940d759
commit aebf676
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 57 deletions.
diff --git a/data/json/item_groups.json b/data/json/item_groups.json
@@ -375,8 +375,8 @@
       [ "atomic_lamp", 1 ],
       [ "dog_whistle", 5 ],
       [ "pet_carrier", 2 ],
-      [ "dogfood_canned", 10 ],
-      [ "catfood_canned", 10 ],
+      { "item": "dogfood", "prob": 10, "container-item": "can_food" },
+      { "item": "catfood", "prob": 10, "container-item": "can_food" },
       [ "nic_gum", 2 ],
       [ "oxygen_tank", 2 ],
       [ "smoxygen_tank", 1 ],
@@ -614,8 +614,8 @@
       [ "coffeemaker", 10 ],
       [ "atomic_coffeepot", 2 ],
       [ "dog_whistle", 5 ],
-      [ "dogfood_canned", 20 ],
-      [ "catfood_canned", 20 ],
+      { "item": "dogfood", "prob": 20, "container-item": "can_food" },
+      { "item": "catfood", "prob": 20, "container-item": "can_food" },
       [ "salted_fish", 15 ],
       [ "charcoal", 5 ],
       [ "soap", 70 ],
@@ -1858,8 +1858,8 @@
       [ "jar_sauerkraut_pickled", 5 ],
       [ "sports_drink", 10 ],
       [ "protein_shake", 10 ],
-      [ "dogfood_canned", 5 ],
-      [ "catfood_canned", 5 ],
+      { "item": "dogfood", "prob": 5, "container-item": "can_food" },
+      { "item": "catfood", "prob": 5, "container-item": "can_food" },
       { "item": "fish_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
       [ "lutefisk", 1 ],
       [ "dry_beans", 40 ],

diff --git a/data/json/itemgroups/food.json b/data/json/itemgroups/food.json
@@ -48,6 +48,15 @@
       [ "dry_rice", 40 ]
     ]
   },
+  {
+    "id": "pet_food",
+    "type": "item_group",
+    "items": [
+      [ "birdfood", 10 ],
+      { "item": "dogfood", "prob": 45, "container-item": "can_food" },
+      { "item": "catfood", "prob": 45, "container-item": "can_food" }
+    ]
+  },
   {
     "type": "item_group",
     "id": "condiments",

diff --git a/data/json/itemgroups/locations.json b/data/json/itemgroups/locations.json
@@ -211,14 +211,20 @@
   {
     "id": "petstore_misc",
     "type": "item_group",
-    "items": [ [ "dogfood_canned", 35 ], [ "catfood_canned", 35 ], [ "birdfood", 15 ], [ "dog_whistle", 15 ], [ "flashlight", 5 ] ]
+    "items": [
+      { "item": "dogfood", "prob": 35, "container-item": "can_food" },
+      { "item": "catfood", "prob": 35, "container-item": "can_food" },
+      [ "birdfood", 15 ],
+      [ "dog_whistle", 15 ],
+      [ "flashlight", 5 ]
+    ]
   },
   {
     "id": "petstore_shelves",
     "type": "item_group",
     "items": [
-      [ "dogfood_canned", 30 ],
-      [ "catfood_canned", 30 ],
+      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "can_tuna", 15 ],
       [ "can_chicken", 15 ],
@@ -846,8 +852,8 @@
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
       [ "petpack", 3 ],
-      [ "dogfood_canned", 30 ],
-      [ "catfood_canned", 30 ],
+      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 10 ],
       [ "towel", 20 ],
       [ "soap", 10 ],

diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -600,17 +600,6 @@
     "flags": [ "LUPINE" ],
     "use_action": "DOGFOOD"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "dogfood_canned",
-    "name": "canned dogfood",
-    "name_plural": "canned dogfood",
-    "copy-from": "dogfood",
-    "color": "light_gray",
-    "container": "can_food",
-    "description": "Canned food for dogs. Keeps the food preserved, not that the dogs care.",
-    "price": 400
-  },
   {
     "id": "catfood",
     "type": "COMESTIBLE",
@@ -634,17 +623,6 @@
     "flags": [ "FELINE" ],
     "use_action": "CATFOOD"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "catfood_canned",
-    "name": "canned catfood",
-    "name_plural": "canned catfood",
-    "copy-from": "catfood",
-    "color": "light_gray",
-    "container": "can_food",
-    "description": "Canned food for cats. Keeps the food preserved, not that the cats care about you.",
-    "price": 400
-  },
   {
     "type": "COMESTIBLE",
     "id": "grass",

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -198,6 +198,18 @@
     "type": "MIGRATION",
     "replace": "jackhammer"
   },
+  {
+    "id": "dogfood_canned",
+    "type": "MIGRATION",
+    "replace": "can_food",
+    "contents": [ "dogfood" ]
+  },
+  {
+    "id": "catfood_canned",
+    "type": "MIGRATION",
+    "replace": "can_food",
+    "contents": [ "catfood" ]
+  },
   {
     "id": "jar_V8",
     "type": "MIGRATION",

diff --git a/data/json/mapgen/animalshelter.json b/data/json/mapgen/animalshelter.json
@@ -36,8 +36,8 @@
     "items": [
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
-      [ "dogfood_canned", 50 ],
-      [ "catfood_canned", 50 ],
+      { "item": "dogfood", "prob": 50, "container-item": "can_food" },
+      { "item": "catfood", "prob": 50, "container-item": "can_food" },
       [ "towel", 20 ],
       [ "soap", 10 ],
       [ "gloves_medical", 20 ],

diff --git a/data/json/mapgen/petstore.json b/data/json/mapgen/petstore.json
@@ -134,15 +134,8 @@
     "object": {
       "fill_ter": "t_floor",
       "place_item": [
-        { "item": "catfood_canned", "repeat": 1, "x": 8, "y": 7 },
-        { "item": "catfood_canned", "repeat": 1, "x": 8, "y": 8 },
         { "item": "pet_carrier", "repeat": 1, "x": 21, "y": 9 },
-        { "item": "dogfood_canned", "repeat": 1, "x": 8, "y": 10 },
         { "item": "pet_carrier", "repeat": 1, "x": 21, "y": 10 },
-        { "item": "dogfood_canned", "repeat": 1, "x": 8, "y": 11 },
-        { "item": "dogfood_canned", "repeat": 1, "x": 15, "y": 12 },
-        { "item": "catfood_canned", "repeat": 1, "x": 16, "y": 12 },
-        { "item": "catfood_canned", "repeat": 1, "x": 17, "y": 12 },
         { "item": "pet_carrier", "repeat": 1, "x": 8, "y": 14 },
         { "item": "bathroom_scale", "x": 21, "y": 19 }
       ],

diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json
@@ -576,7 +576,7 @@
   {
     "id": "prison_canine_food",
     "type": "item_group",
-    "items": [ [ "dogfood_canned", 100 ] ]
+    "items": [ { "item": "dogfood", "prob": 100, "container-item": "can_food" } ]
   },
   {
     "id": "prison_canine_bowl",

diff --git a/data/json/npcs/items_generic.json b/data/json/npcs/items_generic.json
@@ -416,7 +416,7 @@
       [ "canteen", 5 ],
       [ "carpentry_book", 1 ],
       [ "carrot", 3 ],
-      [ "catfood_canned", 3 ],
+      { "item": "catfood", "prob": 3, "container-item": "can_food" },
       [ "cell_phone", 5 ],
       [ "smart_phone", 15 ],
       [ "ceramic_armor", 1 ],
@@ -494,7 +494,7 @@
       [ "diveknife", 1 ],
       [ "diving_watch", 1 ],
       [ "dog_whistle", 3 ],
-      [ "dogfood_canned", 3 ],
+      { "item": "dogfood", "prob": 3, "container-item": "can_food" },
       [ "doublespeargun", 1 ],
       [ "drink_boozeberry", 1 ],
       [ "drink_rumcola", 1 ],

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
@@ -909,7 +909,7 @@
   },
   {
     "type": "recipe",
-    "result": "dogfood_canned",
+    "result": "dogfood",
     "id_suffix": "jarred",
     "byproducts": [ [ "water", 10 ] ],
     "container": "jar_glass_sealed",
@@ -932,14 +932,15 @@
   },
   {
     "type": "recipe",
-    "result": "dogfood_canned",
+    "result": "dogfood",
     "id_suffix": "canned",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
     "difficulty": 5,
     "time": "24 m",
     "autolearn": true,
+    "contained": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [
       { "id": "SAW_M", "level": 1 },
@@ -958,7 +959,7 @@
   },
   {
     "type": "recipe",
-    "result": "dogfood_canned",
+    "result": "dogfood",
     "id_suffix": "jarred_3l",
     "byproducts": [ [ "water", 10 ] ],
     "container": "jar_3l_glass_sealed",
@@ -994,7 +995,7 @@
   },
   {
     "type": "recipe",
-    "result": "catfood_canned",
+    "result": "catfood",
     "id_suffix": "jarred",
     "byproducts": [ [ "water", 10 ] ],
     "container": "jar_glass_sealed",
@@ -1012,14 +1013,15 @@
   },
   {
     "type": "recipe",
-    "result": "catfood_canned",
+    "result": "catfood",
     "id_suffix": "canned",
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_OTHER",
     "skill_used": "cooking",
     "difficulty": 5,
     "time": "24 m",
     "autolearn": true,
+    "contained": true,
     "batch_time_factors": [ 83, 5 ],
     "qualities": [
       { "id": "SAW_M", "level": 1 },
@@ -1037,7 +1039,7 @@
   },
   {
     "type": "recipe",
-    "result": "catfood_canned",
+    "result": "catfood",
     "id_suffix": "jarred_3l",
     "byproducts": [ [ "water", 10 ] ],
     "container": "jar_3l_glass_sealed",

diff --git a/data/json/vehicles/emergency.json b/data/json/vehicles/emergency.json
@@ -1187,9 +1187,7 @@
     "items": [
       { "x": 0, "y": 1, "chance": 14, "items": [ "dog_whistle" ] },
       { "x": -2, "y": 0, "chance": 7, "item_groups": [ "cop_gear" ] },
-      { "x": -2, "y": 0, "chance": 4, "items": [ "dogfood_canned" ] },
       { "x": -2, "y": 1, "chance": 7, "item_groups": [ "cop_gear" ] },
-      { "x": -2, "y": 1, "chance": 4, "items": [ "dogfood_canned" ] },
       { "x": -3, "y": 0, "chance": 10, "items": [ "blanket" ] },
       { "x": -3, "y": 1, "chance": 10, "items": [ "blanket" ] }
     ]

diff --git a/data/json/vehicles/trucks.json b/data/json/vehicles/trucks.json
@@ -891,10 +891,10 @@
       { "x": -2, "y": 1, "chance": 20, "items": [ "blanket" ] },
       { "x": -3, "y": 0, "chance": 20, "items": [ "blanket" ] },
       { "x": -3, "y": 1, "chance": 20, "items": [ "blanket" ] },
-      { "x": -4, "y": 0, "chance": 10, "items": [ "catfood" ] },
-      { "x": -4, "y": 0, "chance": 10, "items": [ "dogfood_canned" ] },
-      { "x": -4, "y": 1, "chance": 10, "items": [ "catfood_canned" ] },
-      { "x": -4, "y": 1, "chance": 10, "items": [ "dogfood_canned" ] },
+      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_food" } },
+      { "x": -4, "y": 0, "chance": 10, "items": { "item": "dog_food", "container-item": "can_food" } },
+      { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } },
+      { "x": -4, "y": 1, "chance": 10, "items": { "item": "cat_food", "container-item": "can_food" } },
       { "x": -4, "y": 0, "chance": 3, "items": [ "beartrap" ] }
     ]
   }