diff --git a/README.md b/README.md index 5bbac6d..eac8487 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ # Ignatz_Tools for Arma3-EpochMod -- Earplugs - StatusBar - Autorestart - Autmatic Door Opener @@ -13,6 +12,11 @@ - All other Settings are in Epoch.Mission\ignatz_config.hpp +Changelog: +- 2019-09-04 + - Tweaked RemoveTrees Scripts (better performance) + - Removed Earplug Scripts (already added into Vanilla EpochMod) + Changelog: - 2019-09-03 - Added Craftable Bicycles into the E-Pad diff --git a/epoch.Mission/Ignatz_config.hpp b/epoch.Mission/Ignatz_config.hpp index 3acd9bc..bbf9a37 100644 --- a/epoch.Mission/Ignatz_config.hpp +++ b/epoch.Mission/Ignatz_config.hpp @@ -1,10 +1,4 @@ class Ignatz_config { -// Earplugs - Earplugs_Keybind = 0x3E; /* Key to put in / out the Earplugs (F4) full list: https://community.bistudio.com/wiki/DIK_KeyCodes */ - Earplugs_AutoEarplugs = "true"; /* Auto insert / remove Earplugs by entering leaving Vehicles */ - Earplugs_UseInVehicles = "true"; /* Set it to false to disable manual Earplugs in Vehicles */ - Earplugs_HintsMessages = "true"; /* Show Hint Messages on Auto-Insert / Remove Earplugs */ - Earplugs_Systemchat = "true"; /* Show Systemchat Messages on Auto-Insert / Remove Earplugs */ // Statusbar Statusbar_OnStart = 1; /* Status Bar on Start - 0 = off / 1 = full / 2 = half / 3 = small */ diff --git a/epoch.Mission/addons/Ignatz_EarPlugs.sqf b/epoch.Mission/addons/Ignatz_EarPlugs.sqf deleted file mode 100644 index cf1b65a..0000000 --- a/epoch.Mission/addons/Ignatz_EarPlugs.sqf +++ /dev/null @@ -1,23 +0,0 @@ -// File created by Ignatz - He-Man -// Last Update: 2017-04-06 - -if (!isclass (getmissionconfig 'Ignatz_config')) exitwith { - systemchat "Error: Can not load Config for Earplugs"; -}; -_config = getmissionconfig 'Ignatz_config'; -Ignatz_KB_Earplug = getnumber (_config >> "Earplugs_Keybind"); -Ignatz_AutoEarplugs = switch (tolower (gettext (_config >> "Earplugs_AutoEarplugs"))) do {case "true": {true};default {false}}; -Ignatz_EnableEarpluginVeh = switch (tolower (gettext (_config >> "Earplugs_UseInVehicles"))) do {case "true": {true};default {false}}; -Ignatz_AutoEarplugsHints = switch (tolower (gettext (_config >> "Earplugs_HintsMessages"))) do {case "true": {true};default {false}}; -Ignatz_EarplugsSystemchat = switch (tolower (gettext (_config >> "Earplugs_Systemchat"))) do {case "true": {true};default {false}}; -Ignatz_Earplugsin = false; -Ignatz_Client_Earplugger = compilefinal " - if (Ignatz_Earplugsin) then { - Ignatz_Earplugsin = false; - 1 fadeSound 1; - } - else { - Ignatz_Earplugsin = true; - 1 fadeSound 0.15; - }; -"; diff --git a/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_GetInMan.sqf b/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_GetInMan.sqf deleted file mode 100644 index 17785ce..0000000 --- a/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_GetInMan.sqf +++ /dev/null @@ -1,28 +0,0 @@ -/* - Author: Aaron Clark - EpochMod.com - - Contributors: [Ignatz] He-Man - - Description: - Custom A3 Epoch GetInMan Eventhandler - - Licence: - Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike - - Github: - https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_code/custom/EPOCH_custom_EH_GetInMan.sqf -*/ -params ["_unit","_position","_vehicle"]; - -// Start Ignatz_Earplugs -if (Ignatz_AutoEarplugs) then { - if (Ignatz_AutoEarplugsHints) then { - hint 'Earplugs have been auto inserted'; - }; - if (Ignatz_EarplugsSystemchat) then { - systemchat 'Earplugs have been auto-inserted...'; - }; - Ignatz_Earplugsin = false; - [] call Ignatz_Client_Earplugger; -}; -// End Ignatz_Earplugs diff --git a/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_GetOutMan.sqf b/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_GetOutMan.sqf deleted file mode 100644 index a049fe8..0000000 --- a/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_GetOutMan.sqf +++ /dev/null @@ -1,28 +0,0 @@ -/* - Author: Aaron Clark - EpochMod.com - - Contributors: [Ignatz] He-Man - - Description: - Custom A3 Epoch GetOutMan Eventhandler - - Licence: - Arma Public License Share Alike (APL-SA) - https://www.bistudio.com/community/licenses/arma-public-license-share-alike - - Github: - https://github.com/EpochModTeam/Epoch/tree/release/Sources/epoch_code/custom/EPOCH_custom_EH_GetOutMan.sqf -*/ -params ["_unit","_position","_vehicle"]; - -// Start Ignatz_Earplugs -if (Ignatz_AutoEarplugs) then { - if (Ignatz_AutoEarplugsHints) then { - hint 'Earplugs have been auto-removed'; - }; - if (Ignatz_EarplugsSystemchat) then { - systemchat 'Earplugs have been auto-removed...'; - }; - Ignatz_Earplugsin = true; - [] call Ignatz_Client_Earplugger; -}; -// End Ignatz_Earplugs diff --git a/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_KeyDown.sqf b/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_KeyDown.sqf index 0d9c417..f59924c 100644 --- a/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_KeyDown.sqf +++ b/epoch.Mission/epoch_code/customs/EPOCH_custom_EH_KeyDown.sqf @@ -27,22 +27,4 @@ if (Ignatz_UseStatusBarSwitchKey) then { }; // End Ignatz_StatusBar -// Start Ignatz_Earplugs -if (!isnil 'Ignatz_KB_Earplug') then { - if (_dikCode == Ignatz_KB_Earplug) then { - if (Ignatz_EnableEarpluginVeh || player == vehicle player) then { - if (Ignatz_EarplugsSystemchat) then { - if (Ignatz_Earplugsin) then { - systemchat 'Earplugs have been removed...'; - } - else { - systemchat 'Earplugs have been inserted...'; - }; - }; - [] call Ignatz_Client_Earplugger; - }; - }; -}; -// End Ignatz_Earplugs - _handled diff --git a/epoch.Mission/init.sqf b/epoch.Mission/init.sqf index 18efdd7..3ef8880 100644 --- a/epoch.Mission/init.sqf +++ b/epoch.Mission/init.sqf @@ -1,7 +1,6 @@ // File created by Ignatz - He-Man if (hasInterface) then { - [] execVM "addons\Ignatz_EarPlugs.sqf"; [] execVM "addons\Ignatz_Statusbar.sqf"; Ignatz_Client_DoorOpener = compilefinal preprocessfilelinenumbers "addons\Ignatz_Client_DoorOpener.sqf"; waituntil {typeof player in ['Epoch_Male_F','Epoch_Female_F']};