diff --git a/.hemtt/project.toml b/.hemtt/project.toml index e24fd201fa..a8e50e494d 100644 --- a/.hemtt/project.toml +++ b/.hemtt/project.toml @@ -36,3 +36,11 @@ preset = "Hemtt" workshop = [ "450814997", # CBA_A3's Workshop ID ] + +[hemtt.launch.vn] +workshop = [ + "450814997", # CBA_A3's Workshop ID +] +dlc = [ + "S.O.G. Prairie Fire", +] diff --git a/optionals/compat_sog/$PBOPREFIX$ b/addons/compat_sog/$PBOPREFIX$ similarity index 100% rename from optionals/compat_sog/$PBOPREFIX$ rename to addons/compat_sog/$PBOPREFIX$ diff --git a/optionals/compat_sog/ACE_CSW_Groups.hpp b/addons/compat_sog/ACE_CSW_Groups.hpp similarity index 100% rename from optionals/compat_sog/ACE_CSW_Groups.hpp rename to addons/compat_sog/ACE_CSW_Groups.hpp diff --git a/optionals/compat_sog/ACE_Medical_Injuries.hpp b/addons/compat_sog/ACE_Medical_Injuries.hpp similarity index 100% rename from optionals/compat_sog/ACE_Medical_Injuries.hpp rename to addons/compat_sog/ACE_Medical_Injuries.hpp diff --git a/optionals/compat_sog/ACE_Triggers.hpp b/addons/compat_sog/ACE_Triggers.hpp similarity index 100% rename from optionals/compat_sog/ACE_Triggers.hpp rename to addons/compat_sog/ACE_Triggers.hpp diff --git a/optionals/compat_sog/CfgAmmo.hpp b/addons/compat_sog/CfgAmmo.hpp similarity index 100% rename from optionals/compat_sog/CfgAmmo.hpp rename to addons/compat_sog/CfgAmmo.hpp diff --git a/optionals/compat_sog/CfgAmmo/bombs.hpp b/addons/compat_sog/CfgAmmo/bombs.hpp similarity index 100% rename from optionals/compat_sog/CfgAmmo/bombs.hpp rename to addons/compat_sog/CfgAmmo/bombs.hpp diff --git a/optionals/compat_sog/CfgAmmo/explosives.hpp b/addons/compat_sog/CfgAmmo/explosives.hpp similarity index 100% rename from optionals/compat_sog/CfgAmmo/explosives.hpp rename to addons/compat_sog/CfgAmmo/explosives.hpp diff --git a/optionals/compat_sog/CfgAmmo/grenades.hpp b/addons/compat_sog/CfgAmmo/grenades.hpp similarity index 100% rename from optionals/compat_sog/CfgAmmo/grenades.hpp rename to addons/compat_sog/CfgAmmo/grenades.hpp diff --git a/optionals/compat_sog/CfgAmmo/melee.hpp b/addons/compat_sog/CfgAmmo/melee.hpp similarity index 100% rename from optionals/compat_sog/CfgAmmo/melee.hpp rename to addons/compat_sog/CfgAmmo/melee.hpp diff --git a/optionals/compat_sog/CfgEventHandlers.hpp b/addons/compat_sog/CfgEventHandlers.hpp similarity index 100% rename from optionals/compat_sog/CfgEventHandlers.hpp rename to addons/compat_sog/CfgEventHandlers.hpp diff --git a/optionals/compat_sog/CfgGlasses.hpp b/addons/compat_sog/CfgGlasses.hpp similarity index 100% rename from optionals/compat_sog/CfgGlasses.hpp rename to addons/compat_sog/CfgGlasses.hpp diff --git a/optionals/compat_sog/CfgMagazines.hpp b/addons/compat_sog/CfgMagazines.hpp similarity index 100% rename from optionals/compat_sog/CfgMagazines.hpp rename to addons/compat_sog/CfgMagazines.hpp diff --git a/optionals/compat_sog/CfgMagazines/belts.hpp b/addons/compat_sog/CfgMagazines/belts.hpp similarity index 100% rename from optionals/compat_sog/CfgMagazines/belts.hpp rename to addons/compat_sog/CfgMagazines/belts.hpp diff --git a/optionals/compat_sog/CfgMagazines/csw.hpp b/addons/compat_sog/CfgMagazines/csw.hpp similarity index 100% rename from optionals/compat_sog/CfgMagazines/csw.hpp rename to addons/compat_sog/CfgMagazines/csw.hpp diff --git a/optionals/compat_sog/CfgMagazines/explosives.hpp b/addons/compat_sog/CfgMagazines/explosives.hpp similarity index 100% rename from optionals/compat_sog/CfgMagazines/explosives.hpp rename to addons/compat_sog/CfgMagazines/explosives.hpp diff --git a/optionals/compat_sog/CfgMagazines/food.hpp b/addons/compat_sog/CfgMagazines/food.hpp similarity index 100% rename from optionals/compat_sog/CfgMagazines/food.hpp rename to addons/compat_sog/CfgMagazines/food.hpp diff --git a/optionals/compat_sog/CfgVehicles.hpp b/addons/compat_sog/CfgVehicles.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles.hpp rename to addons/compat_sog/CfgVehicles.hpp diff --git a/optionals/compat_sog/CfgVehicles/backpacks.hpp b/addons/compat_sog/CfgVehicles/backpacks.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/backpacks.hpp rename to addons/compat_sog/CfgVehicles/backpacks.hpp diff --git a/optionals/compat_sog/CfgVehicles/boats.hpp b/addons/compat_sog/CfgVehicles/boats.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/boats.hpp rename to addons/compat_sog/CfgVehicles/boats.hpp diff --git a/optionals/compat_sog/CfgVehicles/boxes.hpp b/addons/compat_sog/CfgVehicles/boxes.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/boxes.hpp rename to addons/compat_sog/CfgVehicles/boxes.hpp diff --git a/optionals/compat_sog/CfgVehicles/explosives.hpp b/addons/compat_sog/CfgVehicles/explosives.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/explosives.hpp rename to addons/compat_sog/CfgVehicles/explosives.hpp diff --git a/optionals/compat_sog/CfgVehicles/helicopters.hpp b/addons/compat_sog/CfgVehicles/helicopters.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/helicopters.hpp rename to addons/compat_sog/CfgVehicles/helicopters.hpp diff --git a/optionals/compat_sog/CfgVehicles/land.hpp b/addons/compat_sog/CfgVehicles/land.hpp similarity index 92% rename from optionals/compat_sog/CfgVehicles/land.hpp rename to addons/compat_sog/CfgVehicles/land.hpp index 23f7577e6c..c939026590 100644 --- a/optionals/compat_sog/CfgVehicles/land.hpp +++ b/addons/compat_sog/CfgVehicles/land.hpp @@ -24,7 +24,8 @@ class Land_vn_usaf_fueltank_75_01: Land_vn_building_b_base { EGVAR(refuel,hooks)[] = {{0, -0.4, -0.5}}; EGVAR(refuel,fuelCargo) = 2840; // 750 * 3.785 }; -class Land_vn_b_prop_fueldrum_01: Land_vn_building_b_base { +class Land_vn_object_b_base; +class Land_vn_b_prop_fueldrum_01: Land_vn_object_b_base { transportFuel = 0; EGVAR(refuel,hooks)[] = {{0, 0, 0.5}}; // reference is Land_FlexibleTank_01_F EGVAR(refuel,fuelCargo) = 300; // reference is Land_FlexibleTank_01_F diff --git a/optionals/compat_sog/CfgVehicles/planes.hpp b/addons/compat_sog/CfgVehicles/planes.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/planes.hpp rename to addons/compat_sog/CfgVehicles/planes.hpp diff --git a/optionals/compat_sog/CfgVehicles/tracked.hpp b/addons/compat_sog/CfgVehicles/tracked.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/tracked.hpp rename to addons/compat_sog/CfgVehicles/tracked.hpp diff --git a/optionals/compat_sog/CfgVehicles/turrets.hpp b/addons/compat_sog/CfgVehicles/turrets.hpp similarity index 91% rename from optionals/compat_sog/CfgVehicles/turrets.hpp rename to addons/compat_sog/CfgVehicles/turrets.hpp index cb9a5efef4..6142a018e8 100644 --- a/optionals/compat_sog/CfgVehicles/turrets.hpp +++ b/addons/compat_sog/CfgVehicles/turrets.hpp @@ -505,37 +505,4 @@ class vn_o_vc_spiderhole_01: StaticWeapon { EGVAR(dragging,canDrag) = 0; EGVAR(cargo,canLoad) = 0; - - EGVAR(trenches,diggingDuration) = QEGVAR(trenches,smallEnvelopeDigDuration); - EGVAR(trenches,removalDuration) = QEGVAR(trenches,smallEnvelopeRemoveDuration); - EGVAR(trenches,noGeoClass) = QGVAR(spiderhole_01_nogeo); - EGVAR(trenches,placementData)[] = {1.5, 1.5, 0.1}; - EGVAR(trenches,grassCuttingPoints)[] = {}; - - class ACE_Actions: ACE_Actions { - class ACE_MainActions: ACE_MainActions { - class ACE_ContinueDiggingTrench { - displayName = ECSTRING(trenches,ContinueDiggingTrench); - condition = QUOTE([ARR_2(_target,_player)] call EFUNC(trenches,canContinueDiggingTrench)); - statement = QUOTE([ARR_2(_target,_player)] call EFUNC(trenches,continueDiggingTrench);); - }; - }; - }; -}; -class vn_o_vc_spiderhole_02: vn_o_vc_spiderhole_01 { - EGVAR(trenches,noGeoClass) = QGVAR(spiderhole_02_nogeo); -}; -class vn_o_vc_spiderhole_03: vn_o_vc_spiderhole_01 { - EGVAR(trenches,noGeoClass) = QGVAR(spiderhole_03_nogeo); - EGVAR(trenches,placementData)[] = {1.5, 2.5, 0.1}; -}; - -class GVAR(spiderhole_01_nogeo): vn_o_vc_spiderhole_01 { - scope = 1; -}; -class GVAR(spiderhole_02_nogeo): vn_o_vc_spiderhole_02 { - scope = 1; -}; -class GVAR(spiderhole_03_nogeo): vn_o_vc_spiderhole_03 { - scope = 1; }; diff --git a/addons/compat_sog/CfgVehicles/units.hpp b/addons/compat_sog/CfgVehicles/units.hpp new file mode 100644 index 0000000000..e0d194227d --- /dev/null +++ b/addons/compat_sog/CfgVehicles/units.hpp @@ -0,0 +1,14 @@ +class vn_b_men_aircrew_base; +class vn_b_men_jetpilot_01: vn_b_men_aircrew_base { + ACE_GForceCoef = 0.55; +}; + +class vn_o_men_aircrew_01; +class vn_o_men_aircrew_05: vn_o_men_aircrew_01 { + ACE_GForceCoef = 0.55; +}; + +class vn_i_men_aircrew_base; +class vn_i_men_jetpilot_01: vn_i_men_aircrew_base { + ACE_GForceCoef = 0.55; +}; diff --git a/optionals/compat_sog/CfgVehicles/vn_boxes.hpp b/addons/compat_sog/CfgVehicles/vn_boxes.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/vn_boxes.hpp rename to addons/compat_sog/CfgVehicles/vn_boxes.hpp diff --git a/optionals/compat_sog/CfgVehicles/wheeled.hpp b/addons/compat_sog/CfgVehicles/wheeled.hpp similarity index 100% rename from optionals/compat_sog/CfgVehicles/wheeled.hpp rename to addons/compat_sog/CfgVehicles/wheeled.hpp diff --git a/optionals/compat_sog/CfgWeapons.hpp b/addons/compat_sog/CfgWeapons.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons.hpp rename to addons/compat_sog/CfgWeapons.hpp diff --git a/optionals/compat_sog/CfgWeapons/csw.hpp b/addons/compat_sog/CfgWeapons/csw.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/csw.hpp rename to addons/compat_sog/CfgWeapons/csw.hpp diff --git a/optionals/compat_sog/CfgWeapons/helmets.hpp b/addons/compat_sog/CfgWeapons/helmets.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/helmets.hpp rename to addons/compat_sog/CfgWeapons/helmets.hpp diff --git a/optionals/compat_sog/CfgWeapons/launchers.hpp b/addons/compat_sog/CfgWeapons/launchers.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/launchers.hpp rename to addons/compat_sog/CfgWeapons/launchers.hpp diff --git a/optionals/compat_sog/CfgWeapons/pistols.hpp b/addons/compat_sog/CfgWeapons/pistols.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/pistols.hpp rename to addons/compat_sog/CfgWeapons/pistols.hpp diff --git a/optionals/compat_sog/CfgWeapons/uniforms.hpp b/addons/compat_sog/CfgWeapons/uniforms.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/uniforms.hpp rename to addons/compat_sog/CfgWeapons/uniforms.hpp diff --git a/optionals/compat_sog/CfgWeapons/weapons.hpp b/addons/compat_sog/CfgWeapons/weapons.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/weapons.hpp rename to addons/compat_sog/CfgWeapons/weapons.hpp diff --git a/optionals/compat_sog/CfgWeapons/weapons_melee.hpp b/addons/compat_sog/CfgWeapons/weapons_melee.hpp similarity index 100% rename from optionals/compat_sog/CfgWeapons/weapons_melee.hpp rename to addons/compat_sog/CfgWeapons/weapons_melee.hpp diff --git a/optionals/compat_sog/EMM_mainMenu_CfgMenus.hpp b/addons/compat_sog/EMM_mainMenu_CfgMenus.hpp similarity index 100% rename from optionals/compat_sog/EMM_mainMenu_CfgMenus.hpp rename to addons/compat_sog/EMM_mainMenu_CfgMenus.hpp diff --git a/optionals/compat_sog/UI/ammo_1rnd_60mm_ca.paa b/addons/compat_sog/UI/ammo_1rnd_60mm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_1rnd_60mm_ca.paa rename to addons/compat_sog/UI/ammo_1rnd_60mm_ca.paa diff --git a/optionals/compat_sog/UI/ammo_1rnd_81mm_ca.paa b/addons/compat_sog/UI/ammo_1rnd_81mm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_1rnd_81mm_ca.paa rename to addons/compat_sog/UI/ammo_1rnd_81mm_ca.paa diff --git a/optionals/compat_sog/UI/ammo_1rnd_82mm_ca.paa b/addons/compat_sog/UI/ammo_1rnd_82mm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_1rnd_82mm_ca.paa rename to addons/compat_sog/UI/ammo_1rnd_82mm_ca.paa diff --git a/optionals/compat_sog/UI/ammo_1rnd_TOW_ca.paa b/addons/compat_sog/UI/ammo_1rnd_TOW_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_1rnd_TOW_ca.paa rename to addons/compat_sog/UI/ammo_1rnd_TOW_ca.paa diff --git a/optionals/compat_sog/UI/ammo_200rnd_762mm_ca.paa b/addons/compat_sog/UI/ammo_200rnd_762mm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_200rnd_762mm_ca.paa rename to addons/compat_sog/UI/ammo_200rnd_762mm_ca.paa diff --git a/optionals/compat_sog/UI/ammo_250rnd_30cal_ca.paa b/addons/compat_sog/UI/ammo_250rnd_30cal_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_250rnd_30cal_ca.paa rename to addons/compat_sog/UI/ammo_250rnd_30cal_ca.paa diff --git a/optionals/compat_sog/UI/ammo_50rnd_127mm_ca.paa b/addons/compat_sog/UI/ammo_50rnd_127mm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/ammo_50rnd_127mm_ca.paa rename to addons/compat_sog/UI/ammo_50rnd_127mm_ca.paa diff --git a/optionals/compat_sog/UI/csw_dshkm_aa_ca.paa b/addons/compat_sog/UI/csw_dshkm_aa_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_dshkm_aa_ca.paa rename to addons/compat_sog/UI/csw_dshkm_aa_ca.paa diff --git a/optionals/compat_sog/UI/csw_dshkm_ca.paa b/addons/compat_sog/UI/csw_dshkm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_dshkm_ca.paa rename to addons/compat_sog/UI/csw_dshkm_ca.paa diff --git a/optionals/compat_sog/UI/csw_dshkm_shield_ca.paa b/addons/compat_sog/UI/csw_dshkm_shield_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_dshkm_shield_ca.paa rename to addons/compat_sog/UI/csw_dshkm_shield_ca.paa diff --git a/optionals/compat_sog/UI/csw_m1919a4_ca.paa b/addons/compat_sog/UI/csw_m1919a4_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_m1919a4_ca.paa rename to addons/compat_sog/UI/csw_m1919a4_ca.paa diff --git a/optionals/compat_sog/UI/csw_m1919a6_ca.paa b/addons/compat_sog/UI/csw_m1919a6_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_m1919a6_ca.paa rename to addons/compat_sog/UI/csw_m1919a6_ca.paa diff --git a/optionals/compat_sog/UI/csw_m29_ca.paa b/addons/compat_sog/UI/csw_m29_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_m29_ca.paa rename to addons/compat_sog/UI/csw_m29_ca.paa diff --git a/optionals/compat_sog/UI/csw_m2_ca.paa b/addons/compat_sog/UI/csw_m2_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_m2_ca.paa rename to addons/compat_sog/UI/csw_m2_ca.paa diff --git a/optionals/compat_sog/UI/csw_m2b_ca.paa b/addons/compat_sog/UI/csw_m2b_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_m2b_ca.paa rename to addons/compat_sog/UI/csw_m2b_ca.paa diff --git a/optionals/compat_sog/UI/csw_m60_ca.paa b/addons/compat_sog/UI/csw_m60_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_m60_ca.paa rename to addons/compat_sog/UI/csw_m60_ca.paa diff --git a/optionals/compat_sog/UI/csw_mg42_ca.paa b/addons/compat_sog/UI/csw_mg42_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_mg42_ca.paa rename to addons/compat_sog/UI/csw_mg42_ca.paa diff --git a/optionals/compat_sog/UI/csw_mk18_ca.paa b/addons/compat_sog/UI/csw_mk18_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_mk18_ca.paa rename to addons/compat_sog/UI/csw_mk18_ca.paa diff --git a/optionals/compat_sog/UI/csw_pk_ca.paa b/addons/compat_sog/UI/csw_pk_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_pk_ca.paa rename to addons/compat_sog/UI/csw_pk_ca.paa diff --git a/optionals/compat_sog/UI/csw_rpd_ca.paa b/addons/compat_sog/UI/csw_rpd_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_rpd_ca.paa rename to addons/compat_sog/UI/csw_rpd_ca.paa diff --git a/optionals/compat_sog/UI/csw_sgm_ca.paa b/addons/compat_sog/UI/csw_sgm_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_sgm_ca.paa rename to addons/compat_sog/UI/csw_sgm_ca.paa diff --git a/optionals/compat_sog/UI/csw_sgm_shield_ca.paa b/addons/compat_sog/UI/csw_sgm_shield_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_sgm_shield_ca.paa rename to addons/compat_sog/UI/csw_sgm_shield_ca.paa diff --git a/optionals/compat_sog/UI/csw_tow_ca.paa b/addons/compat_sog/UI/csw_tow_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_tow_ca.paa rename to addons/compat_sog/UI/csw_tow_ca.paa diff --git a/optionals/compat_sog/UI/csw_type53_ca.paa b/addons/compat_sog/UI/csw_type53_ca.paa similarity index 100% rename from optionals/compat_sog/UI/csw_type53_ca.paa rename to addons/compat_sog/UI/csw_type53_ca.paa diff --git a/optionals/compat_sog/XEH_PREP.hpp b/addons/compat_sog/XEH_PREP.hpp similarity index 100% rename from optionals/compat_sog/XEH_PREP.hpp rename to addons/compat_sog/XEH_PREP.hpp diff --git a/optionals/compat_sog/XEH_postInit.sqf b/addons/compat_sog/XEH_postInit.sqf similarity index 100% rename from optionals/compat_sog/XEH_postInit.sqf rename to addons/compat_sog/XEH_postInit.sqf diff --git a/optionals/compat_sog/XEH_preInit.sqf b/addons/compat_sog/XEH_preInit.sqf similarity index 100% rename from optionals/compat_sog/XEH_preInit.sqf rename to addons/compat_sog/XEH_preInit.sqf diff --git a/optionals/compat_sog/XEH_preStart.sqf b/addons/compat_sog/XEH_preStart.sqf similarity index 100% rename from optionals/compat_sog/XEH_preStart.sqf rename to addons/compat_sog/XEH_preStart.sqf diff --git a/optionals/compat_sog/addon.toml b/addons/compat_sog/addon.toml similarity index 100% rename from optionals/compat_sog/addon.toml rename to addons/compat_sog/addon.toml diff --git a/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp b/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp new file mode 100644 index 0000000000..3c2ba22410 --- /dev/null +++ b/addons/compat_sog/compat_sog_trenches/CfgVehicles.hpp @@ -0,0 +1,63 @@ +class CfgVehicles { + // Trench Actions + class Man; + class CAManBase: Man { + class ACE_SelfActions { + class ACE_Equipment { + class EGVAR(trenches,digEnvelopeSmall); + class EGVAR(compat_sog,digSpiderhole): EGVAR(trenches,digEnvelopeSmall) { + displayName = ECSTRING(compat_sog,Action_DigSpiderhole); + statement = QUOTE([ARR_2({_this call EFUNC(trenches,placeTrench)},[ARR_2(_this select 0,'vn_o_vc_spiderhole_01')])] call CBA_fnc_execNextFrame); + }; + class EGVAR(compat_sog,digSpiderholeAngled): EGVAR(trenches,digEnvelopeSmall) { + displayName = ECSTRING(compat_sog,Action_DigSpiderholeAngled); + statement = QUOTE([ARR_2({_this call EFUNC(trenches,placeTrench)},[ARR_2(_this select 0,'vn_o_vc_spiderhole_02')])] call CBA_fnc_execNextFrame); + }; + class EGVAR(compat_sog,digSpiderholeDual): EGVAR(trenches,digEnvelopeSmall) { + displayName = ECSTRING(compat_sog,Action_DigSpiderholeDual); + statement = QUOTE([ARR_2({_this call EFUNC(trenches,placeTrench)},[ARR_2(_this select 0,'vn_o_vc_spiderhole_03')])] call CBA_fnc_execNextFrame); + }; + }; + }; + }; + + // Spiderholes + class LandVehicle; + class StaticWeapon: LandVehicle { + class ACE_Actions { + class ACE_MainActions; + }; + }; + class vn_o_vc_spiderhole_01: StaticWeapon { + EGVAR(trenches,diggingDuration) = QEGVAR(trenches,smallEnvelopeDigDuration); + EGVAR(trenches,removalDuration) = QEGVAR(trenches,smallEnvelopeRemoveDuration); + EGVAR(trenches,noGeoClass) = QEGVAR(compat_sog,spiderhole_01_nogeo); + EGVAR(trenches,placementData)[] = {1.5, 1.5, 0.1}; + EGVAR(trenches,grassCuttingPoints)[] = {}; + class ACE_Actions: ACE_Actions { + class ACE_MainActions: ACE_MainActions { + class ACE_ContinueDiggingTrench { + displayName = ECSTRING(trenches,ContinueDiggingTrench); + condition = QUOTE([ARR_2(_target,_player)] call EFUNC(trenches,canContinueDiggingTrench)); + statement = QUOTE([ARR_2(_target,_player)] call EFUNC(trenches,continueDiggingTrench);); + }; + }; + }; + }; + class vn_o_vc_spiderhole_02: vn_o_vc_spiderhole_01 { + EGVAR(trenches,noGeoClass) = QEGVAR(compat_sog,spiderhole_02_nogeo); + }; + class vn_o_vc_spiderhole_03: vn_o_vc_spiderhole_01 { + EGVAR(trenches,noGeoClass) = QEGVAR(compat_sog,spiderhole_03_nogeo); + EGVAR(trenches,placementData)[] = {1.5, 2.5, 0.1}; + }; + class EGVAR(compat_sog,spiderhole_01_nogeo): vn_o_vc_spiderhole_01 { + scope = 1; + }; + class EGVAR(compat_sog,spiderhole_02_nogeo): vn_o_vc_spiderhole_02 { + scope = 1; + }; + class EGVAR(compat_sog,spiderhole_03_nogeo): vn_o_vc_spiderhole_03 { + scope = 1; + }; +}; diff --git a/addons/compat_sog/compat_sog_trenches/config.cpp b/addons/compat_sog/compat_sog_trenches/config.cpp new file mode 100644 index 0000000000..e40d39a0be --- /dev/null +++ b/addons/compat_sog/compat_sog_trenches/config.cpp @@ -0,0 +1,38 @@ +#include "script_component.hpp" + +#if __has_include("\vn\weapons_f_vietnam\config.bin") +#else + #define PATCH_SKIP "SOG-Vietnam" +#endif + +#if __has_include("\z\ace\addons\csw\script_component.hpp") +#else + #ifndef PATCH_SKIP + #define PATCH_SKIP "ACE Trenches" + #endif +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "loadorder_f_vietnam", "ace_trenches" + }; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {"BaerMitUmlaut", "veteran29"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +#include "CfgVehicles.hpp" + +#endif diff --git a/addons/compat_sog/compat_sog_trenches/script_component.hpp b/addons/compat_sog/compat_sog_trenches/script_component.hpp new file mode 100644 index 0000000000..15bb9d933b --- /dev/null +++ b/addons/compat_sog/compat_sog_trenches/script_component.hpp @@ -0,0 +1,5 @@ +#include "\z\ace\addons\compat_sog\script_component.hpp" + +#define SUBCOMPONENT trenches +#undef ADDON +#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT) diff --git a/addons/compat_sog/compat_sog_trenches_grad/CfgVehicles.hpp b/addons/compat_sog/compat_sog_trenches_grad/CfgVehicles.hpp new file mode 100644 index 0000000000..a9c8873ceb --- /dev/null +++ b/addons/compat_sog/compat_sog_trenches_grad/CfgVehicles.hpp @@ -0,0 +1,20 @@ +class CfgVehicles { + // Trench Actions + class Man; + class CAManBase: Man { + class ACE_SelfActions { + class ACE_Equipment { + // delete in reverse order + delete EGVAR(compat_sog,digSpiderholeDual); + delete EGVAR(compat_sog,digSpiderholeAngled); + delete EGVAR(compat_sog,digSpiderhole); + delete EGVAR(trenches,digEnvelopeSmall); + }; + }; + }; + + // Spiderholes + delete EGVAR(compat_sog,spiderhole_01_nogeo); + delete EGVAR(compat_sog,spiderhole_02_nogeo); + delete EGVAR(compat_sog,spiderhole_03_nogeo); +}; diff --git a/addons/compat_sog/compat_sog_trenches_grad/config.cpp b/addons/compat_sog/compat_sog_trenches_grad/config.cpp new file mode 100644 index 0000000000..0dc5621b8d --- /dev/null +++ b/addons/compat_sog/compat_sog_trenches_grad/config.cpp @@ -0,0 +1,45 @@ +#include "script_component.hpp" + +#if __has_include("\vn\weapons_f_vietnam\config.bin") +#else + #define PATCH_SKIP "SOG-Vietnam" +#endif + +#if __has_include("\z\ace\addons\csw\script_component.hpp") +#else + #ifndef PATCH_SKIP + #define PATCH_SKIP "ACE Trenches" + #endif +#endif + +#if __has_include("\x\grad_trenches\addons\main\script_component.hpp") +#else + #ifndef PATCH_SKIP + #define PATCH_SKIP "Grad Trenches" + #endif +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else + +class CfgPatches { + class ADDON { + name = COMPONENT_NAME; + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "loadorder_f_vietnam", "ace_compat_sog_trenches", "grad_trenches_main" + }; + skipWhenMissingDependencies = 1; + author = ECSTRING(common,ACETeam); + authors[] = {"BaerMitUmlaut", "veteran29"}; + url = ECSTRING(main,URL); + VERSION_CONFIG; + }; +}; + +#include "CfgVehicles.hpp" + +#endif diff --git a/addons/compat_sog/compat_sog_trenches_grad/script_component.hpp b/addons/compat_sog/compat_sog_trenches_grad/script_component.hpp new file mode 100644 index 0000000000..b7b8f3c707 --- /dev/null +++ b/addons/compat_sog/compat_sog_trenches_grad/script_component.hpp @@ -0,0 +1,5 @@ +#include "\z\ace\addons\compat_sog\script_component.hpp" + +#define SUBCOMPONENT trenches_grad +#undef ADDON +#define ADDON TRIPLES(PREFIX,COMPONENT,SUBCOMPONENT) diff --git a/optionals/compat_sog/config.cpp b/addons/compat_sog/config.cpp similarity index 88% rename from optionals/compat_sog/config.cpp rename to addons/compat_sog/config.cpp index 3cb5c7156b..dac72a7dee 100644 --- a/optionals/compat_sog/config.cpp +++ b/addons/compat_sog/config.cpp @@ -1,5 +1,14 @@ #include "script_component.hpp" +#if __has_include("\vn\weapons_f_vietnam\config.bin") +#else + #define PATCH_SKIP "SOG-Vietnam" +#endif + +#ifdef PATCH_SKIP +ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP) +#else + class CfgPatches { class ADDON { name = COMPONENT_NAME; @@ -36,9 +45,9 @@ class CfgPatches { }; requiredVersion = REQUIRED_VERSION; requiredAddons[] = { - "ace_trenches", "loadorder_f_vietnam" }; + skipWhenMissingDependencies = 1; author = ECSTRING(common,ACETeam); authors[] = {"BaerMitUmlaut", "veteran29"}; url = ECSTRING(main,URL); @@ -56,3 +65,5 @@ class CfgPatches { #include "CfgVehicles.hpp" #include "CfgWeapons.hpp" #include "EMM_mainMenu_CfgMenus.hpp" + +#endif diff --git a/optionals/compat_sog/functions/fnc_disableCookoff.sqf b/addons/compat_sog/functions/fnc_disableCookoff.sqf similarity index 100% rename from optionals/compat_sog/functions/fnc_disableCookoff.sqf rename to addons/compat_sog/functions/fnc_disableCookoff.sqf diff --git a/optionals/compat_sog/functions/fnc_handleBikeMinePlace.sqf b/addons/compat_sog/functions/fnc_handleBikeMinePlace.sqf similarity index 100% rename from optionals/compat_sog/functions/fnc_handleBikeMinePlace.sqf rename to addons/compat_sog/functions/fnc_handleBikeMinePlace.sqf diff --git a/optionals/compat_sog/functions/fnc_handlePunjiTrapDamage.sqf b/addons/compat_sog/functions/fnc_handlePunjiTrapDamage.sqf similarity index 100% rename from optionals/compat_sog/functions/fnc_handlePunjiTrapDamage.sqf rename to addons/compat_sog/functions/fnc_handlePunjiTrapDamage.sqf diff --git a/optionals/compat_sog/functions/fnc_handlePunjiTrapPlace.sqf b/addons/compat_sog/functions/fnc_handlePunjiTrapPlace.sqf similarity index 100% rename from optionals/compat_sog/functions/fnc_handlePunjiTrapPlace.sqf rename to addons/compat_sog/functions/fnc_handlePunjiTrapPlace.sqf diff --git a/optionals/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf b/addons/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf similarity index 100% rename from optionals/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf rename to addons/compat_sog/functions/fnc_handlePunjiTrapTrigger.sqf diff --git a/optionals/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf b/addons/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf similarity index 100% rename from optionals/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf rename to addons/compat_sog/functions/fnc_woundsHandlerIncendiary.sqf diff --git a/optionals/compat_sog/functions/script_component.hpp b/addons/compat_sog/functions/script_component.hpp similarity index 100% rename from optionals/compat_sog/functions/script_component.hpp rename to addons/compat_sog/functions/script_component.hpp diff --git a/optionals/compat_sog/script_component.hpp b/addons/compat_sog/script_component.hpp similarity index 100% rename from optionals/compat_sog/script_component.hpp rename to addons/compat_sog/script_component.hpp diff --git a/optionals/compat_sog/stringtable.xml b/addons/compat_sog/stringtable.xml similarity index 100% rename from optionals/compat_sog/stringtable.xml rename to addons/compat_sog/stringtable.xml diff --git a/optionals/compat_sog/CfgVehicles/units.hpp b/optionals/compat_sog/CfgVehicles/units.hpp deleted file mode 100644 index 0458ac18b8..0000000000 --- a/optionals/compat_sog/CfgVehicles/units.hpp +++ /dev/null @@ -1,38 +0,0 @@ -#if __has_include("\x\grad_trenches\addons\main\config.bin") -#else -class Man; -class CAManBase: Man { - class ACE_SelfActions { - class ACE_Equipment { - class EGVAR(trenches,digEnvelopeSmall); - class GVAR(digSpiderhole): EGVAR(trenches,digEnvelopeSmall) { - displayName = CSTRING(Action_DigSpiderhole); - statement = QUOTE([ARR_2({_this call EFUNC(trenches,placeTrench)},[ARR_2(_this select 0,'vn_o_vc_spiderhole_01')])] call CBA_fnc_execNextFrame); - }; - class GVAR(digSpiderholeAngled): EGVAR(trenches,digEnvelopeSmall) { - displayName = CSTRING(Action_DigSpiderholeAngled); - statement = QUOTE([ARR_2({_this call EFUNC(trenches,placeTrench)},[ARR_2(_this select 0,'vn_o_vc_spiderhole_02')])] call CBA_fnc_execNextFrame); - }; - class GVAR(digSpiderholeDual): EGVAR(trenches,digEnvelopeSmall) { - displayName = CSTRING(Action_DigSpiderholeDual); - statement = QUOTE([ARR_2({_this call EFUNC(trenches,placeTrench)},[ARR_2(_this select 0,'vn_o_vc_spiderhole_03')])] call CBA_fnc_execNextFrame); - }; - }; - }; -}; -#endif - -class vn_b_men_aircrew_base; -class vn_b_men_jetpilot_01: vn_b_men_aircrew_base { - ACE_GForceCoef = 0.55; -}; - -class vn_o_men_aircrew_01; -class vn_o_men_aircrew_05: vn_o_men_aircrew_01 { - ACE_GForceCoef = 0.55; -}; - -class vn_i_men_aircrew_base; -class vn_i_men_jetpilot_01: vn_i_men_aircrew_base { - ACE_GForceCoef = 0.55; -};