diff --git a/addons/dragon/$PBOPREFIX$ b/addons/dragon/$PBOPREFIX$ index e57469074e..41f191d39b 100644 --- a/addons/dragon/$PBOPREFIX$ +++ b/addons/dragon/$PBOPREFIX$ @@ -1,2 +1 @@ -z\ace\addons\dragon - +z\ace\addons\dragon \ No newline at end of file diff --git a/addons/dragon/ACE_GuidanceConfig.hpp b/addons/dragon/ACE_GuidanceConfig.hpp index 18cc5dd9fe..c90bcefa6c 100644 --- a/addons/dragon/ACE_GuidanceConfig.hpp +++ b/addons/dragon/ACE_GuidanceConfig.hpp @@ -7,5 +7,4 @@ class EGVAR(missileguidance,AttackProfiles) { onFired = QFUNC(onFired); functionName = QFUNC(attackProfile_DRAGON); }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgAmmo.hpp b/addons/dragon/CfgAmmo.hpp index faccdfb1cd..9761ae0fd3 100644 --- a/addons/dragon/CfgAmmo.hpp +++ b/addons/dragon/CfgAmmo.hpp @@ -143,5 +143,4 @@ class CfgAmmo { soundHit[] = {QPATHTOF(sounds\service_charge.wss),56.23413,1,1800}; multiSoundHit[] = {"soundDefault1", 1}; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgEventHandlers.hpp b/addons/dragon/CfgEventHandlers.hpp index 755e0552c5..da6dde25ca 100644 --- a/addons/dragon/CfgEventHandlers.hpp +++ b/addons/dragon/CfgEventHandlers.hpp @@ -8,5 +8,4 @@ class Extended_PreInit_EventHandlers { class ADDON { init = QUOTE(call COMPILE_FILE(XEH_preInit)); }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgMagazines.hpp b/addons/dragon/CfgMagazines.hpp index e4b59a9304..6fa4d9569e 100644 --- a/addons/dragon/CfgMagazines.hpp +++ b/addons/dragon/CfgMagazines.hpp @@ -12,5 +12,4 @@ class CfgMagazines { displayNameShort = CSTRING(dragonName); descriptionShort = CSTRING(dragonDescription); }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgVehicles.hpp b/addons/dragon/CfgVehicles.hpp index 9254dcbae4..98c5888031 100644 --- a/addons/dragon/CfgVehicles.hpp +++ b/addons/dragon/CfgVehicles.hpp @@ -36,7 +36,20 @@ class CfgVehicles { cost = 150000; class Damage { tex[] = {}; - mat[] = {"a3\static_f_gamma\data\staticturret_01.rvmat","a3\static_f_gamma\data\staticturret_01_damage.rvmat","a3\static_f_gamma\data\staticturret_01_destruct.rvmat","a3\static_f_gamma\data\staticturret_02.rvmat","a3\static_f_gamma\data\staticturret_02_damage.rvmat","a3\static_f_gamma\data\staticturret_02_destruct.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_launcher.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_launcher_damage.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_launcher_destruct.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_mtube.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_mtube_damage.rvmat","a3\weapons_f_beta\launchers\titan\data\titan_mtube_destruct.rvmat"}; + mat[] = { + "a3\static_f_gamma\data\staticturret_01.rvmat", + "a3\static_f_gamma\data\staticturret_01_damage.rvmat", + "a3\static_f_gamma\data\staticturret_01_destruct.rvmat", + "a3\static_f_gamma\data\staticturret_02.rvmat", + "a3\static_f_gamma\data\staticturret_02_damage.rvmat", + "a3\static_f_gamma\data\staticturret_02_destruct.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_launcher.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_launcher_damage.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_launcher_destruct.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_mtube.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_mtube_damage.rvmat", + "a3\weapons_f_beta\launchers\titan\data\titan_mtube_destruct.rvmat" + }; }; class Turrets: Turrets { class MainTurret: MainTurret { @@ -191,5 +204,4 @@ class CfgVehicles { }; }; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/CfgWeapons.hpp b/addons/dragon/CfgWeapons.hpp index 2bbb06e592..2fe168e41a 100644 --- a/addons/dragon/CfgWeapons.hpp +++ b/addons/dragon/CfgWeapons.hpp @@ -76,5 +76,4 @@ class CfgWeapons { mass = 68; }; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/XEH_PREP.hpp b/addons/dragon/XEH_PREP.hpp index 776be6c72d..f2965ba0bc 100644 --- a/addons/dragon/XEH_PREP.hpp +++ b/addons/dragon/XEH_PREP.hpp @@ -2,5 +2,4 @@ PREP(attackProfile_DRAGON); PREP(canPickupTripod); PREP(onFired); PREP(onDisassemble); -PREP(canDeployWeapon); - +PREP(canDeployWeapon); \ No newline at end of file diff --git a/addons/dragon/data/M47.rvmat b/addons/dragon/data/M47.rvmat index 451559fa79..3241cd20d7 100644 --- a/addons/dragon/data/M47.rvmat +++ b/addons/dragon/data/M47.rvmat @@ -1,5 +1,5 @@ class StageTI { - texture="z\ace\addons\dragon\data\M47_TI_CA.paa"; + texture="z\ace\addons\dragon\data\m47_ti_ca.paa"; }; ambient[]={0.958,0.984,1,1}; diffuse[]={0.958,0.984,1,1}; @@ -10,7 +10,7 @@ specularPower=90; PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 { - texture="z\ace\addons\dragon\data\M47_nohq.paa"; + texture="z\ace\addons\dragon\data\m47_nohq.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -20,7 +20,7 @@ class Stage1 { }; }; class Stage2 { - texture="a3\weapons_f\data\detailmaps\Metal_rough_DT.tga"; + texture="a3\weapons_f\Data\DetailMaps\Metal_rough_DT.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -50,7 +50,7 @@ class Stage4 { }; }; class Stage5 { - texture="z\ace\addons\dragon\data\M47_smdi.paa"; + texture="z\ace\addons\dragon\data\m47_smdi.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -70,7 +70,7 @@ class Stage6 { }; }; class Stage7 { - texture="a3\data_f\env_land_co.tga"; + texture="a3\data_f\env_land_co.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; diff --git a/addons/dragon/data/M47mis.rvmat b/addons/dragon/data/M47mis.rvmat index 24468d29f3..b530ec030b 100644 --- a/addons/dragon/data/M47mis.rvmat +++ b/addons/dragon/data/M47mis.rvmat @@ -1,5 +1,5 @@ class StageTI { - texture="z\ace\addons\dragon\data\M47_TI_CA.paa"; + texture="z\ace\addons\dragon\data\m47_ti_ca.paa"; }; ambient[]={0.989,1,0.958,1}; diffuse[]={0.989,1,0.958,1}; @@ -10,7 +10,7 @@ specularPower=90; PixelShaderID="Super"; VertexShaderID="Super"; class Stage1 { - texture="z\ace\addons\dragon\data\M47mis_nohq.paa"; + texture="z\ace\addons\dragon\data\m47mis_nohq.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -20,7 +20,7 @@ class Stage1 { }; }; class Stage2 { - texture="a3\weapons_f\data\detailmaps\Metal_rough_DT.tga"; + texture="a3\weapons_f\Data\DetailMaps\Metal_rough_DT.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -50,7 +50,7 @@ class Stage4 { }; }; class Stage5 { - texture="z\ace\addons\dragon\data\M47mis_smdi.paa"; + texture="z\ace\addons\dragon\data\m47mis_smdi.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; @@ -70,7 +70,7 @@ class Stage6 { }; }; class Stage7 { - texture="a3\data_f\env_land_co.tga"; + texture="a3\data_f\env_land_co.paa"; uvSource="tex"; class uvTransform { aside[]={1,0,0}; diff --git a/addons/dragon/functions/script_component.hpp b/addons/dragon/functions/script_component.hpp index 51b93e3d9d..386679ecf6 100644 --- a/addons/dragon/functions/script_component.hpp +++ b/addons/dragon/functions/script_component.hpp @@ -1,2 +1 @@ -#include "\z\ace\addons\dragon\script_component.hpp" - +#include "\z\ace\addons\dragon\script_component.hpp" \ No newline at end of file diff --git a/addons/dragon/models/M47.p3d b/addons/dragon/models/M47.p3d index 982e85a6ad..9554efe7f8 100644 Binary files a/addons/dragon/models/M47.p3d and b/addons/dragon/models/M47.p3d differ diff --git a/addons/dragon/models/M47_loaded.p3d b/addons/dragon/models/M47_loaded.p3d index dfe61ebab0..7afe797185 100644 Binary files a/addons/dragon/models/M47_loaded.p3d and b/addons/dragon/models/M47_loaded.p3d differ diff --git a/addons/dragon/models/ace_m47_magazine.p3d b/addons/dragon/models/ace_m47_magazine.p3d index c9f08cd918..39a8b6d80a 100644 Binary files a/addons/dragon/models/ace_m47_magazine.p3d and b/addons/dragon/models/ace_m47_magazine.p3d differ diff --git a/addons/dragon/models/ace_m47_optic.p3d b/addons/dragon/models/ace_m47_optic.p3d index a69181ef0d..a0d8af5a78 100644 Binary files a/addons/dragon/models/ace_m47_optic.p3d and b/addons/dragon/models/ace_m47_optic.p3d differ diff --git a/addons/dragon/models/ace_m47_static.p3d b/addons/dragon/models/ace_m47_static.p3d index 3340196e67..70a24a7c19 100644 Binary files a/addons/dragon/models/ace_m47_static.p3d and b/addons/dragon/models/ace_m47_static.p3d differ diff --git a/addons/dragon/models/model.cfg b/addons/dragon/models/model.cfg index 5152f6ae35..d531c53223 100644 --- a/addons/dragon/models/model.cfg +++ b/addons/dragon/models/model.cfg @@ -91,5 +91,4 @@ class CfgModels { }; }; }; -}; - +}; \ No newline at end of file diff --git a/addons/dragon/models/optics_m47.p3d b/addons/dragon/models/optics_m47.p3d index e7c41b0b12..08183a1f0e 100644 Binary files a/addons/dragon/models/optics_m47.p3d and b/addons/dragon/models/optics_m47.p3d differ diff --git a/addons/dragon/script_component.hpp b/addons/dragon/script_component.hpp index 78d0319204..a405a182ba 100644 --- a/addons/dragon/script_component.hpp +++ b/addons/dragon/script_component.hpp @@ -15,5 +15,4 @@ #endif #include "\z\ace\addons\main\script_macros.hpp" -#define DRAGON_BOOSTER_ANGLE 45 - +#define DRAGON_BOOSTER_ANGLE 45 \ No newline at end of file