module holder flag and inventory enchantment checking fix

CleverRaven · Jun 4, 2024 · 2491e5a · 2491e5a
1 parent e047475
commit 2491e5a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/data/json/enchantments.json b/data/json/enchantments.json
@@ -49,6 +49,7 @@
     "name": { "str": "Night Vision Goggles" },
     "description": "You are wearing night vision goggles which allow you to see really well in the dark.",
     "condition": "ACTIVE",
+    "has": "WORN",
     "values": [ { "value": "NIGHT_VIS", "add": 4 } ]
   },
   {
@@ -57,6 +58,7 @@
     "name": { "str": "Night Vision Goggles" },
     "description": "You are wearing night vision goggles which allow you to see quite well in the dark.",
     "condition": "ACTIVE",
+    "has": "WORN",
     "values": [ { "value": "NIGHT_VIS", "add": 2 } ]
   },
   {
@@ -65,6 +67,7 @@
     "name": { "str": "Night Vision Goggles" },
     "description": "You are wearing night vision goggles which allow you to see in the dark.",
     "condition": "ACTIVE",
+    "has": "WORN",
     "values": [ { "value": "NIGHT_VIS", "add": -1 } ]
   },
   {
@@ -73,6 +76,7 @@
     "name": { "str": "Night Vision Goggles" },
     "description": "You are wearing night vision goggles which allow you to poorly see in the dark.",
     "condition": "ACTIVE",
+    "has": "WORN",
     "values": [ { "value": "NIGHT_VIS", "add": -4 } ]
   },
   {

diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1568,6 +1568,11 @@
     "id": "MISSION_ITEM",
     "type": "json_flag"
   },
+  {
+    "id": "MODULE_HOLDER",
+    "//": "Allows enchantment check to get modules in pockets of this item (modules are items which have an enchantment effect and the HAS:WORN flag.",
+    "type": "json_flag"
+  },
   {
     "id": "MOUNTED_GUN",
     "info": "This weapon is <bad>too unwieldy</bad> to fire on its own and <info>must be mounted</info> on a vehicle or furniture (window, table, mound of dirt, etc.) before use.",

diff --git a/data/json/items/armor/helmets.json b/data/json/items/armor/helmets.json
@@ -176,7 +176,7 @@
     "warmth": 20,
     "material_thickness": 9,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED", "MODULE_HOLDER" ],
     "armor": [
       {
         "encumbrance_modifiers": [ "NONE" ],
@@ -363,7 +363,7 @@
     "material_thickness": 8,
     "environmental_protection": 2,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "SUN_GLASSES", "PADDED" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "SUN_GLASSES", "PADDED", "MODULE_HOLDER" ],
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -397,7 +397,7 @@
     "warmth": 20,
     "material_thickness": 8,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED" ],
+    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED", "MODULE_HOLDER" ],
     "armor": [
       {
         "encumbrance_modifiers": [ "NONE" ],
@@ -2844,7 +2844,7 @@
     "color": "dark_gray",
     "warmth": 15,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "WATERPROOF", "PADDED" ],
+    "flags": [ "WATERPROOF", "PADDED", "MODULE_HOLDER" ],
     "armor": [
       {
         "material": [

diff --git a/src/character_attire.cpp b/src/character_attire.cpp
@@ -992,7 +992,8 @@ bool outfit::is_worn_module( const item &thing ) const
 {
     return thing.has_flag( flag_CANT_WEAR ) &&
     std::any_of( worn.cbegin(), worn.cend(), [&thing]( item const & elem ) {
-        return elem.contained_where( thing ) != nullptr;
+        return elem.has_flag( flag_MODULE_HOLDER ) && 
+               elem.contained_where( thing ) != nullptr;
     } );
 }
 

diff --git a/src/flag.cpp b/src/flag.cpp
@@ -191,6 +191,7 @@ const flag_id flag_MECH_BAT( "MECH_BAT" );
 const flag_id flag_MELTS( "MELTS" );
 const flag_id flag_MESSY( "MESSY" );
 const flag_id flag_MISSION_ITEM( "MISSION_ITEM" );
+const flag_id flag_MODULE_HOLDER( "MODULE_HOLDER" );
 const flag_id flag_MOUNTED_GUN( "MOUNTED_GUN" );
 const flag_id flag_MOUSE( "MOUSE" );
 const flag_id flag_MUNDANE( "MUNDANE" );

diff --git a/src/flag.h b/src/flag.h
@@ -199,6 +199,7 @@ extern const flag_id flag_MECH_BAT;
 extern const flag_id flag_MELTS;
 extern const flag_id flag_MESSY;
 extern const flag_id flag_MISSION_ITEM;
+extern const flag_id flag_MODULE_HOLDER;
 extern const flag_id flag_MOUNTED_GUN;
 extern const flag_id flag_MOUSE;
 extern const flag_id flag_MUNDANE;