From 383547f12370cccc2bc9a4d45be566f7ba27e9c4 Mon Sep 17 00:00:00 2001 From: Bjanski Date: Tue, 10 May 2016 15:41:49 +0200 Subject: [PATCH 1/4] Moved update.md & changelog.md Moved updates.md and changelog.md to their specefic docs folder instead. Just makes more sense. --- .../Grinding/CHANGELOG.md => docs/Grinding/changelog.md | 0 .../Grinding/UPDATE.md => docs/Grinding/update.md | 0 .../Hacking/CHANGELOG.md => docs/Hacking/changelog.md | 6 ++++-- docs/Hacking/update.md | 9 +++++++++ .../CHANGELOG.md => docs/HaloParachute/changelog.md | 0 .../UPDATE.md => docs/HaloParachute/update.md | 0 .../CHANGELOG.md => docs/VirtualGarage/changelog.md | 0 .../UPDATE.md => docs/VirtualGarage/update.md | 0 .../Core/CHANGELOG.md => docs/core/changelog.md | 0 .../ExAdClient/Core/UPDATE.md => docs/core/update.md | 0 mpmissions/Exile.Altis/ExAdClient/Hacking/UPDATE.md | 5 ----- 11 files changed, 13 insertions(+), 7 deletions(-) rename mpmissions/Exile.Altis/ExAdClient/Grinding/CHANGELOG.md => docs/Grinding/changelog.md (100%) rename mpmissions/Exile.Altis/ExAdClient/Grinding/UPDATE.md => docs/Grinding/update.md (100%) rename mpmissions/Exile.Altis/ExAdClient/Hacking/CHANGELOG.md => docs/Hacking/changelog.md (65%) create mode 100644 docs/Hacking/update.md rename mpmissions/Exile.Altis/ExAdClient/HaloParachute/CHANGELOG.md => docs/HaloParachute/changelog.md (100%) rename mpmissions/Exile.Altis/ExAdClient/HaloParachute/UPDATE.md => docs/HaloParachute/update.md (100%) rename mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CHANGELOG.md => docs/VirtualGarage/changelog.md (100%) rename mpmissions/Exile.Altis/ExAdClient/VirtualGarage/UPDATE.md => docs/VirtualGarage/update.md (100%) rename mpmissions/Exile.Altis/ExAdClient/Core/CHANGELOG.md => docs/core/changelog.md (100%) rename mpmissions/Exile.Altis/ExAdClient/Core/UPDATE.md => docs/core/update.md (100%) delete mode 100644 mpmissions/Exile.Altis/ExAdClient/Hacking/UPDATE.md diff --git a/mpmissions/Exile.Altis/ExAdClient/Grinding/CHANGELOG.md b/docs/Grinding/changelog.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/Grinding/CHANGELOG.md rename to docs/Grinding/changelog.md diff --git a/mpmissions/Exile.Altis/ExAdClient/Grinding/UPDATE.md b/docs/Grinding/update.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/Grinding/UPDATE.md rename to docs/Grinding/update.md diff --git a/mpmissions/Exile.Altis/ExAdClient/Hacking/CHANGELOG.md b/docs/Hacking/changelog.md similarity index 65% rename from mpmissions/Exile.Altis/ExAdClient/Hacking/CHANGELOG.md rename to docs/Hacking/changelog.md index 16747a9..112098d 100644 --- a/mpmissions/Exile.Altis/ExAdClient/Hacking/CHANGELOG.md +++ b/docs/Hacking/changelog.md @@ -1,8 +1,10 @@ #Hacking ## Changelog: -### 160506 01:00 . v0.7.0 +### 160507 09:00 . v0.7.1 #### Fixed +* Removed dependency for VirtualGarage + +### 160506 01:00 . v0.7.0 #### Added * Introduced **Hacking** to the ExAd package -#### Deleted diff --git a/docs/Hacking/update.md b/docs/Hacking/update.md new file mode 100644 index 0000000..372b625 --- /dev/null +++ b/docs/Hacking/update.md @@ -0,0 +1,9 @@ +#Hacking +## Instructions: + +### 160507 09:00 . v0.7.1 +#### Update +* Replace and pack "@ExileServer\addons\exad_hacking" + +### 160506 01:00 . v0.7.0 +#### Full installation diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/CHANGELOG.md b/docs/HaloParachute/changelog.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/HaloParachute/CHANGELOG.md rename to docs/HaloParachute/changelog.md diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/UPDATE.md b/docs/HaloParachute/update.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/HaloParachute/UPDATE.md rename to docs/HaloParachute/update.md diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CHANGELOG.md b/docs/VirtualGarage/changelog.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/VirtualGarage/CHANGELOG.md rename to docs/VirtualGarage/changelog.md diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/UPDATE.md b/docs/VirtualGarage/update.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/VirtualGarage/UPDATE.md rename to docs/VirtualGarage/update.md diff --git a/mpmissions/Exile.Altis/ExAdClient/Core/CHANGELOG.md b/docs/core/changelog.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/Core/CHANGELOG.md rename to docs/core/changelog.md diff --git a/mpmissions/Exile.Altis/ExAdClient/Core/UPDATE.md b/docs/core/update.md similarity index 100% rename from mpmissions/Exile.Altis/ExAdClient/Core/UPDATE.md rename to docs/core/update.md diff --git a/mpmissions/Exile.Altis/ExAdClient/Hacking/UPDATE.md b/mpmissions/Exile.Altis/ExAdClient/Hacking/UPDATE.md deleted file mode 100644 index 476388a..0000000 --- a/mpmissions/Exile.Altis/ExAdClient/Hacking/UPDATE.md +++ /dev/null @@ -1,5 +0,0 @@ -#Hacking -## Instructions: - -### 160506 01:00 . v0.7.0 -#### Full installation From 90f961d2ce9875adce56d3ecda5cbcc59ea6fa91 Mon Sep 17 00:00:00 2001 From: Bjanski Date: Tue, 10 May 2016 17:02:06 +0200 Subject: [PATCH 2/4] v0.7.3 Added auto decleration and standard values of all undeclared customizable variables --- .../exad_hacking/Functions/fn_startHack.sqf | 3 +- CHANGELOG.md | 39 ++++++++++++------- docs/Grinding/changelog.md | 6 ++- docs/Grinding/update.md | 4 ++ docs/Hacking/changelog.md | 5 +++ docs/Hacking/update.md | 5 +++ docs/HaloParachute/changelog.md | 11 +++--- docs/HaloParachute/update.md | 5 +++ docs/VirtualGarage/changelog.md | 4 ++ docs/VirtualGarage/update.md | 4 ++ docs/core/changelog.md | 4 ++ docs/core/update.md | 5 +++ .../Exile.Altis/ExAdClient/Core/postInit.sqf | 12 +++++- .../ExAdClient/Grinding/postInit.sqf | 4 ++ .../ExAdClient/Hacking/postInit.sqf | 11 ++++++ .../ExAdClient/HaloParachute/postInit.sqf | 5 +++ .../ExAdClient/VirtualGarage/postInit.sqf | 8 +++- 17 files changed, 110 insertions(+), 25 deletions(-) diff --git a/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf b/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf index 38a6eab..05dc04a 100644 --- a/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf +++ b/@ExileServer/addons/exad_hacking/Functions/fn_startHack.sqf @@ -48,8 +48,7 @@ _laptop animate ["LaptopLidRotation", 1]; _player removeItem "Exile_Item_Laptop"; [_object, _player, _laptop] spawn { - private ["_object","_player","_laptop","_markers","_marker","_success","_ticks","_newSize","_destroy","_msg"]; - params ["_object","_player","_laptop"]; + params ["_object","_player","_laptop","_markers","_marker","_success","_ticks","_newSize","_destroy","_msg"]; UISleep 2; (parseText (format["%4
%8", ExAd_Hint_Title_Color, ExAd_Hint_Title_Size, ExAd_Hint_Title_Font,STR_ExAd_HACKING_HINT_TITLE, ExAd_Hint_Msg_Color, ExAd_Hint_Msg_Size, ExAd_Hint_Msg_Font, STR_ExAd_HACKING_HINT_HACK_START])) remoteExec ["hint", -2]; diff --git a/CHANGELOG.md b/CHANGELOG.md index 76b9a09..d009131 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,31 @@ #ExAd # Changelog: + +## 160510 16:00 . v0.7.3 +###Fixed +* Cleaned the code (Hacking) +* Declaration of un custamized variables (All) + +## 160507 09:00 . v0.7.2 +### Added +* "docs\core\update.md" & "docs\core\changelog.md" +* "docs\Grinding\update.md" & "docs\Grinding\changelog.md" +* "docs\Hacking\update.md" & "docs\Hacking\changelog.md" +* "docs\HaloParachute\update.md" & "docs\HaloParachute\changelog.md" +* "docs\VirtualGarage\update.md" & "docs\VirtualGarage\changelog.md" + +### Deleted +* "mpmissions\Exile.Altis\ExAdClient\core\update.md" & "mpmissions\Exile.Altis\ExAdClient\core\changelog.md" +* "mpmissions\Exile.Altis\ExAdClient\Grinding\update.md" & "mpmissions\Exile.Altis\ExAdClient\Grinding\changelog.md" +* "mpmissions\Exile.Altis\ExAdClient\Hacking\update.md" & "mpmissions\Exile.Altis\ExAdClient\Hacking\changelog.md" +* "mpmissions\Exile.Altis\ExAdClient\HaloParachute\update.md" & "mpmissions\Exile.Altis\ExAdClient\HaloParachute\changelog.md" +* "mpmissions\Exile.Altis\ExAdClient\VirtualGarage\update.md" & "mpmissions\Exile.Altis\ExAdClient\VirtualGarage\changelog.md" + +## 160507 09:00 . v0.7.1 +### Fixed +* Hacking isn't dependent on VirtualGarage anymore (Hacking) + ## 160506 09:00 . v0.7.0 ### Fixed * Small issue where VG didn't show an advancedHint when storing. (VirtualGarage) @@ -12,30 +37,19 @@ Must be implemented for Hacking to work proparly * Implemented Hacking (Hacking) * Added battleye Hacking exceptions -### Deleted - ## 160505 01:40 . v0.6.1 ### Fixed * Display null when entering Virtual Garage from Flag (Virtual Garage) * Sound error for grinding, tmp fix, sound will work on Chernarus (Grinding) -### Added -### Deleted - ## 160502 23:15 . v0.6.0 -### Fixed ### Added * Implemented Grinding * Added battleye grinding exceptions -### Deleted - ## 160423 14:04 . v0.5.2 ### Fixed * Description.ext was wrongly configured (Core) - -### Added -### Deleted ## 160426 14:04 . v0.5.1 ### Fixed @@ -51,9 +65,6 @@ Must be implemented for Hacking to work proparly * EXO Logo.png (Core) ## 160426 . v0.5.0 -### Fixed ### Added * Changelog introduced (All) * Repo public (All) - -### Deleted diff --git a/docs/Grinding/changelog.md b/docs/Grinding/changelog.md index 51b7f35..a9c1f81 100644 --- a/docs/Grinding/changelog.md +++ b/docs/Grinding/changelog.md @@ -1,6 +1,10 @@ #VirtualGarage ## Changelog: - + +### 160510 16:00 . v0.7.3 +#### Fixed +* Declaration of un custamized variables + ### 160505 01:40 . v0.6.1 #### Fixed * Sound error for grinding, tmp fix, sound will work on Chernarus diff --git a/docs/Grinding/update.md b/docs/Grinding/update.md index bf4dc04..cff423e 100644 --- a/docs/Grinding/update.md +++ b/docs/Grinding/update.md @@ -1,5 +1,9 @@ #VirtualGarage ## Instructions: + +### 160507 16:00 . v0.7.3 +#### Update +* Replace "mpmissions\Exile.\ExAdClient\Grinding\postInit.sqf" ### 160505 01:40 . v0.6.1 #### Update diff --git a/docs/Hacking/changelog.md b/docs/Hacking/changelog.md index 112098d..403582c 100644 --- a/docs/Hacking/changelog.md +++ b/docs/Hacking/changelog.md @@ -1,6 +1,11 @@ #Hacking ## Changelog: +### 160510 16:00 . v0.7.3 +#### Fixed +* Cleaned the server code +* Declaration of un custamized variables + ### 160507 09:00 . v0.7.1 #### Fixed * Removed dependency for VirtualGarage diff --git a/docs/Hacking/update.md b/docs/Hacking/update.md index 372b625..169d085 100644 --- a/docs/Hacking/update.md +++ b/docs/Hacking/update.md @@ -1,6 +1,11 @@ #Hacking ## Instructions: +### 160507 16:00 . v0.7.3 +#### Update +* Replace and pack "@ExileServer\addons\exad_hacking" +* Replace "mpmissions\Exile.\ExAdClient\Hacking\postInit.sqf" + ### 160507 09:00 . v0.7.1 #### Update * Replace and pack "@ExileServer\addons\exad_hacking" diff --git a/docs/HaloParachute/changelog.md b/docs/HaloParachute/changelog.md index cf11af9..8caa68f 100644 --- a/docs/HaloParachute/changelog.md +++ b/docs/HaloParachute/changelog.md @@ -1,15 +1,14 @@ #HaloParachute ## Changelog: + +### 160510 16:00 . v0.7.3 +#### Fixed +* Declaration of un custamized variables + ### 160429 14:04 . v0.5.1 #### Fixed * Added BattlEye exceptions -#### Added - -#### Deleted - ### 160425 12:00 . v0.5.0 -#### Fixed #### Added * Introduced **HaloParachute** to the ExAd package -#### Deleted diff --git a/docs/HaloParachute/update.md b/docs/HaloParachute/update.md index 270a521..7c197ad 100644 --- a/docs/HaloParachute/update.md +++ b/docs/HaloParachute/update.md @@ -1,5 +1,10 @@ #HaloParachute ## Instructions: + +### 160507 16:00 . v0.7.3 +#### Update +* Replace "mpmissions\Exile.\ExAdClient\HaloParachute\postInit.sqf" + ### 160429 14:04 . v0.5.1 #### Update * Add battleye exceptions diff --git a/docs/VirtualGarage/changelog.md b/docs/VirtualGarage/changelog.md index 0e8ba7f..8491fd9 100644 --- a/docs/VirtualGarage/changelog.md +++ b/docs/VirtualGarage/changelog.md @@ -1,5 +1,9 @@ #VirtualGarage ## Changelog: + +### 160510 16:00 . v0.7.3 +#### Fixed +* Declaration of un custamized variables ### 160506 09:00 . v0.7.0 #### Fixed diff --git a/docs/VirtualGarage/update.md b/docs/VirtualGarage/update.md index 5cd3712..fa7a783 100644 --- a/docs/VirtualGarage/update.md +++ b/docs/VirtualGarage/update.md @@ -1,6 +1,10 @@ #VirtualGarage ## Instructions: +### 160507 16:00 . v0.7.3 +#### Update +* Replace "mpmissions\Exile.\ExAdClient\VirtualGarage\postInit.sqf" + ### 160506 09:00 . v0.7.0 #### Update * Copy over the new VirtualGarage Package in "stringtable.xml" diff --git a/docs/core/changelog.md b/docs/core/changelog.md index 4ef85e8..debb2cf 100644 --- a/docs/core/changelog.md +++ b/docs/core/changelog.md @@ -1,6 +1,10 @@ #Core ## Changelog: +### 160510 16:00 . v0.7.3 +#### Fixed +* Declaration of un custamized variables + ### 160506 09:00 . v0.7.0 #### Fixed diff --git a/docs/core/update.md b/docs/core/update.md index 5fcfc8c..1c30f9d 100644 --- a/docs/core/update.md +++ b/docs/core/update.md @@ -1,5 +1,10 @@ #Core ## Instructions: + +### 160507 16:00 . v0.7.3 +#### Update +* Replace "mpmissions\Exile.\ExAdClient\Core\postInit.sqf" + ### 160430 09:20 . v0.7.0 #### Update * Replace "ExAdClient\Core\customize.sqf" diff --git a/mpmissions/Exile.Altis/ExAdClient/Core/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/Core/postInit.sqf index 7c54196..ffba2d2 100644 --- a/mpmissions/Exile.Altis/ExAdClient/Core/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/Core/postInit.sqf @@ -17,4 +17,14 @@ */ -execVM "ExAdClient\Core\customize.sqf"; \ No newline at end of file +execVM "ExAdClient\Core\customize.sqf"; + +if(isNil "ExAd_Debug")then{ExAd_Debug = true;}; + +if(isNil "ExAd_Hint_Title_Color")then{ExAd_Hint_Title_Color = "#E48A36";}; +if(isNil "ExAd_Hint_Title_Size")then{ExAd_Hint_Title_Size = 1.5;}; +if(isNil "ExAd_Hint_Title_Font")then{ExAd_Hint_Title_Font = "TahomaB";}; + +if(isNil "ExAd_Hint_Msg_Color")then{ExAd_Hint_Msg_Color = "#ffffff";}; +if(isNil "ExAd_Hint_Msg_Size")then{ExAd_Hint_Msg_Size = 1;}; +if(isNil "ExAd_Hint_Msg_Font")then{ExAd_Hint_Msg_Font = "TahomaB";}; \ No newline at end of file diff --git a/mpmissions/Exile.Altis/ExAdClient/Grinding/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/Grinding/postInit.sqf index a607f51..749c6b3 100644 --- a/mpmissions/Exile.Altis/ExAdClient/Grinding/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/Grinding/postInit.sqf @@ -19,6 +19,10 @@ execVM "ExAdClient\Grinding\customize.sqf"; +if(isNil "ExAd_GRINDING_PROGRESS_INTERVALL")then{ExAd_GRINDING_PROGRESS_INTERVALL = 60;}; +if(isNil "ExAd_GRINDING_PROGRESS")then{ExAd_GRINDING_PROGRESS = 30;}; +if(isNil "ExAd_GRINDING_OBJECT_MAX")then{ExAd_GRINDING_OBJECT_MAX = 900;}; + ExAd_GRINDING = false; STR_ExAd_GRINDING_NOTI_BROKE = if(isLocalized "STR_ExAd_GRINDING_NOTI_BROKE")then{localize "STR_ExAd_GRINDING_NOTI_BROKE"}else{"Your grinder broke, get a new one before you can continue."}; diff --git a/mpmissions/Exile.Altis/ExAdClient/Hacking/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/Hacking/postInit.sqf index b5fbf11..f0918c0 100644 --- a/mpmissions/Exile.Altis/ExAdClient/Hacking/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/Hacking/postInit.sqf @@ -19,6 +19,17 @@ execVM "ExAdClient\Hacking\customize.sqf"; +if(isNil "ExAd_HACKING_MIN_PLAYERS_ONLINE")then{ExAd_HACKING_MIN_PLAYERS_ONLINE = 30;}; +if(isNil "ExAd_HACKING_ALLOWED_HACKS")then{ExAd_HACKING_ALLOWED_HACKS = 1;}; +if(isNil "ExAd_HACKING_MAX_TIME")then{ExAd_HACKING_MAX_TIME = 1200;}; +if(isNil "ExAd_HACKING_MAX_DISTANCE")then{ExAd_HACKING_MAX_DISTANCE = 50;}; +if(isNil "ExAd_HACKING_TERRITORY_MAX")then{ExAd_HACKING_TERRITORY_MAX = 3;}; +if(isNil "ExAd_HACKING_MARKER_COLOR")then{ExAd_HACKING_MARKER_COLOR = "ColorOrange";}; +if(isNil "ExAd_HACKING_MARKER_TITLE")then{ExAd_HACKING_MARKER_TITLE = "Hacker activity";}; +if(isNil "ExAd_HACKING_FAILED_HACK")then{ExAd_HACKING_FAILED_HACK = 0.15;}; + +if(isNil "ExAd_HACKING_FAILED_HACK")then{ExAd_VG_ACCESS_LEVEL = 1;}; /*Needs to be here if peolpe don't use the VirtualGarage*/ + STR_ExAd_HACKING_NOTI_MAX_TERRITORY_HACKS_REACHED = if(isLocalized "STR_ExAd_HACKING_NOTI_MAX_TERRITORY_HACKS_REACHED")then{localize "STR_ExAd_HACKING_NOTI_MAX_TERRITORY_HACKS_REACHED"}else{"Connection failed! Territory Wi-Fi is down!"}; STR_ExAd_HACKING_NOTI_TERRITORY_ONE_HACK = if(isLocalized "STR_ExAd_HACKING_NOTI_TERRITORY_ONE_HACK")then{localize "STR_ExAd_HACKING_NOTI_TERRITORY_ONE_HACK"}else{"Wi-Fi occupied!!"}; diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf index 640ff3b..79d8a54 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf @@ -19,6 +19,11 @@ execVM "ExAdClient\HaloParachute\customize.sqf"; +if(isNil "ExAd_HALOPARACHUTE_SAFE_MODE"){ExAd_HALOPARACHUTE_SAFE_MODE = false;}; +if(isNil "ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE"){ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE = false;}; +if(isNil "ExAd_ACTION_PARACHUTE_HEIGHT"){ExAd_ACTION_PARACHUTE_HEIGHT = 10;}; +if(isNil "ExAd_ACTION_EJECT_HEIGHT"){ExAd_ACTION_EJECT_HEIGHT = 100;}; + [] spawn { while {true} do { waitUntil{!isNil "ExileClientLoadedIn"}; diff --git a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/postInit.sqf index 16dd1de..87171f0 100644 --- a/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/VirtualGarage/postInit.sqf @@ -17,4 +17,10 @@ */ -execVM "ExAdClient\VirtualGarage\customize.sqf"; \ No newline at end of file +execVM "ExAdClient\VirtualGarage\customize.sqf"; + +if(isNil "ExAd_VG_MIN_ALLOWED_VEH")then{ExAd_VG_MIN_ALLOWED_VEH = 5;}; +if(isNil "ExAd_VG_ALLOWED_VEH_MULTIPLE_FACTOR")then{ExAd_VG_ALLOWED_VEH_MULTIPLE_FACTOR = 3;}; +if(isNil "ExAd_VG_ACCESS_LEVEL")then{ExAd_VG_ACCESS_LEVEL = 1;}; +if(isNil "ExAd_VG_CLEAN_ON_STORE")then{ExAd_VG_CLEAN_ON_STORE = true;}; +if(isNil "ExAd_VG_SHOW_ADVHINT")then{ExAd_VG_SHOW_ADVHINT = false;}; \ No newline at end of file From 1d36ec1170974db7f7e217d7f4610e9d67779458 Mon Sep 17 00:00:00 2001 From: Bjanski Date: Tue, 10 May 2016 17:46:00 +0200 Subject: [PATCH 3/4] v0.7.4 Updated HaloParachute Added some new small features Clarified some documentation --- docs/HaloParachute/changelog.md | 7 ++++ docs/HaloParachute/update.md | 6 +++ docs/README.md | 11 +++++- .../ExAdClient/HaloParachute/CfgFunctions.cpp | 1 - .../Functions/fn_canDetachParachute.sqf | 19 ---------- .../Functions/fn_pullParachute.sqf | 2 +- .../ExAdClient/HaloParachute/customize.sqf | 5 ++- .../ExAdClient/HaloParachute/postInit.sqf | 37 ++++++++++++------- 8 files changed, 50 insertions(+), 38 deletions(-) delete mode 100644 mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_canDetachParachute.sqf diff --git a/docs/HaloParachute/changelog.md b/docs/HaloParachute/changelog.md index 8caa68f..23006ca 100644 --- a/docs/HaloParachute/changelog.md +++ b/docs/HaloParachute/changelog.md @@ -1,6 +1,13 @@ #HaloParachute ## Changelog: +### 160510 18:00 . v0.7.4 +#### Added +* Feature - Customization for using key bindings instead of displayed addActions + +#### Deleted +* "mpmission\Exile.Altis\ExAdClient\HaloParachute\Functions\canDetachParachute.sqf + ### 160510 16:00 . v0.7.3 #### Fixed * Declaration of un custamized variables diff --git a/docs/HaloParachute/update.md b/docs/HaloParachute/update.md index 7c197ad..170a7b5 100644 --- a/docs/HaloParachute/update.md +++ b/docs/HaloParachute/update.md @@ -1,6 +1,12 @@ #HaloParachute ## Instructions: +### 160507 18:00 . v0.7.4 +#### Update +* Replace folder "mpmissions\Exile.\ExAdClient\HaloParachute\Functions" +* Replace file "mpmissions\Exile.\ExAdClient\HaloParachute\CfgFunctions.cpp" +* Replace file "mpmissions\Exile.\ExAdClient\HaloParachute\postInit.sqf" + ### 160507 16:00 . v0.7.3 #### Update * Replace "mpmissions\Exile.\ExAdClient\HaloParachute\postInit.sqf" diff --git a/docs/README.md b/docs/README.md index b5135f9..310a2c6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,7 +1,14 @@ #Documentation -Each subfolder withholds the choosen dokumentation including installation instruction and examples on useage. +Each subfolder withholds the choosen documentation including installation instruction and examples on useage. + +To simplify the proccess for me, I've decided to simply devide everything and leave a changelog and update instructions in every subprojects documentation folder. This way you won't miss any information related to that subproject and it will be simple for me to keep the track off all changes with out skimming a general changelog. ## How to Update Since this project consist of multiple sub projects I've had some issues deciding how to structure the project for a simple update process. -To simplify the proccess for me, I've decided to simply devide everything and leave a changelog and update instructions in every subprojects client folder. This way you won't miss any information related to that subproject and it will be simple for me to keep the track off all changes with out skimming a general changelog. +#### Problems remember which version you have? +General update for all mods are to +* replace plugin specific server files +* Copy and save plugin specific customization file +* replace plugin client folder, e.g. "mpmission\Exile.\ExAdClient\HaloParachute" +* Compare old with new customize.sqf file - add extras \ No newline at end of file diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/CfgFunctions.cpp b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/CfgFunctions.cpp index ed11310..59fa7c5 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/CfgFunctions.cpp +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/CfgFunctions.cpp @@ -20,7 +20,6 @@ class HaloParachute { file = "ExAdClient\HaloParachute\Functions"; - class canDetachParachute {}; class ejectPlayer {}; class parachutesafemode {}; class pullParachute {}; diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_canDetachParachute.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_canDetachParachute.sqf deleted file mode 100644 index ddb78d9..0000000 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_canDetachParachute.sqf +++ /dev/null @@ -1,19 +0,0 @@ -/* - fn_showDetachParachute.sqf - - Copyright 2016 Jan Babor - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -((getPos player) select 2 > ExAd_ACTION_PARACHUTE_HEIGHT && vehicle player isKindOf "Steerable_Parachute_F") \ No newline at end of file diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf index 45bc451..6da370d 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_pullParachute.sqf @@ -37,7 +37,7 @@ if(ExAd_HALOPARACHUTE_SAFE_MODE)then{ [ExAd_PARACHUTE_SAFE_THREAD] call ExileClient_system_thread_removeTask; }; -if(ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE)then{ +if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{ hint localize "STR_ExAd_HALOPARACHUTE_INFO_DETACH" }; diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/customize.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/customize.sqf index 870bf85..0aef078 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/customize.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/customize.sqf @@ -17,7 +17,8 @@ */ ExAd_HALOPARACHUTE_SAFE_MODE = false; //BOOLEAN - Force pull parachute when player reaches ExAd_ACTION_PARACHUTE_HEIGHT if they ejected from vehicle -ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE = false; //BOOLEAN - Allows player to detach himself from parachute +ExAd_HALOPARACHUTE_USE_ACTIONS = true; //BOOLEAN - Allows player to eject from all vehicles with a pressed key combination 'alt shift x' +ExAd_HALOPARACHUTE_USE_KEY_ACTIONS = true; //BOOLEAN - Show addActions on the screen ExAd_ACTION_PARACHUTE_HEIGHT = 10; //SCALAR - What is the minimum altitude a player can pull a parachute. |RECOMMENDED 30 meters when safe_mode activated -ExAd_ACTION_EJECT_HEIGHT = 100; //SCALAR - What is the minimum altitude a player can Halo/Eject from a vehicle. \ No newline at end of file +ExAd_ACTION_EJECT_HEIGHT = 100; //SCALAR - What is the minimum altitude a player can Halo/Eject from a vehicle. diff --git a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf index 79d8a54..5eca15c 100644 --- a/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf +++ b/mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf @@ -17,12 +17,15 @@ */ +ExAd_HALOPARACHUTE_VERSION = "v0.7.4"; + execVM "ExAdClient\HaloParachute\customize.sqf"; if(isNil "ExAd_HALOPARACHUTE_SAFE_MODE"){ExAd_HALOPARACHUTE_SAFE_MODE = false;}; -if(isNil "ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE"){ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE = false;}; +if(isNil "ExAd_HALOPARACHUTE_USE_ACTIONS"){ExAd_HALOPARACHUTE_USE_ACTIONS = true;}; +if(isNil "ExAd_HALOPARACHUTE_USE_KEY_ACTIONS"){ExAd_HALOPARACHUTE_USE_KEY_ACTIONS = true;}; if(isNil "ExAd_ACTION_PARACHUTE_HEIGHT"){ExAd_ACTION_PARACHUTE_HEIGHT = 10;}; -if(isNil "ExAd_ACTION_EJECT_HEIGHT"){ExAd_ACTION_EJECT_HEIGHT = 100;}; +if(isNil "ExAd_ACTION_EJECT_HEIGHT"){ExAd_ACTION_EJECT_HEIGHT = 0;}; [] spawn { while {true} do { @@ -32,25 +35,33 @@ if(isNil "ExAd_ACTION_EJECT_HEIGHT"){ExAd_ACTION_EJECT_HEIGHT = 100;}; UISleep 0.1; waitUntil{alive player}; - ExAd_ACTION_PARACHUTE = player addaction [format["%1", localize "STR_ExAd_HALOPARACHUTE_ACTIONS_PARACHUTE"], {call ExAd_fnc_pullParachute}, [], 6, true, true, "", "call ExAd_fnc_showParachute"]; - ExAd_ACTION_EJECT = player addaction [format["%1", localize "STR_ExAd_HALOPARACHUTE_ACTIONS_HALO"], {call ExAd_fnc_ejectPlayer}, [], 6, false, true, "", "call ExAd_fnc_showEject;"]; + if(ExAd_HALOPARACHUTE_USE_ACTIONS)then{ + ExAd_ACTION_PARACHUTE = player addaction [format["%1", localize "STR_ExAd_HALOPARACHUTE_ACTIONS_PARACHUTE"], {call ExAd_fnc_pullParachute}, [], 6, true, true, "", "call ExAd_fnc_showParachute"]; + ExAd_ACTION_EJECT = player addaction [format["%1", localize "STR_ExAd_HALOPARACHUTE_ACTIONS_HALO"], {call ExAd_fnc_ejectPlayer}, [], 6, false, true, "", "call ExAd_fnc_showEject;"]; + }; - if(ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE)then{ - ExAd_ACTION_PARACHUTE_DETACH = (findDisplay 46) displayAddEventHandler ["KeyDown",{ - if(call ExAd_fnc_canDetachParachute)then{ - if(_this select 1 == 45 && _this select 2 && _this select 4)then{ + if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{ + ExAd_ACTION_HALOPARACHUTE_USE_KEY_ACTIONS = (findDisplay 46) displayAddEventHandler ["KeyDown",{ + if(_this select 1 == 45 && _this select 2 && _this select 4)then{ + if((getPos player) select 2 > ExAd_ACTION_EJECT_HEIGHT && vehicle player != player)then{ call ExAd_fnc_ejectPlayer - } + }else{ + if(ExAd_fnc_showParachute)then{ + call ExAd_fnc_pullParachute + } + } } }]; }; waitUntil{!alive player}; - player removeAction ExAd_ACTION_PARACHUTE; - player removeAction ExAd_ACTION_EJECT; + if(ExAd_HALOPARACHUTE_USE_ACTIONS)then{ + player removeAction ExAd_ACTION_PARACHUTE; + player removeAction ExAd_ACTION_EJECT; + }; - if(ExAd_HALOPARACHUTE_DETACH_PARACHUTE_MODE)then{ - (findDisplay 46) displayRemoveEventHandler ["KeyDown", ExAd_ACTION_PARACHUTE_DETACH]; + if(ExAd_HALOPARACHUTE_USE_KEY_ACTIONS)then{ + (findDisplay 46) displayRemoveEventHandler ["KeyDown", ExAd_ACTION_HALOPARACHUTE_USE_KEY_ACTIONS]; }; }; }; \ No newline at end of file From 612243de04aff70ca1332e11d592382ccf1bd272 Mon Sep 17 00:00:00 2001 From: Bjanski Date: Tue, 10 May 2016 17:46:28 +0200 Subject: [PATCH 4/4] updated update.md --- docs/HaloParachute/update.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/HaloParachute/update.md b/docs/HaloParachute/update.md index 170a7b5..779f140 100644 --- a/docs/HaloParachute/update.md +++ b/docs/HaloParachute/update.md @@ -6,6 +6,7 @@ * Replace folder "mpmissions\Exile.\ExAdClient\HaloParachute\Functions" * Replace file "mpmissions\Exile.\ExAdClient\HaloParachute\CfgFunctions.cpp" * Replace file "mpmissions\Exile.\ExAdClient\HaloParachute\postInit.sqf" +* Replace, or update manually, file "mpmissions\Exile.\ExAdClient\HaloParachute\customize.sqf" ### 160507 16:00 . v0.7.3 #### Update