weakpoint families to optional

Author: ehughsbaird

src/monstergenerator.cpp

@@ -870,25 +870,7 @@ void mtype::load( const JsonObject &jo, const std::string &src )
     optional( jo, was_loaded, "status_chance_multiplier", status_chance_multiplier, numeric_bound_reader{0.0f, 5.0f},
               1.f );
 
-    if( !was_loaded || jo.has_array( "families" ) ) {
-        families.clear();
-        families.load( jo.get_array( "families" ) );
-    } else {
-        if( jo.has_object( "extend" ) ) {
-            JsonObject tmp = jo.get_object( "extend" );
-            tmp.allow_omitted_members();
-            if( tmp.has_array( "families" ) ) {
-                families.load( tmp.get_array( "families" ) );
-            }
-        }
-        if( jo.has_object( "delete" ) ) {
-            JsonObject tmp = jo.get_object( "delete" );
-            tmp.allow_omitted_members();
-            if( tmp.has_array( "families" ) ) {
-                families.remove( tmp.get_array( "families" ) );
-            }
-        }
-    }
+    optional( jo, was_loaded, "families", families );
 
     optional( jo, was_loaded, "absorb_ml_per_hp", absorb_ml_per_hp, 250 );
     optional( jo, was_loaded, "split_move_cost", split_move_cost, 200 );

src/weakpoint.cpp

@@ -200,6 +200,26 @@ void weakpoint_families::load( const JsonArray &ja )
     }
 }
 
+void weakpoint_families::deserialize( const JsonValue &jv )
+{
+    // the load function extends, which is kinda gross, but fine
+    clear();
+    load( jv.get_array() );
+}
+
+bool weakpoint_families::handle_extend( const JsonValue &jv )
+{
+    // the load function extends, which is fine I guess
+    load( jv.get_array() );
+    return true;
+}
+
+bool weakpoint_families::handle_delete( const JsonValue &jv )
+{
+    remove( jv.get_array() );
+    return true;
+}
+
 void weakpoint_families::remove( const JsonArray &ja )
 {
     for( const JsonValue jsin : ja ) {

src/weakpoint.h

@@ -117,6 +117,9 @@ struct weakpoint_family {
 
     float modifier( const Character &attacker ) const;
     void load( const JsonValue &jsin );
+    void deserialize( const JsonValue &jsin ) {
+        load( jsin );
+    }
 };
 
 struct weakpoint_families {
@@ -133,6 +136,10 @@ struct weakpoint_families {
     void clear();
     void load( const JsonArray &ja );
     void remove( const JsonArray &ja );
+
+    void deserialize( const JsonValue &jv );
+    bool handle_extend( const JsonValue &jv );
+    bool handle_delete( const JsonValue &jv );
 };
 
 struct weakpoint {