Backport #70359 and #71065 (#74036)

* Merge pull request #70359 from mqrause/reload_inv_selector Migrate reload ammo selection menu to inventory_selector * DEBUG_ONLY flag for more consistency in "seeing this is a bug" (#71065) * DEBUG_ONLY flag * apparently a fake item being wood triggers the density tests --------- Co-authored-by: mqrause <[email protected]> Co-authored-by: NetSysFire <[email protected]>
CleverRaven · May 26, 2024 · 6fbaf6f · 6fbaf6f
1 parent 2a8906d
commit 6fbaf6f
Show file tree

Hide file tree

Showing 16 changed files with 462 additions and 445 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1,80 +1,85 @@
 [
+  {
+    "id": "DEBUG_ONLY",
+    "type": "json_flag",
+    "info": "This is not intended to be visible during normal gameplay.  <bad>Please file a bug report</bad> unless you are seeing this in the debug menu."
+  },
   {
     "id": "ABLATIVE_CHAINMAIL_ARMS",
     "type": "json_flag",
-    "info": "You can use this armor <info>with chainmail</info> with out encumbrance penalty",
+    "info": "You can use this armor <info>with chainmail</info> without encumbrance penalty.",
     "restriction": "Item must be a chainmail compatible armor piece"
   },
   {
     "id": "ABLATIVE_CHAINMAIL_ELBOWS",
     "type": "json_flag",
-    "info": "You can use this armor <info>with chainmail</info> with out encumbrance penalty",
+    "info": "You can use this armor <info>with chainmail</info> without encumbrance penalty.",
     "restriction": "Item must be a chainmail compatible armor piece"
   },
   {
     "id": "ABLATIVE_CHAINMAIL_LEGS",
     "type": "json_flag",
-    "info": "You can use this armor <info>with chainmail</info> with out encumbrance penalty",
+    "info": "You can use this armor <info>with chainmail</info> without encumbrance penalty.",
     "restriction": "Item must be a chainmail compatible armor piece"
   },
   {
     "id": "ABLATIVE_CHAINMAIL_KNEES",
     "type": "json_flag",
-    "info": "You can use this armor <info>with chainmail</info> with out encumbrance penalty",
+    "info": "You can use this armor <info>with chainmail</info> without encumbrance penalty.",
     "restriction": "Item must be a chainmail compatible armor piece"
   },
   {
     "id": "ABLATIVE_CHAINMAIL_TORSO",
     "type": "json_flag",
-    "info": "You can use this armor <info>with chainmail</info> with out encumbrance penalty",
+    "info": "You can use this armor <info>with chainmail</info> without encumbrance penalty.",
     "restriction": "Item must be a chainmail compatible armor piece"
   },
   {
     "id": "ABLATIVE_LARGE",
     "type": "json_flag",
-    "info": "This plate will fit in <info>large</info> armor pockets",
+    "info": "This plate will fit in <info>large</info> armor pockets.",
     "restriction": "Item must be a large ablative plate"
   },
   {
     "id": "ABLATIVE_MANTLE",
     "type": "json_flag",
-    "info": "This will hook to a <info>Hub 01 proprietary</info> mantle connector",
+    "info": "This will hook to a <info>Hub 01 proprietary</info> mantle connector.",
     "restriction": "Item must be an armored mantle"
   },
   {
     "id": "STAR_PLATE",
     "type": "json_flag",
-    "info": "This can be supported by the ryūsei battle kit",
+    "info": "This can be supported by the ryūsei battle kit.",
     "restriction": "Item must be resonance plate"
   },
   {
     "id": "STAR_SHOULDER",
     "type": "json_flag",
-    "info": "This can be supported by the ryūsei battle kit",
+    "info": "This can be supported by the ryūsei battle kit.",
     "restriction": "Item must be resonance shoulder"
   },
   {
     "id": "STAR_SKIRT",
     "type": "json_flag",
-    "info": "This can be supported by the ryūsei battle kit",
+    "info": "This can be supported by the ryūsei battle kit.",
     "restriction": "Item must be resonance skirt"
   },
   {
     "id": "ABLATIVE_MEDIUM",
     "type": "json_flag",
-    "info": "This plate will fit in <info>medium</info> armor pockets",
+    "info": "This plate will fit in <info>medium</info> armor pockets.",
     "restriction": "Item must be a medium ablative plate"
   },
   {
     "id": "ABLATIVE_SKIRT",
     "type": "json_flag",
-    "info": "This will hook to a <info>Hub 01 proprietary</info> skirt connector",
+    "info": "This will hook to a <info>Hub 01 proprietary</info> skirt connector.",
     "restriction": "Item must be an armored skirt"
   },
   {
     "id": "ABLATIVE_HELMET",
     "type": "json_flag",
-    "info": "This will hook to a <info>Hub 01 proprietary</info> helmet connector",
+    "info": "This will hook to a <info>Hub 01 proprietary</info> helmet connector.",
     "restriction": "Item must be an armored helmet"
   },
   {
@@ -406,13 +411,13 @@
     "id": "HEAD_STRAP_MOUNT",
     "type": "json_flag",
     "info": "This item is attachable to straps and mountings on some masks and hoods.",
-    "restriction": "Item must be some kind of item that can be attached to straps on masks and hoods."
+    "restriction": "Item must be some kind of item that can be attached to straps on masks and hoods"
   },
   {
     "id": "WRIST_MOUNT_ATTACHMENT",
     "type": "json_flag",
     "info": "This item is attachable to a proprietary wrist mount.",
-    "restriction": "Item must be some kind of item that can be attached to a proprietary wrist mount."
+    "restriction": "Item must be some kind of item that can be attached to a proprietary wrist mount"
   },
   {
     "id": "EXTRA_PLATING",

diff --git a/data/json/items/fake.json b/data/json/items/fake.json
@@ -3,14 +3,22 @@
     "abstract": "fake_item",
     "type": "GENERIC",
     "name": { "str": "fake item" },
-    "description": "Dummy item.  If you see this, then something went wrong.",
+    "description": "Dummy item.",
     "//": "Include ZERO_WEIGHT flag to avoid errors when instantiating pseudo items.",
-    "flags": [ "ZERO_WEIGHT" ],
+    "flags": [ "ZERO_WEIGHT", "TRADER_AVOID", "DEBUG_ONLY" ],
     "weight": "1 g",
     "volume": "1 ml",
     "symbol": "@",
     "color": "red"
   },
+  {
+    "id": "fake_crafting_tool",
+    "copy-from": "fake_item",
+    "type": "TOOL",
+    "name": { "str": "fake crafting tool" },
+    "description": "Used for practice recipes and the like.",
+    "extend": { "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ] }
+  },
   {
     "id": "fake_arcfurnace",
     "copy-from": "fake_item",
@@ -195,7 +203,6 @@
   {
     "abstract": "fake_appliance_tool",
     "name": { "str": "fake appliance tool" },
-    "description": "Dummy item.  If you see this, then something went wrong.",
     "type": "TOOL",
     "copy-from": "fake_item",
     "ammo": [ "battery" ],
@@ -279,82 +286,74 @@
     "id": "pseudo_exercise_machine",
     "type": "TOOL",
     "name": { "str": "exercise machine" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "material": [ "steel" ],
     "symbol": "T",
-    "color": "dark_gray",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "dark_gray"
   },
   {
     "id": "pseudo_punching_bag",
     "type": "TOOL",
     "name": { "str": "heavy punching bag" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "0",
-    "color": "dark_gray",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "dark_gray"
   },
   {
     "id": "pseudo_ergometer_mechanical",
     "type": "TOOL",
     "name": { "str": "mechanical ergometer" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "5",
-    "color": "dark_gray",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "dark_gray"
   },
   {
     "id": "pseudo_treadmill_mechanical",
     "type": "TOOL",
     "name": { "str": "gravity treadmill" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "L",
-    "color": "dark_gray",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "dark_gray"
   },
   {
     "id": "pseudo_training_dummy_light",
     "type": "TOOL",
     "name": { "str": "training dummy", "str_pl": "training dummies" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "@",
-    "color": "brown",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "brown"
   },
   {
     "id": "pseudo_training_dummy_heavy",
     "type": "TOOL",
     "name": { "str": "armored training dummy", "str_pl": "armored training dummies" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "@",
-    "color": "brown",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "brown"
   },
   {
     "id": "pseudo_archery_target_box",
     "type": "TOOL",
     "name": { "str": "box archery target" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "@",
-    "color": "brown",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "brown"
   },
   {
     "id": "pseudo_archery_target_bale",
     "type": "TOOL",
     "name": { "str": "bale archery target" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "copy-from": "fake_crafting_tool",
     "symbol": "@",
-    "color": "yellow",
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ]
+    "color": "yellow"
   },
   {
     "id": "pseudo_magazine",
     "type": "MAGAZINE",
     "category": "spare_parts",
     "name": { "str": "pseudo magazine" },
-    "description": "Pseudo magazine for use in dirty vehicle hacks.  If you see this, then something went wrong",
-    "flags": [ "PSEUDO", "ZERO_WEIGHT", "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD" ],
+    "description": "Pseudo magazine for use in dirty vehicle hacks.",
+    "flags": [ "PSEUDO", "ZERO_WEIGHT", "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "DEBUG_ONLY" ],
     "ammo_type": [ "battery" ],
     "capacity": 1000000,
     "pocket_data": [
@@ -371,53 +370,40 @@
   },
   {
     "id": "fake_lift_light",
-    "copy-from": "fake_item",
+    "copy-from": "fake_crafting_tool",
     "type": "TOOL",
     "name": { "str": "light hoist" },
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ],
     "qualities": [ [ "LIFT", 2 ], [ "ROPE", 2 ], [ "SUSPENDING", 2 ] ]
   },
   {
     "id": "fake_lift_medium",
-    "copy-from": "fake_item",
+    "copy-from": "fake_crafting_tool",
     "type": "TOOL",
     "name": { "str": "sturdy hoist" },
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ],
     "qualities": [ [ "LIFT", 8 ], [ "ROPE", 2 ], [ "SUSPENDING", 2 ] ]
   },
   {
     "id": "fake_lift_heavy",
-    "copy-from": "fake_item",
+    "copy-from": "fake_crafting_tool",
     "type": "TOOL",
     "name": { "str": "heavy-duty hoist" },
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO" ],
     "qualities": [ [ "LIFT", 40 ], [ "ROPE", 2 ], [ "SUSPENDING", 2 ] ]
   },
   {
     "id": "pseudo_app_oxygen_concentrator",
     "type": "TOOL",
+    "name": { "str": "oxygen concentrator" },
+    "copy-from": "fake_crafting_tool",
     "ammo": [ "battery" ],
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO", "ZERO_WEIGHT" ],
-    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "default_magazine": "pseudo_battery" } ],
-    "description": "Dummy item.  If you see this, then something went wrong.",
-    "weight": "1 g",
-    "volume": "1 ml",
-    "symbol": "@",
-    "color": "red",
-    "name": { "str": "oxygen concentrator" }
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "default_magazine": "pseudo_battery" } ]
   },
   {
     "id": "pseudo_app_hd_compressor_unit",
     "type": "TOOL",
+    "name": { "str": "high pressure compressor unit" },
+    "copy-from": "fake_crafting_tool",
     "ammo": [ "battery" ],
-    "flags": [ "ALLOWS_REMOTE_USE", "PSEUDO", "ZERO_WEIGHT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "default_magazine": "pseudo_battery" } ],
-    "description": "Dummy item.  If you see this, then something went wrong.",
-    "weight": "1 g",
-    "volume": "1 ml",
-    "symbol": "@",
-    "color": "red",
-    "name": { "str": "high pressure compressor unit" },
     "charges_per_use": 100,
     "charged_qualities": [ [ "PRESSURIZATION", 10 ] ]
   }

diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
@@ -37,23 +37,6 @@
     "price_postapoc": 150,
     "qualities": [ [ "CUT", 2 ], [ "CUT_FINE", 1 ], [ "BUTCHER", 37 ] ]
   },
-  {
-    "id": "butter_churn",
-    "type": "TOOL",
-    "name": { "str": "pseudo butter churn" },
-    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
-    "weight": "6464 g",
-    "volume": "9 L",
-    "price": 20000,
-    "price_postapoc": 100,
-    "to_hit": -2,
-    "material": [ "wood" ],
-    "qualities": [ [ "CHURN", 1 ] ],
-    "symbol": "H",
-    "color": "light_cyan",
-    "flags": [ "ALLOWS_REMOTE_USE" ],
-    "melee_damage": { "bash": 9 }
-  },
   {
     "id": "screw_press",
     "type": "TOOL",