Merge pull request #37 from Bjanski/Dev

Dev

@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["<t color='%1' size='%2' font='%3'>%4</t><br/><t color='%5' size='%6' font='%7'>%8</t>", 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];

CHANGELOG.md

@@ -1,6 +1,31 @@
 #<img src="logo.png" alt="ExAd" width="200" />
 
 # 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,31 +37,20 @@ 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  
 * BattlEye filters been updated  (All)
@@ -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

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

docs/Grinding/update.md

@@ -1,6 +1,10 @@
 #VirtualGarage  
 ## Instructions:   
   
+### 160507 16:00 . v0.7.3  
+#### Update
+* Replace "mpmissions\Exile.<map>\ExAdClient\Grinding\postInit.sqf"
+ 
 ### 160505 01:40 . v0.6.1  
 #### Update 
 * Replace "ExAdClient\Grinding\Functions"

docs/Hacking/changelog.md

@@ -0,0 +1,15 @@
+#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
+
+### 160506 01:00 . v0.7.0  
+#### Added  
+* Introduced **Hacking** to the ExAd package

docs/Hacking/update.md

@@ -0,0 +1,14 @@
+#Hacking  
+## Instructions:   
+ 
+### 160507 16:00 . v0.7.3  
+#### Update
+* Replace and pack "@ExileServer\addons\exad_hacking" 
+* Replace "mpmissions\Exile.<map>\ExAdClient\Hacking\postInit.sqf" 
+
+### 160507 09:00 . v0.7.1  
+#### Update
+* Replace and pack "@ExileServer\addons\exad_hacking"
+
+### 160506 01:00 . v0.7.0  
+#### Full installation

docs/HaloParachute/changelog.md

@@ -0,0 +1,21 @@
+#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  
+
+### 160429 14:04 . v0.5.1  
+#### Fixed   
+* Added BattlEye exceptions   
+
+### 160425 12:00 . v0.5.0  
+#### Added  
+* Introduced **HaloParachute** to the ExAd package

docs/HaloParachute/update.md

@@ -0,0 +1,20 @@
+#HaloParachute  
+## Instructions:   
+ 
+### 160507 18:00 . v0.7.4  
+#### Update
+* Replace folder "mpmissions\Exile.<map>\ExAdClient\HaloParachute\Functions"
+* Replace file "mpmissions\Exile.<map>\ExAdClient\HaloParachute\CfgFunctions.cpp"
+* Replace file "mpmissions\Exile.<map>\ExAdClient\HaloParachute\postInit.sqf"
+* Replace, or update manually, file "mpmissions\Exile.<map>\ExAdClient\HaloParachute\customize.sqf"
+ 
+### 160507 16:00 . v0.7.3  
+#### Update
+* Replace "mpmissions\Exile.<map>\ExAdClient\HaloParachute\postInit.sqf"
+
+### 160429 14:04 . v0.5.1  
+#### Update  
+* Add battleye exceptions   
+
+### 160425 12:00 . v0.5.0  
+#### Full installation

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.<map>\ExAdClient\HaloParachute"
+* Compare old with new customize.sqf file - add extras 

docs/VirtualGarage/changelog.md

@@ -1,6 +1,10 @@
 #VirtualGarage  
 ## Changelog:    
 
+### 160510 16:00 . v0.7.3  
+#### Fixed  
+* Declaration of un custamized variables  
+ 
 ### 160506 09:00 . v0.7.0  
 #### Fixed 
 * Small issue where VG didn't show an advancedHint when storing.

docs/VirtualGarage/update.md

@@ -1,6 +1,10 @@
 #VirtualGarage  
 ## Instructions:   
  
+### 160507 16:00 . v0.7.3  
+#### Update
+* Replace "mpmissions\Exile.<map>\ExAdClient\VirtualGarage\postInit.sqf"
+ 
 ### 160506 09:00 . v0.7.0  
 #### Update 
 * Copy over the new VirtualGarage Package in "stringtable.xml"  

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  
 

docs/core/update.md

@@ -1,5 +1,10 @@
 #Core  
 ## Instructions:   
+ 
+### 160507 16:00 . v0.7.3  
+#### Update
+* Replace "mpmissions\Exile.<map>\ExAdClient\Core\postInit.sqf"
+
 ### 160430 09:20 . v0.7.0  
 #### Update  
 * Replace "ExAdClient\Core\customize.sqf"

mpmissions/Exile.Altis/ExAdClient/Core/postInit.sqf

@@ -18,3 +18,13 @@
 */
 
 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";};

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."};

mpmissions/Exile.Altis/ExAdClient/Hacking/CHANGELOG.md

@@ -1,8 +0,0 @@
-#Hacking  
-## Changelog:    
-
-### 160506 01:00 . v0.7.0  
-#### Fixed  
-#### Added  
-* Introduced **Hacking** to the ExAd package
-#### Deleted  

mpmissions/Exile.Altis/ExAdClient/Hacking/UPDATE.md

@@ -1,5 +0,0 @@
-#Hacking  
-## Instructions:   
- 
-### 160506 01:00 . v0.7.0  
-#### Full installation

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!!"};

mpmissions/Exile.Altis/ExAdClient/HaloParachute/CHANGELOG.md

@@ -1,15 +0,0 @@
-#HaloParachute  
-## Changelog:    
-### 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  

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 {};

mpmissions/Exile.Altis/ExAdClient/HaloParachute/Functions/fn_canDetachParachute.sqf

@@ -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")

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"
 };
 

mpmissions/Exile.Altis/ExAdClient/HaloParachute/UPDATE.md

@@ -1,8 +0,0 @@
-#HaloParachute  
-## Instructions:   
-### 160429 14:04 . v0.5.1  
-#### Update  
-* Add battleye exceptions   
-
-### 160425 12:00 . v0.5.0  
-#### Full installation

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.

mpmissions/Exile.Altis/ExAdClient/HaloParachute/postInit.sqf

@@ -17,8 +17,16 @@
 
 */
 
+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_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 = 0;};
+
 [] spawn {
 	while {true} do {
 		waitUntil{!isNil "ExileClientLoadedIn"};
@@ -27,25 +35,33 @@ execVM "ExAdClient\HaloParachute\customize.sqf";
 		UISleep 0.1;
 		waitUntil{alive player};
 		
+		if(ExAd_HALOPARACHUTE_USE_ACTIONS)then{
 			ExAd_ACTION_PARACHUTE = player addaction [format["<t color='#E48A36'><img image='\a3\ui_f\data\gui\cfg\CommunicationMenu\supplydrop_ca.paa' />%1</t>", localize "STR_ExAd_HALOPARACHUTE_ACTIONS_PARACHUTE"], {call ExAd_fnc_pullParachute}, [], 6, true, true, "", "call ExAd_fnc_showParachute"];
 			ExAd_ACTION_EJECT = player addaction [format["<t color='#E48A36'><img image='\a3\ui_f\data\gui\cfg\CommunicationMenu\supplydrop_ca.paa' />%1</t>", 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(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};
+		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];
 		};
 	};
 };

mpmissions/Exile.Altis/ExAdClient/VirtualGarage/postInit.sqf

@@ -18,3 +18,9 @@
 */
 
 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;};