wip on_hit_effect

CleverRaven · Jun 18, 2024 · 0dfaed8 · 0dfaed8
1 parent 8fac787
commit 0dfaed8
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/ammo_effect.cpp b/src/ammo_effect.cpp
@@ -90,6 +90,17 @@ void ammo_effect::load( const JsonObject &jo, const std::string_view )
         JsonObject joe = jo.get_object( "explosion" );
         aoe_explosion_data = load_explosion_data( joe );
     }
+    if( jo.has_member( "on_hit_effects" ) ) {
+        JsonArray json_arr = jo.get_array( "on_hit_effects" );
+        for( JsonObject joe : json_arr ) {
+            on_hit_effect new_effect;
+            optional( joe, was_loaded, "bp_to_hit", new_effect.bp_to_hit, bodypart_str_id::NULL_ID() );
+            mandatory( joe, was_loaded, "duration", new_effect.duration );
+            mandatory( joe, was_loaded, "effect", new_effect.effect );
+            mandatory( joe, was_loaded, "intensity", new_effect.intensity );
+            on_hit_effects.push_back( new_effect );
+        }
+    }
     optional( jo, was_loaded, "do_flashbang", do_flashbang, false );
     optional( jo, was_loaded, "do_emp_blast", do_emp_blast, false );
     optional( jo, was_loaded, "foamcrete_build", foamcrete_build, false );

diff --git a/src/ammo_effect.h b/src/ammo_effect.h
@@ -19,6 +19,13 @@ template <typename T> class generic_factory;
 
 generic_factory<ammo_effect> &get_all_ammo_effects();
 
+struct on_hit_effect {
+    bodypart_id bp_to_hit;
+    efftype_id effect;
+    int duration;
+    int intensity;
+};
+
 struct ammo_effect {
     public:
         void load( const JsonObject &jo, std::string_view src );
@@ -53,6 +60,8 @@ struct ammo_effect {
         int trail_intensity_max = 0;
         int trail_chance = 100;
 
+        std::vector<on_hit_effect> on_hit_effects;
+
         // Used by generic_factory
         ammo_effect_str_id id;
         std::vector<std::pair<ammo_effect_str_id, mod_id>> src;