Chemlight and IR strobe improvements (#6645)

* Make IR chemlight brighter

* Improve IR strobe light visibility

* Make chemlights more realistic

* Tweak IR strobe light to make it brighter

* Increase chemlight TTL to realistic durations

* Add blue and green hi chemlights, replace orange hi by orange utlra-hi

* Add ACE chemlights to 3DEN chemlight module

* Add zeus chemlight modules for ACE chemlights

* Add time to live stat for hand smokes and chemlights

* Add hi blue and hi green pictures by @Drofseh

addons/arsenal/ACE_Arsenal_Stats.hpp

@@ -101,4 +101,14 @@ class GVAR(stats) {
         barStatement = QUOTE([ARR_3((_this select 0) select 0, _this select 1, [ARR_3([ARR_2(0, 500)], [ARR_2(0.01, 1)], false)])] call FUNC(statBarStatement_default));
         tabs[] = {{3,4,5}, {}};
     };
+    class ACE_smokeChemTTL: statBase {
+        scope =  2;
+        priority = 3;
+        stats[] = {"ammo"};
+        displayName = CSTRING(statTTL);
+        showText = 1;
+        textStatement= QUOTE(call FUNC(statTextStatement_smokeChemTTL));
+        condition = QUOTE((configName (_this select 1)) isKindOf [ARR_2('smokeShell', configFile >> 'CfgMagazines')]);
+        tabs[] = {{}, {5}};
+    };
 };

addons/arsenal/XEH_PREP.hpp

@@ -64,6 +64,7 @@ PREP(statTextStatement_accuracy);
 PREP(statTextStatement_mass);
 PREP(statTextStatement_rateOfFire);
 PREP(statTextStatement_scopeMag);
+PREP(statTextStatement_smokeChemTTL);
 PREP(updateCamPos);
 PREP(updateRightPanel);
 PREP(updateUniqueItemsList);

addons/arsenal/functions/fnc_statTextStatement_smokeChemTTL.sqf

@@ -0,0 +1,40 @@
+#include "script_component.hpp"
+/*
+ * Author: Alganthe
+ * Text statement for the smoke / chemlight time to live stat.
+ *
+ * Arguments:
+ * 0: not used
+ * 1: item config path (CONFIG)
+ *
+ * Return Value:
+ * String to display
+ *
+ * Public: No
+ */
+
+params ["", "_config"];
+
+private _TTL = getNumber (configFile >> "CfgAmmo" >> getText (_config >> "ammo") >> "timeToLive");
+
+if (_TTL > 3600) then {
+
+    _TTL = _TTL / 60^2;
+    _TTL = str _TTL splitString ".";
+
+    if (count _TTL > 1) then  {
+        format [
+            "%1h %2m",
+            parseNumber (_TTL select 0),
+            round (60 * parseNumber  ("0." + (_TTL select 1)))
+        ]
+    } else {
+        format [
+            "%1h",
+            parseNumber (_TTL select 0)
+        ]
+    };
+} else {
+
+    format ["%1m", round (_TTL / 60)];
+};

addons/arsenal/stringtable.xml

@@ -809,5 +809,9 @@
             <Japanese>スクリプト用に現在のアイテム リストをアレイで出力します</Japanese>
             <Italian>Esporta l'attuale lista di elementi come un array, per essere usati negli script</Italian>
         </Key>
+        <Key ID="STR_ACE_Arsenal_statTTL">
+            <English>Time to live</English>
+            <French>Durée de vie</French>
+        </Key>
     </Package>
 </Project>

addons/attach/CfgVehicles.hpp

@@ -77,17 +77,12 @@ class CfgVehicles {
         simulation = "nvmarker";
 
         class NVGMarker {
-            diffuse[] = {0.006, 0.006, 0.006, 1};
+            diffuse[]={0.015,0.015,0.015};
-            ambient[] = {0.005, 0.005, 0.005, 1};
+            ambient[]={0.001,0.001,0.001};
-            brightness = 0.1;
+            brightness=0.45;
             name = "pozicni blik";
-            drawLightSize = 0.1;
-            drawLightCenterSize = 0.003;
             activeLight = 0;
             blinking=1;
-            blinkingStartsOn=1;
-            blinkingPattern[] = {2,2};
-            blinkingPatternGuarantee = false;
             dayLight = 0;
             onlyInNvg = 1;
             useFlare = 0;

addons/chemlights/CfgAmmo.hpp

@@ -4,23 +4,23 @@ class CfgAmmo {
     class Chemlight_base;
     
     class Chemlight_Blue: Chemlight_base {
-        timeToLive = 1500;
+        timeToLive = 28800; // 8h as per cyalume website
     };
     
     class Chemlight_Red: Chemlight_base {
-        timeToLive = 1800;
+        timeToLive = 43200; // 12h as per cyalume website
     };
     
     class Chemlight_Green: Chemlight_base {
-        timeToLive = 1800;
+        timeToLive = 43200;
     };
     
     class Chemlight_Yellow: Chemlight_base {
-        timeToLive = 1800;
+        timeToLive = 43200;
     };
     
     class ACE_G_Chemlight_Orange: Chemlight_base {
-        timeToLive = 1800;
+        timeToLive = 43200;
         effectsSmoke = "ACE_ChemlightEffect_Orange";
         model = "\A3\Weapons_f\chemlight\chemlight_yellow_lit";
     };
@@ -30,7 +30,7 @@ class CfgAmmo {
     };
     
     class ACE_G_Chemlight_White: Chemlight_base {
-        timeToLive = 1500;
+        timeToLive = 28800;
         effectsSmoke = "ACE_ChemlightEffect_White";
         model = "\A3\Weapons_f\chemlight\chemlight_yellow_lit";
     };
@@ -41,7 +41,7 @@ class CfgAmmo {
     
     class ACE_G_Chemlight_HiRed: Chemlight_Red {     
         effectsSmoke = "ACE_ChemlightEffect_HiRed";
-        timeToLive = 300;
+        timeToLive = 1800;
     };
     
     class ACE_G_Chemlight_HiRed_Infinite: ACE_G_Chemlight_HiRed {
@@ -50,35 +50,53 @@ class CfgAmmo {
     
     class ACE_G_Chemlight_HiYellow: Chemlight_Yellow {
         effectsSmoke = "ACE_ChemlightEffect_HiYellow";
-        timeToLive = 300;
+        timeToLive = 1800;
     };
     
     class ACE_G_Chemlight_HiYellow_Infinite: ACE_G_Chemlight_HiYellow {
         timeToLive = 1e10;
     };
 
-    class ACE_G_Chemlight_HiOrange: ACE_G_Chemlight_Orange {
-        effectsSmoke = "ACE_ChemlightEffect_HiOrange";
-        timeToLive = 300;
-    };
-    
-    class ACE_G_Chemlight_HiOrange_Infinite: ACE_G_Chemlight_HiOrange {
-        timeToLive = 1e10;
-    };   
-    
     class ACE_G_Chemlight_HiWhite: ACE_G_Chemlight_White {
         effectsSmoke = "ACE_ChemlightEffect_HiWhite";
-        timeToLive = 300;
+        timeToLive = 1800;
     };
 
     class ACE_G_Chemlight_HiWhite_Infinite: ACE_G_Chemlight_HiWhite {
         timeToLive = 1e10;
     };
 
+    class ACE_G_Chemlight_HiBlue: Chemlight_Blue {
+        effectsSmoke = "ACE_ChemlightEffect_HiBlue";
+        timeToLive = 1800;
+    };
+
+    class ACE_G_Chemlight_HiBlue_Infinite: ACE_G_Chemlight_HiBlue {
+        timeToLive = 1e10;
+    };
+
+    class ACE_G_Chemlight_HiGreen: Chemlight_Green {
+        effectsSmoke = "ACE_ChemlightEffect_HiGreen";
+        timeToLive = 1800;
+    };
+
+    class ACE_G_Chemlight_HiGreen_Infinite: ACE_G_Chemlight_HiGreen {
+        timeToLive = 1e10;
+    };
+
+    class ACE_G_Chemlight_UltraHiOrange: ACE_G_Chemlight_Orange {
+        effectsSmoke = "ACE_ChemlightEffect_UltraHiOrange";
+        timeToLive = 300;
+    };
+    
+    class ACE_G_Chemlight_UltraHiOrange_Infinite: ACE_G_Chemlight_UltraHiOrange {
+        timeToLive = 1e10;
+    };
+
     class ACE_G_Chemlight_IR: Chemlight_base {
         ACE_Chemlight_IR = "ACE_Chemlight_IR_Dummy";
         effectsSmoke = "ACE_ChemlightEffect_IR";
-        timeToLive = 1500;
+        timeToLive = 28800;
         model = "\A3\Weapons_f\chemlight\chemlight_blue_lit";
     };
 };

addons/chemlights/CfgLights.hpp

@@ -9,6 +9,15 @@
     };
 
 #define HI_ATTENUATION \
+    class Attenuation { \
+        constant = 0; \
+        linear = 0; \
+        quadratic = 20; \
+        hardLimitStart = 2.1; \
+        hardLimitEnd = 2.8; \
+    };
+
+#define ULTRA_HI_ATTENUATION \
     class Attenuation { \
         constant = 0; \
         linear = 0; \
@@ -63,28 +72,36 @@ class CfgLights {
     };
 
     class ACE_ChemlightLight_HiRed: ChemLight_Red {
-        intensity = 12000;
+        intensity = 9000;
 
         HI_ATTENUATION
     };
-    
     class ACE_ChemlightLight_HiYellow: ChemLight_Yellow {
-        intensity = 12000;
+        intensity = 9000;
 
         HI_ATTENUATION
     };
-    
-    class ACE_ChemlightLight_HiOrange: ACE_ChemlightLight_Orange {
-        intensity = 12000;
-        
-        HI_ATTENUATION
-    };
-    
     class ACE_ChemlightLight_HiWhite: ACE_ChemlightLight_White {
-        intensity = 12000;
+        intensity = 9000;
 
         HI_ATTENUATION
     };
+    class ACE_ChemlightLight_HiBlue: ChemLight_Blue {
+        intensity = 9000;
+
+        HI_ATTENUATION
+    };
+    class ACE_ChemlightLight_HiGreen: ChemLight_Green {
+        intensity = 9000;
+
+        HI_ATTENUATION
+    };
+
+    class ACE_ChemlightLight_UltraHiOrange: ACE_ChemlightLight_Orange {
+        intensity = 12000;
+        
+        ULTRA_HI_ATTENUATION
+    };
 
     class ACE_ChemlightLight_IR: ChemLight_Green {
         intensity = 0;

addons/chemlights/CfgMagazines.hpp

@@ -2,7 +2,6 @@
 class CfgMagazines {
 
     class SmokeShell;
-    
     class Chemlight_Green: Smokeshell {
         ACE_Chemlight_Shield = "ACE_Chemlight_Shield_Green";
     };
@@ -65,17 +64,6 @@ class CfgMagazines {
         picture = QPATHTOF(UI\ace_chemlight_hiyellow_x_ca.paa);
     };
 
-    class ACE_Chemlight_HiOrange: ACE_Chemlight_Orange {
-        ACE_Attachable = "ACE_G_Chemlight_HiOrange";
-        ACE_Chemlight_Shield = "";
-        author = ECSTRING(common,ACETeam);
-        ammo = "ACE_G_Chemlight_HiOrange";
-        displayName = CSTRING(HiOrange_DisplayName);
-        displayNameShort = CSTRING(HiOrange_DisplayNameShort);
-        descriptionShort = CSTRING(HiOrange_DescriptionShort);
-        picture = QPATHTOF(UI\ace_chemlight_hiorange_x_ca.paa);
-    };
-    
     class ACE_Chemlight_HiWhite: ACE_Chemlight_White {
         ACE_Attachable = "ACE_G_Chemlight_HiWhite";
         ACE_Chemlight_Shield = "";
@@ -87,6 +75,40 @@ class CfgMagazines {
         picture = QPATHTOF(UI\ace_chemlight_hiwhite_x_ca.paa);
     };
 
+    class ACE_Chemlight_HiBlue: Chemlight_Blue {
+        ACE_Attachable = "ACE_G_Chemlight_HiBlue";
+        ACE_Chemlight_Shield = "";
+        author = ECSTRING(common,ACETeam);
+        ammo = "ACE_G_Chemlight_HiBlue";
+        displayName = CSTRING(HiBlue_DisplayName);
+        displayNameShort = CSTRING(HiBlue_DisplayNameShort);
+        descriptionShort = CSTRING(HiBlue_DescriptionShort);
+        picture = QPATHTOF(UI\ace_chemlight_hiblue_x_ca.paa);
+    };
+
+    class ACE_Chemlight_HiGreen: Chemlight_Green {
+        ACE_Attachable = "ACE_G_Chemlight_HiGreen";
+        ACE_Chemlight_Shield = "";
+        author = ECSTRING(common,ACETeam);
+        ammo = "ACE_G_Chemlight_HiGreen";
+        displayName = CSTRING(HiGreen_DisplayName);
+        displayNameShort = CSTRING(HiGreen_DisplayNameShort);
+        descriptionShort = CSTRING(HiGreen_DescriptionShort);
+        picture = QPATHTOF(UI\ace_chemlight_higreen_x_ca.paa);
+    };
+
+    class ACE_Chemlight_UltraHiOrange: ACE_Chemlight_Orange {
+        ACE_Attachable = "ACE_G_Chemlight_UltraHiOrange";
+        ACE_Chemlight_Shield = "";
+        author = ECSTRING(common,ACETeam);
+        ammo = "ACE_G_Chemlight_UltraHiOrange";
+        displayName = CSTRING(UltraHiOrange_DisplayName);
+        displayNameShort = CSTRING(UltraHiOrange_DisplayNameShort);
+        descriptionShort = CSTRING(UltraHiOrange_DescriptionShort);
+        picture = QPATHTOF(UI\ace_chemlight_ultrahiorange_x_ca.paa);
+    };
+
+
     class ACE_Chemlight_IR: Chemlight_Green {
         ACE_Attachable = "ACE_Chemlight_IR_Dummy";
         ACE_Chemlight_Shield = "";

addons/chemlights/CfgVehicles.hpp

@@ -33,9 +33,9 @@ class CfgVehicles {
         nvTarget = 1;
         brightness = 0.2;
         class NVGMarker {
-            diffuse[] = {0.1,0.1,0.1};
+            diffuse[] = {0.04,0.04,0.04};
-            ambient[] = {0.01,0.01,0.01};
+            ambient[] = {0.0001,0.0001,0.0001};
-            brightness = 0.015;
+            brightness = 0.12;
             name = "pozicni blik";
             drawLight = 0;
             drawLightSize = 0;
@@ -228,8 +228,10 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_Chemlight_White,20);
             MACRO_ADDMAGAZINE(ACE_Chemlight_HiRed,10);
             MACRO_ADDMAGAZINE(ACE_Chemlight_HiYellow,10);
-            MACRO_ADDMAGAZINE(ACE_Chemlight_HiOrange,10);
+            MACRO_ADDMAGAZINE(ACE_Chemlight_HiBlue,10);
+            MACRO_ADDMAGAZINE(ACE_Chemlight_HiGreen,10);
             MACRO_ADDMAGAZINE(ACE_Chemlight_HiWhite,10);
+            MACRO_ADDMAGAZINE(ACE_Chemlight_UltraHiOrange,10);
             MACRO_ADDMAGAZINE(ACE_Chemlight_IR,20);
         };
     };
@@ -258,8 +260,10 @@ class CfgVehicles {
             MACRO_ADDMAGAZINE(ACE_Chemlight_White,20);
             MACRO_ADDMAGAZINE(ACE_Chemlight_HiRed,10);
             MACRO_ADDMAGAZINE(ACE_Chemlight_HiYellow,10);
-            MACRO_ADDMAGAZINE(ACE_Chemlight_HiOrange,10);
+            MACRO_ADDMAGAZINE(ACE_Chemlight_HiBlue,10);
+            MACRO_ADDMAGAZINE(ACE_Chemlight_HiGreen,10);
             MACRO_ADDMAGAZINE(ACE_Chemlight_HiWhite,10);
+            MACRO_ADDMAGAZINE(ACE_Chemlight_UltraHiOrange,10);
             MACRO_ADDMAGAZINE(ACE_Chemlight_IR,20);
         };
 
@@ -286,4 +290,104 @@ class CfgVehicles {
             };
         };
     };
+
+    class Module_F;
+    class ModuleChemlight_F: Module_F {
+        class Arguments {
+            class Type {
+                class values {
+                    class Orange {
+                        name= CSTRING(Orange_DisplayName);
+                        value="ACE_G_Chemlight_Orange";
+                    };
+                    class White {
+                        name= CSTRING(White_DisplayName);
+                        value="ACE_G_Chemlight_White";
+                    };
+                    class HiRed {
+                        name= CSTRING(HiRed_DisplayName);
+                        value="ACE_G_Chemlight_HiRed";
+                    };
+                    class HiYellow {
+                        name= CSTRING(HiYellow_DisplayName);
+                        value="ACE_G_Chemlight_HiYellow";
+                    };
+                    class HiWhite {
+                        name= CSTRING(HiWhite_DisplayName);
+                        value="ACE_G_Chemlight_HiWhite";
+                    };
+                    class HiBlue {
+                        name= CSTRING(HiBlue_DisplayName);
+                        value="ACE_G_Chemlight_HiBlue";
+                    };
+                    class HiGreen {
+                        name= CSTRING(HiGreen_DisplayName);
+                        value="ACE_G_Chemlight_HiGreen";
+                    };
+                    class UltraHiOrange {
+                        name= CSTRING(UltraHiOrange_DisplayName);
+                        value="ACE_G_Chemlight_UltraHiOrange";
+                    };
+                };
+            };
+        };
+    };
+
+    class ModuleChemlightBlue_F;
+    class ModuleChemlightOrange: ModuleChemlightBlue_F {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightOrange";
+        displayName = CSTRING(Orange_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_orange_x_ca.paa);
+        ammo = "ACE_G_Chemlight_Orange";
+    };
+    class ModuleChemlightWhite: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightWhite";
+        displayName = CSTRING(White_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_white_x_ca.paa);
+        ammo = "ACE_G_Chemlight_White";
+    };
+    class ModuleChemlightHiRed: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightHiRed";
+        displayName = CSTRING(HiRed_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_hired_x_ca.paa);
+        ammo = "ACE_G_Chemlight_HiRed";
+    };
+    class ModuleChemlightHiYellow: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightHiYellow";
+        displayName = CSTRING(HiYellow_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_hiyellow_x_ca.paa);
+        ammo = "ACE_G_Chemlight_HiYellow";
+    };
+    class ModuleChemlightHiWhite: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightHiWhite";
+        displayName = CSTRING(HiWhite_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_hiwhite_x_ca.paa);
+        ammo = "ACE_G_Chemlight_HiWhite";
+    };
+    class ModuleChemlightHiBlue: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightHiBlue";
+        displayName = CSTRING(HiBlue_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_hiblue_x_ca.paa);
+        ammo = "ACE_G_Chemlight_HiBlue";
+    };
+    class ModuleChemlightHiGreen: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightHiGreen";
+        displayName = CSTRING(HiGreen_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_higreen_x_ca.paa);
+        ammo = "ACE_G_Chemlight_HiGreen";
+    };
+    class ModuleChemlightUltraHiOrange: ModuleChemlightOrange {
+        author = ECSTRING(common,ACETeam);
+        _generalMacro = "ModuleChemlightUltraHiOrange";
+        displayName = CSTRING(UltraHiOrange_DisplayName);
+        portrait = QPATHTOF(UI\ace_chemlight_ultrahiorange_x_ca.paa);
+        ammo = "ACE_G_Chemlight_UltraHiOrange";
+    };
 };

addons/chemlights/CfgWeapons.hpp

@@ -3,7 +3,7 @@ class CfgWeapons {
 
     class GrenadeLauncher;
     class Throw: GrenadeLauncher {
-        muzzles[] += {"ACE_Chemlight_OrangeMuzzle","ACE_Chemlight_WhiteMuzzle","ACE_Chemlight_HiRedMuzzle","ACE_Chemlight_HiYellowMuzzle","ACE_Chemlight_HiOrangeMuzzle","ACE_Chemlight_HiWhiteMuzzle","ACE_Chemlight_IRMuzzle"};
+        muzzles[] += {"ACE_Chemlight_OrangeMuzzle","ACE_Chemlight_WhiteMuzzle","ACE_Chemlight_HiRedMuzzle","ACE_Chemlight_HiYellowMuzzle","ACE_Chemlight_HiWhiteMuzzle", "ACE_Chemlight_HiBlueMuzzle", "ACE_Chemlight_HiGreenMuzzle","ACE_Chemlight_UltraHiOrangeMuzzle","ACE_Chemlight_IRMuzzle"};
 
         class ThrowMuzzle;
 
@@ -23,13 +23,22 @@ class CfgWeapons {
             magazines[] = {"ACE_Chemlight_HiYellow"};
         };
 
-        class ACE_Chemlight_HiOrangeMuzzle: ThrowMuzzle {
-            magazines[] = {"ACE_Chemlight_HiOrange"};
-        };
-
         class ACE_Chemlight_HiWhiteMuzzle: ThrowMuzzle {
             magazines[] = {"ACE_Chemlight_HiWhite"};
         };
+
+        class ACE_Chemlight_HiBlueMuzzle: ThrowMuzzle {
+            magazines[] = {"ACE_Chemlight_HiBlue"};
+        };
+
+        class ACE_Chemlight_HiGreenMuzzle: ThrowMuzzle {
+            magazines[] = {"ACE_Chemlight_HiGreen"};
+        };
+
+        class ACE_Chemlight_UltraHiOrangeMuzzle: ThrowMuzzle {
+            magazines[] = {"ACE_Chemlight_UltraHiOrange"};
+        };
+
         class ACE_Chemlight_IRMuzzle: ThrowMuzzle {
             magazines[] = {"ACE_Chemlight_IR"};
         };

addons/chemlights/Effects.hpp

@@ -27,13 +27,6 @@ class ACE_ChemlightEffect_HiYellow {
     };
 };
 
-class ACE_ChemlightEffect_HiOrange {
-    class Light1 {
-        simulation = "light";
-        type = "ACE_ChemlightLight_HiOrange";
-    };
-};
-
 class ACE_ChemlightEffect_HiWhite {
     class Light1 {
         simulation = "light";
@@ -41,6 +34,27 @@ class ACE_ChemlightEffect_HiWhite {
     };
 };
 
+class ACE_ChemlightEffect_HiBlue {
+    class Light1 {
+        simulation = "light";
+        type = "ACE_ChemlightLight_HiBlue";
+    };
+};
+
+class ACE_ChemlightEffect_HiGreen {
+    class Light1 {
+        simulation = "light";
+        type = "ACE_ChemlightLight_HiGreen";
+    };
+};
+
+class ACE_ChemlightEffect_UltraHiOrange {
+    class Light1 {
+        simulation = "light";
+        type = "ACE_ChemlightLight_UltraHiOrange";
+    };
+};
+
 class ACE_ChemlightEffect_IR {
     class Light1 {
         simulation = "light";

addons/chemlights/config.cpp

@@ -3,7 +3,7 @@
 
 class CfgPatches {
     class ADDON {
-        units[] = {"ACE_Box_Chemlights","ACE_Item_Chemlight_Shield","ACE_Item_Chemlight_Shield_Green","ACE_Item_Chemlight_Shield_Red","ACE_Item_Chemlight_Shield_Blue","ACE_Item_Chemlight_Shield_Yellow","ACE_Item_Chemlight_Shield_Orange","ACE_Item_Chemlight_Shield_White"};
+        units[] = {"ACE_Box_Chemlights","ACE_Item_Chemlight_Shield","ACE_Item_Chemlight_Shield_Green","ACE_Item_Chemlight_Shield_Red","ACE_Item_Chemlight_Shield_Blue","ACE_Item_Chemlight_Shield_Yellow","ACE_Item_Chemlight_Shield_Orange","ACE_Item_Chemlight_Shield_White","ModuleChemlightOrange","ModuleChemlightWhite","ModuleChemlightHiRed","ModuleChemlightHiYellow","ModuleChemlightHiWhite","ModuleChemlightHiBlue","ModuleChemlightHiGreen","ModuleChemlightUltraHiOrange"};
         weapons[] = {"ACE_Chemlight_Shield", "ACE_Chemlight_Shield_Green","ACE_Chemlight_Shield_Red","ACE_Chemlight_Shield_Blue","ACE_Chemlight_Shield_Yellow","ACE_Chemlight_Shield_Orange","ACE_Chemlight_Shield_White"};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};

addons/chemlights/stringtable.xml

@@ -150,15 +150,15 @@
             <Chinesesimp>超亮红色光</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiRed_DescriptionShort">
-            <English>Type: Light - Red Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <English>Type: Light - Red Hi (30 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
-            <Japanese>種類: 照明 - 高輝度 赤 (5分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
+            <Japanese>種類: 照明 - 高輝度 赤 (30分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
-            <Polish>Typ: Światło - jaskrawe czerwone (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
+            <Polish>Typ: Światło - jaskrawe czerwone (30 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
-            <German>Typ: Licht - rot, hell (5 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
+            <German>Typ: Licht - rot, hell (30 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
-            <Korean>종류: 밝은 빨간색 (5분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: 손</Korean>
+            <Korean>종류: 밝은 빨간색 (30분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: 손</Korean>
-            <French>Type: Lumière - rouge Hi (5 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
+            <French>Type: Lumière - rouge Hi (30 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
-            <Italian>Tipo: Luce - Rossa Hi (5 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
+            <Italian>Tipo: Luce - Rossa Hi (30 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
-            <Chinese>類型: 光 - 超亮紅色 (5分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
+            <Chinese>類型: 光 - 超亮紅色 (30分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
-            <Chinesesimp>类型: 光 - 超亮红色 (5分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
+            <Chinesesimp>类型: 光 - 超亮红色 (30分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiYellow_DisplayName">
             <English>Chemlight (Hi Yellow)</English>
@@ -183,48 +183,15 @@
             <Chinesesimp>超亮黄色光</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiYellow_DescriptionShort">
-            <English>Type: Light - Yellow Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <English>Type: Light - Yellow Hi (30 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
-            <Japanese>種類: 照明 - 高輝度 黄 (5分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
+            <Japanese>種類: 照明 - 高輝度 黄 (30分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
-            <Polish>Typ: Światło - jaskrawe żółte (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
+            <Polish>Typ: Światło - jaskrawe żółte (30 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
-            <German>Typ: Licht - gelb, hell (5 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
+            <German>Typ: Licht - gelb, hell (30 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
-            <Korean>종류:밝은 노란색 (5분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: Hand</Korean>
+            <Korean>종류:밝은 노란색 (30분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: Hand</Korean>
-            <French>Type: Lumière - Jaune Hi (5 minutes)Nbre: 1&lt;br /&gt; À main</French>
+            <French>Type: Lumière - Jaune Hi (30 minutes)Nbre: 1&lt;br /&gt; À main</French>
-            <Italian>Tipo: Luce - Gialla Hi (5 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
+            <Italian>Tipo: Luce - Gialla Hi (30 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
-            <Chinese>類型: 光 - 超亮黃色 (5分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
+            <Chinese>類型: 光 - 超亮黃色 (30分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
-            <Chinesesimp>类型: 光 - 超亮黄色 (5分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
+            <Chinesesimp>类型: 光 - 超亮黄色 (30分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
-        </Key>
-        <Key ID="STR_ACE_Chemlights_HiOrange_DisplayName">
-            <English>Chemlight (Hi Orange)</English>
-            <Japanese>ケミライト (高輝度 オレンジ)</Japanese>
-            <Polish>Świetlik (jaskrawy pomarańczowy)</Polish>
-            <German>Knicklicht (orange, hell)</German>
-            <Korean>켐라이트 (밝은 주황색)</Korean>
-            <French>Cyalume (Hi orange)</French>
-            <Italian>Luce chimica (Hi Arancione)</Italian>
-            <Chinese>螢光棒 (超亮橘色)</Chinese>
-            <Chinesesimp>萤光棒 (超亮橘色)</Chinesesimp>
-        </Key>
-        <Key ID="STR_ACE_Chemlights_HiOrange_DisplayNameShort">
-            <English>Orange Hi Light</English>
-            <Japanese>高輝度のオレンジ</Japanese>
-            <Polish>Jaskrawe pomarańczowe światło</Polish>
-            <German>Helles, oranges Knicklicht</German>
-            <Korean>밝은 주황색</Korean>
-            <French>Lum. orange haute intensité</French>
-            <Italian>Luce Hi Arancione</Italian>
-            <Chinese>超亮橘色光</Chinese>
-            <Chinesesimp>超亮橘色光</Chinesesimp>
-        </Key>
-        <Key ID="STR_ACE_Chemlights_HiOrange_DescriptionShort">
-            <English>Type: Light - Orange Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
-            <Japanese>種類: 照明 - 高輝度 オレンジ (5分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
-            <Polish>Typ: Światło - jaskrawe pomarańczowe (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
-            <German>Typ: Licht - orange, hell (5 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
-            <Korean>종류: 밝은 주황색 (5분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: 손</Korean>
-            <French>Type: Lumière - orange Hi (5 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
-            <Italian>Tipo: Luce - Arancione Hi (5 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
-            <Chinese>類型: 光 - 超亮橘色 (5分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
-            <Chinesesimp>类型: 光 - 超亮橘色 (5分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiWhite_DisplayName">
             <English>Chemlight (Hi White)</English>
@@ -249,15 +216,51 @@
             <Chinesesimp>超亮白色光</Chinesesimp>
         </Key>
         <Key ID="STR_ACE_Chemlights_HiWhite_DescriptionShort">
-            <English>Type: Light - White Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <English>Type: Light - White Hi (30 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
-            <Japanese>種類: 照明 - 高輝度 白 (5分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
+            <Japanese>種類: 照明 - 高輝度 白 (30分間)&lt;br /&gt;装填数: 1&lt;br /&gt;次で使用: 携帯</Japanese>
-            <Polish>Typ: Światło - jaskrawe białe (5 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
+            <Polish>Typ: Światło - jaskrawe białe (30 minut)&lt;br/&gt;Pociski: 1&lt;br/&gt;Używany w: ręce</Polish>
-            <German>Typ: Licht - weiß, hell (5 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
+            <German>Typ: Licht - weiß, hell (30 Minuten)&lt;br /&gt;Anzahl: 1&lt;br /&gt;Benutzt in: Hand</German>
-            <Korean>종류: 밝은 하얀색 (5분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: 손</Korean>
+            <Korean>종류: 밝은 하얀색 (30분)&lt;br /&gt;수량: 1&lt;br /&gt;사용처: 손</Korean>
-            <French>Type: Lumière - blanche Hi (5 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
+            <French>Type: Lumière - blanche Hi (30 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
-            <Italian>Tipo: Luce - Bianca Hi (5 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
+            <Italian>Tipo: Luce - Bianca Hi (30 minuti)&lt;br /&gt;Rimanenti: 1&lt;br/&gt;Usata in: Mano</Italian>
-            <Chinese>類型: 光 - 超亮白色 (5分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
+            <Chinese>類型: 光 - 超亮白色 (30分鐘)&lt;br /&gt;發數: 1&lt;br /&gt;使用於: 手</Chinese>
-            <Chinesesimp>类型: 光 - 超亮白色 (5分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
+            <Chinesesimp>类型: 光 - 超亮白色 (30分钟)&lt;br /&gt;发数: 1&lt;br /&gt;使用于: 手</Chinesesimp>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_HiBlue_DisplayName">
+            <English>Chemlight (Hi Blue)</English>
+            <French>Cyalume (Hi Bleu)</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_HiBlue_DisplayNameShort">
+            <English>Blue Hi Light</English>
+            <French>Lum. bleue haute intensité</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_HiBlue_DescriptionShort">
+            <English>Type: Light - Blue Hi (30 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <French>Type: Lumière - bleue Hi (30 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_HiGreen_DisplayName">
+            <English>Chemlight (Hi Green)</English>
+            <French>Cyalume (Hi Vert)</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_HiGreen_DisplayNameShort">
+            <English>Green Hi Light</English>
+            <French>Lum. verte haute intensité</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_HiGreen_DescriptionShort">
+            <English>Type: Light - Green Hi (30 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <French>Type: Lumière - verte Hi (30 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_UltraHiOrange_DisplayName">
+            <English>Chemlight (Ultra-Hi Orange)</English>
+            <French>Cyalume (Ultra-Hi orange)</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_UltraHiOrange_DisplayNameShort">
+            <English>Orange Ultra-Hi Light</English>
+            <French>Lum. orange ultra haute intensité</French>
+        </Key>
+        <Key ID="STR_ACE_Chemlights_UltraHiOrange_DescriptionShort">
+            <English>Type: Light - Orange Ultra-Hi (5 minute)&lt;br /&gt;Rounds: 1&lt;br /&gt;Used in: Hand</English>
+            <French>Type: Lumière - Orange Ultra-Hi (5 minutes)&lt;br /&gt;Nbre: 1&lt;br /&gt; À main</French>
         </Key>
         <Key ID="STR_ACE_Chemlights_IR_DisplayName">
             <English>Chemlight (IR)</English>