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

Merge branch 'apex' into medical-rewrite

Browse Source
This commit is contained in:
Glowbal 2016-06-30 16:51:50 +02:00
commit 8b1b31fc8d
6 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/ballistics/CfgWeapons.hpp
View File

@ -1,7 +1,3 @@
class Single;
class Burst;
class FullAuto;
class Mode_SemiAuto;
class Mode_Burst;
class Mode_FullAuto;
@ -90,7 +86,10 @@ class CfgWeapons {
/* MX */
class arifle_MX_Base_F: Rifle_Base_F {};
class arifle_MX_Base_F: Rifle_Base_F {
class Single: Mode_SemiAuto {};
class FullAuto: Mode_FullAuto {};
};
class arifle_MX_SW_F: arifle_MX_Base_F {
magazines[] = {
"100Rnd_65x39_caseless_mag_Tracer",

2
addons/explosives/CfgVehicles.hpp
View File

@ -286,7 +286,7 @@ class CfgVehicles {
class B_Soldier_03_f; class B_engineer_F:B_Soldier_03_f {MACRO_ADDMINEKIT};
class B_Soldier_diver_base_F; class B_diver_exp_F:B_Soldier_diver_base_F {MACRO_ADDMINEKIT};
class B_Soldier_recon_base; class B_recon_exp_F:B_Soldier_recon_base {MACRO_ADDMINEKIT};
class B_CTRG_soldier_engineer_exp_F:B_Soldier_base_F {MACRO_ADDMINEKIT};
class B_Soldier_02_f; class B_CTRG_soldier_engineer_exp_F:B_Soldier_02_f {MACRO_ADDMINEKIT};
class I_G_Soldier_base_F; class I_G_engineer_F:I_G_Soldier_base_F {MACRO_ADDMINEKIT};
class I_G_Soldier_exp_F:I_G_Soldier_base_F {MACRO_ADDMINEKIT};
class B_G_engineer_F:I_G_engineer_F {MACRO_ADDMINEKIT};

5
addons/huntir/CfgWeapons.hpp
View File

@ -19,11 +19,6 @@ class CfgWeapons {
class UGL_F: GrenadeLauncher {
magazines[] += {"ACE_HuntIR_M203"};
};
class GL_3GL_F: UGL_F {
//magazines[] += {"ACE_HuntIR_M203"};
magazines[] = {"1Rnd_HE_Grenade_shell","UGL_FlareWhite_F","UGL_FlareGreen_F","UGL_FlareRed_F","UGL_FlareYellow_F","UGL_FlareCIR_F","1Rnd_Smoke_Grenade_shell","1Rnd_SmokeRed_Grenade_shell","1Rnd_SmokeGreen_Grenade_shell","1Rnd_SmokeYellow_Grenade_shell","1Rnd_SmokePurple_Grenade_shell","1Rnd_SmokeBlue_Grenade_shell","1Rnd_SmokeOrange_Grenade_shell","3Rnd_HE_Grenade_shell","3Rnd_UGL_FlareWhite_F","3Rnd_UGL_FlareGreen_F","3Rnd_UGL_FlareRed_F","3Rnd_UGL_FlareYellow_F","3Rnd_UGL_FlareCIR_F","3Rnd_Smoke_Grenade_shell","3Rnd_SmokeRed_Grenade_shell","3Rnd_SmokeGreen_Grenade_shell","3Rnd_SmokeYellow_Grenade_shell","3Rnd_SmokePurple_Grenade_shell","3Rnd_SmokeBlue_Grenade_shell","3Rnd_SmokeOrange_Grenade_shell","ACE_HuntIR_M203"};
};
class Rifle_Base_F;
class arifle_MX_Base_F: Rifle_Base_F {
class GL_3GL_F: UGL_F {

6
addons/javelin/CfgWeapons.hpp
View File

@ -38,6 +38,9 @@ class CfgWeapons {
lockingTargetSound[] = {"",0,1};
lockedTargetSound[] = {"",0,1};
};
class launch_B_Titan_short_tna_F: launch_B_Titan_short_F {
GVAR(enabled) = 1;
};
class launch_I_Titan_short_F: launch_Titan_short_base {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";
@ -59,6 +62,9 @@ class CfgWeapons {
lockingTargetSound[] = {"",0,1};
lockedTargetSound[] = {"",0,1};
};
class launch_O_Titan_short_ghex_F: launch_O_Titan_short_F {
GVAR(enabled) = 1;
};
class launch_Titan_short_F: launch_Titan_short_base {
GVAR(enabled) = 1;
weaponInfoType = "ACE_RscOptics_javelin";

6
addons/missileguidance/functions/fnc_onFired.sqf
View File

@ -70,12 +70,6 @@ if(isNil "_target") then {
};
};
//ToDo: Add correct configs for new apex titans (in ace_javelin)
if ((isNil "_target") && {(_weapon == "launch_B_Titan_short_tna_F") || {_weapon == "launch_O_Titan_short_ghex_F"}}) then {
ACE_LOGWARNING_1("APEX Launcher [%1] not supported - Wait for ACE 3.6.1",_weapon);
if (!isNull cursorObject) then {_target = cursorObject;}; //Attempt to give some kind of target or it will
};
TRACE_4("Beginning ACE guidance system",_target,_ammo,_seekerType,_attackProfile);
_args = [_this,
[_shooter,

43
addons/smallarms/CfgWeapons.hpp
View File

@ -1,49 +1,10 @@
class Mode_SemiAuto;
class Mode_Burst;
class Mode_FullAuto;
class MuzzleSlot;
// config inheritance of weapon slot info v1.32
class SlotInfo;
class CowsSlot: SlotInfo {};
class PointerSlot: SlotInfo {
//compatibleItems[] = {"acc_flashlight","acc_pointer_IR", "ACE_acc_flashlight_tls"};
};
class CfgWeapons {
// config inheritance of weapon slot info v1.32 for launchers
class Launcher;
class Launcher_Base_F: Launcher {
class WeaponSlotsInfo {};
};
// config inheritance of weapon slot info v1.32 for assault rifles
class RifleCore;
class Rifle: RifleCore {
class WeaponSlotsInfo {
class MuzzleSlot: MuzzleSlot {};
class CowsSlot: CowsSlot {};
class PointerSlot: PointerSlot {};
};
};
class Rifle_Base_F: Rifle {};
class Rifle_Long_Base_F: Rifle_Base_F {
class WeaponSlotsInfo: WeaponSlotsInfo {};
};
// config inheritance of weapon slot info v1.32 for handguns
class PistolCore;
class Pistol: PistolCore {
class WeaponSlotsInfo {
class CowsSlot: SlotInfo {};
};
};
class Pistol_Base_F: Pistol {
class WeaponSlotsInfo: WeaponSlotsInfo {
class MuzzleSlot: SlotInfo {};
};
};
class Rifle_Base_F;
class Rifle_Long_Base_F;
///////////////////////////////////////////////////////////////////////////////
//////////// SMALL ARMS WEAPONS ///////////////////////////////////////////////