Merge pull request #82617 from ehughsbaird/more-extend-delete

More monster type to optional/mandatory

Author: Maleclypse

data/json/monsters/insect_spider.json

@@ -2370,7 +2370,7 @@
     "weakpoints": [ { "id": "abdomen", "name": "the abdomen", "coverage": 30 } ],
     "vision_night": 8,
     "zombify_into": "mon_meat_cocoon_tiny",
-    "delete": { "weakpoints": [ { "id": "stinger" } ], "flags": [ "FLIES" ], "special_attacks": [ "DERMATIK" ] }
+    "delete": { "weakpoints": [ { "id": "stinger" } ], "flags": [ "FLIES" ], "special_attacks": [ "dermatik_impale" ] }
   },
   {
     "id": "mon_dermatik_incubator_deer",

data/json/monsters/zed_nomex.json

@@ -32,7 +32,7 @@
       "families": [ "prof_wp_syn_armored", "prof_wp_nat_armored" ],
       "flags": [ "ACIDPROOF", "FIREPROOF" ]
     },
-    "delete": { "special_attacks": [ "bite_humanoid" ] }
+    "delete": { "special_attacks": [ "bite" ] }
   },
   {
     "id": "mon_zombie_fireproof_grappler",

data/mods/No_Hope/monsters.json

@@ -503,6 +503,7 @@
     "weight": "386 kg",
     "hp": 120,
     "speed": 200,
+    "weakpoint_sets": [ "wps_animal_quadruped" ],
     "material": [ "flesh" ],
     "symbol": "M",
     "color": "brown",

data/mods/Xedra_Evolved/monsters/zombies.json

@@ -96,7 +96,7 @@
       "corpse_type": "NO_CORPSE"
     },
     "emit_fields": [ { "emit_id": "xedra_monochrome_boomer_frozen_time", "delay": "1 s" } ],
-    "delete": { "special_attacks": [ "BOOMER" ] },
+    "delete": { "special_attacks": [ "boomer_bile" ] },
     "extend": { "flags": [ "STABILIZED_TIMELINE" ] },
     "upgrades": false
   }

src/generic_factory.h

@@ -1389,6 +1389,7 @@ template<typename Derived>
 class generic_typed_reader
 {
     static constexpr bool read_objects = false;
+    static constexpr bool check_extend_delete_copy_from = true;
 public:
     template<typename C, typename Fn>
     // I tried using a member function pointer and couldn't work it out
@@ -1619,8 +1620,11 @@ class generic_typed_reader
         const Derived &derived = static_cast<const Derived &>( *this );
         // or no handler for the container
         if( !was_loaded ) {
-            warn_disabled_feature( jo, "extend", member_name, "no copy-from" );
-            warn_disabled_feature( jo, "delete", member_name, "no copy-from" );
+            // this is gross, but some JSON wants to delete from things loaded by a different member on the same entity
+            if( Derived::check_extend_delete_copy_from ) {
+                warn_disabled_feature( jo, "extend", member_name, "no copy-from" );
+                warn_disabled_feature( jo, "delete", member_name, "no copy-from" );
+            }
             warn_disabled_feature( jo, "relative", member_name, "no copy-from" );
             warn_disabled_feature( jo, "proportional", member_name, "no copy-from" );
         }
@@ -2083,6 +2087,20 @@ class time_bound_reader : public bound_reader<T>
     };
 };
 
+struct weakpoints;
+
+struct weakpoints_reader : generic_typed_reader<weakpoints_reader> {
+    static constexpr bool check_extend_delete_copy_from = false;
+
+    std::set<std::string> &deleted;
+
+    explicit weakpoints_reader( std::set<std::string> &del ) : deleted( del ) {}
+
+    weakpoints get_next( const JsonValue &jv ) const;
+    bool do_extend( const JsonObject &jo, std::string_view name, weakpoints &member ) const;
+    bool do_delete( const JsonObject &jo, std::string_view name, weakpoints &member ) const;
+};
+
 /**
  * Only for external use in legacy code where migrating to `class translation`
  * is impractical. For new code load with `class translation` instead.

src/mattack_actors.cpp

@@ -93,6 +93,17 @@ static const skill_id skill_throw( "throw" );
 static const trait_id trait_TOXICFLESH( "TOXICFLESH" );
 static const trait_id trait_VAMPIRE( "VAMPIRE" );
 
+bool invalid_mattack_actor::call( monster &m ) const
+{
+    debugmsg( "%s has invalid mattack actor definition!", m.type->id.str() );
+    return false;
+}
+
+std::unique_ptr<mattack_actor> invalid_mattack_actor::clone() const
+{
+    return std::make_unique<invalid_mattack_actor>( *this );
+}
+
 void leap_actor::load_internal( const JsonObject &obj, const std::string & )
 {
     // Mandatory:

src/mattack_actors.h

@@ -22,6 +22,13 @@ class Creature;
 class JsonObject;
 class monster;
 
+class invalid_mattack_actor : public mattack_actor
+{
+        bool call( monster & ) const override;
+        std::unique_ptr<mattack_actor> clone() const override;
+        void load_internal( const JsonObject &, const std::string & ) override {}
+};
+
 class leap_actor : public mattack_actor
 {
     public:

src/mattack_common.h

@@ -44,7 +44,7 @@ class mattack_actor
 struct mtype_special_attack {
     protected:
         // TODO: Remove friend
-        friend struct mtype;
+        friend struct special_attacks_reader;
         cata::clone_ptr<mattack_actor> actor;
 
     public: