Switched to using the explosive value in cfgAmmo instead of maintaini…

…ng a list of explosive bullets
Brians200 · Feb 14, 2014 · 94592be · 94592be
1 parent 43e18a3
commit 94592be
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/EPD/IED/ExplosionEventHandler.sqf b/EPD/IED/ExplosionEventHandler.sqf
@@ -18,9 +18,12 @@ if(allowExplosiveToTriggerIEDs) then {
 		};
 	} foreach ehExplosiveSuperClasses;
 
-	if((! _isExplosive) && (_projectile in explosiveBullets)) then
+	if(! _isExplosive) then
 	{
-		_isExplosiveBullet = true;
+		_explosiveValue = getNumber(configfile >> "CfgAmmo" >> format["%1", _projectile] >> "explosive");
+		if(_explosiveValue > 0) then {
+			_isExplosiveBullet = true;
+		};
 	};
 
 	{//smoke grenades.. chem lights.. ir strobes.. rocks..

diff --git a/EPD/IED/Ied.sqf b/EPD/IED/Ied.sqf
@@ -14,9 +14,6 @@ publicVariable "ehExplosiveSuperClasses";
 explosiveSuperClasses = ["TimeBombCore","BombCore", "Grenade"];
 publicVariable "explosiveSuperClasses";
 
-explosiveBullets = ["B_20mm", "B_20mm_Tracer_Red", "B_30mm_HE", "B_30mm_HE_Tracer_Green", "B_30mm_HE_Tracer_Red", "B_30mm_HE_Tracer_Yellow", "B_30mm_MP", "B_30mm_MP_Tracer_Green", "B_30mm_MP_Tracer_Red", "B_30mm_MP_Tracer_Yellow", "B_35mm_AA", "B_35mm_AA_Tracer_Green", "B_35mm_AA_Tracer_Red", "B_35mm_AA_Tracer_Yellow", "B_40mm_GPR", "B_40mm_GPR_Tracer_Green", "B_40mm_GPR_Tracer_Red", "B_40mm_GPR_Tracer_Yellow"];
-publicVariable "explosiveBullets";	
-
 thingsToIgnore = ["SmokeShell", "FlareCore", "IRStrobeBase", "GrenadeHand_stone", "Smoke_120mm_AMOS_White", "TMR_R_DG32V_F"];
 publicVariable "thingsToIgnore";