Merge pull request #22 from DevZupa/V3.0_Dev

V3.0 Release
DevZupa · Jul 18, 2016 · a7e87b2 · a7e87b2
2 parents b65046a + c68c20a
commit a7e87b2
Show file tree

Hide file tree

Showing 8 changed files with 123 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -1,42 +1,36 @@
 # ZCP-A3-Exile
 
-Install info @ [ZCP @ Exile forums](http://www.exilemod.com/topic/12116-release-official-zcp-zupas-capture-points/)
+Topic @ [ZCP @ Exile forums](http://www.exilemod.com/topic/12116-release-official-zcp-zupas-capture-points/)
 
+#ZCP for Exile wiki
 
+### Zupa's Capture Points
+> Latest version: 3.0
+> Latest update: 18 - 07 - 2016
+> [Changelog](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Changelog)
 
-### BE filters
+##Table of content
 
-These are kicks based on what i encountered:
+1. [Description](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Description)
+2. [Installation](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Installation)
+3. [Battleye](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Battleye)
+4. [Configuration](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Configuration)
+5. [Bases](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Bases)
+6. [Changelog](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Changelog)
+7. [Updating](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Updating)
+8. [Contributing](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Contributing)
 
-on the line of 'isPlayer' add
-```sqf
-!="if (isPlayer _this) then {}"
-```
+##Previous releases
 
-on the line of 'units' add
-```sqf
-!="if (count units group _this>1) then"
-```
-
-#### Credits to the following people:
+* [V2.1](https://github.com/DevZupa/ZCP-A3-Exile/releases/tag/V2.1)
+* [V2.0](https://github.com/DevZupa/ZCP-A3-Exile/releases/tag/V2.0)
+* [V1.1](https://github.com/DevZupa/ZCP-A3-Exile/releases/tag/V1.1)
+* [V1.0.2](https://github.com/DevZupa/ZCP-A3-Exile/releases/tag/V1.0.2)
+* [V1.0.1](https://github.com/DevZupa/ZCP-A3-Exile/releases/tag/V1.0.1)
+* [V1.0](https://github.com/DevZupa/ZCP-A3-Exile/releases/tag/V1.0)
 
+##Credits
 * JamieKG for Testing and XCAM Base.
 * Zombie for AlRayak testing and whining.
 * Ferry for 3 cap bases!
-* DMS (Eraser, Defent) for code usage!
-
-#### Changes in 2.1
-
-* Amount of starting AI is now defined per mission instead of global..
-* Code cleanup.
-* Fixed cappoint not being capable ( problem with non private variables ).
-* Allow multiple rewards for 1 mission.
-* Option to deploy smokescreen per missions after finishing it.
-* Option to pass list/array of basesfiles per mission (Instead of only Random or 1 basefile).
-* No longer need to define baseType in the Cappoints array. It will auto determine it from the cappbases array.
-* Add m3e export base support
-* Option to disable damage when bombing is happening on map and build objects ( people and vehicles still die ).
-* Added minimum distance check to Exile buildables
-* Multiple static locations can be passed to 1 cappoint to be chosen randomly from the list.
-* 3 New bases by eXo
-* Amount of cappoints can now be relative to the amount of players online ( checks every x minuts ( default 10 minuts)
+* [DMS](https://github.com/Defent/DMS_Exile) (Eraser, Defent) for code usage!
diff --git a/server_addon_code/a3_zcp_exile/fn_config.sqf b/server_addon_code/a3_zcp_exile/fn_config.sqf
@@ -18,10 +18,20 @@
 // Being first in the zone starts the timer.
 // Holding a zone  gives you a reward after x Min.
 
-ZCP_dev = true; // Devmode for shorter development capture times
+ZCP_dev = false; // Devmode for shorter development capture times
 
 ZCP_AI_Type = 'DMS'; // NONE | DMS | FUMS
 
+ZCP_useOldMessages = false;
+
+/*Exile Toasts Notification Settings*/
+ZCP_DMS_ExileToasts_Title_Size			= 22;						// Size for Client Exile Toasts  mission titles.
+ZCP_DMS_ExileToasts_Title_Font			= "puristaMedium";			// Font for Client Exile Toasts  mission titles.
+ZCP_DMS_ExileToasts_Message_Color		= "#FFFFFF";				// Exile Toasts color for "ExileToast" client notification type.
+ZCP_DMS_ExileToasts_Message_Size		= 19;						// Exile Toasts size for "ExileToast" client notification type.
+ZCP_DMS_ExileToasts_Message_Font		= "PuristaLight";			// Exile Toasts font for "ExileToast" client notification type.
+/*Exile Toasts Notification Settings*/
+
 ZCP_AI_useLaunchersChance = 25; // %Change to spawn Launcher on AI soldier ( never exeeds the MIN and MAX defined per cappoint).
 
 // Put the following to -1 to disable it.

diff --git a/server_addon_code/a3_zcp_exile/functions/fn_createDMSGroup.sqf b/server_addon_code/a3_zcp_exile/functions/fn_createDMSGroup.sqf
@@ -17,7 +17,7 @@ _ZCP_CDG_groupAI setVariable ["DMS_SpawnedGroup",true];
 _ZCP_CDG_groupAI setVariable ["DMS_Group_Side", EAST];
 
 for "_i" from 1 to _ZCP_CDG_unitsPerGroup do {
-  [_ZCP_CDG_groupAI, _ZCP_CDG_spawnAIPos, _ZCP_CDG_dificulty, _ZCP_CDG_solierType] call ZCP_fnc_createDMSSoldier;
+  private _zcp_unit = [_ZCP_CDG_groupAI, _ZCP_CDG_spawnAIPos, _ZCP_CDG_dificulty, _ZCP_CDG_solierType] call ZCP_fnc_createDMSSoldier;
 };
 
 _ZCP_CDG_groupAI selectLeader ((units _ZCP_CDG_groupAI) select 0);

diff --git a/server_addon_code/a3_zcp_exile/functions/fn_createDMSSoldier.sqf b/server_addon_code/a3_zcp_exile/functions/fn_createDMSSoldier.sqf
@@ -42,7 +42,6 @@ _ZCP_CDS_posAI = [_ZCP_CDS_spawnAIPos, 0, 20, 1, 0, 9999, 0] call BIS_fnc_findSa
 
 _ZCP_CDS_unitAI = _ZCP_CDS_groupAI createUnit ['O_Soldier_F', _ZCP_CDS_posAI, [], 0,"FORM"];
 _ZCP_CDS_unitAI allowFleeing 0;
-[_ZCP_CDS_unitAI] joinSilent _ZCP_CDS_groupAI;
 
 
 // Remove existing gear
@@ -225,3 +224,8 @@ _ZCP_CDS_unitAI setVariable
 	0,
 	true
 ];
+
+
+[_ZCP_CDS_unitAI] joinSilent _ZCP_CDS_groupAI;
+
+_ZCP_CDS_unitAI
diff --git a/server_addon_code/a3_zcp_exile/functions/fn_createMarker.sqf b/server_addon_code/a3_zcp_exile/functions/fn_createMarker.sqf
@@ -23,7 +23,7 @@ private _ZCP_CM_marker 			= createMarker [format['ZCP_CM_%1',_ZCP_CM_mission], _
 
 _ZCP_CM_marker setMarkerColor
 (
-	switch (ZCP_Data select _ZCP_CM_index) do
+	switch ( (ZCP_Data select _ZCP_CM_index) select 1 ) do
 	{
 	    case 1:
 		{
@@ -46,8 +46,7 @@ _ZCP_CM_marker 		setMarkerSize [_ZCP_CM_capRadius,_ZCP_CM_capRadius];
 _ZCP_CM_marker 		setMarkerText _ZCP_CM_name;
 
 private _ZCP_CM_dot 	= createMarker [format['ZCP_CM_dot_%1',_ZCP_CM_mission], _ZCP_CM_position];
-_ZCP_CM_dot 			setMarkerColor "ColorBlack";
-_ZCP_CM_dot 			setMarkerType "hd_flag";
-_ZCP_CM_dot 			setMarkerText _ZCP_CM_name;
+_ZCP_CM_dot 			setMarkerType "ExileMissionCapturePointIcon";
+_ZCP_CM_dot 			setMarkerText format["   %1",_ZCP_CM_name];
 
 [_ZCP_CM_attentionMarker, _ZCP_CM_marker, _ZCP_CM_dot]
diff --git a/server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf b/server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf
@@ -125,7 +125,7 @@ while{_ZCP_MM_continueLoop}do{
       _ZCP_MM_isContested = false;
       {
         if( _x != _ZCP_MM_currentCapper)then{
-          if( _ZCP_MM_currentGroup ==  grpNull || group _x != _ZCP_MM_currentGroup)then{
+          if( (_ZCP_MM_currentGroup isEqualTo ExileServerLoneWolfGroup || group _x != _ZCP_MM_currentGroup ) )then{
             (ZCP_Data select _ZCP_MM_capIndex) set[1,2];
             _ZCP_MM_isContested = true;
           };
@@ -240,7 +240,7 @@ if(_ZCP_MM_recreateTrigger) then {
   ['Notification', ["ZCP",[format[[5] call ZCP_fnc_translate,_ZCP_MM_name,_ZCP_MM_finishText]], 'ZCP_Capped']] call ZCP_fnc_showNotification;
   [_ZCP_MM_currentCapper,_ZCP_MM_name,_ZCP_MM_capturePosition,_ZCP_MM_originalThis select 2, _ZCP_MM_baseRadius] call ZCP_fnc_giveReward;
 
-  ['PersonalNotification', ["ZCP",[format[[11] call ZCP_fnc_translate]], 'ZCP_Capped'], _ZCP_MM_currentCapper] call ZCP_fnc_showNotification;
+  ['PersonalNotification', ["ZCP",[format[[11] call ZCP_fnc_translate]], 'ZCP_Init'], _ZCP_MM_currentCapper] call ZCP_fnc_showNotification;
 
   if (_ZCP_MM_originalThis select 14) then {
     [_ZCP_MM_capturePosition, _ZCP_MM_baseRadius, _ZCP_MM_originalThis select 15, _ZCP_MM_originalThis select 16] spawn ZCP_fnc_createSmokeScreen;

diff --git a/server_addon_code/a3_zcp_exile/functions/fn_showNotification.sqf b/server_addon_code/a3_zcp_exile/functions/fn_showNotification.sqf
@@ -5,16 +5,87 @@ _ZCP_SN_message          = _this select 1;
 
 if(ZCP_CurrentMod == 'Exile') exitWith {
 
-  switch (_ZCP_SN_notificationType) do {
+  if(ZCP_useOldMessages) exitWith {
+      switch (_ZCP_SN_notificationType) do {
+          case ('Notification'): {
+            PV_ZCP_zupastic = _ZCP_SN_message;
+            publicVariable "PV_ZCP_zupastic";
+          };
+          case ('PersonalNotification'): {
+              private['_ZCP_SN_player'];
+              _ZCP_SN_player = _this select 2;
+              PV_ZCP_zupastic = _ZCP_SN_message;
+              owner _ZCP_SN_player publicVariableClient "PV_ZCP_zupastic";
+          };
+          case ('Reputation'): {
+            _ZCP_SN_message call ExileServer_system_network_send_to;
+          };
+          case ('Money'): {
+            _ZCP_SN_message call ExileServer_system_network_send_to;
+          };
+      };
+  };
+
+    private _titleColor = "#3FD4FC";
+    private _zcp_toast_type =
+          switch (_ZCP_SN_message select 2) do
+          {
+              case "ZCP_Init": {_titleColor = "#A0DF3B";"SuccessEmpty"};
+              case "ZCP_Capped": {_titleColor = "#C62651";"ErrorEmpty"};
+              default {"InfoEmpty"};		// case "start":
+          };
+
+
+    // new exile messages
+    switch (_ZCP_SN_notificationType) do {
       case ('Notification'): {
-        PV_ZCP_zupastic = _ZCP_SN_message;
-        publicVariable "PV_ZCP_zupastic";
+
+            [
+                "toastRequest",
+                [
+                    _zcp_toast_type,
+                    [
+                        format
+                        [
+                            "<t color='%1' size='%2' font='%3'>%4</t><br/><t color='%5' size='%6' font='%7'>%8</t>",
+                            _titleColor,
+                            ZCP_DMS_ExileToasts_Title_Size,
+                            ZCP_DMS_ExileToasts_Title_Font,
+                            _ZCP_SN_message select 0,
+                            ZCP_DMS_ExileToasts_Message_Color,
+                            ZCP_DMS_ExileToasts_Message_Size,
+                            ZCP_DMS_ExileToasts_Message_Font,
+                            _ZCP_SN_message select 1 select 0
+                        ]
+                    ]
+                ]
+            ] call ExileServer_system_network_send_broadcast;
       };
       case ('PersonalNotification'): {
           private['_ZCP_SN_player'];
           _ZCP_SN_player = _this select 2;
-          PV_ZCP_zupastic = _ZCP_SN_message;
-          owner _ZCP_SN_player publicVariableClient "PV_ZCP_zupastic";
+
+              [
+                   _ZCP_SN_player,
+                  "toastRequest",
+                  [
+                      _zcp_toast_type,
+                      [
+                          format
+                          [
+                              "<t color='%1' size='%2' font='%3'>%4</t><br/><t color='%5' size='%6' font='%7'>%8</t>",
+                              _titleColor,
+                              ZCP_DMS_ExileToasts_Title_Size,
+                              ZCP_DMS_ExileToasts_Title_Font,
+                              _ZCP_SN_message select 0,
+                              ZCP_DMS_ExileToasts_Message_Color,
+                              ZCP_DMS_ExileToasts_Message_Size,
+                              ZCP_DMS_ExileToasts_Message_Font,
+                              _ZCP_SN_message select 1 select 0
+                          ]
+                      ]
+                  ]
+              ] call ExileServer_system_network_send_to;
       };
       case ('Reputation'): {
         _ZCP_SN_message call ExileServer_system_network_send_to;
@@ -24,6 +95,7 @@ if(ZCP_CurrentMod == 'Exile') exitWith {
       };
   };
 
+
 };
 
 if(ZCP_CurrentMod == 'Epoch') exitWith {

diff --git a/server_addon_pbo/a3_zcp_exile.pbo b/server_addon_pbo/a3_zcp_exile.pbo