Merge pull request CleverRaven#87 from Firestorm01X2/ammo-fix

Extend ammo effects and Fix Grenade launcher rounds don't explode
Kodiologist · Oct 3, 2020 · 04edad3 · 04edad3
2 parents ebd4f88 + a3c3760
commit 04edad3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 2 deletions.
diff --git a/data/json/items/ammo/40x46mm.json b/data/json/items/ammo/40x46mm.json
@@ -38,7 +38,7 @@
     "weight": "230 g",
     "damage": { "damage_type": "stab", "amount": 200, "armor_penetration": 30 },
     "casing": "40x46mm_m118_casing",
-    "extend": { "effects": [ "EXPLOSIVE_m433" ] }
+    "extend": { "effects": [ "FRAG" ] }
   },
   {
     "id": "40x46mm_m576",

diff --git a/data/json/items/ammo/40x53mm.json b/data/json/items/ammo/40x53mm.json
@@ -41,7 +41,7 @@
     "volume": "132 ml",
     "damage": { "damage_type": "stab", "amount": 250, "armor_penetration": 45 },
     "casing": "40x53mm_m169_casing",
-    "extend": { "effects": [ "EXPLOSIVE_m430a1" ] }
+    "extend": { "effects": [ "FRAG" ] }
   },
   {
     "id": "40x53mm_buckshot_m169",

diff --git a/src/item_factory.cpp b/src/item_factory.cpp
@@ -1480,6 +1480,24 @@ void islot_ammo::load( const JsonObject &jo )
     optional( jo, was_loaded, "count", def_charges, 1 );
     optional( jo, was_loaded, "loudness", loudness, -1 );
     optional( jo, was_loaded, "effects", ammo_effects );
+    if( jo.has_object( "extend" ) ) {
+        JsonObject tmp = jo.get_object( "extend" );
+        tmp.allow_omitted_members();
+        std::set<std::string> ammo_effects_ext;
+        optional( tmp, was_loaded, "effects", ammo_effects_ext );
+        ammo_effects.insert( ammo_effects_ext.begin(), ammo_effects_ext.end() );
+    }
+    if( jo.has_object( "delete" ) ) {
+        JsonObject tmp = jo.get_object( "delete" );
+        tmp.allow_omitted_members();
+        std::set<std::string> ammo_effects_ext;
+        optional( tmp, was_loaded, "effects", ammo_effects_ext );
+        for( auto it : ammo_effects_ext ) {
+            if( ammo_effects.count( it ) ) {
+                ammo_effects.erase( it );
+            }
+        }
+    }
     optional( jo, was_loaded, "show_stats", force_stat_display, cata::nullopt );
 }