From 175988efe6db5184e21c4d5dcb170b53ea38a5ba Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Sun, 4 May 2025 00:04:36 -0500 Subject: [PATCH 1/6] Removed PVS14 and PVS15 from Blacklist --- defines/DisallowedEquipment.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index acaa924..0c81889 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -11,9 +11,9 @@ class DisallowedEquipment { label = "BLACKLISTED WEAPON OR ITEM"; description = "Items that NO member is allowed to use."; items[] = { - "17BN_ANPVS14", // NVG AN/PVS-14 - "ej_PVS15D", // NVG AN/PVS-15 - "ej_PVS15", // NVG AN/PVS-15 + //"17BN_ANPVS14", // NVG AN/PVS-14 + //"ej_PVS15D", // NVG AN/PVS-15 + //"ej_PVS15", // NVG AN/PVS-15 "LMG_Mk200_black_F", //Mk200 Series "LMG_Mk200_F", //Mk200 Series "rhs_weap_g36c", // G36 Series @@ -95,8 +95,8 @@ class DisallowedEquipment { "UK3CB_M14DMR_Railed_BLK", // M14 Series "UK3CB_M14DMR_Railed", // M14 Series "UK3CB_M14DMR", // M14 Series - "USP_PVS_14", // NVG AN/PVS-14 - "USP_PVS_15" // NVG AN/PVS-15 + //"USP_PVS_14", // NVG AN/PVS-14 + //"USP_PVS_15" // NVG AN/PVS-15 }; }; From 84ab6a1ca76d1f04c8370fd66e8e1124ab2b7185 Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Sun, 4 May 2025 15:11:46 -0500 Subject: [PATCH 2/6] Update defines/BattalionInfo.hpp Updated Alpha Callsign --- defines/BattalionInfo.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defines/BattalionInfo.hpp b/defines/BattalionInfo.hpp index cb5d347..ec9908c 100644 --- a/defines/BattalionInfo.hpp +++ b/defines/BattalionInfo.hpp @@ -7,7 +7,7 @@ #define COMMAND_CALLSIGN POWERLINE //#define RRC_CALLSIGN TIGER //#define MEDIC_CALLSIGN LIFELINE -#define ALPHA_CALLSIGN NOMAD +#define ALPHA_CALLSIGN KINGPIN #define ECHO_CALLSIGN WARLORD #define WPN_CALLSIGN BLACKFOOT From 05936d921320aea731e93629df781773994c9b0c Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Mon, 5 May 2025 23:44:21 -0500 Subject: [PATCH 3/6] Update defines/DisallowedEquipment.hpp Added AJ's T-Shirts to the Tabbed Weapons --- defines/DisallowedEquipment.hpp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index 0c81889..4996f19 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -283,7 +283,22 @@ class DisallowedEquipment { "rhs_weap_m16a4_grip_acog_usmc", //M16 Series "rhs_weap_m16a4_grip_acog2_usmc", //M16 Series "rhs_weap_m32", //M32/MGL Series - "rhs_weap_m32_usmc" //M32/MGL Series + "rhs_weap_m32_usmc", //M32/MGL Series + "G3_Multicam_Tee_WARLORD", //Custom T-Shirt + "G3_M81_Tee_WARLORD", //Custom T-Shirt + "G3_TGR_Tee_WARLORD", //Custom T-Shirt + "G3_Multicam_Tee_BLK", //Custom T-Shirt + "G3_M81_Tee_BLK", //Custom T-Shirt + "G3_TGR_Tee_BLK", //Custom T-Shirt + "G3_Multicam_Tee_Tan", //Custom T-Shirt + "G3_M81_Tee_Tan", //Custom T-Shirt + "G3_TGR_Tee_Tan", //Custom T-Shirt + "G3_Multicam_Tee_Gray", //Custom T-Shirt + "G3_M81_Tee_Gray", //Custom T-Shirt + "G3_TGR_Tee_Gray", //Custom T-Shirt + "G3_Multicam_Tee_Green", //Custom T-Shirt + "G3_M81_Tee_Green", //Custom T-Shirt + "G3_TGR_Tee_Green", //Custom T-Shirt }; }; From 840652f8534a32918ce9091dcfffd8bc8ee53466 Mon Sep 17 00:00:00 2001 From: EagleTrooper Date: Sun, 18 May 2025 19:12:45 -0500 Subject: [PATCH 4/6] Update defines/SupplyCrates.hpp Added new resupply Mags for KAR and JCA --- defines/SupplyCrates.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/defines/SupplyCrates.hpp b/defines/SupplyCrates.hpp index 26fe919..695cc7a 100644 --- a/defines/SupplyCrates.hpp +++ b/defines/SupplyCrates.hpp @@ -36,6 +36,9 @@ class SupplyCrates { {"Tier1_20Rnd_762x51_M993_SR25_Mag",25}, {"KAR_20Rnd_Fury_blk",25}, {"rhsusf_m112_mag",25}, + {"JCA_20Rnd_762x51_PMAG",25}, + {"JCA_20Rnd_762x51_Tracer_Red_PMAG",25}, + {"KAR_100Rnd_Fury_blk",25}, }; items[] = {}; }; @@ -58,7 +61,8 @@ class SupplyCrates { {"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50}, {"Titan_AA",10}, {"Titan_AT",10}, - {"200Rnd_65x39_cased_Box_Tracer_Red",50} + {"200Rnd_65x39_cased_Box_Tracer_Red",50}, + {"KAR_100Rnd_Fury_RT_blk",50} }; items[] = {}; }; From 3f4d4147a32c230b62068504f1e0acf5bfcc22a7 Mon Sep 17 00:00:00 2001 From: hizumi <> Date: Mon, 19 May 2025 16:31:24 -0500 Subject: [PATCH 5/6] Warlord emblem addition add new texture for warlord flag and add it to vehicle flag list --- defines/VehicleFlags.hpp | 5 +++++ textures/flags_misc/flag_17th_warlord_co.paa | Bin 0 -> 23227 bytes 2 files changed, 5 insertions(+) create mode 100644 textures/flags_misc/flag_17th_warlord_co.paa diff --git a/defines/VehicleFlags.hpp b/defines/VehicleFlags.hpp index 752753a..b55e018 100644 --- a/defines/VehicleFlags.hpp +++ b/defines/VehicleFlags.hpp @@ -248,6 +248,11 @@ class VehicleFlags { actionTitle = "17th Emblem"; texture = "textures\flags_misc\flag_17th_emblem_co.paa"; }; + class WarlordEmblem { + actionID = "flag_17th_warlord"; + actionTitle = "Warlord Emblem"; + texture = "textures\flags_misc\flag_17th_warlord_co.paa"; + }; class RedCross { actionID = "flag_redcross"; actionTitle = "Red Cross"; diff --git a/textures/flags_misc/flag_17th_warlord_co.paa b/textures/flags_misc/flag_17th_warlord_co.paa new file mode 100644 index 0000000000000000000000000000000000000000..b8eddc9d2bd234b550bd32b86574b83643c2d7cb GIT binary patch literal 23227 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 Date: Mon, 19 May 2025 16:31:42 -0500 Subject: [PATCH 6/6] revert 05936d921320aea731e93629df781773994c9b0c revert Update defines/DisallowedEquipment.hpp Added AJ's T-Shirts to the Tabbed Weapons --- defines/DisallowedEquipment.hpp | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index 4996f19..0c81889 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -283,22 +283,7 @@ class DisallowedEquipment { "rhs_weap_m16a4_grip_acog_usmc", //M16 Series "rhs_weap_m16a4_grip_acog2_usmc", //M16 Series "rhs_weap_m32", //M32/MGL Series - "rhs_weap_m32_usmc", //M32/MGL Series - "G3_Multicam_Tee_WARLORD", //Custom T-Shirt - "G3_M81_Tee_WARLORD", //Custom T-Shirt - "G3_TGR_Tee_WARLORD", //Custom T-Shirt - "G3_Multicam_Tee_BLK", //Custom T-Shirt - "G3_M81_Tee_BLK", //Custom T-Shirt - "G3_TGR_Tee_BLK", //Custom T-Shirt - "G3_Multicam_Tee_Tan", //Custom T-Shirt - "G3_M81_Tee_Tan", //Custom T-Shirt - "G3_TGR_Tee_Tan", //Custom T-Shirt - "G3_Multicam_Tee_Gray", //Custom T-Shirt - "G3_M81_Tee_Gray", //Custom T-Shirt - "G3_TGR_Tee_Gray", //Custom T-Shirt - "G3_Multicam_Tee_Green", //Custom T-Shirt - "G3_M81_Tee_Green", //Custom T-Shirt - "G3_TGR_Tee_Green", //Custom T-Shirt + "rhs_weap_m32_usmc" //M32/MGL Series }; };