Actually working, non-tedious food heating!

Includes: Revert "Remove food temperature" This reverts commit a58076c.
cataclysmbnteam · Mar 25, 2021 · 9c8a8e6 · 9c8a8e6
1 parent f0ff08f
commit 9c8a8e6
Show file tree

Hide file tree

Showing 21 changed files with 143 additions and 33 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -239,6 +239,30 @@
     "context": [ "ARMOR", "TOOL_ARMOR" ],
     "info": "This clothing has a <info>hood</info> to keep your head warm if your head is unencumbered."
   },
+  {
+    "id": "HEATS_FOOD",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "info": "This item will be used to <good>heat food</good> before eating food that is best eaten hot."
+  },
+  {
+    "id": "HEATS_FOOD_IS_CONSUMED",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "info": "This item can be used to <good>heat food</good>, but will <bad>be destroyed afterwards</bad>."
+  },
+  {
+    "id": "HEATS_FOOD_USING_CHARGES",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "info": "This item can be used to <good>heat food</good> using <info>charges</info>."
+  },
+  {
+    "id": "HEATS_FOOD_USING_FIRE",
+    "type": "json_flag",
+    "context": [ "GENERIC", "TOOL" ],
+    "info": "This item will be used to <good>heat food</good> over <info>fire</info>."
+  },
   {
     "id": "HYGROMETER",
     "type": "json_flag",

diff --git a/data/json/item_actions.json b/data/json/item_actions.json
@@ -79,6 +79,11 @@
     "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",
@@ -564,6 +569,16 @@
     "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",
@@ -884,6 +899,11 @@
     "id": "THROWABLE_EXTINGUISHER_ACT",
     "name": { "str": "Extinguish a fire" }
   },
+  {
+    "type": "item_action",
+    "id": "TOGGLE_HEATS_FOOD",
+    "name": { "str": "Enable/disable food heating" }
+  },
   {
     "type": "item_action",
     "id": "TOWEL",

diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
@@ -116,6 +116,7 @@
     "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" ]
   },
@@ -414,6 +415,7 @@
     "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" ]
   },
   {
@@ -483,7 +485,8 @@
     "symbol": ")",
     "color": "light_gray",
     "container_data": { "contains": "1 L", "watertight": true },
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
+    "use_action": "HEAT_FOOD"
   },
   {
     "id": "pot_makeshift_copper",
@@ -501,7 +504,8 @@
     "symbol": ")",
     "color": "light_red",
     "container_data": { "contains": "1 L", "watertight": true },
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
+    "use_action": "HEAT_FOOD"
   },
   {
     "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": [
-      { "type": "cauterize", "flame": false },
+      "HOTPLATE",
       {
         "target": "hobo_stove",
         "msg": "The ember is extinguished.",
@@ -1257,6 +1257,7 @@
     "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
@@ -163,7 +163,8 @@
     "sub": "hotplate",
     "initial_charges": 50,
     "max_charges": 50,
-    "charges_per_use": 1
+    "charges_per_use": 1,
+    "use_action": "HOTPLATE"
   },
   {
     "id": "clay_pot",
@@ -181,6 +182,7 @@
     "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" ]
   },
   {
@@ -232,6 +234,7 @@
     "ammo": "battery",
     "charges_per_use": 10,
     "qualities": [ [ "BOIL", 1 ] ],
+    "use_action": "HOTPLATE",
     "magazines": [
       [
         "battery",
@@ -305,7 +308,8 @@
     "sub": "hotplate",
     "initial_charges": 50,
     "max_charges": 50,
-    "charges_per_use": 1
+    "charges_per_use": 1,
+    "use_action": [ "HOTPLATE", "HEAT_FOOD" ]
   },
   {
     "id": "flask_yeast",
@@ -377,7 +381,8 @@
     "sub": "hotplate",
     "initial_charges": 500,
     "max_charges": 500,
-    "charges_per_use": 1
+    "charges_per_use": 1,
+    "use_action": "HOTPLATE"
   },
   {
     "id": "heatpack",
@@ -394,7 +399,7 @@
     "material": "plastic",
     "symbol": ";",
     "color": "light_gray",
-    "flags": [ "HEATS_FOOD_IS_CONSUMED" ]
+    "use_action": "HEATPACK"
   },
   {
     "id": "hobo_stove",
@@ -412,7 +417,8 @@
     "color": "light_gray",
     "ammo": "tinder",
     "max_charges": 100,
-    "charges_per_use": 25
+    "charges_per_use": 25,
+    "use_action": "HOTPLATE"
   },
   {
     "id": "hotplate",
@@ -430,7 +436,7 @@
     "color": "green",
     "ammo": "battery",
     "charges_per_use": 5,
-    "use_action": { "type": "cauterize", "flame": false },
+    "use_action": "HOTPLATE",
     "magazines": [
       [
         "battery",
@@ -549,7 +555,7 @@
     "sub": "hotplate",
     "charges_per_use": 5,
     "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": [ { "type": "cauterize", "flame": false } ],
+    "use_action": [ "HOTPLATE", "HEAT_FOOD" ],
     "magazines": [
       [
         "battery",
@@ -573,7 +579,8 @@
     "material": "steel",
     "symbol": ")",
     "color": "light_gray",
-    "qualities": [ [ "COOK", 2 ], [ "BOIL", 1 ], [ "CONTAIN", 1 ] ]
+    "qualities": [ [ "COOK", 2 ], [ "BOIL", 1 ], [ "CONTAIN", 1 ] ],
+    "use_action": "HEAT_FOOD"
   },
   {
     "id": "milk_cream_jar",
@@ -633,7 +640,7 @@
     "sub": "hotplate",
     "charges_per_use": 5,
     "qualities": [ [ "COOK", 2 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
-    "use_action": [ { "type": "cauterize", "flame": false } ],
+    "use_action": [ "HOTPLATE", "HEAT_FOOD" ],
     "magazines": [
       [
         "battery",
@@ -709,7 +716,8 @@
     "sub": "hotplate",
     "initial_charges": 800,
     "max_charges": 800,
-    "charges_per_use": 1
+    "charges_per_use": 1,
+    "use_action": "HOTPLATE"
   },
   {
     "id": "pastaextruder",
@@ -769,7 +777,8 @@
     "sub": "hotplate",
     "initial_charges": 500,
     "max_charges": 500,
-    "charges_per_use": 1
+    "charges_per_use": 1,
+    "use_action": "HOTPLATE"
   },
   {
     "id": "pressure_cooker",
@@ -789,6 +798,7 @@
     "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" ]
   },
   {
@@ -894,7 +904,8 @@
     "sub": "hotplate",
     "max_charges": 800,
     "charges_per_use": 1,
-    "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ]
+    "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "CHEM", 1 ] ],
+    "use_action": [ "HOTPLATE", "HEAT_FOOD" ]
   },
   {
     "id": "teapot",

diff --git a/data/json/items/tool/metalworking.json b/data/json/items/tool/metalworking.json
@@ -265,6 +265,7 @@
     "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": [ { "type": "cauterize", "flame": false } ],
+    "use_action": "HOTPLATE",
     "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": "cauterize",
+    "use_action": "HOTPLATE",
     "magazines": [
       [
         "battery",

diff --git a/data/mods/Aftershock/items/items.json b/data/mods/Aftershock/items/items.json
@@ -30,7 +30,8 @@
     "color": "dark_gray",
     "contains": "2500 ml",
     "watertight": true,
-    "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ]
+    "qualities": [ [ "COOK", 1 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ] ],
+    "use_action": "HEAT_FOOD"
   },
   {
     "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": "cauterize",
+    "use_action": "HOTPLATE",
     "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": "cauterize"
+    "use_action": "HOTPLATE"
   },
   {
     "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": "cauterize"
+    "use_action": "HOTPLATE"
   },
   {
     "id": "knife_crt",

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

diff --git a/data/mods/Magiclysm/items/tools.json b/data/mods/Magiclysm/items/tools.json
@@ -17,7 +17,8 @@
     "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 ] ]
+    "qualities": [ [ "COOK", 3 ], [ "BOIL", 2 ], [ "CONTAIN", 1 ], [ "MAGIC_MUTAGEN", 2 ] ],
+    "use_action": "HEAT_FOOD"
   },
   {
     "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": "cauterize" },
+      { "type": "HOTPLATE" },
       { "type": "WATER_PURIFIER" },
       { "type": "GUN_REPAIR" },
       { "type": "firestarter" },

diff --git a/src/consumption.cpp b/src/consumption.cpp
@@ -219,13 +219,15 @@ static cata::optional<prepared_item_consumption> find_food_heater( Character &c,
     }
     std::vector<const item *> charged_heaters = inv.items_with( [&c]( const item & it ) {
         return it.has_flag( "HEATS_FOOD_USING_CHARGES" ) &&
+               it.has_flag( "HEATS_FOOD" ) &&
                c.has_enough_charges( it, false );
     } );
     if( !charged_heaters.empty() ) {
         return prepared_item_consumption( item_consumption_t::tool, *charged_heaters.front() );
     }
     std::vector<const item *> consumed_heaters = inv.items_with( []( const item & it ) {
         return it.has_flag( "HEATS_FOOD_IS_CONSUMED" ) &&
+               it.has_flag( "HEATS_FOOD" ) &&
                is_crafting_component( it );
     } );
     if( !consumed_heaters.empty() ) {
@@ -1068,8 +1070,8 @@ void Character::modify_morale( item &food, int nutr )
 {
     time_duration morale_time = 2_hours;
     if( food.has_flag( flag_EATEN_HOT ) ) {
-        auto heater = find_food_heater( *this, crafting_inventory(), get_heat_radiation( pos(),
-                                        true ) > 0 );
+        auto heater = find_food_heater( *this, crafting_inventory(),
+                                        get_map().has_nearby_fire( pos(), PICKUP_RANGE ) );
         if( heater && heater->consume( *this ) ) {
             add_msg_player_or_npc( m_good,
                                    _( "You heat up your %1$s using the %2$s." ),