diff --git a/AUTHORS.txt b/AUTHORS.txt index 3b3c7a669c..11f7094d44 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -151,6 +151,7 @@ Riccardo Petricca Robert Boklahánics ruPaladin Rutger "RedBery" Meijering +sancron Schwaggot shukari simon84 diff --git a/optionals/compat_gm/CfgMagazines.hpp b/optionals/compat_gm/CfgMagazines.hpp index 07aaffc425..febeb5d898 100644 --- a/optionals/compat_gm/CfgMagazines.hpp +++ b/optionals/compat_gm/CfgMagazines.hpp @@ -93,34 +93,4 @@ class cfgMagazines { }; }; }; - - - // Vehicle Ammo - class gm_magazine_20x139mm_base; - class gme_320Rnd_20x139mm_hei_t_dm81: gm_magazine_20x139mm_base { - displayName = "20 mm 320Rnd HEI-T DM81"; - descriptionShort = "Caliber: 20x139 mm HEI-T DM81
Rounds: 320
Used in: RH202"; - displaynameshort = "HEI-T"; - ammo = "gm_bullet_20x139mm_hei_t_dm81"; - count = 320; - initSpeed = 1175; - tracersEvery = 1; - lastRoundsTracer = 1; - scope = 1; - scopeCurator = 2; - author = "Global Mobilization"; - }; - class gme_180Rnd_20x139mm_apds_t_dm63: gm_magazine_20x139mm_base { - displayName = "20 mm 180Rnd APDS-T DM63"; - descriptionShort = "Caliber: 20x139 mm APDS-T DM63
Rounds: 120
Used in: RH202"; - displaynameshort = "APDS-T"; - ammo = "gm_bullet_20x139mm_apds_t_dm63"; - count = 180; - initSpeed = 1175; - tracersEvery = 1; - lastRoundsTracer = 1; - scope = 1; - scopeCurator = 2; - author = "Global Mobilization"; - }; }; diff --git a/optionals/compat_gm/CfgWeapons.hpp b/optionals/compat_gm/CfgWeapons.hpp index b9f402fd85..1c2adf8e52 100644 --- a/optionals/compat_gm/CfgWeapons.hpp +++ b/optionals/compat_gm/CfgWeapons.hpp @@ -29,7 +29,7 @@ class CfgWeapons { EGVAR(overpressure,priority) = 1; EGVAR(overpressure,range) = 10; }; - + // SUB MACHINE GUNS class gm_mp2_base: gm_rifle_base { EGVAR(overheating,closedBolt) = 0; @@ -37,7 +37,7 @@ class CfgWeapons { class gm_pm63_base: gm_rifle_base { EGVAR(overheating,closedBolt) = 0; }; - + // GRENADE LAUNCHERS class gm_hk69a1_base: gm_rifle_base { EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"}; @@ -45,7 +45,7 @@ class CfgWeapons { class gm_pallad_d_base: gm_rifle_base { EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"}; }; - + // FLARE GUNS class gm_pistol_base; class gm_lp1_base: gm_pistol_base { @@ -54,24 +54,24 @@ class CfgWeapons { class gm_p2a1_base: gm_pistol_base { EGVAR(overheating,jamTypesAllowed)[] = {"Fire", "Dud"}; }; - + // HELMETS #define HEARING_PROTECTION_OPEN EGVAR(hearing,protection) = 0; EGVAR(hearing,lowerVolume) = 0; #define HEARING_PROTECTION_VICCREW EGVAR(hearing,protection) = 0.85; EGVAR(hearing,lowerVolume) = 0.6; #define HEARING_PROTECTION_EARMUFF EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0.5; #define HEARING_PROTECTION_PELTOR EGVAR(hearing,protection) = 0.75; EGVAR(hearing,lowerVolume) = 0; - + class gm_ge_headgear_headset_crew_base; class gm_ge_headgear_headset_crew_oli: gm_ge_headgear_headset_crew_base { HEARING_PROTECTION_PELTOR }; - + class gm_ge_headgear_sph4_base; class gm_ge_headgear_sph4_oli: gm_ge_headgear_sph4_base { HEARING_PROTECTION_PELTOR }; - + class gm_pl_headgear_wz63_base; class gm_pl_army_headgear_wz63_oli: gm_pl_headgear_wz63_base { HEARING_PROTECTION_PELTOR @@ -79,25 +79,25 @@ class CfgWeapons { class gm_pl_army_headgear_wz63_net_oli: gm_pl_headgear_wz63_base { HEARING_PROTECTION_PELTOR }; - + class gm_ge_headgear_crewhat_80_base; class gm_ge_headgear_crewhat_80_blk: gm_ge_headgear_crewhat_80_base { HEARING_PROTECTION_PELTOR }; - + class gm_gc_headgear_crewhat_80_base; class gm_gc_army_headgear_crewhat_80_blk: gm_gc_headgear_crewhat_80_base { HEARING_PROTECTION_PELTOR }; - + class gm_gc_headgear_zsh3_base; - class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base { + class gm_gc_headgear_zsh3_wht: gm_gc_headgear_zsh3_base { HEARING_PROTECTION_PELTOR }; - class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base { + class gm_gc_headgear_zsh3_blu: gm_gc_headgear_zsh3_base { HEARING_PROTECTION_PELTOR }; - class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base { + class gm_gc_headgear_zsh3_orn: gm_gc_headgear_zsh3_base { HEARING_PROTECTION_PELTOR }; diff --git a/optionals/compat_gm/config.cpp b/optionals/compat_gm/config.cpp index fa94cccace..47191aed12 100644 --- a/optionals/compat_gm/config.cpp +++ b/optionals/compat_gm/config.cpp @@ -8,7 +8,7 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_csw", "ace_explosives", "ace_rearm", "ace_refuel", "ace_repair", "gm_core"}; author = ECSTRING(common,ACETeam); - authors[] = {"nomisum"}; + authors[] = {"sancron", "nomisum"}; url = ECSTRING(main,URL); VERSION_CONFIG; };