Merge ACEX

AUTHORS.txt

@@ -31,9 +31,10 @@ VKing <kauestad@gmail.com>
 Walter Pearce <jaynus@gmail.com>
 
 # CONTRIBUTORS
-[BIG]Bull
+10Dozen a.k.a Dusin
 11RDP-LoupVert <loupvert@11rdp.fr>
 654wak654 <ozanegitmen@gmail.com>
+[BIG]Bull
 ACCtomeek <tomeek99@gmail.com>
 adam3adam <br.ada@seznam.cz>
 Adanteh
@@ -44,8 +45,8 @@ Aleksey EpMAK Yermakov <epmak777@gmail.com>
 Alganthe <alganthe@live.fr>
 Andrea "AtixNeon" Verano <veranoandrea88@gmail.com>
 Anthariel <Contact@storm-simulation.com>
-Arcanum417 <lubos.len@gmail.com>
 Anton
+Arcanum417 <lubos.len@gmail.com>
 Arkhir <wonsz666@gmail.com >
 ARV187 aka Spark23
 Asgar Serran <piechottaf@web.de>
@@ -60,23 +61,24 @@ Brett Mayson
 Brisse <brisse@outlook.com>
 Brostrom.A | Evul <andreas.brostrom.ce@gmail.com>
 BullHorn <bullhorn7@gmail.com>
+C0kkie
 chris579 <github@klemm.one>
 classicarma
 Clon1998 <ps.patti1998@gmail.com>
 Codingboy
 Coren <coren4@gmail.com>
 Crusty
-C0kkie
+dabako <dabako@dabakoworld.de>
 dgibso29 <gibson@earringpranks.com>
 Dharma Bellamkonda <dharma.bellamkonda@gmail.com>
 Dimaslg <dimaslg@telecable.es>
 diwako
 dixon13 <dixonbegay@gmail.com>
 Drift_91
 Drill <drill87@gmail.com>
-Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Drofseh <drofseh@gmail.com>
 Dslyecxi <dslyecxi@gmail.com>
+Dudakov aka [OMCB]Kaban <dudakov.s@gmail.com>
 Eclipser <jms@modeemi.fi>
 Elgin675
 ElTyranos
@@ -91,7 +93,9 @@ FFAAMOD <modffaa@gmail.com>
 Filip Basara <filip.basara93@googlemail.com>
 fr89k <kaschitoku@web.de>
 Fragment
+Frank <frankplow@protonmail.com>
 FreeZbe <freeseb@gmail.com>
+Fyuran <dankemedic@hotmail.com>
 geraldbolso1899
 Ghost
 Gianmarco Varriale (TeamNuke) <admin@forhost.org>
@@ -134,8 +138,8 @@ Orbis2358 <mgkid3310@naver.com>
 oscarmolinadev
 Panisher (Tushino Serious Games) <panisher333@gmail.com>
 PaxJaromeMalues <seemax1991@gmail.com>
-PiZZADOX <509thParachuteInfantry@gmail.com>
 Phyma <sethramstrom@gmail.com>
+PiZZADOX <509thParachuteInfantry@gmail.com>
 pokertour
 Professor <lukas.trneny@wo.cz>
 Pterolatypus <pterolatypus@gmail.com>
@@ -168,10 +172,7 @@ voiper
 VyMajoris(W-Cephei)<vycanismajoriscsa@gmail.com>
 Walthzer <walthzer.69@gmail.com>
 Winter <simon@agius-muscat.net>
+wizpig64
 xrufix
 Zakant <Zakant@gmx.de>
 zGuba
-Fyuran <dankemedic@hotmail.com>
-dabako <dabako@dabakoworld.de>
-Frank <frankplow@protonmail.com>
-10Dozen a.k.a Dusin

addons/field_rations/$PBOPREFIX$

@@ -0,0 +1 @@
+z\ace\addons\field_rations

addons/field_rations/Cfg3DEN.hpp

@@ -0,0 +1,24 @@
+#define GET_NUMBER(config,default) (if (isNumber (config)) then {getNumber (config)} else {default})
+#define DEFAULT_WATER_SUPPLY GET_NUMBER(configFile >> 'CfgVehicles' >> typeOf _this >> QQXGVAR(waterSupply),REFILL_WATER_DISABLED)
+
+class Cfg3DEN {
+    class Object {
+        class AttributeCategories {
+            class ace_attributes {
+                class Attributes {
+                    class XGVAR(waterSupply) {
+                        displayName = CSTRING(WaterSupply_3DEN_DisplayName);
+                        tooltip = CSTRING(WaterSupply_3DEN_Description);
+                        property = QXGVAR(waterSupply);
+                        control = "EditShort";
+                        expression = QUOTE(if (_value != DEFAULT_WATER_SUPPLY) then {_this setVariable [ARR_3(QQGVAR(currentWaterSupply),_value,true)]});
+                        defaultValue = QUOTE(DEFAULT_WATER_SUPPLY);
+                        validate = "NUMBER";
+                        condition = "(1 - objectBrain) * (1 - objectAgent)";
+                        typeName = "NUMBER";
+                    };
+                };
+            };
+        };
+    };
+};

addons/field_rations/CfgEventHandlers.hpp

@@ -0,0 +1,17 @@
+class Extended_PreStart_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preStart));
+    };
+};
+
+class Extended_PreInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_preInit));
+    };
+};
+
+class Extended_PostInit_EventHandlers {
+    class ADDON {
+        init = QUOTE(call COMPILE_FILE(XEH_postInit));
+    };
+};

addons/field_rations/CfgMoves.hpp

@@ -0,0 +1,67 @@
+class CfgMovesBasic;
+class CfgMovesMaleSdr: CfgMovesBasic {
+    class States {
+        class CutSceneAnimationBase;
+        class GVAR(drinkStand): CutSceneAnimationBase {
+            file = QPATHTOF(anim\drink_stand.rtm);
+            actions = "CivilStandActions";
+            speed = 0.1;
+            disableWeapons = 1;
+            disableWeaponsLong = 1;
+            canReload = 0;
+            canPullTrigger = 0;
+            showWeaponAim = 0;
+            looped = 0;
+            head = "headNo";
+            aiming = "aimingNo";
+            legs = "legsNo";
+            connectTo[] = {"AmovPercMstpSnonWnonDnon", 0.1};
+            interpolateFrom[] = {"AmovPercMstpSnonWnonDnon", 0.1};
+            interpolateTo[] = {"Unconscious", 0.1};
+        };
+        class GVAR(drinkCrouch): GVAR(drinkStand) {
+            file = QPATHTOF(anim\drink_crouch.rtm);
+            actions = "CivilKneelActions";
+            connectTo[] = {"AmovPknlMstpSnonWnonDnon", 0.1};
+            interpolateFrom[] = {"AmovPknlMstpSnonWnonDnon", 0.1};
+        };
+        class GVAR(drinkProne): GVAR(drinkStand) {
+            file = QPATHTOF(anim\drink_prone.rtm);
+            actions = "CivilProneActions";
+            connectTo[] = {"AmovPpneMstpSnonWnonDnon", 0.1};
+            interpolateFrom[] = {"AmovPpneMstpSnonWnonDnon", 0.1};
+        };
+        class GVAR(drinkStandCan): GVAR(drinkStand) {
+            file = QPATHTOF(anim\drink_stand_can.rtm);
+            speed = 1/9;
+        };
+        class GVAR(drinkCrouchCan): GVAR(drinkCrouch) {
+            file = QPATHTOF(anim\drink_crouch_can.rtm);
+            speed = 1/9;
+        };
+        class GVAR(drinkProneCan): GVAR(drinkProne) {
+            file = QPATHTOF(anim\drink_prone_can.rtm);
+            speed = 1/9;
+        };
+        class GVAR(drinkFromSource): GVAR(drinkStand) {
+            file = QPATHTOF(anim\drink_source.rtm);
+            speed = 1/8;
+        };
+        class GVAR(drinkFromSourceHigh): GVAR(drinkFromSource) {
+            file = QPATHTOF(anim\drink_source_high.rtm);
+        };
+        class GVAR(drinkFromSourceLow): GVAR(drinkFromSource) {
+            file = QPATHTOF(anim\drink_source_low.rtm);
+        };
+        class GVAR(drinkFromSourceSquat): GVAR(drinkFromSource) {
+            file = QPATHTOF(anim\drink_source_squat.rtm);
+            interpolateFrom[] = {"AmovPercMstpSnonWnonDnon", 0.1, "AmovPknlMstpSnonWnonDnon", 0.1};
+        };
+        class GVAR(drinkFromSourceSquatHigh): GVAR(drinkFromSourceSquat) {
+            file = QPATHTOF(anim\drink_source_squat_high.rtm);
+        };
+        class GVAR(drinkFromSourceSquatLow): GVAR(drinkFromSourceSquat) {
+            file = QPATHTOF(anim\drink_source_squat_low.rtm);
+        };
+    };
+};

addons/field_rations/CfgSounds.hpp

@@ -0,0 +1,22 @@
+class CfgSounds {
+    class GVAR(drink1) {
+        name = QGVAR(drink1);
+        sound[] = {QPATHTOF(sounds\drink1.ogg), 1, 1};
+        titles[] = {};
+    };
+    class GVAR(drink2) {
+        name = QGVAR(drink2);
+        sound[] = {QPATHTOF(sounds\drink2.ogg), 1, 1};
+        titles[] = {};
+    };
+    class GVAR(drinkCan1) {
+        name = QGVAR(drinkCan1);
+        sound[] = {QPATHTOF(sounds\drink_can1.ogg), 1, 1};
+        titles[] = {};
+    };
+    class GVAR(drinkCan2) {
+        name = QGVAR(drinkCan2);
+        sound[] = {QPATHTOF(sounds\drink_can2.ogg), 1, 1};
+        titles[] = {};
+    };
+};

addons/field_rations/CfgUIGrids.hpp

@@ -0,0 +1,29 @@
+class CfgUIGrids {
+    class IGUI {
+        class Presets {
+            class Arma3 {
+                class Variables {
+                    XGVAR(grid)[] = {
+                        {
+                            safeZoneX + safeZoneW - 4.2 * GUI_GRID_W,
+                            safeZoneY + safeZoneH - 2.2 * GUI_GRID_H,
+                            4 * GUI_GRID_W,
+                            2 * GUI_GRID_H
+                        },
+                        GUI_GRID_W,
+                        GUI_GRID_H
+                    };
+                };
+            };
+        };
+        class Variables {
+            class XGVAR(grid) {
+                displayName = CSTRING(IGUI_DisplayName);
+                description = CSTRING(IGUI_Description);
+                preview = QPATHTOF(ui\igui_preview.paa);
+                saveToProfile[] = {0, 1};
+                canResize = 0;
+            };
+        };
+    };
+};