Rewrite bionic fuel system

data/json/bionics.json

@@ -465,9 +465,9 @@
     "occupied_bodyparts": [ [ "torso", 20 ] ],
     "fuel_options": [ "battery" ],
     "fuel_efficiency": 1,
-    "fuel_capacity": 2000,
     "time": "1 s",
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "internal_battery_compartment" ]
   },
   {
     "id": "bio_blade",
@@ -780,11 +780,11 @@
     "description": "You burn alcohol as fuel in an extremely efficient reaction.",
     "occupied_bodyparts": [ [ "torso", 20 ] ],
     "fuel_options": [ "alcohol" ],
-    "fuel_capacity": 400,
     "fuel_efficiency": 0.5,
     "exothermic_power_gen": true,
     "time": "1 s",
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "internal_ethanol_tank" ]
   },
   {
     "id": "bio_lampoil",
@@ -793,11 +793,11 @@
     "description": "Slowly generates bionic power out of kerosene or motor oil.",
     "occupied_bodyparts": [ [ "torso", 20 ] ],
     "fuel_options": [ "lamp_oil", "motor_oil" ],
-    "fuel_capacity": 750,
     "fuel_efficiency": 0.35,
     "exothermic_power_gen": true,
     "time": "5 s",
-    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ]
+    "flags": [ "BIONIC_POWER_SOURCE", "BIONIC_SHOCKPROOF", "BIONIC_TOGGLED" ],
+    "passive_pseudo_items": [ "internal_oil_tank" ]
   },
   {
     "id": "bio_evap",
@@ -1674,11 +1674,11 @@
     "occupied_bodyparts": [ [ "torso", 8 ] ],
     "encumbrance": [ [ "torso", 5 ] ],
     "fuel_options": [ "gasoline" ],
-    "fuel_capacity": 500,
     "fuel_efficiency": 0.25,
     "exothermic_power_gen": true,
     "time": "1 s",
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE", "BIONIC_NPC_USABLE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE" ],
+    "passive_pseudo_items": [ "internal_gasoline_tank" ]
   },
   {
     "id": "bio_syringe",

data/json/flags.json

@@ -2107,5 +2107,10 @@
     "id": "SINGLE_USE",
     "type": "json_flag",
     "info": "This item is removed after use."
+  },
+  {
+    "id": "BIONIC_FUEL_SOURCE",
+    "type": "json_flag",
+    "info": "Contents of this item are used for fueling bionics."
   }
 ]

data/json/items/tool/integrated.json

@@ -0,0 +1,99 @@
+[
+  {
+    "id": "internal_gasoline_tank",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "internal gasoline tank" },
+    "description": "Internal tank for gasoline fuel cell bionic.",
+    "volume": "501 ml",
+    "weight": "1 g",
+    "price": 0,
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS", "BIONIC_FUEL_SOURCE" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "500 ml",
+        "max_item_volume": "32 ml",
+        "max_contains_weight": "1 kg",
+        "material_restriction": [ "gasoline" ]
+      }
+    ]
+  },
+  {
+    "id": "internal_ethanol_tank",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "internal ethanol tank" },
+    "description": "Internal ethanol tank for ethanol burner bionic.",
+    "volume": "401 ml",
+    "weight": "1 g",
+    "price": 0,
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS", "BIONIC_FUEL_SOURCE" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "400 ml",
+        "max_item_volume": "32 ml",
+        "max_contains_weight": "1 kg",
+        "material_restriction": [ "alcohol" ]
+      }
+    ]
+  },
+  {
+    "id": "internal_oil_tank",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "internal oil tank" },
+    "description": "Internal oil tank for oil generator bionic.",
+    "volume": "751 ml",
+    "weight": "1 g",
+    "price": 0,
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS", "BIONIC_FUEL_SOURCE" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "750 ml",
+        "max_item_volume": "32 ml",
+        "max_contains_weight": "1 kg",
+        "material_restriction": [ "lamp_oil", "motor_oil" ]
+      }
+    ]
+  },
+  {
+    "id": "internal_battery_compartment",
+    "type": "TOOL",
+    "name": { "str": "internal battery compartment" },
+    "description": "Internal compartment for holding medium sized batteries for battery system bionic.",
+    "volume": "750 ml",
+    "weight": "1 g",
+    "price": 0,
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS", "BIONIC_FUEL_SOURCE" ],
+    "ammo": [ "battery" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "rigid": true,
+        "flag_restriction": [ "BATTERY_MEDIUM", "BATTERY_LIGHT" ],
+        "default_magazine": "medium_battery_cell"
+      }
+    ]
+  }
+]

data/json/player_activities.json

@@ -990,15 +990,6 @@
     "based_on": "neither",
     "no_resume": true
   },
-  {
-    "id": "ACT_CONSUME_FUEL_MENU",
-    "type": "activity_type",
-    "activity_level": "NO_EXERCISE",
-    "verb": "consuming fuel",
-    "suspendable": false,
-    "based_on": "neither",
-    "no_resume": true
-  },
   {
     "id": "ACT_HACKING",
     "type": "activity_type",

data/mods/Magiclysm/bionics.json

@@ -6,10 +6,35 @@
     "description": "Embedded into your back and connected to your bionic power supply is a powerful spell focus able to consume blood from dead creatures to produce bionic power.  It can store up to 100 mL of blood.",
     "occupied_bodyparts": [ [ "torso", 8 ] ],
     "fuel_options": [ "blood", "dragon_blood", "tainted_blood", "hblood" ],
-    "fuel_capacity": 100,
     "fuel_efficiency": 0.6,
     "exothermic_power_gen": true,
     "time": "6 s",
-    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE" ]
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE" ],
+    "passive_pseudo_items": [ "integrated_blood_bank" ]
+  },
+  {
+    "id": "integrated_blood_bank",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "internal blood bank" },
+    "description": "Internal tank for blood power generator bionic.",
+    "volume": "101 ml",
+    "weight": "1 g",
+    "price": 0,
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS", "BIONIC_FUEL_SOURCE" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "100 ml",
+        "max_item_volume": "32 ml",
+        "max_contains_weight": "1 kg",
+        "material_restriction": [ "blood", "dragon_blood", "tainted_blood", "hblood" ]
+      }
+    ]
   }
 ]

data/mods/Magiclysm/materials.json

@@ -219,7 +219,7 @@
       { "fuel": 900, "smoke": 6, "burn": 3 }
     ],
     "fuel_data": {
-      "energy": "50000000 kJ",
+      "energy": "50000 kJ",
       "explosion_data": { "chance_hot": 20, "chance_cold": 1000, "factor": 0.2, "fiery": true, "size_factor": 0.1 }
     }
   },
@@ -247,14 +247,14 @@
       { "fuel": -50, "smoke": 2, "burn": 1 },
       { "fuel": -10, "smoke": 2, "burn": 2 }
     ],
-    "fuel_data": { "energy": "1000 kJ" }
+    "fuel_data": { "energy": "1 kJ" }
   },
   {
     "type": "material",
     "id": "tainted_blood",
     "name": "Tainted blood",
     "copy-from": "blood",
-    "fuel_data": { "energy": "5000 kJ" }
+    "fuel_data": { "energy": "5 kJ" }
   },
   {
     "type": "material",

data/mods/TEST_DATA/bionics.json

@@ -12,5 +12,47 @@
     "included": true,
     "//": "not actually included, this is a trick to not have to add an item version.",
     "time": "1 s"
+  },
+  {
+    "id": "bio_fuel_wood",
+    "type": "bionic",
+    "name": { "str": "Wood burner bionic" },
+    "description": "Test bionic that generates energy from wood.  Tests for bionic fueled by items that are not counted by charge.",
+    "occupied_bodyparts": [ [ "torso", 8 ] ],
+    "encumbrance": [ [ "torso", 5 ] ],
+    "fuel_options": [ "wood" ],
+    "fuel_efficiency": 0.25,
+    "exothermic_power_gen": true,
+    "time": "1 s",
+    "flags": [ "BIONIC_TOGGLED", "BIONIC_POWER_SOURCE" ],
+    "passive_pseudo_items": [ "internal_woodshed" ],
+    "included": true,
+    "//": "not actually included, this is a trick to not have to add an item version."
+  },
+  {
+    "id": "internal_woodshed",
+    "type": "GENERIC",
+    "category": "container",
+    "name": { "str": "internal woodshed" },
+    "description": "Woodshed, in your chest..",
+    "volume": "301 L",
+    "weight": "1 g",
+    "price": 0,
+    "material": [ "plastic" ],
+    "symbol": "(",
+    "color": "magenta",
+    "flags": [ "INTEGRATED", "UNBREAKABLE", "PERSONAL", "NO_REPAIR", "ALLOWS_NATURAL_ATTACKS", "BIONIC_FUEL_SOURCE" ],
+    "pocket_data": [
+      {
+        "pocket_type": "CONTAINER",
+        "watertight": true,
+        "rigid": true,
+        "max_contains_volume": "300 L",
+        "max_item_volume": "300 L",
+        "max_contains_weight": "300 kg",
+        "max_item_length": "140 cm",
+        "material_restriction": [ "wood" ]
+      }
+    ]
   }
 ]

doc/JSON_INFO.md

@@ -3625,7 +3625,8 @@ Any Item can be a container. To add the ability to contain things to an item, yo
     "ammo_restriction": { "ammotype": count }, // Restrict pocket to a given ammo type and count.  This overrides mandatory volume, weight, watertight and airtight to use the given ammo type instead.  A pocket can contain any number of unique ammo types each with different counts, and the container will only hold one type (as of now).  If this is left out, it will be empty.
     "flag_restriction": [ "FLAG1", "FLAG2" ],  // Items can only be placed into this pocket if they have a flag that matches one of these flags.
     "item_restriction": [ "item_id" ],         // Only these item IDs can be placed into this pocket. Overrides ammo and flag restrictions.
-	// If both "flag_restriction" and "item_restriction" are used simultaneously then any item that matches either of them will be accepted.
+    "material_restriction": [ "material_id" ], // Only items that are mainly made of this material can enter.
+	// If multiple of "flag_restriction", "material_restriction" and "item_restriction" are used simultaneously then any item that matches any of them will be accepted.
 
     "sealed_data": { "spoil_multiplier": 0.0 } // If a pocket has sealed_data, it will be sealed when the item spawns.  The sealed version of the pocket will override the unsealed version of the same datatype.
   }

src/activity_actor.cpp

@@ -2535,12 +2535,7 @@ void consume_activity_actor::start( player_activity &act, Character &guy )
     Character &player_character = get_player_character();
     if( consume_location ) {
         ret_val<edible_rating> ret = ret_val<edible_rating>::make_success();
-        if( refuel ) {
-            ret = player_character.can_consume_fuel( *consume_location );
-        } else {
-            ret = player_character.will_eat( *consume_location, true );
-        }
-
+        ret = player_character.will_eat( *consume_location, true );
         if( !ret.success() ) {
             canceled = true;
             consume_menu_selections = std::vector<int>();
@@ -2551,11 +2546,7 @@ void consume_activity_actor::start( player_activity &act, Character &guy )
         }
     } else if( !consume_item.is_null() ) {
         ret_val<edible_rating> ret = ret_val<edible_rating>::make_success();
-        if( refuel ) {
-            ret = player_character.can_consume_fuel( consume_item );
-        } else {
-            ret = player_character.will_eat( consume_item, true );
-        }
+        ret = player_character.will_eat( consume_item, true );
         if( !ret.success() ) {
             canceled = true;
             consume_menu_selections = std::vector<int>();
@@ -2591,9 +2582,9 @@ void consume_activity_actor::finish( player_activity &act, Character & )
     avatar &player_character = get_avatar();
     if( !canceled ) {
         if( consume_loc ) {
-            player_character.consume( consume_loc, /*force=*/true, refuel );
+            player_character.consume( consume_loc, /*force=*/true );
         } else if( !consume_item.is_null() ) {
-            player_character.consume( consume_item, /*force=*/true, refuel );
+            player_character.consume( consume_item, /*force=*/true );
         } else {
             debugmsg( "Item location/name to be consumed should not be null." );
         }
@@ -2641,7 +2632,6 @@ void consume_activity_actor::serialize( JsonOut &jsout ) const
     jsout.member( "consume_menu_filter", consume_menu_filter );
     jsout.member( "canceled", canceled );
     jsout.member( "type", type );
-    jsout.member( "refuel", refuel );
 
     jsout.end_object();
 }
@@ -2660,7 +2650,6 @@ std::unique_ptr<activity_actor> consume_activity_actor::deserialize( JsonValue &
     data.read( "consume_menu_filter", actor.consume_menu_filter );
     data.read( "canceled", actor.canceled );
     data.read( "type", actor.type );
-    data.read( "refuel", actor.refuel );
 
     return actor.clone();
 }

src/activity_actor_definitions.h

@@ -692,7 +692,6 @@ class consume_activity_actor : public activity_actor
         std::string consume_menu_filter;
         bool canceled = false;
         activity_id type;
-        bool refuel = false;
         /**
          * @pre @p other is a consume_activity_actor
          */
@@ -705,12 +704,12 @@ class consume_activity_actor : public activity_actor
         consume_activity_actor( const item_location &consume_location,
                                 std::vector<int> consume_menu_selections,
                                 const std::vector<item_location> &consume_menu_selected_items,
-                                const std::string &consume_menu_filter, activity_id type, bool refuel = false ) :
+                                const std::string &consume_menu_filter, activity_id type ) :
             consume_location( consume_location ),
             consume_menu_selections( std::move( consume_menu_selections ) ),
             consume_menu_selected_items( consume_menu_selected_items ),
             consume_menu_filter( consume_menu_filter ),
-            type( type ), refuel( refuel ) {}
+            type( type ) {}
 
         explicit consume_activity_actor( const item_location &consume_location ) :
             consume_location( consume_location ), consume_menu_selections( std::vector<int>() ) {}