fix: only single exosuit can be worn now (#5933)

* changes * formatter
cataclysmbnteam · Jan 17, 2025 · f1679cc · f1679cc
1 parent 1885898
commit f1679cc
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -261,6 +261,11 @@
     "context": [ "ARMOR", "TOOL_ARMOR" ],
     "info": "You can wear <info>only one</info>."
   },
+  {
+    "id": "EXOSUIT",
+    "type": "json_flag",
+    "context": [ "ARMOR", "TOOL_ARMOR" ]
+  },
   {
     "id": "FANCY",
     "type": "json_flag",

diff --git a/data/json/items/armor/power_armor.json b/data/json/items/armor/power_armor.json
@@ -647,7 +647,7 @@
       "NO_UNLOAD",
       "NO_RELOAD",
       "BELTED",
-      "ONLY_ONE",
+      "EXOSUIT",
       "POWERARMOR_COMPATIBLE",
       "OVERSIZE",
       "ALLOWS_NATURAL_ATTACKS"
@@ -717,7 +717,7 @@
       "NO_RELOAD",
       "COMPACT",
       "BELTED",
-      "ONLY_ONE",
+      "EXOSUIT",
       "POWERARMOR_COMPATIBLE",
       "OVERSIZE",
       "ALLOWS_NATURAL_ATTACKS"

diff --git a/src/character.cpp b/src/character.cpp
@@ -3260,6 +3260,12 @@ ret_val<bool> Character::can_wear( const item &it, bool with_equip_change ) cons
         }
     }
 
+    for( auto &i : worn ) {
+        if( i->has_flag( flag_EXOSUIT ) && it.has_flag( flag_EXOSUIT ) ) {
+            return ret_val<bool>::make_failure( _( "Can't wear more than one exosuit!" ) );
+        }
+    }
+
     if( amount_worn( it.typeId() ) >= MAX_WORN_PER_TYPE ) {
         return ret_val<bool>::make_failure( _( "Can't wear %i or more %s at once." ),
                                             MAX_WORN_PER_TYPE + 1, it.tname( MAX_WORN_PER_TYPE + 1 ) );

diff --git a/src/flag.cpp b/src/flag.cpp
@@ -221,6 +221,7 @@ const flag_id flag_NPC_THROWN( "NPC_THROWN" );
 const flag_id flag_NPC_THROW_NOW( "NPC_THROW_NOW" );
 const flag_id flag_NUTRIENT_OVERRIDE( "NUTRIENT_OVERRIDE" );
 const flag_id flag_ONLY_ONE( "ONLY_ONE" );
+const flag_id flag_EXOSUIT( "EXOSUIT" );
 const flag_id flag_ORGANIC( "ORGANIC" );
 const flag_id flag_OUTER( "OUTER" );
 const flag_id flag_OVERSIZE( "OVERSIZE" );

diff --git a/src/flag.h b/src/flag.h
@@ -224,6 +224,7 @@ extern const flag_id flag_NPC_THROWN;
 extern const flag_id flag_NPC_THROW_NOW;
 extern const flag_id flag_NUTRIENT_OVERRIDE;
 extern const flag_id flag_ONLY_ONE;
+extern const flag_id flag_EXOSUIT;
 extern const flag_id flag_ORGANIC;
 extern const flag_id flag_OUTER;
 extern const flag_id flag_OVERSIZE;