Merge branch 'master' into special-items

Theseus-Aegis · Apr 20, 2024 · 6fcdd86 · 6fcdd86
2 parents 756cad3 + 589f40a
commit 6fcdd86
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 8 deletions.
diff --git a/.hemtt/project.toml b/.hemtt/project.toml
@@ -1,5 +1,6 @@
 name = "GT Armory"
 prefix = "tacgt"
+mainprefix = "x"
 author = "Theseus Incorporated"
 
 [files]
@@ -13,8 +14,24 @@ include = [
 [version]
 git_hash = 0
 
-[hemtt.config]
-preset = "Hemtt"
-
 [hemtt.release]
 folder = "gt_armory"
+
+[hemtt.launch.default]
+workshop = [
+    "450814997", # CBA
+    "463939057", # ACE3
+    "646999497", # Theseus Services
+]
+
+[hemtt.launch.zen]
+extends = "default"
+workshop = [
+    "1779063631", # Zeus Enhanced
+]
+
+[hemtt.launch.ws]
+extends = "default"
+dlc = [
+    "ws",
+]
diff --git a/addons/flashlight/CfgWeapons.hpp b/addons/flashlight/CfgWeapons.hpp
@@ -13,6 +13,7 @@ class CfgWeapons {
     class CUP_acc_LLM01_L;
     class cup_acc_llm_black;
     class CUP_acc_MLPLS_Laser;
+    class CUP_acc_SF_XC1;
     class InventoryFlashLightItem_Base_F;
 
     #include "AN_PEQ.hpp"

diff --git a/addons/flashlight/Surefire.hpp b/addons/flashlight/Surefire.hpp
@@ -99,3 +99,15 @@ class CLASS(Surefire_Low_Flashlight_Tan): CLASS(Surefire_Flashlight_Tan) {
     MRT_SwitchItemPrevClass = QCLASS(Surefire_Flashlight_Tan);
     MRT_SwitchItemHintText = "Flashlight Red";
 };
+
+// XC-1-C Pistol Flashlight
+class CLASS(Surefire_XC1_Flashlight): CUP_acc_SF_XC1 {
+    displayName = "Surefire XC1-C (GT Edition)";
+    descriptionShort = "Light GT Edition";
+    class ItemInfo: InventoryFlashLightItem_Base_F {
+        mass = 4;
+        class Flashlight {
+            MACRO_FLASHLIGHT;
+        };
+    };
+};
diff --git a/addons/flashlight/config.cpp b/addons/flashlight/config.cpp
@@ -48,6 +48,7 @@ class CfgPatches {
             QCLASS(Surefire_Low_Flashlight_Black),
             QCLASS(Surefire_Low_Flashlight_OD),
             QCLASS(Surefire_Low_Flashlight_Tan),
+            QCLASS(Surefire_XC1_Flashlight),
             QCLASS(UTG_Flashlight),
             QCLASS(UTG_Low_Flashlight)
         };

diff --git a/addons/flashlight/joint_rails.hpp b/addons/flashlight/joint_rails.hpp
@@ -52,5 +52,6 @@ class asdg_PistolUnderRail: asdg_SlotInfo {
         tacgt_CZ_M3X_Vis_Laser = 1;
         tacgt_MLPLS_Laser = 1;
         tacgt_MLPLS_Vis_Laser = 1;
+        tacgt_Surefire_XC1_Flashlight = 1;
     };
 };
diff --git a/addons/hidden/config.cpp b/addons/hidden/config.cpp
@@ -10,8 +10,7 @@ class CfgPatches {
             "tacgt_main",
             "CUP_Weapons_AmmoBoxes",
             "CUP_Weapons_Grenades",
-            "CUP_Weapons_Put",
-            "CUP_Weapons_ACE_compat"
+            "CUP_Weapons_Put"
         };
         skipWhenMissingDependencies = 1;
         author = ECSTRING(main,Author);

diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
@@ -1,3 +1,3 @@
 #define MAJOR 2
 #define MINOR 7
-#define PATCH 1
+#define PATCH 2
diff --git a/addons/replacements/CfgWeapons.hpp b/addons/replacements/CfgWeapons.hpp
@@ -32,8 +32,8 @@ class CfgWeapons {
             "ACE_tourniquet",
             "ACE_tourniquet",
             "ACE_tourniquet",
-            "tac_medical_painkillers",
-            "tac_medical_painkillers"
+            "ACE_painkillers",
+            "ACE_painkillers"
         };
     };