Move flags to optional with reader

Pretty nice +/- here, plus some data error cleanups.

Author: ehughsbaird

data/json/monsters/insect_spider.json

@@ -206,7 +206,7 @@
     "dissect": "dissect_troglobite_sample_single",
     "upgrades": { "age_grow": 30, "into": "mon_worm" },
     "extend": { "flags": [ "DIGS", "GOODHEARING", "SMALL_HIDER" ] },
-    "delete": { "flags": [ "SEES", "SMELLS" ], "move_skills": { "climb": 2 } }
+    "delete": { "flags": [ "SEES" ], "move_skills": { "climb": 2 } }
   },
   {
     "id": "mon_large_cockroach",

data/json/monsters/nether.json

@@ -308,7 +308,7 @@
       "corpse_type": "NO_CORPSE",
       "message": "The %s shatters like pane of glass."
     },
-    "delete": { "flags": [ "ATTACKMON", "ALWAYS_SEES_YOU", "HIT_AND_RUN" ] },
+    "delete": { "flags": [ "ALWAYS_SEES_YOU" ] },
     "extend": { "flags": [ "SILENT_DISAPPEAR" ] }
   },
   {
@@ -331,7 +331,7 @@
       "corpse_type": "NO_CORPSE",
       "message": "The %s shatters like pane of glass."
     },
-    "delete": { "flags": [ "ATTACKMON", "ALWAYS_SEES_YOU", "HIT_AND_RUN" ] },
+    "delete": { "flags": [ "ALWAYS_SEES_YOU" ] },
     "extend": { "flags": [ "SILENT_DISAPPEAR" ] }
   },
   {
@@ -356,7 +356,7 @@
       { "id": "drag_followup", "grab_data": { "drag_distance": 1 } }
     ],
     "death_function": { "corpse_type": "NO_CORPSE", "message": "The %s shatters like pane of glass." },
-    "delete": { "flags": [ "ATTACKMON", "ALWAYS_SEES_YOU", "HIT_AND_RUN" ] },
+    "delete": { "flags": [ "ALWAYS_SEES_YOU" ] },
     "extend": { "flags": [ "SILENT_DISAPPEAR" ] }
   },
   {

data/json/monsters/zed_skeletal.json

@@ -53,8 +53,7 @@
     "upgrades": { "half_life": 180, "into": "mon_skeleton_hulk" },
     "fungalize_into": "mon_skeleton_brute_dusted",
     "armor": { "bash": 12, "cut": 30, "acid": 1, "bullet": 30, "electric": 4 },
-    "extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ], "flags": [ "PULP_PRYING" ] },
-    "delete": { "flags": [ "STUMBLES" ] }
+    "extend": { "weakpoint_sets": [ "wps_bone_armor" ], "families": [ "prof_wp_skeleton" ], "flags": [ "PULP_PRYING" ] }
   },
   {
     "id": "mon_skeleton_electric",

data/mods/CrazyCataclysm/crazy_monsters.json

@@ -14,13 +14,6 @@
     "copy-from": "mon_zombie_electric",
     "special_attacks": [ [ "SHOCKING_REVEAL", 25 ] ]
   },
-  {
-    "id": "halloween_dragon",
-    "type": "MONSTER",
-    "name": { "str": "inflatable dragon" },
-    "copy-from": "mon_dragon_dummy",
-    "delete": { "flags": [ "NOT_HALLUCINATION" ] }
-  },
   {
     "id": "halloween_ghost",
     "type": "MONSTER",

src/monstergenerator.cpp

@@ -1137,49 +1137,7 @@ void mtype::load( const JsonObject &jo, const std::string_view src )
     optional( jo, was_loaded, "burn_into", burn_into, string_id_reader<::mtype> {},
               mtype_id::NULL_ID() );
 
-    if( jo.has_member( "flags" ) ) {
-        pre_flags_.clear();
-        if( jo.has_string( "flags" ) ) {
-            pre_flags_.emplace( jo.get_string( "flags" ) );
-        } else {
-            for( JsonValue jval : jo.get_array( "flags" ) ) {
-                pre_flags_.emplace( jval.get_string() );
-            }
-        }
-    } else {
-        if( jo.has_member( "extend" ) ) {
-            JsonObject exjo = jo.get_object( "extend" );
-            exjo.allow_omitted_members();
-            if( exjo.has_member( "flags" ) ) {
-                if( exjo.has_string( "flags" ) ) {
-                    pre_flags_.emplace( exjo.get_string( "flags" ) );
-                } else {
-                    for( JsonValue jval : exjo.get_array( "flags" ) ) {
-                        pre_flags_.emplace( jval.get_string() );
-                    }
-                }
-            }
-        }
-        if( jo.has_member( "delete" ) ) {
-            JsonObject deljo = jo.get_object( "delete" );
-            deljo.allow_omitted_members();
-            if( deljo.has_member( "flags" ) ) {
-                if( deljo.has_string( "flags" ) ) {
-                    auto iter = pre_flags_.find( mon_flag_str_id( deljo.get_string( "flags" ) ) );
-                    if( iter != pre_flags_.end() ) {
-                        pre_flags_.erase( iter );
-                    }
-                } else {
-                    for( JsonValue jval : deljo.get_array( "flags" ) ) {
-                        auto iter = pre_flags_.find( mon_flag_str_id( jval.get_string() ) );
-                        if( iter != pre_flags_.end() ) {
-                            pre_flags_.erase( iter );
-                        }
-                    }
-                }
-            }
-        }
-    }
+    optional( jo, was_loaded, "flags", pre_flags_, string_id_reader<mon_flag> {} );
 
     // Can't calculate yet - we want all flags first
     optional( jo, was_loaded, "bash_skill", bash_skill, -1 );
@@ -1218,49 +1176,7 @@ void species_type::load( const JsonObject &jo, std::string_view )
     optional( jo, was_loaded, "description", description );
     optional( jo, was_loaded, "footsteps", footsteps, to_translation( "footsteps." ) );
 
-    if( jo.has_member( "flags" ) ) {
-        flags.clear();
-        if( jo.has_string( "flags" ) ) {
-            flags.emplace( jo.get_string( "flags" ) );
-        } else {
-            for( JsonValue jval : jo.get_array( "flags" ) ) {
-                flags.emplace( jval.get_string() );
-            }
-        }
-    } else {
-        if( jo.has_member( "extend" ) ) {
-            JsonObject exjo = jo.get_object( "extend" );
-            exjo.allow_omitted_members();
-            if( exjo.has_member( "flags" ) ) {
-                if( exjo.has_string( "flags" ) ) {
-                    flags.emplace( exjo.get_string( "flags" ) );
-                } else {
-                    for( JsonValue jval : exjo.get_array( "flags" ) ) {
-                        flags.emplace( jval.get_string() );
-                    }
-                }
-            }
-        }
-        if( jo.has_member( "delete" ) ) {
-            JsonObject deljo = jo.get_object( "delete" );
-            deljo.allow_omitted_members();
-            if( deljo.has_member( "flags" ) ) {
-                if( deljo.has_string( "flags" ) ) {
-                    auto iter = flags.find( mon_flag_str_id( deljo.get_string( "flags" ) ) );
-                    if( iter != flags.end() ) {
-                        flags.erase( iter );
-                    }
-                } else {
-                    for( JsonValue jval : deljo.get_array( "flags" ) ) {
-                        auto iter = flags.find( mon_flag_str_id( jval.get_string() ) );
-                        if( iter != flags.end() ) {
-                            flags.erase( iter );
-                        }
-                    }
-                }
-            }
-        }
-    }
+    optional( jo, was_loaded, "flags", flags, string_id_reader<mon_flag> {} );
 
     const auto trigger_reader = enum_flags_reader<mon_trigger> { "monster trigger" };
     optional( jo, was_loaded, "anger_triggers", anger, trigger_reader );