diff --git a/README.md b/README.md index 438704b20..1db1b60cb 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Included Custom Addons * RedRyder BB Gun by WillRobinson - https://github.com/arma2WillRobinson/Red-Ryder * Namalsk Addons by SumrakDZN - https://github.com/SumrakDZN/DayZNamalsk * Stalker Units by Icewindo - http://www.armaholic.com/page.php?id=9795 +* Post Apocalypse Units by Icewindo - http://www.armaholic.com/page.php?id=11840 * Ghillie Suits by Brainbug - http://www.armaholic.com/page.php?id=11424 * Retextured German KSK Units by Brainbug - http://www.armaholic.com/page.php?id=11129 diff --git a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp index 66c417222..4c95e0a54 100644 --- a/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp +++ b/SQF/dayz_code/Configs/CfgMagazines/Magazines/556x45.hpp @@ -139,4 +139,19 @@ class 30Rnd_556x45_G36SD : 30Rnd_556x45_G36 }; }; }; +}; + +//ice apo resistance mod new 60rnd stanag mag +class 60Rnd_556x45_Stanag_tape_ice_DZE : CA_Magazine { + scope = public; + displayName = $STR_DZE_MAG_60RND_556x45_STANAG_NAME; + cartridgeName = "556x45"; + ammo = "B_556x45_Ball"; + count = 60; + initSpeed = 930; + //type = 2* 256; + type = 256; + tracersEvery = 0; + descriptionShort = $STR_DZE_MAG_60RND_556x45_STANAG_DESC; + picture = "\ice_apo_weapons\data\double_ca.paa"; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp index dd6adceb0..57481a616 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36.hpp @@ -3,13 +3,16 @@ class G36K_Camo_DZ : G36C model = "z\addons\dayz_communityweapons\g36\g36k_camo.p3d"; picture = "\z\addons\dayz_communityweapons\g36\data\w_g36k_camo_ca.paa"; displayName = $STR_DZ_WPN_G36K_CAMO_NAME; - /* //Allow default A2 mags magazines[] = { 30Rnd_556x45_G36, - 30Rnd_556x45_G36SD + 30Rnd_556x45_G36SD, //Allow both SD and non-SD + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 30Rnd_556x45_StanagSD, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; - */ //G36 Optic optics = true; opticsDisablePeripherialVision = true; @@ -92,7 +95,8 @@ class G36K_Camo_SD_DZ : G36_C_SD_eotech 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD, - 20Rnd_556x45_Stanag + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; //G36 Optic diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp index 4b5d6b2d5..ac14e25d1 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/G36C.hpp @@ -41,13 +41,16 @@ class G36C_DZ : G36C model = "z\addons\dayz_communityweapons\g36c\g36c.p3d"; picture = "\z\addons\dayz_communityweapons\g36c\data\w_g36c_ca.paa"; displayName = $STR_DZ_WPN_G36C_NAME; - /* //Allow default A2 mags magazines[] = { 30Rnd_556x45_G36, - 30Rnd_556x45_G36SD + 30Rnd_556x45_G36SD, //Allow both SD and non-SD + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 30Rnd_556x45_StanagSD, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; - */ class Attachments { Attachment_CCO = "G36C_CCO_DZ"; @@ -70,7 +73,8 @@ class G36C_SD_DZ : G36_C_SD_eotech 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, 30Rnd_556x45_StanagSD, - 20Rnd_556x45_Stanag + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; class Attachments diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp index 0c411bbf9..8cb66f808 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L110A1.hpp @@ -5,15 +5,18 @@ class L110A1_CCO_DZ : BAF_L110A1_Aim displayName = $STR_DZ_WPN_L110A1_CCO_NAME; irDistance = 0; type = WeaponSlotPrimary; - /* //Allow default A2 mags magazines[] = { 200Rnd_556x45_M249, 100Rnd_556x45_M249, + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, //Allow both SD and non-SD + 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD + 30Rnd_556x45_StanagSD, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; - */ class ItemActions { class RemoveCCO diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp index c49c1733c..c4570271d 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/L85A2.hpp @@ -68,13 +68,16 @@ class L85A2_DZ : BAF_L85A2_RIS_Holo irDistance = 0; - /* //Allow default A2 mags magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD + 30Rnd_556x45_StanagSD,//Allow both SD and non-SD + 30Rnd_556x45_G36, + 30Rnd_556x45_G36SD, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; - */ class Single; class FullAuto; @@ -146,9 +149,12 @@ class L85A2_SD_Base : L85A2_DZ magazines[] = { 30Rnd_556x45_StanagSD, - 30Rnd_556x45_Stanag, //Allow both SD and non-SD + 30Rnd_556x45_Stanag,//Allow both SD and non-SD 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36 + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; fireLightDuration = 0; fireLightIntensity = 0; diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp index b3a962300..d1fa27548 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A2.hpp @@ -1,13 +1,16 @@ //no attachments on either of the M16A2s. class M16A2_DZ : M16A2 { - /* magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD + 30Rnd_556x45_StanagSD,//Allow both SD and non-SD + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; - */ class Attachments { Attachment_M203 = "M16A2_GL_DZ"; @@ -15,14 +18,17 @@ class M16A2_DZ : M16A2 }; class M16A2_GL_DZ : M16A2GL -{ - /* +{ magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD + 30Rnd_556x45_StanagSD,//Allow both SD and non-SD + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; - */ class ItemActions { class RemoveGL @@ -31,4 +37,35 @@ class M16A2_GL_DZ : M16A2GL script = "; ['Attachment_M203',_id,'M16A2_DZ'] call player_removeAttachment"; }; }; +}; +//ice apo resistance mod m16 +class ice_apo_weapons_M16_DZE : M16A2 { + class FlashLight { + color[] = {0.9, 0.9, 0.7, 0.9}; + ambient[] = {0.1, 0.1, 0.1, 1.0}; + position = "flash dir"; + direction = "flash"; + angle = 30; + scale[] = {1, 1, 0.5}; + brightness = 0.1; + }; + scope = public; + picture = "\ice_apo_weapons\Data\m16_ca.paa"; + model = "\ice_apo_weapons\M16_proxy"; + displayName = $STR_DZE_WPN_M16RUSTY_NAME; + descriptionShort = $STR_DZE_WPN_M16RUSTY_DESC; + selectionFireAnim = "zasleh"; + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_StanagSD,//Allow both SD and non-SD + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; + class Library { + libTextDesc = "This M16 rifle is in a very bad shape."; + }; }; \ No newline at end of file diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp index ac7f0d179..20870037a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M16A4.hpp @@ -65,11 +65,16 @@ class M16A4_DZ : M16A2 picture = "\z\addons\dayz_communityweapons\m16a4\data\w_m16a4_ca.paa"; displayName = $STR_DZ_WPN_M16A4; - /*magazines[] = //Allow default A2 mags + magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD - };*/ + 30Rnd_556x45_StanagSD, //Allow both SD and non-SD + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; class Attachments { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp index b8a5cbb16..ad7f572a9 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M249.hpp @@ -6,13 +6,18 @@ class M249_CCO_DZ : M249 type = WeaponSlotPrimary; - /*magazines[] = //Allow default A2 mags + magazines[] = { 200Rnd_556x45_M249, 100Rnd_556x45_M249, + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, //Allow both SD and non-SD + 100Rnd_556x45_BetaCMag, 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD - };*/ + 30Rnd_556x45_StanagSD, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; class ItemActions { diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp index 5779f6f68..b6634a35a 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4A1.hpp @@ -71,11 +71,16 @@ class M4A1_DZ : M4A1 handAnim[]={"OFP2_ManSkeleton","\Ca\weapons_E\SCAR\Data\Anim\SCAR.rtm"}; - /*magazines[] = //Allow default A2 mags + magazines[] = { 30Rnd_556x45_Stanag, - 30Rnd_556x45_StanagSD - };*/ + 30Rnd_556x45_StanagSD,//Allow both SD and non-SD + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; class Attachments { @@ -165,12 +170,13 @@ class M4A1_SD_DZ : M4A1_AIM_SD_camo magazines[] = { - 30Rnd_556x45_StanagSD, - 30Rnd_556x45_Stanag, //Allow both SD and non-SD - 20Rnd_556x45_Stanag, 30Rnd_556x45_G36SD, - 30Rnd_556x45_G36, - 100Rnd_556x45_BetaCMag + 30Rnd_556x45_G36, //Allow both SD and non-SD + 100Rnd_556x45_BetaCMag, + 30Rnd_556x45_Stanag, + 30Rnd_556x45_StanagSD, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE }; class Attachments @@ -1560,6 +1566,37 @@ class M4A1_GL_ACOG_SD_MFL_DZ : M4A1_GL_SD_MFL_DZ }; }; +//ice apo resistance mod m4 +class ice_apo_weapons_M4_DZE : M4A1 { + class FlashLight { + color[] = {0.9, 0.9, 0.7, 0.9}; + ambient[] = {0.1, 0.1, 0.1, 1.0}; + position = "flash dir"; + direction = "flash"; + angle = 30; + scale[] = {1, 1, 0.5}; + brightness = 0.1; + }; + scope = public; + model = "\ice_apo_weapons\M4_ironsight"; + picture = "\ice_apo_weapons\Data\m4a1_ca.paa"; + displayName = $STR_DZE_WPN_M4RUSTY_NAME; + descriptionShort = $STR_DZE_WPN_M4RUSTY_DESC; + magazines[] = + { + 30Rnd_556x45_Stanag, + 30Rnd_556x45_StanagSD,//Allow both SD and non-SD + 30Rnd_556x45_G36SD, + 30Rnd_556x45_G36, + 100Rnd_556x45_BetaCMag, + 20Rnd_556x45_Stanag, + 60Rnd_556x45_Stanag_tape_ice_DZE + }; + selectionFireAnim = "zasleh"; + class Library { + libTextDesc = "This M4 rifle is in a very bad shape."; + }; +}; #undef M4A1_FLASHLIGHT #undef M4A1_MFLASHLIGHT #undef M4A1_M203 diff --git a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp index 2cb9a4585..804b4f6e6 100644 --- a/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp +++ b/SQF/dayz_code/Configs/CfgWeapons/Rifles/M4SPR.hpp @@ -2,7 +2,7 @@ class M4SPR; class M4SPR_DZE: M4SPR { //Moved 30Rnd Stanag to first in array - magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_StanagSD", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "30Rnd_556x45_G36SD"}; + magazines[] = {"30Rnd_556x45_Stanag", "20Rnd_556x45_Stanag", "30Rnd_556x45_StanagSD", "30Rnd_556x45_G36", "100Rnd_556x45_BetaCMag", "30Rnd_556x45_G36SD","60Rnd_556x45_Stanag_tape_ice_DZE"}; //A2OA M4SPR does not allow NVG after 2018-04-05 CorePatch visionMode[] = {"Normal", "NVG"}; diff --git a/SQF/dayz_code/stringtable.xml b/SQF/dayz_code/stringtable.xml index 1e7f755d3..a26f98bf7 100644 --- a/SQF/dayz_code/stringtable.xml +++ b/SQF/dayz_code/stringtable.xml @@ -19091,7 +19091,31 @@ GER Teamleader (woodland) Dt. Truppführer (Waldtarn) - + + + M16A2 (Rusty) + M16A2 (Rostig) + + + This M16 rifle is in a very bad shape. + Dieses M16 Gewehr ist in einem sehr heruntergekommenen Zustand. + + + M4A1 (Rusty) + M4A1 (Rostig) + + + This M4 rifle is in a very bad shape. + Dieses M4 Gewehr ist in einem sehr heruntergekommenen Zustand. + + + 60Rnd. Stanag Mag + 60 Schuss Stanag Mag + + + Caliber: 5.56x45mm <br/>Rounds: 60, duct-taped <br/>Used in: G36, M16, M4, M249, MK-12 and L110 + Kaliber: 5.56x45mm <br/>Schuss: 60, zusammengeklebt <br/>Eingesetzt in: G36, M16, M4, M249, MK-12 und L110 +