Remove bad explosive addittions

Author: Maleclypse

data/json/recipes/weapon/explosive.json

@@ -20,7 +20,6 @@
     ],
     "qualities": [ { "id": "CHEM", "level": 2 } ],
     "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "paper", 5 ], [ "rolling_paper", 32 ] ],
       [ [ "chem_sulphuric_acid", 2 ] ],
@@ -65,7 +64,6 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "qualities": [ { "id": "CUT", "level": 2 } ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "thread", 10 ] ],
       [ [ "paper", 1 ], [ "rolling_paper", 6 ] ],
@@ -80,7 +78,6 @@
     "subcategory": "CSC_WEAPON_EXPLOSIVE",
     "skill_used": "fabrication",
     "time": "3 m",
-    "flags": [ "EXPLOSIVE" ],
     "reversible": true,
     "autolearn": true,
     "qualities": [ { "id": "CUT", "level": 2 } ],
@@ -180,7 +177,6 @@
     "time": "12 m",
     "reversible": true,
     "autolearn": true,
-    "flags": [ "EXPLOSIVE" ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "GLARE", "level": 1 } ],
     "tools": [
@@ -216,7 +212,6 @@
       [ "adv_chemistry", 3 ],
       [ "textbook_anarch", 3 ]
     ],
-    "flags": [ "EXPLOSIVE" ],
     "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
     "time": "7 m 30 s",
     "qualities": [ { "id": "SCREW", "level": 1 } ],
@@ -241,7 +236,6 @@
     "book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_anarch", 3 ] ],
     "proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
     "time": "7 m 30 s",
-    "flags": [ "EXPLOSIVE" ],
     "qualities": [ { "id": "SCREW", "level": 1 } ],
     "using": [ [ "small_gas_canister_case", 1 ] ],
     "components": [
@@ -286,7 +280,6 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "using": [ [ "military_explosive", 92 ], [ "explosives_casting_standard", 1 ] ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ],
@@ -308,7 +301,6 @@
     "book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "military_explosive", 92 ], [ "explosives_casting_standard", 1 ] ],
-    "flags": [ "EXPLOSIVE" ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "pipe", 1 ] ], [ [ "delay_fuze", 1 ] ] ]
   },
@@ -326,7 +318,6 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "military_explosive", 697 ], [ "explosives_casting_standard", 1 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ],
@@ -347,7 +338,6 @@
     "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "explosives_casting_standard", 5 ], [ "military_explosive", 10000 ] ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ],
@@ -367,7 +357,6 @@
     "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "explosives_casting_standard", 10 ], [ "military_explosive", 20000 ] ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "delay_fuze", 1 ] ],
       [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ],
@@ -429,7 +418,6 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
-    "flags": [ "EXPLOSIVE" ],
     "using": [ [ "stable_explosive", 29 ], [ "volatile_explosive", 1 ] ],
     "components": [ [ [ "pipe", 1 ] ], [ [ "fuse", 1 ] ] ]
   },
@@ -459,7 +447,6 @@
       "allowing it on smaller explosives, but not on the largest like ",
       "the barrel bombs."
     ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [ [ [ "pipe", 1 ] ], [ [ "fuse", 1 ] ] ]
   },
   {
@@ -477,7 +464,6 @@
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "stable_explosive", 226 ], [ "volatile_explosive", 6 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
-    "flags": [ "EXPLOSIVE" ],
     "components": [
       [ [ "fuse", 1 ] ],
       [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ],
@@ -499,7 +485,6 @@
     "book_learn": [ [ "manual_launcher", 4 ], [ "textbook_anarch", 5 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "stable_explosive", 253 ], [ "volatile_explosive", 6 ] ],
-    "flags": [ "EXPLOSIVE" ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "fuse", 1 ] ], [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ], [ [ "jug_plastic", 1 ] ] ]
   },
@@ -513,7 +498,6 @@
     "difficulty": 3,
     "time": "30 m",
     "reversible": true,
-    "flags": [ "EXPLOSIVE" ],
     "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "using": [ [ "volatile_explosive", 86 ], [ "stable_explosive", 3354 ] ],
@@ -531,7 +515,6 @@
     "reversible": true,
     "book_learn": [ [ "manual_launcher", 7 ], [ "textbook_anarch", 8 ] ],
     "proficiencies": [ { "proficiency": "prof_handloading" } ],
-    "flags": [ "EXPLOSIVE" ],
     "using": [ [ "volatile_explosive", 173 ], [ "stable_explosive", 6747 ] ],
     "components": [ [ [ "fuse", 1 ] ], [ [ "glue_strong", 4 ], [ "duct_tape", 10 ], [ "cordage", 1, "LIST" ] ], [ [ "30gal_drum", 1 ] ] ]
   }

src/crafting.cpp

@@ -34,7 +34,6 @@
 #include "effect_on_condition.h"
 #include "enum_traits.h"
 #include "enums.h"
-#include "explosion.h"
 #include "faction.h"
 #include "flag.h"
 #include "game.h"
@@ -120,7 +119,6 @@ static const trait_id trait_INT_ALPHA( "INT_ALPHA" );
 static const std::string flag_AFFECTED_BY_PAIN( "AFFECTED_BY_PAIN" );
 static const std::string flag_BLIND_EASY( "BLIND_EASY" );
 static const std::string flag_BLIND_HARD( "BLIND_HARD" );
-static const std::string flag_EXPLOSIVE( "EXPLOSIVE" );
 static const std::string flag_FULL_MAGAZINE( "FULL_MAGAZINE" );
 static const std::string flag_NO_BENCH( "NO_BENCH" );
 static const std::string flag_NO_ENCHANTMENT( "NO_ENCHANTMENT" );
@@ -1363,55 +1361,6 @@ static void destroy_random_component( item &craft, const Character &crafter )
     crafter.add_msg_player_or_npc( game_message_params( game_message_type::m_bad ),
                                    _( "You mess up and destroy the %s." ),
                                    _( "<npcname> messes up and destroys the %s" ), destroyed.tname() );
-
-    // Explosive failure chance reduced by proficiency ratio
-    if( craft.has_flag( flag_EXPLOSIVE ) ) {
-        const recipe &rec = craft.get_making();
-        const std::vector<recipe_proficiency> &profs = rec.proficiencies;
-        int num_required = 0;
-        int num_known = 0;
-
-        for( const recipe_proficiency &prof : profs ) {
-            if( prof.required ) {
-                num_required++;
-                if( crafter.has_proficiency( prof.id ) ) {
-                    num_known++;
-                }
-            }
-        }
-        double reduction = ( num_required > 0 ) ? ( static_cast<double>( num_known ) / num_required ) : 0.0;
-        const double base_explosion_chance = 0.4; // 40%
-        double explosion_chance = base_explosion_chance * ( 1.0 - reduction );
-
-        int missing = num_required - num_known;
-        if( missing <= 0 ) {
-            missing = 1; 
-        }
-
-        int batch_size = craft.get_making_batch_size();
-        if( batch_size <= 0 ) {
-            batch_size = 1;
-        }
-
-        if( x_in_y( explosion_chance * 100, 100 ) ) {
-            const int weight_grams = units::to_gram(craft.weight()); 
-            const int explosion_power = 2 * weight_grams * missing * batch_size;
-            const double casing_mass = static_cast<double>(weight_grams * missing * batch_size);
-            const double fragment_mass = 0.1;
-
-            explosion_data exp;
-            exp.power = explosion_power;
-            exp.shrapnel = cata::make_value<explosion_shrapnel_data>();
-            exp.shrapnel->casing_mass = casing_mass;
-            exp.shrapnel->fragment_mass = fragment_mass;
-
-            crafter.add_msg_player_or_npc( m_bad,
-                _( "The explosive craft explodes violently!" ),
-                _( "The explosive craft explodes violently near <npcname>!" )
-            );
-            explosion( crafter.pos(), exp );
-        }
-    }
 }
 
 bool item::handle_craft_failure( Character &crafter )