MORPHIC Sizing (#76560)

Update flag.cpp Flag fix Fixed
CleverRaven · Sep 21, 2024 · 0376347 · 0376347
1 parent 1a9f5ac
commit 0376347
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 7 deletions.
diff --git a/data/json/flags.json b/data/json/flags.json
@@ -1538,6 +1538,11 @@
     "type": "json_flag",
     "info": "This is <info>integrated into the body</info>."
   },
+  {
+    "id": "MORPHIC",
+    "type": "json_flag",
+    "info": "This is <info>naturally sized to the body</info>."
+  },
   {
     "id": "IR_EFFECT",
     "type": "json_flag"

diff --git a/data/mods/Xedra_Evolved/items/armor/armor.json b/data/mods/Xedra_Evolved/items/armor/armor.json
@@ -870,7 +870,7 @@
     "material_thickness": 1.4,
     "environmental_protection": 2,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED" ]
+    "flags": [ "WATERPROOF", "STURDY", "PADDED", "MORPHIC" ]
   },
   {
     "id": "dreamforged_helmet",
@@ -887,7 +887,7 @@
     "warmth": 10,
     "material_thickness": 1.4,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED" ],
+    "flags": [ "MORPHIC", "WATERPROOF", "STURDY", "PADDED" ],
     "armor": [ { "encumbrance_modifiers": [ "NONE" ], "coverage": 85, "covers": [ "head" ] } ]
   },
   {
@@ -907,7 +907,7 @@
     "longest_side": "60 cm",
     "material_thickness": 2,
     "use_action": [ { "type": "attach_molle", "size": 4 }, { "type": "detach_molle" } ],
-    "flags": [ "OUTER", "STURDY", "ONLY_ONE", "BLOCK_WHILE_WORN", "PADDED" ],
+    "flags": [ "OUTER", "STURDY", "ONLY_ONE", "BLOCK_WHILE_WORN", "PADDED", "MORPHIC" ],
     "armor": [
       {
         "material": [ { "type": "forged_dreamstuff", "covered_by_mat": 100, "thickness": 2 } ],
@@ -944,7 +944,7 @@
     "color": "dark_gray",
     "warmth": 10,
     "material_thickness": 1.2,
-    "flags": [ "VARSIZE", "OUTER", "STURDY", "BLOCK_WHILE_WORN", "PADDED" ],
+    "flags": [ "MORPHIC", "OUTER", "STURDY", "BLOCK_WHILE_WORN", "PADDED" ],
     "armor": [
       {
         "covers": [ "arm_l", "arm_r" ],
@@ -972,7 +972,7 @@
     "warmth": 10,
     "material_thickness": 1.5,
     "environmental_protection": 1,
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED" ],
+    "flags": [ "MORPHIC", "WATERPROOF", "STURDY", "PADDED" ],
     "armor": [
       {
         "covers": [ "foot_l", "foot_r" ],
@@ -1065,7 +1065,7 @@
     "warmth": 5,
     "material_thickness": 0.7,
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "VARSIZE", "WATERPROOF", "STURDY", "PADDED" ]
+    "flags": [ "MORPHIC", "WATERPROOF", "STURDY", "PADDED" ]
   },
   {
     "id": "dreamforged_armguard_plate_gunslinger",

diff --git a/src/character_attire.cpp b/src/character_attire.cpp
@@ -142,7 +142,7 @@ ret_val<void> Character::can_wear( const item &it, bool with_equip_change ) cons
     }
 
     if( !it.has_flag( flag_OVERSIZE ) && !it.has_flag( flag_INTEGRATED ) &&
-        !it.has_flag( flag_SEMITANGIBLE ) &&
+        !it.has_flag( flag_SEMITANGIBLE ) && !it.has_flag( flag_MORPHIC ) &&
         !it.has_flag( flag_UNRESTRICTED ) ) {
         for( const trait_id &mut : get_mutations() ) {
             const mutation_branch &branch = mut.obj();

diff --git a/src/flag.cpp b/src/flag.cpp
@@ -193,6 +193,7 @@ 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_MORPHIC( "MORPHIC" );
 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
@@ -201,6 +201,7 @@ 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_MORPHIC;
 extern const flag_id flag_MOUNTED_GUN;
 extern const flag_id flag_MOUSE;
 extern const flag_id flag_MUNDANE;

diff --git a/src/item.cpp b/src/item.cpp
@@ -2061,6 +2061,16 @@ item::sizing item::get_sizing( const Character &p ) const
             }
         }
 
+        if( has_flag( flag_MORPHIC ) ) {
+            if( big ) {
+                return sizing::big_sized_big_char;
+            } else if( small ) {
+                return sizing::small_sized_small_char;
+            } else {
+                return sizing::human_sized_human_char;
+            }
+        }
+
         // due to the iterative nature of these features, something can fit and be undersized/oversized
         // but that is fine because we have separate logic to adjust encumbrance per each. One day we
         // may want to have fit be a flag that only applies if a piece of clothing is sized for you as there