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