Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Explosives - Remove replacement explosives (#10206)

Browse Source 
Remove replacement explosives
This commit is contained in:
johnb432 2024-08-15 09:32:17 +02:00 committed by GitHub
parent f3e2e11693
commit 4014cd5539
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
addons/compat_sog/CfgAmmo/explosives.hpp
View File

@ -2,16 +2,10 @@ class DirectionalBombBase;
class vn_mine_m18_ammo: DirectionalBombBase {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.15};
EGVAR(explosives,size) = 1;
EGVAR(explosives,explosive) = "vn_mine_m18_ammo_scripted";
};
class vn_mine_m18_x3_ammo: vn_mine_m18_ammo {
EGVAR(explosives,defuseObjectPosition)[] = {0, 0, 0.1};
EGVAR(explosives,explosive) = "vn_mine_m18_x3_ammo_scripted";
};
class vn_mine_m18_wp_ammo: vn_mine_m18_ammo {
EGVAR(explosives,explosive) = "vn_mine_m18_wp_ammo_scripted";
};
class vn_mine_m16_base;
@ -99,13 +93,7 @@ class vn_mine_punji_05_ammo: vn_mine_punji_04_ammo {
};
class APERSMine_Range_Ammo;
class vn_mine_bike_ammo: APERSMine_Range_Ammo {
EGVAR(explosives,explosive) = "vn_mine_bike_ammo_scripted";
};
class vn_mine_cartridge_ammo: APERSMine_Range_Ammo {
EGVAR(explosives,explosive) = "vn_mine_cartridge_ammo_scripted";
// bump range and damage slightly, default values do not work well with ACE Medical
indirectHit = QUOTE(getNumber (configFile >> 'CfgAmmo' >> 'vn_mine_cartridge_ammo' >> 'GVAR(indirectHit)'));
GVAR(indirectHit) = QUOTE([ARR_2(2,1)] select isNull (configFile >> 'CfgPatches' >> 'ace_medical'));
@ -116,50 +104,8 @@ class vn_mine_cartridge_ammo: APERSMine_Range_Ammo {
class vn_mine_lighter_ammo: APERSMine_Range_Ammo {
ACE_damageType = QGVAR(explosive_incendiary);
EGVAR(explosives,explosive) = "vn_mine_lighter_ammo_scripted";
};
class vn_mine_jerrycan_ammo: APERSMine_Range_Ammo {
ACE_damageType = QGVAR(explosive_incendiary);
EGVAR(explosives,explosive) = "vn_mine_jerrycan_ammo_scripted";
};
class vn_mine_pot_ammo: APERSMine_Range_Ammo {
EGVAR(explosives,explosive) = "vn_mine_pot_ammo_scripted";
};
class vn_mine_mortar_range_ammo: APERSMine_Range_Ammo {
EGVAR(explosives,explosive) = "vn_mine_mortar_range_ammo_scripted";
};
class vn_mine_limpet_01_ammo: DemoCharge_Remote_Ammo {
EGVAR(explosives,explosive) = "vn_mine_limpet_01_ammo_scripted";
};
class vn_mine_limpet_02_ammo: vn_mine_limpet_01_ammo {
EGVAR(explosives,explosive) = "vn_mine_limpet_02_ammo_scripted";
};
class vn_mine_chicom_no8_ammo: APERSMine_Range_Ammo {
EGVAR(explosives,explosive) = "vn_mine_chicom_no8_ammo_scripted";
};
class vn_mine_dh10_ammo: DirectionalBombBase {
EGVAR(explosives,explosive) = "vn_mine_dh10_ammo_scripted";
};
class PipeBombBase;
class vn_mine_gboard_range_ammo: PipeBombBase {
EGVAR(explosives,explosive) = "vn_mine_gboard_range_ammo_scripted";
};
class SatchelCharge_Remote_Ammo;
class vn_mine_satchelcharge_02_ammo: SatchelCharge_Remote_Ammo {
EGVAR(explosives,explosive) = "vn_mine_satchelcharge_02_ammo_scripted";
};
class vn_mine_bangalore_ammo: SatchelCharge_Remote_Ammo {
EGVAR(explosives,explosive) = "vn_mine_bangalore_ammo_scripted";
};

16
addons/explosives/functions/fnc_detonateExplosive.sqf
View File

@ -31,25 +31,9 @@ private _result = true;
if !([_unit, _range, _item select 0, _item select 1, _triggerClassname] call FUNC(checkDetonateHandlers)) exitWith {false};
if (getNumber (ConfigFile >> "CfgAmmo" >> typeOf (_item select 0) >> "TriggerWhenDestroyed") == 0) then {
private _previousExp = _item select 0;
private _exp = getText (ConfigFile >> "CfgAmmo" >> typeOf (_previousExp) >> QGVAR(Explosive));
if (_exp != "") then {
_exp = createVehicle [_exp, [0,0,15001], [], 0, "NONE"];
_exp setDir (getDir _previousExp);
_item set [0, _exp];
private _pos = getPosASL _previousExp;
deleteVehicle _previousExp;
_exp setPosASL _pos;
};
};
if (isNull (_item select 0)) then {
WARNING_1("Explosive is null [%1]",_this);
};
if ((getNumber (configFile >> "CfgAmmo" >> (typeOf (_item select 0)) >> "triggerWhenDestroyed")) != 1) then {
WARNING_1("Explosive is not triggerWhenDestroyed [%1]",typeOf (_item select 0));
};
[QGVAR(detonate), [_unit, _item select 0, _item select 1]] call CBA_fnc_serverEvent;