Remove food temperature

cataclysmbnteam · Jun 15, 2020 · a58076c · a58076c
1 parent 0718323
commit a58076c
Show file tree

Hide file tree

Showing 49 changed files with 110 additions and 1,726 deletions.
diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -79,11 +79,6 @@
     "id": "BOLTCUTTERS",
     "name": { "str": "Cut bolts or wires" }
   },
-  {
-    "type": "item_action",
-    "id": "HOTPLATE",
-    "name": { "str": "Heat up food (with it)" }
-  },
   {
     "type": "item_action",
     "id": "TOOLMOD_ATTACH",
@@ -569,16 +564,6 @@
     "id": "HAIRKIT",
     "name": { "str": "Trim the hair" }
   },
-  {
-    "type": "item_action",
-    "id": "HEATPACK",
-    "name": { "str": "Use" }
-  },
-  {
-    "type": "item_action",
-    "id": "HEAT_FOOD",
-    "name": { "str": "Heat up food (in it)" }
-  },
   {
     "type": "item_action",
     "id": "HONEYCOMB",

diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
@@ -116,7 +116,6 @@
     "to_hit": 1,
     "price": 4500,
     "price_postapoc": 10,
-    "use_action": "HEAT_FOOD",
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
@@ -690,7 +689,6 @@
     "color": "dark_gray",
     "container_data": { "contains": "25 L", "watertight": true },
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
-    "use_action": "HEAT_FOOD",
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
   {
@@ -762,8 +760,7 @@
     "symbol": ")",
     "color": "light_gray",
     "container_data": { "contains": "1 L", "watertight": true },
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": "HEAT_FOOD"
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
   },
   {
     "id": "pot_makeshift_copper",
@@ -781,8 +778,7 @@
     "symbol": ")",
     "color": "light_red",
     "container_data": { "contains": "1 L", "watertight": true },
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": "HEAT_FOOD"
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
@@ -956,7 +956,7 @@
     "turns_per_charge": 300,
     "revert_to": "hobo_stove",
     "use_action": [
-      "HOTPLATE",
+      "cauterize",
       {
         "target": "hobo_stove",
         "msg": "The ember is extinguished.",
@@ -1261,7 +1261,6 @@
     "color": "dark_gray",
     "container_data": { "contains": "1500 ml", "watertight": true },
     "qualities": [ [ "COOK", 2 ], [ "BOIL", 1 ], [ "CONTAIN", 1 ] ],
-    "use_action": "HEAT_FOOD",
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
   {

diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
@@ -164,7 +164,7 @@
     "initial_charges": 50,
     "max_charges": 50,
     "charges_per_use": 1,
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "clay_pot",
@@ -182,7 +182,6 @@
     "color": "brown",
     "container_data": { "contains": "2 L", "watertight": true },
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
-    "use_action": "HEAT_FOOD",
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
   {
@@ -234,7 +233,7 @@
     "ammo": "battery",
     "charges_per_use": 10,
     "qualities": [ [ "BOIL", 1 ] ],
-    "use_action": "HOTPLATE",
+    "use_action": "cauterize",
     "magazines": [
       [
         "battery",
@@ -309,7 +308,7 @@
     "initial_charges": 50,
     "max_charges": 50,
     "charges_per_use": 1,
-    "use_action": [ "HOTPLATE", "HEAT_FOOD" ]
+    "use_action": [ "cauterize" ]
   },
   {
     "id": "flask_yeast",
@@ -382,7 +381,7 @@
     "initial_charges": 500,
     "max_charges": 500,
     "charges_per_use": 1,
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "heatpack",
@@ -398,8 +397,7 @@
     "cutting": 1,
     "material": "plastic",
     "symbol": ";",
-    "color": "light_gray",
-    "use_action": "HEATPACK"
+    "color": "light_gray"
   },
   {
     "id": "heatpack_used",
@@ -435,7 +433,7 @@
     "ammo": "tinder",
     "max_charges": 100,
     "charges_per_use": 25,
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "hotplate",
@@ -453,7 +451,7 @@
     "color": "green",
     "ammo": "battery",
     "charges_per_use": 5,
-    "use_action": "HOTPLATE",
+    "use_action": "cauterize",
     "magazines": [
       [
         "battery",
@@ -572,7 +570,7 @@
     "sub": "hotplate",
     "charges_per_use": 5,
     "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": [ "HOTPLATE", "HEAT_FOOD" ],
+    "use_action": [ "cauterize" ],
     "magazines": [
       [
         "battery",
@@ -596,8 +594,7 @@
     "material": "steel",
     "symbol": ")",
     "color": "light_gray",
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 1 ], [ "CONTAIN", 1 ] ],
-    "use_action": "HEAT_FOOD"
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 1 ], [ "CONTAIN", 1 ] ]
   },
   {
     "id": "milk_cream_jar",
@@ -657,7 +654,7 @@
     "sub": "hotplate",
     "charges_per_use": 5,
     "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": [ "HOTPLATE", "HEAT_FOOD" ],
+    "use_action": [ "cauterize" ],
     "magazines": [
       [
         "battery",
@@ -734,7 +731,7 @@
     "initial_charges": 800,
     "max_charges": 800,
     "charges_per_use": 1,
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "pastaextruder",
@@ -795,7 +792,7 @@
     "initial_charges": 500,
     "max_charges": 500,
     "charges_per_use": 1,
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "pressure_cooker",
@@ -815,7 +812,6 @@
     "looks_like": "pot_canning",
     "container_data": { "contains": "2 L", "seals": true, "watertight": true },
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
-    "use_action": "HEAT_FOOD",
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
   {
@@ -922,7 +918,7 @@
     "max_charges": 800,
     "charges_per_use": 1,
     "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
-    "use_action": [ "HOTPLATE", "HEAT_FOOD" ]
+    "use_action": [ "cauterize" ]
   },
   {
     "id": "teapot",

diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -265,7 +265,6 @@
     "symbol": ";",
     "color": "light_gray",
     "qualities": [ [ "COOK", 1 ] ],
-    "use_action": "HEAT_FOOD",
     "flags": [ "BELT_CLIP", "ALLOWS_REMOTE_USE" ]
   }
 ]
diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json
@@ -53,7 +53,7 @@
     "sub": "hotplate",
     "charges_per_use": 1,
     "qualities": [ [ "DISTILL", 1 ], [ "CHEM", 3 ], [ "BOIL", 1 ] ],
-    "use_action": "HOTPLATE",
+    "use_action": "cauterize",
     "magazines": [
       [
         "battery",

diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json
@@ -187,7 +187,7 @@
     "ammo": "battery",
     "charges_per_use": 20,
     "qualities": [ [ "CONTAIN", 1 ] ],
-    "use_action": "HOTPLATE",
+    "use_action": "cauterize",
     "magazines": [
       [
         "battery",

diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json
@@ -37,8 +37,7 @@
     "color": "dark_gray",
     "contains": "2500 ml",
     "watertight": true,
-    "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": "HEAT_FOOD"
+    "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
   },
   {
     "id": "afs_fridge",

diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json
@@ -104,7 +104,7 @@
     "looks_like": "pot",
     "symbol": ")",
     "color": "light_green",
-    "use_action": "HOTPLATE",
+    "use_action": "cauterize",
     "flags": [ "ALLOWS_REMOTE_USE" ]
   },
   {

diff --git a/data/mods/CRT_EXPANSION/items/crt_toolarmor.json b/data/mods/CRT_EXPANSION/items/crt_toolarmor.json
@@ -228,7 +228,7 @@
     "material": "hardsteel",
     "material_thickness": 1,
     "qualities": [ [ "BOIL", 1 ], [ "CONTAIN", 1 ] ],
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "bandana_wet",

diff --git a/data/mods/CRT_EXPANSION/items/crt_tools.json b/data/mods/CRT_EXPANSION/items/crt_tools.json
@@ -19,7 +19,7 @@
     "charges_per_use": 1,
     "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
     "artifact_data": { "charge_type": "ARTC_SOLAR" },
-    "use_action": "HOTPLATE"
+    "use_action": "cauterize"
   },
   {
     "id": "knife_crt",

diff --git a/data/mods/Magiclysm/items/enchanted_misc.json b/data/mods/Magiclysm/items/enchanted_misc.json
@@ -21,8 +21,7 @@
     "sub": "hotplate",
     "artifact_data": { "charge_type": "ARTC_TIME" },
     "use_action": [
-      "HOTPLATE",
-      "HEAT_FOOD",
+      "cauterize",
       {
         "type": "transform",
         "target": "heat_cube_torch_on",

diff --git a/data/mods/Magiclysm/items/tools.json b/data/mods/Magiclysm/items/tools.json
@@ -17,8 +17,7 @@
     "contains": "16 L",
     "//": "I went ahead and gave this a level of 2 for when magical mutagens become a thing as I figured dragonblood for instance should need different tools than making alpha mutagen.",
     "watertight": true,
-    "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "MAGIC_MUTAGEN", 2 ] ],
-    "use_action": "HEAT_FOOD"
+    "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "MAGIC_MUTAGEN", 2 ] ]
   },
   {
     "id": "demon_forge",

diff --git a/data/mods/Salvaged_Robots/items.json b/data/mods/Salvaged_Robots/items.json
@@ -174,7 +174,7 @@
     "use_action": [
       { "type": "HAMMER" },
       { "type": "BOLTCUTTERS" },
-      { "type": "HOTPLATE" },
+      { "type": "cauterize" },
       { "type": "WATER_PURIFIER" },
       { "type": "GUN_REPAIR" },
       { "type": "firestarter" },

diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -228,7 +228,7 @@ void move_items_activity_actor::do_turn( player_activity &act, Character &who )
         }
 
         // Check that we can pick it up.
-        if( !newit.made_of_from_type( LIQUID ) ) {
+        if( !newit.made_of( LIQUID ) ) {
             // This is for hauling across zlevels, remove when going up and down stairs
             // is no longer teleportation
             if( newit.is_owned_by( who, true ) ) {