From 63f8324310a44488e5f6740704fb7a9dd46f0d85 Mon Sep 17 00:00:00 2001 From: Zupa Date: Mon, 18 Jul 2016 23:24:01 +0200 Subject: [PATCH 1/5] 3.0 Arma Apex --- server_addon_code/a3_zcp_exile/fn_config.sqf | 12 ++- .../functions/fn_createDMSGroup.sqf | 2 +- .../functions/fn_createDMSSoldier.sqf | 6 +- .../functions/fn_createMarker.sqf | 7 +- .../functions/fn_monitorMission.sqf | 2 +- .../functions/fn_showNotification.sqf | 82 +++++++++++++++++-- 6 files changed, 98 insertions(+), 13 deletions(-) diff --git a/server_addon_code/a3_zcp_exile/fn_config.sqf b/server_addon_code/a3_zcp_exile/fn_config.sqf index 4afb74e..4c00b42 100644 --- 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 index 1a9a50d..a3f79a6 100644 --- 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 index 3b6beb5..8fd5dfe 100644 --- 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 \ No newline at end of file diff --git a/server_addon_code/a3_zcp_exile/functions/fn_createMarker.sqf b/server_addon_code/a3_zcp_exile/functions/fn_createMarker.sqf index 844cb3b..ecfc04d 100644 --- 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 index d51b870..7a4137d 100644 --- 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; }; diff --git a/server_addon_code/a3_zcp_exile/functions/fn_showNotification.sqf b/server_addon_code/a3_zcp_exile/functions/fn_showNotification.sqf index 8d485d5..eaacb3e 100644 --- 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 + [ + "%4
%8", + _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 + [ + "%4
%8", + _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 { From 67b9df07b08923f3a686ee538810659a135ccafa Mon Sep 17 00:00:00 2001 From: Zupa Date: Mon, 18 Jul 2016 23:25:40 +0200 Subject: [PATCH 2/5] 3.0 Arma Apex Add prepacked PBO --- server_addon_pbo/a3_zcp_exile.pbo | Bin 175075 -> 183252 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/server_addon_pbo/a3_zcp_exile.pbo b/server_addon_pbo/a3_zcp_exile.pbo index c6bb24ed3dd0992fe1503b6a3f6489fc712ae34d..8ffd394e20684cda3955372d6ca25795606d36ce 100644 GIT binary patch delta 8870 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 delta 2335 zcmaJ>Yfu~474|(y2rbqcA@h=La@j!FIC2a)8ERAFP{1Ua%8>zAZe>MTqZM8vv|=Us zQ4dYxQuj|L!6@eB!8o45@sEz%z|ir|Br{E2W8;u%rb#-JDSnWt`v`ICX{Uecwy}G6 zg(N(kc7N#Jd(QWL=W)-~Z?O30XWXc-;rG^6=J)dI&3e+P9Uo%XZZ_yWHXM;lcv>SIVxvqIDL*(pfpEZ z_~{gJ>0eBdJLUS^Jh{U^uPFzad_V|&x7`49h@CsyunakUL{;*yA+Sh;dV8uYAp3(2Pa1pGQ*_b z87a%tc}8!_(O2-@?P@G3Cz4qK`|vWKrIHI$x>J+oJi>^B-@idN;N9zFdQG+lb_uM2 zOa%q(kSWu(NGeNBE)~q>n^CFnIRQ%+Nlnp#a3~U$`pwgNoVY>Cp3kb~?}W{0AYx8& zK+H5y^kh-Xvk~;rJmUX*Sz`YU$lSUi${RD9kBuAtK(^_37fEq_b)s`9B}IExDs&!J zqH@S9^-JGVVsfbGkP_?1Q4ZGXvK{Uf>5)=csK$6BP<^ZsY5^LXP~QrFEnp*xFSaq< zCy&6ppieeKA?OR+z|Z4Y7nF0Yl=f@!U8!gkl_#K9AAJHwcznnYn`}Xvh)aiJ_@*Cf zaj*qk`ntU!TJ$~pV50@=BoOsV2|DfkaY67Qc*UM~4OkcK_6;#*@{d@(=ztmx`+Ye427C>pZ$b%0>4v#X$q7Az3^wSr5M}Zhi~cc zybu2%wxH1}djLnL*$n>b0=Nl&@k{td0k>%j)?b7Oa3b!z1P|bqi_mW2f-M}rcM{yC z9Ho6yLZ%zV4sVZGznvb%W3wRQk7uFT!kiSZU4}}$I}7V^-6hyYIP_nFwnEPEQEa=+ zW+8f5K%W!z`Dt=Ae$D z>aKv4YpLCpMWmFTs4T~66GQI*0DKRa!5Pma=PKB_CtE_p1b7_A9|!eI2jz#^DW5 From a9a0e7562949627fed1195ec9a7629f7b3783554 Mon Sep 17 00:00:00 2001 From: Zupa Date: Mon, 18 Jul 2016 23:26:52 +0200 Subject: [PATCH 3/5] 3.0 Arma Apex Readme --- README.md | 54 ++++++++++++++++++++++++------------------------------ 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 341bffe..1e1907d 100644 --- 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](Changelog) -### BE filters +##Table of content -These are kicks based on what i encountered: +1. [Description](Description) +2. [Installation](Installation) +3. [Battleye](Battleye) +4. [Configuration](Configuration) +5. [Bases](Bases) +6. [Changelog](Changelog) +7. [Updating](Updating) +8. [Contributing](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) \ No newline at end of file +* [DMS](https://github.com/Defent/DMS_Exile) (Eraser, Defent) for code usage! \ No newline at end of file From fa7f35d9acb443f16ff197f9215bffe815c813c3 Mon Sep 17 00:00:00 2001 From: Zupa Date: Mon, 18 Jul 2016 23:28:09 +0200 Subject: [PATCH 4/5] 3.0 Arma Apex Readme fix --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1e1907d..96f1b18 100644 --- a/README.md +++ b/README.md @@ -7,18 +7,18 @@ Topic @ [ZCP @ Exile forums](http://www.exilemod.com/topic/12116-release-officia ### Zupa's Capture Points > Latest version: 3.0 > Latest update: 18 - 07 - 2016 -> [Changelog](Changelog) +> [Changelog](https://github.com/DevZupa/ZCP-A3-Exile/wiki/Changelog) ##Table of content -1. [Description](Description) -2. [Installation](Installation) -3. [Battleye](Battleye) -4. [Configuration](Configuration) -5. [Bases](Bases) -6. [Changelog](Changelog) -7. [Updating](Updating) -8. [Contributing](Contributing) +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) ##Previous releases From c68c20a674ff69e6fcd869e77201faae206e3c39 Mon Sep 17 00:00:00 2001 From: Zupa Date: Mon, 18 Jul 2016 23:32:41 +0200 Subject: [PATCH 5/5] 3.0 Arma Apex Reward in success green --- server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf b/server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf index 7a4137d..a8da4b3 100644 --- a/server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf +++ b/server_addon_code/a3_zcp_exile/functions/fn_monitorMission.sqf @@ -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;