From 53d3458779dcd0d2d3798d37e10be1d83969268f Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sat, 13 Apr 2024 19:48:16 +0200 Subject: [PATCH 1/2] 1.6.6.0 (#33) * 1.6.5.0 * 1.6.6.0 --- .github/ISSUE_TEMPLATE/bug_report.md | 56 ++++++++++++++++ CHANGELOG.md | 7 +- LICENSE | 16 +++-- addons/main/XEH_postInit.sqf | 64 +++++++++---------- addons/main/functions/fnc_switchUnitStart.sqf | 2 +- ...s.sqf => functionality_dragBodies.inc.sqf} | 0 ...rCrew.sqf => module_behaviourCrew.inc.sqf} | 6 +- ....sqf => module_behaviourCrew_init.inc.sqf} | 0 ...ule_captive.sqf => module_captive.inc.sqf} | 0 ...ule_carBomb.sqf => module_carBomb.inc.sqf} | 0 ...y.sqf => module_channelVisibility.inc.sqf} | 6 +- ...oors.sqf => module_configureDoors.inc.sqf} | 0 ...ries.sqf => module_createInjuries.inc.sqf} | 0 ...pply.sqf => module_createResupply.inc.sqf} | 0 ...f => module_createResupplyMedical.inc.sqf} | 0 ....sqf => module_deleteObjectForced.inc.sqf} | 0 ...leteZeus.sqf => module_deleteZeus.inc.sqf} | 0 ...dogAttack.sqf => module_dogAttack.inc.sqf} | 0 ...dCarry.sqf => module_dragAndCarry.inc.sqf} | 0 ...agBodies.sqf => module_dragBodies.inc.sqf} | 4 +- ...qf => module_dragBodies_aceAction.inc.sqf} | 0 ...nit.sqf => module_dragBodies_init.inc.sqf} | 0 ...dustStorm.sqf => module_dustStorm.inc.sqf} | 2 +- ...ng.sqf => module_garrisonBuilding.inc.sqf} | 0 ...arScript.sqf => module_gearScript.inc.sqf} | 0 ...sRender.sqf => module_grassRender.inc.sqf} | 6 +- ...pMarkers.sqf => module_mapMarkers.inc.sqf} | 0 ....sqf => module_missionEndModifier.inc.sqf} | 0 ...qf => module_missionObjectCounter.inc.sqf} | 0 ...pauseTime.sqf => module_pauseTime.inc.sqf} | 0 ...ades.sqf => module_removeGrenades.inc.sqf} | 15 +++++ ...odule_rhsAps.sqf => module_rhsAps.inc.sqf} | 0 ...omber.sqf => module_suicideBomber.inc.sqf} | 4 +- ...module_suicideBomber_deadMan_init.inc.sqf} | 0 ....sqf => module_suicideBomber_init.inc.sqf} | 0 ...itchUnit.sqf => module_switchUnit.inc.sqf} | 0 ...ange.sqf => module_tfarRadioRange.inc.sqf} | 6 +- ... module_toggleConsciousnessForced.inc.sqf} | 0 ...eath.sqf => module_trackUnitDeath.inc.sqf} | 0 ...radrop.sqf => module_unitParadrop.inc.sqf} | 0 ....sqf => module_unitParadropAction.inc.sqf} | 0 ...module_vehicleExplosionPrevention.inc.sqf} | 0 addons/main/script_version.hpp | 2 +- 43 files changed, 132 insertions(+), 64 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md rename addons/main/modules/{functionality_dragBodies.sqf => functionality_dragBodies.inc.sqf} (100%) rename addons/main/modules/{module_behaviourCrew.sqf => module_behaviourCrew.inc.sqf} (97%) rename addons/main/modules/{module_behaviourCrew_init.sqf => module_behaviourCrew_init.inc.sqf} (100%) rename addons/main/modules/{module_captive.sqf => module_captive.inc.sqf} (100%) rename addons/main/modules/{module_carBomb.sqf => module_carBomb.inc.sqf} (100%) rename addons/main/modules/{module_channelVisibility.sqf => module_channelVisibility.inc.sqf} (96%) rename addons/main/modules/{module_configureDoors.sqf => module_configureDoors.inc.sqf} (100%) rename addons/main/modules/{module_createInjuries.sqf => module_createInjuries.inc.sqf} (100%) rename addons/main/modules/{module_createResupply.sqf => module_createResupply.inc.sqf} (100%) rename addons/main/modules/{module_createResupplyMedical.sqf => module_createResupplyMedical.inc.sqf} (100%) rename addons/main/modules/{module_deleteObjectForced.sqf => module_deleteObjectForced.inc.sqf} (100%) rename addons/main/modules/{module_deleteZeus.sqf => module_deleteZeus.inc.sqf} (100%) rename addons/main/modules/{module_dogAttack.sqf => module_dogAttack.inc.sqf} (100%) rename addons/main/modules/{module_dragAndCarry.sqf => module_dragAndCarry.inc.sqf} (100%) rename addons/main/modules/{module_dragBodies.sqf => module_dragBodies.inc.sqf} (97%) rename addons/main/modules/{module_dragBodies_aceAction.sqf => module_dragBodies_aceAction.inc.sqf} (100%) rename addons/main/modules/{module_dragBodies_init.sqf => module_dragBodies_init.inc.sqf} (100%) rename addons/main/modules/{module_dustStorm.sqf => module_dustStorm.inc.sqf} (99%) rename addons/main/modules/{module_garrisonBuilding.sqf => module_garrisonBuilding.inc.sqf} (100%) rename addons/main/modules/{module_gearScript.sqf => module_gearScript.inc.sqf} (100%) rename addons/main/modules/{module_grassRender.sqf => module_grassRender.inc.sqf} (92%) rename addons/main/modules/{module_mapMarkers.sqf => module_mapMarkers.inc.sqf} (100%) rename addons/main/modules/{module_missionEndModifier.sqf => module_missionEndModifier.inc.sqf} (100%) rename addons/main/modules/{module_missionObjectCounter.sqf => module_missionObjectCounter.inc.sqf} (100%) rename addons/main/modules/{module_pauseTime.sqf => module_pauseTime.inc.sqf} (100%) rename addons/main/modules/{module_removeGrenades.sqf => module_removeGrenades.inc.sqf} (87%) rename addons/main/modules/{module_rhsAps.sqf => module_rhsAps.inc.sqf} (100%) rename addons/main/modules/{module_suicideBomber.sqf => module_suicideBomber.inc.sqf} (98%) rename addons/main/modules/{module_suicideBomber_deadMan_init.sqf => module_suicideBomber_deadMan_init.inc.sqf} (100%) rename addons/main/modules/{module_suicideBomber_init.sqf => module_suicideBomber_init.inc.sqf} (100%) rename addons/main/modules/{module_switchUnit.sqf => module_switchUnit.inc.sqf} (100%) rename addons/main/modules/{module_tfarRadioRange.sqf => module_tfarRadioRange.inc.sqf} (94%) rename addons/main/modules/{module_toggleConsciousnessForced.sqf => module_toggleConsciousnessForced.inc.sqf} (100%) rename addons/main/modules/{module_trackUnitDeath.sqf => module_trackUnitDeath.inc.sqf} (100%) rename addons/main/modules/{module_unitParadrop.sqf => module_unitParadrop.inc.sqf} (100%) rename addons/main/modules/{module_unitParadropAction.sqf => module_unitParadropAction.inc.sqf} (100%) rename addons/main/modules/{module_vehicleExplosionPrevention.sqf => module_vehicleExplosionPrevention.inc.sqf} (100%) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..566bff6 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,56 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: kind/bug +assignees: '' +--- + + + +**Mods (complete and add to the following information):** +- **Arma 3:** `x.xx` [e.g. 1.00 stable, rc, dev] +- **CBA:** `3.x.x` [e.g. 3.0.0 stable, commit hash] +- **ZEN:** `1.x.x` [e.g. 1.0.0 stable, commit hash] +- **Zeus Additions:** `1.x.x` [e.g. 1.0.0 stable, commit hash] +- **(Optional) ACE:** `3.x.x` [e.g. 3.0.0 stable, commit hash] (remove line if not loaded) +- **(Optional) TFAR:** `3.x.x` [e.g. 3.0.0 stable, commit hash] (remove line if not loaded) +- **(Optional) RHS:** `0.x.x` [e.g. 0.0.0 stable, commit hash] (remove line if not loaded) + + +**Description:** +A clear and concise description of what the bug is. + +**Steps to reproduce:** +_Follow [this flowchart](https://ace3.acemod.org/img/wiki/user/issue_flowchart.webp) (Replace 'ACE3' with 'Zeus Additions', ignore any 'Slack' mentions)!_ + +1. _Go to ..._ +2. _Click ..._ +3. _See ..._ + +**Expected behavior:** +A clear and concise description of what you expected to happen. + +**Where did the issue occur?** +- Dedicated / Self-Hosted Multiplayer / Singleplayer / Editor (Singleplayer) / Editor (Multiplayer) / Virtual Arsenal + +**Log Files:** +- Link to ([gist](https://gist.github.com) or [pastebin](http://pastebin.com)) to the client and/or server RPT file. An instruction to find your RPT files can be found [here](https://community.bistudio.com/wiki/Crash_Files#Arma_3). + +**Additional context:** +Add any other context about the problem here. + +**Screenshots:** +If applicable, add screenshots to help explain your problem. diff --git a/CHANGELOG.md b/CHANGELOG.md index b26bad3..8f6d646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# Changelog for Zeus Additions 13.4.2024 + +1.6.6.0 +- Added latest HEMTT support. + # Changelog for Zeus Additions 4.2.2024 1.6.5.0 @@ -177,7 +182,7 @@ # Changelog for Zeus Additions 14.7.2021 1.6.2.0 -- Added hemtt support. +- Added HEMTT support. - Changed signature (due to thing above). - Updated to support ZEN 1.11.0. - Added "Add ACE Drag and Carry Options" module which allows any object apart units to be draggable and carriable. diff --git a/LICENSE b/LICENSE index 6b84af5..386ba2a 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,5 @@ +MIT License + Copyright (c) 2018 cineafx (gear script), 2021 johnb432 Permission is hereby granted, free of charge, to any person obtaining a copy @@ -10,10 +12,10 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -OR OTHER DEALINGS IN THE SOFTWARE. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/addons/main/XEH_postInit.sqf b/addons/main/XEH_postInit.sqf index 697e2cc..11fe594 100644 --- a/addons/main/XEH_postInit.sqf +++ b/addons/main/XEH_postInit.sqf @@ -27,39 +27,39 @@ if (!hasInterface) exitWith {}; // Add Drag Bodies module if (!isNil "ace_dragging") then { - #include "modules\module_dragBodies.sqf" + #include "modules\module_dragBodies.inc.sqf" }; }] call CBA_fnc_addEventHandlerArgs; // Add functionality -#include "modules\functionality_dragBodies.sqf" +#include "modules\functionality_dragBodies.inc.sqf" // Add modules -#include "modules\module_behaviourCrew.sqf" -#include "modules\module_captive.sqf" -#include "modules\module_carBomb.sqf" -#include "modules\module_channelVisibility.sqf" -#include "modules\module_configureDoors.sqf" -#include "modules\module_createResupply.sqf" -#include "modules\module_deleteObjectForced.sqf" -#include "modules\module_deleteZeus.sqf" -#include "modules\module_dogAttack.sqf" -#include "modules\module_dustStorm.sqf" -#include "modules\module_garrisonBuilding.sqf" -#include "modules\module_gearScript.sqf" -#include "modules\module_grassRender.sqf" -#include "modules\module_mapMarkers.sqf" -#include "modules\module_missionEndModifier.sqf" -#include "modules\module_missionObjectCounter.sqf" -#include "modules\module_pauseTime.sqf" -#include "modules\module_removeGrenades.sqf" -#include "modules\module_suicideBomber.sqf" -#include "modules\module_switchUnit.sqf" -#include "modules\module_toggleConsciousnessForced.sqf" -#include "modules\module_trackUnitDeath.sqf" -#include "modules\module_unitParadrop.sqf" -#include "modules\module_unitParadropAction.sqf" -#include "modules\module_vehicleExplosionPrevention.sqf" +#include "modules\module_behaviourCrew.inc.sqf" +#include "modules\module_captive.inc.sqf" +#include "modules\module_carBomb.inc.sqf" +#include "modules\module_channelVisibility.inc.sqf" +#include "modules\module_configureDoors.inc.sqf" +#include "modules\module_createResupply.inc.sqf" +#include "modules\module_deleteObjectForced.inc.sqf" +#include "modules\module_deleteZeus.inc.sqf" +#include "modules\module_dogAttack.inc.sqf" +#include "modules\module_dustStorm.inc.sqf" +#include "modules\module_garrisonBuilding.inc.sqf" +#include "modules\module_gearScript.inc.sqf" +#include "modules\module_grassRender.inc.sqf" +#include "modules\module_mapMarkers.inc.sqf" +#include "modules\module_missionEndModifier.inc.sqf" +#include "modules\module_missionObjectCounter.inc.sqf" +#include "modules\module_pauseTime.inc.sqf" +#include "modules\module_removeGrenades.inc.sqf" +#include "modules\module_suicideBomber.inc.sqf" +#include "modules\module_switchUnit.inc.sqf" +#include "modules\module_toggleConsciousnessForced.inc.sqf" +#include "modules\module_trackUnitDeath.inc.sqf" +#include "modules\module_unitParadrop.inc.sqf" +#include "modules\module_unitParadropAction.inc.sqf" +#include "modules\module_vehicleExplosionPrevention.inc.sqf" // Optionals private _cfgPatches = configFile >> "CfgPatches"; @@ -67,26 +67,26 @@ GVAR(ACEClipboardLoaded) = isClass (configFile >> "ACE_Extensions" >> "ace_clipb // Check if ACE Dragging is loaded if (!isNil "ace_dragging") then { - #include "modules\module_dragAndCarry.sqf" + #include "modules\module_dragAndCarry.inc.sqf" }; // Check if ACE Medical components are loaded if (!isNil "ace_medical_damage") then { - #include "modules\module_createInjuries.sqf" + #include "modules\module_createInjuries.inc.sqf" }; if (zen_common_aceMedicalTreatment) then { - #include "modules\module_createResupplyMedical.sqf" + #include "modules\module_createResupplyMedical.inc.sqf" }; // Check if TFAR is loaded if (isClass (_cfgPatches >> "tfar_core") || {isClass (_cfgPatches >> "task_force_radio")}) then { - #include "modules\module_tfarRadioRange.sqf" + #include "modules\module_tfarRadioRange.inc.sqf" }; // Check if RHS AFRF is loaded if (isClass (_cfgPatches >> "rhs_main_loadorder")) then { - #include "modules\module_rhsAps.sqf" + #include "modules\module_rhsAps.inc.sqf" }; // Optionals finished diff --git a/addons/main/functions/fnc_switchUnitStart.sqf b/addons/main/functions/fnc_switchUnitStart.sqf index ed0446d..e05b1d7 100644 --- a/addons/main/functions/fnc_switchUnitStart.sqf +++ b/addons/main/functions/fnc_switchUnitStart.sqf @@ -136,7 +136,7 @@ if (!local _unit) then { // Check if the necessary keys were pressed for a keybind if (_comboDikPressed && {_mainDevice == "KEYBOARD"} && - {((ace_common_keyboardInputMain getOrDefault [_mainDik, [false, 0]]) select 1) > ([0, 1] select _isDoubleTap)} // check how many times the main key was pressed + {((ace_common_keyboardInputMain getOrDefault [_mainDik, [false, 0]]) select 1) > (parseNumber _isDoubleTap)} // check how many times the main key was pressed ) exitWith { call FUNC(switchUnitStop); }; diff --git a/addons/main/modules/functionality_dragBodies.sqf b/addons/main/modules/functionality_dragBodies.inc.sqf similarity index 100% rename from addons/main/modules/functionality_dragBodies.sqf rename to addons/main/modules/functionality_dragBodies.inc.sqf diff --git a/addons/main/modules/module_behaviourCrew.sqf b/addons/main/modules/module_behaviourCrew.inc.sqf similarity index 97% rename from addons/main/modules/module_behaviourCrew.sqf rename to addons/main/modules/module_behaviourCrew.inc.sqf index 9f95fae..8d3aaf1 100644 --- a/addons/main/modules/module_behaviourCrew.sqf +++ b/addons/main/modules/module_behaviourCrew.inc.sqf @@ -37,9 +37,11 @@ }; if (isNil QFUNC(addBehaviourEh)) then { - #include "module_behaviourCrew_init.sqf" + #include "module_behaviourCrew_init.inc.sqf" }; + /////////////////////////_object setVariable ["ace_vehicle_damage_allowCrewInImmobile", _stayCrew, true]; + ["zen_common_execute", [{ (_this select 0) allowCrewInImmobile (_this select 1); }, [_object, _stayCrew]], _object] call CBA_fnc_targetEvent; @@ -129,7 +131,7 @@ }; if (isNil QFUNC(addBehaviourEh)) then { - #include "module_behaviourCrew_init.sqf" + #include "module_behaviourCrew_init.inc.sqf" }; if (_addAiDriver) then { diff --git a/addons/main/modules/module_behaviourCrew_init.sqf b/addons/main/modules/module_behaviourCrew_init.inc.sqf similarity index 100% rename from addons/main/modules/module_behaviourCrew_init.sqf rename to addons/main/modules/module_behaviourCrew_init.inc.sqf diff --git a/addons/main/modules/module_captive.sqf b/addons/main/modules/module_captive.inc.sqf similarity index 100% rename from addons/main/modules/module_captive.sqf rename to addons/main/modules/module_captive.inc.sqf diff --git a/addons/main/modules/module_carBomb.sqf b/addons/main/modules/module_carBomb.inc.sqf similarity index 100% rename from addons/main/modules/module_carBomb.sqf rename to addons/main/modules/module_carBomb.inc.sqf diff --git a/addons/main/modules/module_channelVisibility.sqf b/addons/main/modules/module_channelVisibility.inc.sqf similarity index 96% rename from addons/main/modules/module_channelVisibility.sqf rename to addons/main/modules/module_channelVisibility.inc.sqf index 4f27baf..fd14e2c 100644 --- a/addons/main/modules/module_channelVisibility.sqf +++ b/addons/main/modules/module_channelVisibility.inc.sqf @@ -82,11 +82,7 @@ LSTRING(changedChanneLVisibilityOnPlayerMessage) } else { // If unit is AI, null or otherwise invalid, display error if not something done to self - if (_self) then { - LSTRING(changedChanneLVisibilityOnYourselfMessage) - } else { - LSTRING_ZEN(modules,noUnitSelected) - }; + [LSTRING_ZEN(modules,noUnitSelected), LSTRING(changedChanneLVisibilityOnYourselfMessage)] select (_self) }; [_string] call zen_common_fnc_showMessage; diff --git a/addons/main/modules/module_configureDoors.sqf b/addons/main/modules/module_configureDoors.inc.sqf similarity index 100% rename from addons/main/modules/module_configureDoors.sqf rename to addons/main/modules/module_configureDoors.inc.sqf diff --git a/addons/main/modules/module_createInjuries.sqf b/addons/main/modules/module_createInjuries.inc.sqf similarity index 100% rename from addons/main/modules/module_createInjuries.sqf rename to addons/main/modules/module_createInjuries.inc.sqf diff --git a/addons/main/modules/module_createResupply.sqf b/addons/main/modules/module_createResupply.inc.sqf similarity index 100% rename from addons/main/modules/module_createResupply.sqf rename to addons/main/modules/module_createResupply.inc.sqf diff --git a/addons/main/modules/module_createResupplyMedical.sqf b/addons/main/modules/module_createResupplyMedical.inc.sqf similarity index 100% rename from addons/main/modules/module_createResupplyMedical.sqf rename to addons/main/modules/module_createResupplyMedical.inc.sqf diff --git a/addons/main/modules/module_deleteObjectForced.sqf b/addons/main/modules/module_deleteObjectForced.inc.sqf similarity index 100% rename from addons/main/modules/module_deleteObjectForced.sqf rename to addons/main/modules/module_deleteObjectForced.inc.sqf diff --git a/addons/main/modules/module_deleteZeus.sqf b/addons/main/modules/module_deleteZeus.inc.sqf similarity index 100% rename from addons/main/modules/module_deleteZeus.sqf rename to addons/main/modules/module_deleteZeus.inc.sqf diff --git a/addons/main/modules/module_dogAttack.sqf b/addons/main/modules/module_dogAttack.inc.sqf similarity index 100% rename from addons/main/modules/module_dogAttack.sqf rename to addons/main/modules/module_dogAttack.inc.sqf diff --git a/addons/main/modules/module_dragAndCarry.sqf b/addons/main/modules/module_dragAndCarry.inc.sqf similarity index 100% rename from addons/main/modules/module_dragAndCarry.sqf rename to addons/main/modules/module_dragAndCarry.inc.sqf diff --git a/addons/main/modules/module_dragBodies.sqf b/addons/main/modules/module_dragBodies.inc.sqf similarity index 97% rename from addons/main/modules/module_dragBodies.sqf rename to addons/main/modules/module_dragBodies.inc.sqf index 0e66462..e6f8fea 100644 --- a/addons/main/modules/module_dragBodies.sqf +++ b/addons/main/modules/module_dragBodies.inc.sqf @@ -4,7 +4,7 @@ * Cobbled together out of ACE3 code. */ -#include "module_dragBodies_init.sqf" +#include "module_dragBodies_init.inc.sqf" [LSTRING(moduleCategoryUtility), LSTRING(dragBodiesModuleName), { params ["", "_object"]; @@ -35,7 +35,7 @@ GVAR(dragBodyActions) = true; publicVariable QGVAR(dragBodyActions); - #include "module_dragBodies_aceAction.sqf" + #include "module_dragBodies_aceAction.inc.sqf" }; private _string = if (_bodies isNotEqualTo []) then { diff --git a/addons/main/modules/module_dragBodies_aceAction.sqf b/addons/main/modules/module_dragBodies_aceAction.inc.sqf similarity index 100% rename from addons/main/modules/module_dragBodies_aceAction.sqf rename to addons/main/modules/module_dragBodies_aceAction.inc.sqf diff --git a/addons/main/modules/module_dragBodies_init.sqf b/addons/main/modules/module_dragBodies_init.inc.sqf similarity index 100% rename from addons/main/modules/module_dragBodies_init.sqf rename to addons/main/modules/module_dragBodies_init.inc.sqf diff --git a/addons/main/modules/module_dustStorm.sqf b/addons/main/modules/module_dustStorm.inc.sqf similarity index 99% rename from addons/main/modules/module_dustStorm.sqf rename to addons/main/modules/module_dustStorm.inc.sqf index b29b8d7..21e37b8 100644 --- a/addons/main/modules/module_dustStorm.sqf +++ b/addons/main/modules/module_dustStorm.inc.sqf @@ -49,7 +49,7 @@ [_string] call zen_common_fnc_showMessage; }; - private _string = LSTRING(dustStormNothingChangedMessage), + private _string = LSTRING(dustStormNothingChangedMessage); // Handle JIP if (_doJIP) then { diff --git a/addons/main/modules/module_garrisonBuilding.sqf b/addons/main/modules/module_garrisonBuilding.inc.sqf similarity index 100% rename from addons/main/modules/module_garrisonBuilding.sqf rename to addons/main/modules/module_garrisonBuilding.inc.sqf diff --git a/addons/main/modules/module_gearScript.sqf b/addons/main/modules/module_gearScript.inc.sqf similarity index 100% rename from addons/main/modules/module_gearScript.sqf rename to addons/main/modules/module_gearScript.inc.sqf diff --git a/addons/main/modules/module_grassRender.sqf b/addons/main/modules/module_grassRender.inc.sqf similarity index 92% rename from addons/main/modules/module_grassRender.sqf rename to addons/main/modules/module_grassRender.inc.sqf index 3248cfa..648e866 100644 --- a/addons/main/modules/module_grassRender.sqf +++ b/addons/main/modules/module_grassRender.inc.sqf @@ -32,11 +32,7 @@ LSTRING(changedGrassRenderingOnPlayerMessage) } else { // If unit is AI, null or otherwise invalid, display error if not something done to self - if (_self) then { - LSTRING(changedGrassRenderingOnYourselfMessage) - } else { - LSTRING_ZEN(modules,noUnitSelected) - }; + [LSTRING_ZEN(modules,noUnitSelected), LSTRING(changedGrassRenderingOnYourselfMessage)] select (_self) }; [_string] call zen_common_fnc_showMessage; diff --git a/addons/main/modules/module_mapMarkers.sqf b/addons/main/modules/module_mapMarkers.inc.sqf similarity index 100% rename from addons/main/modules/module_mapMarkers.sqf rename to addons/main/modules/module_mapMarkers.inc.sqf diff --git a/addons/main/modules/module_missionEndModifier.sqf b/addons/main/modules/module_missionEndModifier.inc.sqf similarity index 100% rename from addons/main/modules/module_missionEndModifier.sqf rename to addons/main/modules/module_missionEndModifier.inc.sqf diff --git a/addons/main/modules/module_missionObjectCounter.sqf b/addons/main/modules/module_missionObjectCounter.inc.sqf similarity index 100% rename from addons/main/modules/module_missionObjectCounter.sqf rename to addons/main/modules/module_missionObjectCounter.inc.sqf diff --git a/addons/main/modules/module_pauseTime.sqf b/addons/main/modules/module_pauseTime.inc.sqf similarity index 100% rename from addons/main/modules/module_pauseTime.sqf rename to addons/main/modules/module_pauseTime.inc.sqf diff --git a/addons/main/modules/module_removeGrenades.sqf b/addons/main/modules/module_removeGrenades.inc.sqf similarity index 87% rename from addons/main/modules/module_removeGrenades.sqf rename to addons/main/modules/module_removeGrenades.inc.sqf index 2181bc1..614741b 100644 --- a/addons/main/modules/module_removeGrenades.sqf +++ b/addons/main/modules/module_removeGrenades.inc.sqf @@ -69,6 +69,21 @@ } forEach (_magazines arrayIntersect _magazines); } forEach _units; + /* + 2.18 + private _throwables = []; + + // Remove grenades from all AI units + { + _unit = _x; + _throwables = (throwables _unit) apply {_x select 0}; + + { + _unit removeMagazines _x; + } forEach (_throwables arrayIntersect _throwables); + } forEach _units; + */ + [_string] call zen_common_fnc_showMessage; }, {}, _unit] call zen_dialog_fnc_create; }, "x\zen\addons\context_actions\ui\grenade_ca.paa"] call zen_custom_modules_fnc_register; diff --git a/addons/main/modules/module_rhsAps.sqf b/addons/main/modules/module_rhsAps.inc.sqf similarity index 100% rename from addons/main/modules/module_rhsAps.sqf rename to addons/main/modules/module_rhsAps.inc.sqf diff --git a/addons/main/modules/module_suicideBomber.sqf b/addons/main/modules/module_suicideBomber.inc.sqf similarity index 98% rename from addons/main/modules/module_suicideBomber.sqf rename to addons/main/modules/module_suicideBomber.inc.sqf index dad2cfa..871375a 100644 --- a/addons/main/modules/module_suicideBomber.sqf +++ b/addons/main/modules/module_suicideBomber.inc.sqf @@ -42,7 +42,7 @@ if (_makeIntoSuicideBomber) then { if (isNil {_unit getVariable QGVAR(suicideBomberActionJIP)}) then { if (isNil QFUNC(addDetonateAction)) then { - #include "module_suicideBomber_init.sqf" + #include "module_suicideBomber_init.inc.sqf" }; // Create explosives around player @@ -60,7 +60,7 @@ if (!isNil {_unit getVariable QGVAR(suicideBomberDeadManSwitchJIP)}) exitWith {}; if (isNil QFUNC(addSuicideEh)) then { - #include "module_suicideBomber_deadMan_init.sqf" + #include "module_suicideBomber_deadMan_init.inc.sqf" }; private _jipID = [QGVAR(executeFunction), [QFUNC(addSuicideEh), _unit]] call FUNC(globalEventJIP); diff --git a/addons/main/modules/module_suicideBomber_deadMan_init.sqf b/addons/main/modules/module_suicideBomber_deadMan_init.inc.sqf similarity index 100% rename from addons/main/modules/module_suicideBomber_deadMan_init.sqf rename to addons/main/modules/module_suicideBomber_deadMan_init.inc.sqf diff --git a/addons/main/modules/module_suicideBomber_init.sqf b/addons/main/modules/module_suicideBomber_init.inc.sqf similarity index 100% rename from addons/main/modules/module_suicideBomber_init.sqf rename to addons/main/modules/module_suicideBomber_init.inc.sqf diff --git a/addons/main/modules/module_switchUnit.sqf b/addons/main/modules/module_switchUnit.inc.sqf similarity index 100% rename from addons/main/modules/module_switchUnit.sqf rename to addons/main/modules/module_switchUnit.inc.sqf diff --git a/addons/main/modules/module_tfarRadioRange.sqf b/addons/main/modules/module_tfarRadioRange.inc.sqf similarity index 94% rename from addons/main/modules/module_tfarRadioRange.sqf rename to addons/main/modules/module_tfarRadioRange.inc.sqf index d082f8f..400eb9b 100644 --- a/addons/main/modules/module_tfarRadioRange.sqf +++ b/addons/main/modules/module_tfarRadioRange.inc.sqf @@ -37,11 +37,7 @@ LSTRING(changedRangesOnPlayerMessage) } else { // If unit is AI, null or otherwise invalid, display error if not something done to self - if (_self) then { - LSTRING(changedRangesOnYourselfMessage) - } else { - LSTRING_ZEN(modules,noUnitSelected) - }; + [LSTRING_ZEN(modules,noUnitSelected), LSTRING(changedRangesOnYourselfMessage)] select _self }; [_string] call zen_common_fnc_showMessage; diff --git a/addons/main/modules/module_toggleConsciousnessForced.sqf b/addons/main/modules/module_toggleConsciousnessForced.inc.sqf similarity index 100% rename from addons/main/modules/module_toggleConsciousnessForced.sqf rename to addons/main/modules/module_toggleConsciousnessForced.inc.sqf diff --git a/addons/main/modules/module_trackUnitDeath.sqf b/addons/main/modules/module_trackUnitDeath.inc.sqf similarity index 100% rename from addons/main/modules/module_trackUnitDeath.sqf rename to addons/main/modules/module_trackUnitDeath.inc.sqf diff --git a/addons/main/modules/module_unitParadrop.sqf b/addons/main/modules/module_unitParadrop.inc.sqf similarity index 100% rename from addons/main/modules/module_unitParadrop.sqf rename to addons/main/modules/module_unitParadrop.inc.sqf diff --git a/addons/main/modules/module_unitParadropAction.sqf b/addons/main/modules/module_unitParadropAction.inc.sqf similarity index 100% rename from addons/main/modules/module_unitParadropAction.sqf rename to addons/main/modules/module_unitParadropAction.inc.sqf diff --git a/addons/main/modules/module_vehicleExplosionPrevention.sqf b/addons/main/modules/module_vehicleExplosionPrevention.inc.sqf similarity index 100% rename from addons/main/modules/module_vehicleExplosionPrevention.sqf rename to addons/main/modules/module_vehicleExplosionPrevention.inc.sqf diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp index 87c34e8..79db422 100644 --- a/addons/main/script_version.hpp +++ b/addons/main/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 1 #define MINOR 6 -#define PATCHLVL 5 +#define PATCHLVL 6 #define BUILD 0 From bdbbb310a99e72aad58fb97787592e886cfc440f Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:08:48 +0200 Subject: [PATCH 2/2] Update bug_report.md --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 566bff6..1718bd1 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -21,7 +21,7 @@ All good? Then proceed and fill out the items below. --> **Mods (complete and add to the following information):** -- **Arma 3:** `x.xx` [e.g. 1.00 stable, rc, dev] +- **Arma 3:** `2.xx` [e.g. 2.00 stable, rc, dev, profiling] - **CBA:** `3.x.x` [e.g. 3.0.0 stable, commit hash] - **ZEN:** `1.x.x` [e.g. 1.0.0 stable, commit hash] - **Zeus Additions:** `1.x.x` [e.g. 1.0.0 stable, commit hash]