From a6da0fca1c2eb411933a2eef7895a254ff8b1012 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 11:19:04 +0200 Subject: [PATCH 01/18] asd asd --- .../addons/a3_dms/crates/DMS_CreateBox.sqf | 4 ++-- @ExileServer/addons/a3_dms/missions/MM1.sqf | 3 ++- .../a3_dms/scripts/DMS_MissionControl.sqf | 0 .../a3_dms/scripts/DMS_fnc_nearbyPlayers.sqf | 1 + .../addons/a3_dms/scripts/DMS_spawnAI.sqf | 7 ++----- Pre-Packed PBO/a3_dms.pbo | Bin 24454 -> 24476 bytes 6 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 @ExileServer/addons/a3_dms/scripts/DMS_MissionControl.sqf diff --git a/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf b/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf index 1cc1ff2..6a3f443 100644 --- a/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf +++ b/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf @@ -16,7 +16,7 @@ private ["_type","_crate"]; _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",2]; _crate addMagazineCargoGlobal ["Exile_Item_DoorwayKit",1]; _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; - _crate addMagazineCargoGlobal ["Exile_Melee_Axe",2]; + _crate addWeaponCargoGlobal ["Exile_Melee_Axe",2]; _crate addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",2]; _crate addMagazineCargoGlobal ["Exile_Item_Beer",3]; _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",3]; @@ -37,7 +37,7 @@ private ["_type","_crate"]; _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_DoorwayKit",1]; _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; - _crate addMagazineCargoGlobal ["Exile_Melee_Axe",5]; + _crate addWeaponCargoGlobal ["Exile_Melee_Axe",5]; _crate addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",5]; _crate addMagazineCargoGlobal ["Exile_Item_Beer",5]; _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",5]; diff --git a/@ExileServer/addons/a3_dms/missions/MM1.sqf b/@ExileServer/addons/a3_dms/missions/MM1.sqf index 953c31d..43cdd18 100644 --- a/@ExileServer/addons/a3_dms/missions/MM1.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM1.sqf @@ -25,7 +25,8 @@ uiSleep 2; // spawn AI //[_pos,5,4] call DMS_SpawnAI; -[(_pos),(5),(4)] call DMS_DMS_SpawnAI; +//[(_pos),(5),(4)] call DMS_SpawnAI; +[_pos,5,4] call DMS_SpawnAI; waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_MissionControl.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_MissionControl.sqf new file mode 100644 index 0000000..e69de29 diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_fnc_nearbyPlayers.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_fnc_nearbyPlayers.sqf index 42ad9ec..bcb0da9 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_fnc_nearbyPlayers.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_fnc_nearbyPlayers.sqf @@ -1,3 +1,4 @@ +// Not being used at the moment. DMS_fnc_nearbyPlayers = { private ["_pos", "_isNearList", "_isNear"]; _pos = [_this, 0, objNull, [objNull,[]], [2,3]] call BIS_fnc_param; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf index 53146b4..19a2ae5 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf @@ -1,10 +1,7 @@ -DMS_spawnAI = { private ["_group", "_pos","_soldier","_skill","_units","_playerObject"]; _pos = _this select 0; _units = _this select 1; _skill = _this select 2; - //_playerObject = (owner player); - // Needed 4 exile _group = createGroup EAST; _group setBehaviour "COMBAT"; _group setCombatMode "RED"; @@ -17,7 +14,7 @@ DMS_spawnAI = { for "_i" from 1 to _units do { - _soldier = _group createUnit ["i_g_soldier_unarmed_f", [_pos select 0, _pos select 1, 0], [], 1, "Form"]; + _soldier = _group createUnit ["SoldierWB", [_pos select 0, _pos select 1, 0], [], 1, "Form"]; removeAllAssignedItems _soldier; removeUniform _soldier; removeHeadgear _soldier; @@ -104,4 +101,4 @@ DMS_spawnAI = { }; }; }; -}; + diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index cc05892afb710084c752a626d6ea46495f8b5ec8..55197aa7795f3e76f6a7e742f096b964620738f3 100644 GIT binary patch delta 314 zcmZqM&p2m4ql$E z7vvXf>S&k(v5Ds7kB+93RrNDB&k|=fQPS5}@XIezNJ`DjOIIi@PEAorEKw-QNL9$q z&rQuM(c|UXJl|WCZSv8;Ih$t&)iH7g=jWtkrWS=eZPp2Kuac2T$l!yoWO!mG-0ziqdt>> zFf&BRMEPDQh&}l}r|jfq%!a&sc_9*xA@@S}ZhpdS#yPp4M`m)IAopf_URD+mXLFq3 z4OXdWjrfB6Voe7ASbahwa7myD>b^$H6=c6vrC90w`46)8^Z(NY4XDFSS8XY Date: Thu, 27 Aug 2015 11:24:26 +0200 Subject: [PATCH 02/18] asd asd --- .../addons/a3_dms/crates/DMS_CreateBox.sqf | 12 ++++++------ Pre-Packed PBO/a3_dms.pbo | Bin 24476 -> 24480 bytes 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf b/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf index 6a3f443..005616f 100644 --- a/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf +++ b/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf @@ -14,15 +14,15 @@ private ["_type","_crate"]; { _crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",6]; _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",2]; - _crate addMagazineCargoGlobal ["Exile_Item_DoorwayKit",1]; + _crate addMagazineCargoGlobal ["Exile_Item_WoodDoorwayKit",1]; _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; _crate addWeaponCargoGlobal ["Exile_Melee_Axe",2]; - _crate addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",2]; + _crate addMagazineCargoGlobal ["Exile_Item_BBQSandwich",2]; _crate addMagazineCargoGlobal ["Exile_Item_Beer",3]; _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",3]; _crate addMagazineCargoGlobal ["Exile_Item_CampFireKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_InstaDoc",5]; - _crate addMagazineCargoGlobal ["Exile_Item__JunkMetal",2]; + _crate addMagazineCargoGlobal ["Exile_Item_JunkMetal",2]; _crate addMagazineCargoGlobal ["Exile_Item_SafeKit",1]; _crate addMagazineCargoGlobal ["Exile_Item_MetalBoard",2]; _crate addMagazineCargoGlobal ["Exile_Item_DuctTape",2]; @@ -35,15 +35,15 @@ private ["_type","_crate"]; { _crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_DoorwayKit",1]; + _crate addMagazineCargoGlobal ["Exile_Item_WoodDoorwayKit",1]; _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; _crate addWeaponCargoGlobal ["Exile_Melee_Axe",5]; - _crate addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",5]; + _crate addMagazineCargoGlobal ["Exile_Item_BBQSandwich",5]; _crate addMagazineCargoGlobal ["Exile_Item_Beer",5]; _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_CampFireKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_InstaDoc",5]; - _crate addMagazineCargoGlobal ["Exile_Item__JunkMetal",5]; + _crate addMagazineCargoGlobal ["Exile_Item_JunkMetal",5]; _crate addMagazineCargoGlobal ["Exile_Item_SafeKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_MetalBoard",5]; _crate addMagazineCargoGlobal ["Exile_Item_DuctTape",5]; diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 55197aa7795f3e76f6a7e742f096b964620738f3..7a88c93860181892e8059d3633a638b40d307eee 100644 GIT binary patch delta 115 zcmbQUpK-x{#tBb(t2i0JVC$!Qp;a3{?c-(%&(BYpyn*K^M{r_ZN_l2-#$-c&)5)88 zzinQ{XTSuL?w_0~XtsHQpfMw-S7~0hZ)! Date: Thu, 27 Aug 2015 13:50:43 +0200 Subject: [PATCH 03/18] asd asd --- .../addons/a3_dms/scripts/DMS_spawnAI.sqf | 3 ++- Pre-Packed PBO/a3_dms.pbo | Bin 24480 -> 24500 bytes 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf index 19a2ae5..1bbed00 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf @@ -14,7 +14,7 @@ for "_i" from 1 to _units do { - _soldier = _group createUnit ["SoldierWB", [_pos select 0, _pos select 1, 0], [], 1, "Form"]; + _soldier = _group createUnit ["i_g_soldier_unarmed_f", [_pos select 0, _pos select 1, 0], [], 1, "Form"]; removeAllAssignedItems _soldier; removeUniform _soldier; removeHeadgear _soldier; @@ -102,3 +102,4 @@ }; }; +_soldier \ No newline at end of file diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 7a88c93860181892e8059d3633a638b40d307eee..34825375d7f4f686bd8388e09fae1c649d2ba8d9 100644 GIT binary patch delta 85 zcmZ3mpK;56#tqk*d8>FCz+i^x{m`n-Pne?vL^I>l delta 65 zcmdn8pK-x{#tqk*dDD0qz<}%1z0kDHPne?vID_+ZQZiGE!kspUggA4HGHf-=m9PIl Tr*rX-)Bl3FZ+HYS@@@tI1mqa^ From 01ed2fbdc9bdf73cfb1f899fd9b101387420bff9 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 15:41:44 +0200 Subject: [PATCH 04/18] asd asd --- @ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf index 1bbed00..8a8edd6 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf @@ -33,6 +33,10 @@ }forEach ["TARGET","AUTOTARGET","MOVE","ANIM"]; _soldier disableAI "FSM"; _soldier allowDammage true; + + // FIX FOR Ai vs Ai killing. + [_soldier] joinSilent _group; + switch (_skill) do { case 1: From 1af8814a54841725622144308f2630626e506b40 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 16:31:57 +0200 Subject: [PATCH 05/18] fas faff --- Pre-Packed PBO/a3_dms.pbo | Bin 24500 -> 24569 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 34825375d7f4f686bd8388e09fae1c649d2ba8d9..677a1bc1832f19b6dc00da5d7584acccf1cee538 100644 GIT binary patch delta 122 zcmdn8pYi8@#tqk*dH3@&fWa31`=R?cKVkkI^V0P|^3n0d`8g?>sYS60S^1fH!I?R!c_j+*=|%aa1=hS=o9~7l<`4;)lhv-y T->a$KD%JPN%Fn>7H&+S((s3zR delta 54 zcmeylpK;56#tqk*d8>FCz+i^x{m`n-PndrPZB_|C$RVQtDlq89XA}4Go%|cabI)|1 I|66$*086kJ)Bpeg From 3f6891d94239c392e0a25aee82aede7167a7f34c Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 16:51:28 +0200 Subject: [PATCH 06/18] asd asd --- @ExileServer/addons/a3_dms/missions/MM5.sqf | 2 +- Pre-Packed PBO/a3_dms.pbo | Bin 24569 -> 24571 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/@ExileServer/addons/a3_dms/missions/MM5.sqf b/@ExileServer/addons/a3_dms/missions/MM5.sqf index 606d50a..3b215e7 100644 --- a/@ExileServer/addons/a3_dms/missions/MM5.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM5.sqf @@ -31,7 +31,7 @@ uiSleep 2; //[_pos, amount of ai ] call DMS_SpawnAI; -[_pos,4] call DMS_SpawnAI; +[_pos,4,5] call DMS_SpawnAI; diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 677a1bc1832f19b6dc00da5d7584acccf1cee538..e7016b63b1ffd2b11a38c093d09bcbbcd6c3d485 100644 GIT binary patch delta 61 zcmeylpYiv8#tlapdGD|=fWdUT`=NI>Uu5jiWzsR7oTw$bIZwabKt%EJ{mNt8dBhYO P%y;vMJBvOv5=#I8&e#?y delta 58 zcmeyppYi8@#tlapd2g{WfWa5jd!e^BUu5jio!o3Iy178V+(0B`PFA}*f3K!`t5n}7 LD?bCT-drgFrNtHF From ecf93db52e0bcab23f62b2a9b951bbea9b0042b2 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 17:05:34 +0200 Subject: [PATCH 07/18] ASD asd --- .../addons/a3_dms/scripts/DMS_spawnAI.sqf | 2 +- Pre-Packed PBO/a3_dms.pbo | Bin 24571 -> 24577 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf index 8a8edd6..8f334ac 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf @@ -21,7 +21,7 @@ removeAllItems _soldier; removeAllWeapons _soldier; _soldier forceaddUniform "U_I_officerUniform"; - _soldier addVest " V_HarnessO_gry "; + _soldier addVest " V_TacVest_blk_POLICE "; _soldier addGoggles "G_Tactical_Clear"; for "_i" from 1 to 3 do { _soldier addItemToVest "30Rnd_65x39_caseless_mag"; diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index e7016b63b1ffd2b11a38c093d09bcbbcd6c3d485..ba8d5a82526336aafdfcf70fc331f9dd112757cd 100644 GIT binary patch delta 73 zcmeyppRw@(Sg+daO!%~Y&;*)Z+;{*JCJe^%PmxmT` biKJYfp}6|pk+73{VnSnIhNZ4sE-D59{_Gt* delta 67 zcmZoX!1#MVz+j91{m}iJpD?!v@^~Z`<)s!E`^TpjRc@{gE#MMSe0;z1 U*mfQ<#Rl`;JmSux4~@hU0BBMfE&u=k From c5f62ca028eee53cbaca08ddeb4f15f828212032 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 21:28:16 +0200 Subject: [PATCH 08/18] asd asdas --- @ExileServer/addons/a3_dms.pbo | Bin 0 -> 24840 bytes @ExileServer/addons/a3_dms/DMS_init.sqf | 25 ++++++--------- @ExileServer/addons/a3_dms/missions/MM1.sqf | 6 ++-- @ExileServer/addons/a3_dms/missions/MM10.sqf | 10 ++---- @ExileServer/addons/a3_dms/missions/MM2.sqf | 10 ++---- @ExileServer/addons/a3_dms/missions/MM3.sqf | 9 ++---- @ExileServer/addons/a3_dms/missions/MM4.sqf | 10 ++---- @ExileServer/addons/a3_dms/missions/MM5.sqf | 10 ++---- @ExileServer/addons/a3_dms/missions/MM6.sqf | 9 ++---- @ExileServer/addons/a3_dms/missions/MM7.sqf | 10 ++---- @ExileServer/addons/a3_dms/missions/MM8.sqf | 9 ++---- @ExileServer/addons/a3_dms/missions/MM9.sqf | 8 ++--- .../a3_dms/scripts/DMS_CreateMarker.sqf | 25 +++++++-------- .../addons/a3_dms/scripts/DMS_cleanup.sqf | 14 +++++++-- .../addons/a3_dms/scripts/DMS_findSafePos.sqf | 12 +++++--- .../addons/a3_dms/scripts/DMS_markerLoop.sqf | 29 ++++++++++++++++++ Pre-Packed PBO/a3_dms.pbo | Bin 24577 -> 24840 bytes 17 files changed, 99 insertions(+), 97 deletions(-) create mode 100644 @ExileServer/addons/a3_dms.pbo create mode 100644 @ExileServer/addons/a3_dms/scripts/DMS_markerLoop.sqf diff --git a/@ExileServer/addons/a3_dms.pbo b/@ExileServer/addons/a3_dms.pbo new file mode 100644 index 0000000000000000000000000000000000000000..7dcebd6e7ec0b7f6540fc13b8e90b585ff1488e4 GIT binary patch literal 24840 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 literal 0 HcmV?d00001 diff --git a/@ExileServer/addons/a3_dms/DMS_init.sqf b/@ExileServer/addons/a3_dms/DMS_init.sqf index e76637e..c3b4dc2 100644 --- a/@ExileServer/addons/a3_dms/DMS_init.sqf +++ b/@ExileServer/addons/a3_dms/DMS_init.sqf @@ -1,37 +1,30 @@ -// Loads compiles // Made by Defent for Defents Mission System // And for Numenadayz.com - -if(isServer) then { - - // compilation list + // Compiles for custom files. DMS_findSafePos = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_findSafePos.sqf"; DMS_createBox = compile preprocessFileLineNumbers "\x\addons\dms\crates\DMS_CreateBox.sqf"; DMS_CreateMarker = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_CreateMarker.sqf"; DMS_spawnAI = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_spawnAI.sqf"; DMS_selectMission = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf"; DMS_CleanUp = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_CleanUp.sqf"; - //DMS_Config = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_Config.sqf"; + DMS_markerLoop = compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_markerLoop.sqf"; + // CONFIGS //DMS_UseMissions = true; //DMS_DetectNearWater = true; //DMS_MissionMin = 60; // Timers in seconds //DMS_MissionMax = 120; // Timers in seconds - //DMS_player_minDist = 700; // CONFIGS uiSleep 2; - - - //[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf"; - //[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf"; + // Selects the mission [] call DMS_selectMission; - - diag_log "DMS :: Functions loaded - starting the rest of the script."; - - -}; + + // Loops markers + //[] call DMS_markerLoop; + + diag_log "DMS :: Functions loaded - starting the rest of the script."; \ No newline at end of file diff --git a/@ExileServer/addons/a3_dms/missions/MM1.sqf b/@ExileServer/addons/a3_dms/missions/MM1.sqf index 43cdd18..5807913 100644 --- a/@ExileServer/addons/a3_dms/missions/MM1.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM1.sqf @@ -28,7 +28,7 @@ uiSleep 2; //[(_pos),(5),(4)] call DMS_SpawnAI; [_pos,5,4] call DMS_SpawnAI; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; /* @@ -40,12 +40,12 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -["Ended","Clean"] call DMS_CleanUp; +[_pos] call DMS_CleanUp; -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM10.sqf b/@ExileServer/addons/a3_dms/missions/MM10.sqf index 6227037..e20988a 100644 --- a/@ExileServer/addons/a3_dms/missions/MM10.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM10.sqf @@ -34,21 +34,17 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - +[_pos] call DMS_CleanUp; -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM2.sqf b/@ExileServer/addons/a3_dms/missions/MM2.sqf index bc0ee53..47d2269 100644 --- a/@ExileServer/addons/a3_dms/missions/MM2.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM2.sqf @@ -33,19 +33,15 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - +[_pos] call DMS_CleanUp; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM3.sqf b/@ExileServer/addons/a3_dms/missions/MM3.sqf index dee6e6d..e24cee5 100644 --- a/@ExileServer/addons/a3_dms/missions/MM3.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM3.sqf @@ -31,7 +31,7 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; @@ -39,13 +39,10 @@ uiSleep 1; // Run Cleanup -[] call DMS_CleanUp; - - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; +[_pos] call DMS_CleanUp; -sleep 150; +uiSleep 150; [] call DMS_SelectMission; \ No newline at end of file diff --git a/@ExileServer/addons/a3_dms/missions/MM4.sqf b/@ExileServer/addons/a3_dms/missions/MM4.sqf index b806fc5..b2d6127 100644 --- a/@ExileServer/addons/a3_dms/missions/MM4.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM4.sqf @@ -34,20 +34,16 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - +[_pos] call DMS_CleanUp; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM5.sqf b/@ExileServer/addons/a3_dms/missions/MM5.sqf index 3b215e7..e4b278b 100644 --- a/@ExileServer/addons/a3_dms/missions/MM5.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM5.sqf @@ -35,7 +35,7 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; @@ -43,12 +43,8 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - +[_pos] call DMS_CleanUp; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM6.sqf b/@ExileServer/addons/a3_dms/missions/MM6.sqf index baba40c..2d5d217 100644 --- a/@ExileServer/addons/a3_dms/missions/MM6.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM6.sqf @@ -33,7 +33,7 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; @@ -41,13 +41,10 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; +[_pos] call DMS_CleanUp; -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM7.sqf b/@ExileServer/addons/a3_dms/missions/MM7.sqf index f20fbc4..2ade1fa 100644 --- a/@ExileServer/addons/a3_dms/missions/MM7.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM7.sqf @@ -34,20 +34,16 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - +[_pos] call DMS_CleanUp; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM8.sqf b/@ExileServer/addons/a3_dms/missions/MM8.sqf index dfad689..2ef145b 100644 --- a/@ExileServer/addons/a3_dms/missions/MM8.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM8.sqf @@ -35,19 +35,16 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; +[_pos] call DMS_CleanUp; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - -sleep 150; +uiSleep 150; [] call DMS_SelectMission; diff --git a/@ExileServer/addons/a3_dms/missions/MM9.sqf b/@ExileServer/addons/a3_dms/missions/MM9.sqf index e95b0b4..4e0929a 100644 --- a/@ExileServer/addons/a3_dms/missions/MM9.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM9.sqf @@ -40,12 +40,8 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[] call DMS_CleanUp; - +[_pos] call DMS_CleanUp; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - -sleep 150; +uiSleep 150; [] call DMS_SelectMission; \ No newline at end of file diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_CreateMarker.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_CreateMarker.sqf index e121ea3..81a1904 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_CreateMarker.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_CreateMarker.sqf @@ -1,15 +1,16 @@ +private["_mark","_name"]; +DMS_Cords = _this select 0; +DMS_MainName = _this select 1; - private["_mark","_name"]; - DMS_Cords = _this select 0; - DMS_MainName = _this select 1; +_mark = createMarker ["DMS_MainMarker", DMS_Cords]; +"DMS_MainMarker" setMarkerColor "ColorRed"; +"DMS_MainMarker" setMarkerShape "ELLIPSE"; +"DMS_MainMarker" setMarkerBrush "Grid"; +"DMS_MainMarker" setMarkerSize [150,150]; + +_name = createMarker ["DMS_MainDot", DMS_Cords]; +"DMS_MainDot" setMarkerColor "ColorBlack"; +"DMS_MainDot" setMarkerType "mil_dot"; +"DMS_MainDot" setMarkerText DMS_MainName; - _mark = createMarker ["DMS_MainMarker", DMS_Cords]; - "DMS_MainMarker" setMarkerColor "ColorRed"; - "DMS_MainMarker" setMarkerShape "ELLIPSE"; - "DMS_MainMarker" setMarkerBrush "Grid"; - "DMS_MainMarker" setMarkerSize [150,150]; - _name = createMarker ["DMS_MainDot", DMS_Cords]; - "DMS_MainDot" setMarkerColor "ColorBlack"; - "DMS_MainDot" setMarkerType "mil_dot"; - "DMS_MainDot" setMarkerText DMS_MainName; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf index 9ce7a2b..4e41858 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf @@ -1,4 +1,6 @@ - +private ["_pos"]; +_pos = _this select 0; +{ _this enableSimulation false; _this removeAllMPEventHandlers "mpkilled"; _this removeAllMPEventHandlers "mphit"; @@ -14,6 +16,12 @@ deleteVehicle _this; deleteGroup (group _this); _this = nil; - - diag_log format ["DMS :: Markers, vehicles, AI and loot boxes and other items have been cleaned up!"]; + deleteMarker "DMS_MainMarker"; + deleteMarker "DMS_MainDot"; + + } forEach (_pos nearObjects 50); + + + + diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_findSafePos.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_findSafePos.sqf index a03d9ee..e50e138 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_findSafePos.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_findSafePos.sqf @@ -1,7 +1,10 @@ -private ["_pos","_centerPos","_fetchPos"]; +private ["_pos","_centerPos","_fetchPos","_mapRadii"]; //_centerPos = [getMarkerPos "center",4000,20000,10,0,25,0]; -_centerPos = [getMarkerPos "center",2000,4000,10,0,25,0]; +//_centerPos = [getMarkerPos "center",2000,4000,10,0,25,0]; +_centerPos = [15440, 15342, 0]; +_mapRadii = 17000; + _fetchPos = false; @@ -11,7 +14,8 @@ while {!_fetchPos} do { sleep 2; - _pos = _centerPos call BIS_fnc_findSafePos; + //_pos = _centerPos call BIS_fnc_findSafePos; + _pos = [_centerPos,150,_mapRadii,10,0,20,0] call BIS_fnc_findSafePos; _int = _int + 1; _fetchPos = true; @@ -24,4 +28,4 @@ while {!_fetchPos} do { // water if exception to be added above }; -_pos \ No newline at end of file +_pos diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_markerLoop.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_markerLoop.sqf new file mode 100644 index 0000000..c0cda55 --- /dev/null +++ b/@ExileServer/addons/a3_dms/scripts/DMS_markerLoop.sqf @@ -0,0 +1,29 @@ +/* +private["_mark","_name","_loop"]; +_loop = true; + +diag_log format ["DMS :: Marker loop script started."]; + +while {_loop} do +{ + uiSleep 25; + if (!(getMarkerColor "DMS_MainMarker" = "")) then { + + + deleteMarker "DMS_MainMarker"; + deleteMarker "DMS_MainDot"; + + _mark = createMarker ["DMS_MainMarker", DMS_Cords]; + "DMS_MainMarker" setMarkerColor "ColorRed"; + "DMS_MainMarker" setMarkerShape "ELLIPSE"; + "DMS_MainMarker" setMarkerBrush "Grid"; + "DMS_MainMarker" setMarkerSize [150,150]; + + _name = createMarker ["DMS_MainDot", DMS_Cords]; + "DMS_MainDot" setMarkerColor "ColorBlack"; + "DMS_MainDot" setMarkerType "mil_dot"; + "DMS_MainDot" setMarkerText DMS_MainName; + + }; +}; +*/ \ No newline at end of file diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index ba8d5a82526336aafdfcf70fc331f9dd112757cd..7dcebd6e7ec0b7f6540fc13b8e90b585ff1488e4 100644 GIT binary patch delta 1700 zcmbVMPi)&{6vs{iONzHb>0)g({gOeOgtT$enog?PRr9jifvANNA=H(~OC93j#A)pC zM^W1ip{Y<++VnVZ*rD42X%a|V4M=d9rd`-!LV^Pa4hxkKQV$@|Bo0ghzRyWhS3;Cw z%l^JRzu)iu-plvixtr9=E$YI;{yXl6>`SaQvUl7Umsf{AYFWC^HnL=2QVm1Z%f_ip zCczCF3kBPM)#0@YV-)-HI}QukJ8(m7*uOXpx1G*An9jq;6w9nTEbH(Mj`p6zLiUbm zBmYda+v#ZAX~n^`0uwaLEIBMopwPX{eY#nt3(Jk{eYi+ZG54sZMGza=d+;-Tgt^-C zDWn?NtI*?01xs@Eb*1{eu2|xx$6xICOl%m8;>JFFI7}c zF;GFTqI}IT^%5!&!=Uw<=T&RBvNRU@p+-LZv&q4j`<1YjG`%d z(?DiXL9I%`pWfai_QPL^LIX894BIq2hw`$fq1~Y{ErK3j+A@3r=3rtJ)x)YWt;ugI zRg`-xg8KSU7%m_0rXp}H9)~UeSMFRzHz3Hfk1{?CCa;=0V{Ni)uD$RHct5z*#LL_v z7lBd7B+B|FaGZVsY>@Zc*iAM}S!+j5{U@vjKMZ)_!|?-c{g1Sy!zSBrN&TlEMER6NlraNGT2XcGLxV{~FTmB?vd6Ijl-o~*G$!9m7?fAcntuv#_o@yO`)=swb?p-;M z(t*_95yVF#G>6X;IU8sU<;4ub?FQTxG zD=Tt!>hu}=RP$T}!B)Wy?oJ+tKPG#C6+#=@)j(54^QOt99(tj8$({K+rt4ek_kXfxMB+hSvo@FwI zkZm{eRkdOw!<4J0GCyb|7~h*kJYG=UCRs%DI&RcDo&&h&G)1YPB#()_Y5|3V;nx&1 zV~;gK*YJ1>kqMEJ)pFAq!hu7fNQ4ZUGQu3>_QDn6AWZXN%4;1J*C_^@7BM4vqH*i# fsoR}TZ2W%v%aLzC_`dU%t#^NXvOaVD+W6Yvn&0~v delta 1206 zcmaiyO-vI(6vy2z1-h`H3D_FGh6MydWtBn{t4O64D3+>Z!9+eRbdZgug>G#~)D-pN z*8%bl8WZBtgQ$snF;R#hK}|Ho5HAL6JQ!n)hNwpg&eAPeBj8+i=FRW_e{bHt%hS|_ zr_{(`np3}NWfc`f1*d*Aa?LWH5Q}h&Q9;@Fi;^S;{8GEiwQFa&G}yaxJ*!f`s-nUy z?59j^lbVRK*XS&(vd0=o*=wN6RcKm;TzjL!G>lUwc0rBYsQDl)z#Eb+&M5hny~b$w zKSpandsd+-)mwq4pjKyMCp3`>z`8tkP8aLR55mmBsLstUQL#u)UQ}3uZ@L23q%yzF zQNaW`v;#)zqx4)^RQ^PVsV#>C9e6`L?rQ0(3;27*Q^)|ziFK*5gYqKI3YU@}g2iwk zg?OykoajLC;FuBIiFt4S-PUi z3b4*j*~ZsX^8B_#I+cH`+))TlHX8xi8S>3d zW*PEemXW~5m&(ig5G8l!9@Gjl6IX!0R5TF~_Yw-|nr!(!R~r{RgWG03d@V}fI8!l1 zY$>vPdmF8(Y`sKkWfTRI8M*T3vaWctHYm0XlSJzYNrhM93F7Pq&mWeZl__yvY1MkZ zs|CqJ)i_?v8ogDzq_Wn8|M}gsb?6ew&mapvW@I%5Pvf9uMq%71_K>MGBU>Z#_`S#% z2!v2~V2BK=atx5U3?eav`z6%p31ifa$(#~}$B(_}%s@WZVU@%7Vu}=FfH6lFWq?PH zoK%A{sV%nwUkK$5MmX2thSv=|*c*S!)y^tfHXnJh bIm0`DGym@Qnbwz2+J%lUt@!?(%&mU_>bGDb From caab8cbaabdfeb900126e9bf498e7b03b7e66499 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 21:33:03 +0200 Subject: [PATCH 09/18] d d --- @ExileServer/addons/a3_dms.pbo | Bin 24840 -> 0 bytes .../addons/a3_dms/scripts/DMS_cleanup.sqf | 28 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 @ExileServer/addons/a3_dms.pbo diff --git a/@ExileServer/addons/a3_dms.pbo b/@ExileServer/addons/a3_dms.pbo deleted file mode 100644 index 7dcebd6e7ec0b7f6540fc13b8e90b585ff1488e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24840 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 diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf index 4e41858..c96434e 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf @@ -1,21 +1,21 @@ private ["_pos"]; _pos = _this select 0; { - _this enableSimulation false; - _this removeAllMPEventHandlers "mpkilled"; - _this removeAllMPEventHandlers "mphit"; - _this removeAllMPEventHandlers "mprespawn"; - _this removeAllEventHandlers "FiredNear"; - _this removeAllEventHandlers "HandleDamage"; - _this removeAllEventHandlers "Killed"; - _this removeAllEventHandlers "Fired"; - _this removeAllEventHandlers "GetOut"; - _this removeAllEventHandlers "GetIn"; - _this removeAllEventHandlers "Local"; + _x enableSimulation false; + _x removeAllMPEventHandlers "mpkilled"; + _x removeAllMPEventHandlers "mphit"; + _x removeAllMPEventHandlers "mprespawn"; + _x removeAllEventHandlers "FiredNear"; + _x removeAllEventHandlers "HandleDamage"; + _x removeAllEventHandlers "Killed"; + _x removeAllEventHandlers "Fired"; + _x removeAllEventHandlers "GetOut"; + _x removeAllEventHandlers "GetIn"; + _x removeAllEventHandlers "Local"; // clearVehicleInit _this; - deleteVehicle _this; - deleteGroup (group _this); - _this = nil; + deleteVehicle _x; + deleteGroup (group _x); + _x = nil; deleteMarker "DMS_MainMarker"; deleteMarker "DMS_MainDot"; From ca6308ad05e064ebabbbe81dfd820d83814d419e Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 21:33:22 +0200 Subject: [PATCH 10/18] asd asd --- Pre-Packed PBO/a3_dms.pbo | Bin 24840 -> 24798 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 7dcebd6e7ec0b7f6540fc13b8e90b585ff1488e4..ffce06fe7403affc5206707ec70e3cb8f075dccf 100644 GIT binary patch delta 205 zcmeA;#CY!@jeN&JY75h From ff0ddf03195fbb8a1e4e0b3bc2864ff83c4364b8 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 21:57:18 +0200 Subject: [PATCH 11/18] asd asd --- @ExileServer/addons/a3_dms/DMS_init.sqf | 1 + @ExileServer/addons/a3_dms/missions/MM1.sqf | 10 +--------- @ExileServer/addons/a3_dms/missions/MM10.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM2.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM3.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM4.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM5.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM6.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM7.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM8.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM9.sqf | 4 ++-- .../addons/a3_dms/scripts/DMS_cleanup.sqf | 9 ++++++--- .../addons/a3_dms/scripts/DMS_spawnAI.sqf | 4 +++- Pre-Packed PBO/a3_dms.pbo | Bin 24798 -> 24871 bytes 14 files changed, 21 insertions(+), 23 deletions(-) diff --git a/@ExileServer/addons/a3_dms/DMS_init.sqf b/@ExileServer/addons/a3_dms/DMS_init.sqf index c3b4dc2..cd4b6ed 100644 --- a/@ExileServer/addons/a3_dms/DMS_init.sqf +++ b/@ExileServer/addons/a3_dms/DMS_init.sqf @@ -17,6 +17,7 @@ //DMS_MissionMin = 60; // Timers in seconds //DMS_MissionMax = 120; // Timers in seconds //DMS_player_minDist = 700; + DMS_CleanUpTimer = 25; // set to 300 for 5 minutes to clean up the missions. // CONFIGS uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM1.sqf b/@ExileServer/addons/a3_dms/missions/MM1.sqf index 5807913..b4fd7b7 100644 --- a/@ExileServer/addons/a3_dms/missions/MM1.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM1.sqf @@ -18,7 +18,7 @@ diag_log format ["DMS :: Main Mission 1 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; @@ -31,20 +31,12 @@ uiSleep 2; waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; -/* - -[_pos] call MissionCompleted; -[_pos,] call MissionCleanup; -*/ ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup [_pos] call DMS_CleanUp; - - - uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM10.sqf b/@ExileServer/addons/a3_dms/missions/MM10.sqf index e20988a..29f76fa 100644 --- a/@ExileServer/addons/a3_dms/missions/MM10.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM10.sqf @@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 10 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM2.sqf b/@ExileServer/addons/a3_dms/missions/MM2.sqf index 47d2269..71ab243 100644 --- a/@ExileServer/addons/a3_dms/missions/MM2.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM2.sqf @@ -21,7 +21,7 @@ diag_log format ["DMS :: Main Mission 2 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM3.sqf b/@ExileServer/addons/a3_dms/missions/MM3.sqf index e24cee5..4103e70 100644 --- a/@ExileServer/addons/a3_dms/missions/MM3.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM3.sqf @@ -20,7 +20,7 @@ diag_log format ["DMS :: Main Mission 3 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; diff --git a/@ExileServer/addons/a3_dms/missions/MM4.sqf b/@ExileServer/addons/a3_dms/missions/MM4.sqf index b2d6127..560efd0 100644 --- a/@ExileServer/addons/a3_dms/missions/MM4.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM4.sqf @@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 4 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM5.sqf b/@ExileServer/addons/a3_dms/missions/MM5.sqf index e4b278b..7b54ee3 100644 --- a/@ExileServer/addons/a3_dms/missions/MM5.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM5.sqf @@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 5 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; //[_crate] call createBox; // [_crate, amount of weapons, amount of ammo] call createBox; [1,_crate] call DMS_createBox; diff --git a/@ExileServer/addons/a3_dms/missions/MM6.sqf b/@ExileServer/addons/a3_dms/missions/MM6.sqf index 2d5d217..d71b5c1 100644 --- a/@ExileServer/addons/a3_dms/missions/MM6.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM6.sqf @@ -21,7 +21,7 @@ diag_log format ["DMS :: Main Mission 6 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM7.sqf b/@ExileServer/addons/a3_dms/missions/MM7.sqf index 2ade1fa..18f988a 100644 --- a/@ExileServer/addons/a3_dms/missions/MM7.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM7.sqf @@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 7 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM8.sqf b/@ExileServer/addons/a3_dms/missions/MM8.sqf index 2ef145b..8c5f17f 100644 --- a/@ExileServer/addons/a3_dms/missions/MM8.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM8.sqf @@ -22,7 +22,7 @@ diag_log format ["DMS :: Main Mission 8 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/missions/MM9.sqf b/@ExileServer/addons/a3_dms/missions/MM9.sqf index 4e0929a..5224646 100644 --- a/@ExileServer/addons/a3_dms/missions/MM9.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM9.sqf @@ -21,7 +21,7 @@ diag_log format ["DMS :: Main Mission 9 started at (%1)",_pos]; [_pos,_missname] call DMS_CreateMarker; // Spawn Box -_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; +_crate = createVehicle ["Box_NATO_Wps_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; [1,_crate] call DMS_createBox; uiSleep 2; @@ -33,7 +33,7 @@ uiSleep 2; - waitUntil{sleep 25; {isPlayer _x && _x distance _pos < 30 } count playableUnits > 0}; + waitUntil{sleep 1; {(isPlayer _x) && (_x distance _pos < 30) } count playableUnits > 0}; uiSleep 1; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf index c96434e..016b1b0 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf @@ -1,5 +1,8 @@ private ["_pos"]; _pos = _this select 0; +deleteMarker "DMS_MainMarker"; +deleteMarker "DMS_MainDot"; +uiSleep DMS_CleanUpTimer; { _x enableSimulation false; _x removeAllMPEventHandlers "mpkilled"; @@ -16,10 +19,10 @@ _pos = _this select 0; deleteVehicle _x; deleteGroup (group _x); _x = nil; - deleteMarker "DMS_MainMarker"; - deleteMarker "DMS_MainDot"; - } forEach (_pos nearObjects 50); + } forEach (_pos nearObjects 80); + + diag_log "DMS :: Mission got cleaned up!"; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf index 8f334ac..cc9eb77 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_spawnAI.sqf @@ -15,11 +15,14 @@ for "_i" from 1 to _units do { _soldier = _group createUnit ["i_g_soldier_unarmed_f", [_pos select 0, _pos select 1, 0], [], 1, "Form"]; + _soldier addeventhandler ["fired", {(_this select 0) setvehicleammo 1}]; + removeAllAssignedItems _soldier; removeUniform _soldier; removeHeadgear _soldier; removeAllItems _soldier; removeAllWeapons _soldier; + uiSleep 1; _soldier forceaddUniform "U_I_officerUniform"; _soldier addVest " V_TacVest_blk_POLICE "; _soldier addGoggles "G_Tactical_Clear"; @@ -105,5 +108,4 @@ }; }; }; - _soldier \ No newline at end of file diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index ffce06fe7403affc5206707ec70e3cb8f075dccf..d87add3bac7867710c694dd50d9995b6ae78edec 100644 GIT binary patch delta 763 zcmcb2ka77T#tDUd(yR<%Ak}_9RGM{SeYbHi3q)j7+x<`wJ2$hqI5R)5IL6o4&_J)a zFbyo-j-;x6vMr-TcpZ`mh>fJr7_JSEA``fxCM1)ZCa+`PnaNK@&XtpPc~0vDrMwTRLR)WhAm?Tt=J0~z$^9BBoAbr=7$%DCM%f# zn>=5Kb@OZ0xiIB*EKqw~Hb>}&fH^=TOBgq+8w)T)jkIIlTx017vyP2%^C{~}n4CG& zrxA%Tn`7G7|Gra)A73rL@eV)D$Hhg=&rXl8nq^U>N44CYLA}Xo5nsEHxt&6mYq@ w`3i=$vDUm?lQTkRa>DF2-25l>9G8gO%l^;7VZtdF>{~S!nzG(;oG_Ig076pjc>n+a delta 773 zcmZ2}i1FS*#tDUdXIL1(z@zkj=oyxY_1(tHpdz9T_d`MK+|1(Q%>2CK7++sQ1HIzH zG_d+^Bvsv$Z5buPn~+36Y$ScgaBX-LnZOmbA(_-Rc@3ik?*b%|1(PoVZRK;$OH)`;imhc7dKC2DrMw5$_o*4biN;Y zly|cTiv#QC#he>>*d23o^ZkobCNHo`nH-~1GucdhldHZKFBdOYbbLX6ajZgeVor{N zFCcDS@3PrJHw0DvB$>R;+{OZ!_JR%B9AW7SHvs6ydUVZ#qDH3H3JTSk#Q`~q zm8nGv@f8YcY6_FjTZ>LkH2*R=(ouW!9Y-T376l-f+~TMp2V$h8g2K%=u_zm;L&?QA zINmogGtVWzL}@a&ixQ*hW<3{e!O6=*r*8HNJIN(-oBhe2weNoLew6;B<9?^-XmK9< FaR6Kk=sy4e From 9e21149f24c46c5baeb6e70405ad559d94c810f2 Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 22:02:53 +0200 Subject: [PATCH 12/18] Last fix Updated. --- @ExileServer/addons/a3_dms/DMS_init.sqf | 5 ++++- .../a3_dms/scripts/DMS_selectMission.sqf | 15 +++------------ Pre-Packed PBO/a3_dms.pbo | Bin 24871 -> 24768 bytes 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/@ExileServer/addons/a3_dms/DMS_init.sqf b/@ExileServer/addons/a3_dms/DMS_init.sqf index cd4b6ed..48f6462 100644 --- a/@ExileServer/addons/a3_dms/DMS_init.sqf +++ b/@ExileServer/addons/a3_dms/DMS_init.sqf @@ -17,7 +17,10 @@ //DMS_MissionMin = 60; // Timers in seconds //DMS_MissionMax = 120; // Timers in seconds //DMS_player_minDist = 700; - DMS_CleanUpTimer = 25; // set to 300 for 5 minutes to clean up the missions. + + DMS_MisMinTime = 600; // 10 mins + DMS_MisMaxTime = 1200; // 20 mins + DMS_CleanUpTimer = 300; // set to 300 for 5 minutes to clean up the missions. // CONFIGS uiSleep 2; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_selectMission.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_selectMission.sqf index d07d66d..c06f9df 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_selectMission.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_selectMission.sqf @@ -1,17 +1,10 @@ - private ["_sleepTime","_run","_countArray","_randomMiss","_missVar","_minTime","_maxTime","_missionFnc","_MainArray"]; - // First we add the array of missions + private ["_sleepTime","_run","_countArray","_randomMiss","_missVar","_missionFnc","_MainArray"]; + _MainArray = ["MM1","MM2","MM3","MM4","MM5","MM6","MM7","MM8","MM9","MM10"]; - //DMS_SideArray = ["SM1","SM2"]; - /* - _minTime = 1*600; //1 sec - _maxTime = 2*600; //4 sec - */ - _minTime = 1*5; //1 sec - _maxTime = 2*10; //4 sec - _sleepTime = (random (_maxTime - _minTime)) + _minTime; + _sleepTime = (random (DMS_MisMaxTime - DMS_MisMinTime)) + DMS_MisMinTime; sleep _sleepTime; _countArray = count _MainArray; @@ -24,5 +17,3 @@ - //DMS_MissionRunning = 1; - diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index d87add3bac7867710c694dd50d9995b6ae78edec..3552276de63891d341b78488519530baa6e5c50a 100644 GIT binary patch delta 318 zcmZ2}i1ENd#tDVInXC+8u(#uWXy(Q`HYPq{W{8MO`~6U1=FO9sJQ(>Dm>^==KvfD% zlV32)@yhc-gr)(N$!`{BabWf4<>GYl4UYHCEcVUJ3(3q)RZvi{RWLI!uvXC5S1>eC z$j!_vMpBem0as*b1XX1OQ8hV`Q;gZzz+iJG=NT(4g_O+1^!S|obOj}#1qxPH3P3xG zGxPHl((_9cl5j88VcI6o&PGqs38nQOzj#6us$zlo%3y^z`4pWpMD9{>cwUhMz? delta 418 zcmX?bka77T#tDVI(yR<%Ak}_9RC;3_8x!9XCWy$3w)>$^m^M#h@?hj+Vupy7y50|E zVxIhhS&mnc4*NKTB1}f6o40eGvD&=Jg_TDjFC;TJRY^xFJ~y!f z#GJe_KtYXDUths3v#7X4p*&R~F(pNzBm+nn6(v?GG`=I0epz8DZ#4^-;n z8yp{;nUd-VR$!|TtrYBQ2sAR-*GMVWnwN`HUkgaY=VpTKQm|Dp)G{+LuvXC5H&iH2 zO$N(BECKUxh($ From 6650113e98459d5849cd533889f70bb70e72366c Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 23:03:11 +0200 Subject: [PATCH 13/18] Fixed a problem with the cleanup --- @ExileServer/addons/a3_dms/missions/MM1.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM10.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM2.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM3.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM4.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM5.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM6.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM7.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM8.sqf | 2 +- @ExileServer/addons/a3_dms/missions/MM9.sqf | 2 +- .../addons/a3_dms/scripts/DMS_cleanup.sqf | 5 +++-- Pre-Packed PBO/a3_dms.pbo | Bin 24768 -> 24877 bytes 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/@ExileServer/addons/a3_dms/missions/MM1.sqf b/@ExileServer/addons/a3_dms/missions/MM1.sqf index b4fd7b7..9043351 100644 --- a/@ExileServer/addons/a3_dms/missions/MM1.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM1.sqf @@ -35,7 +35,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM10.sqf b/@ExileServer/addons/a3_dms/missions/MM10.sqf index 29f76fa..0b769e3 100644 --- a/@ExileServer/addons/a3_dms/missions/MM10.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM10.sqf @@ -41,7 +41,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM2.sqf b/@ExileServer/addons/a3_dms/missions/MM2.sqf index 71ab243..c4db297 100644 --- a/@ExileServer/addons/a3_dms/missions/MM2.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM2.sqf @@ -40,7 +40,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM3.sqf b/@ExileServer/addons/a3_dms/missions/MM3.sqf index 4103e70..1e851cd 100644 --- a/@ExileServer/addons/a3_dms/missions/MM3.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM3.sqf @@ -39,7 +39,7 @@ uiSleep 1; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; diff --git a/@ExileServer/addons/a3_dms/missions/MM4.sqf b/@ExileServer/addons/a3_dms/missions/MM4.sqf index 560efd0..f996ee6 100644 --- a/@ExileServer/addons/a3_dms/missions/MM4.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM4.sqf @@ -41,7 +41,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM5.sqf b/@ExileServer/addons/a3_dms/missions/MM5.sqf index 7b54ee3..2cc54ba 100644 --- a/@ExileServer/addons/a3_dms/missions/MM5.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM5.sqf @@ -43,7 +43,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM6.sqf b/@ExileServer/addons/a3_dms/missions/MM6.sqf index d71b5c1..927458a 100644 --- a/@ExileServer/addons/a3_dms/missions/MM6.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM6.sqf @@ -41,7 +41,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; diff --git a/@ExileServer/addons/a3_dms/missions/MM7.sqf b/@ExileServer/addons/a3_dms/missions/MM7.sqf index 18f988a..4ec1d24 100644 --- a/@ExileServer/addons/a3_dms/missions/MM7.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM7.sqf @@ -41,7 +41,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM8.sqf b/@ExileServer/addons/a3_dms/missions/MM8.sqf index 8c5f17f..701586a 100644 --- a/@ExileServer/addons/a3_dms/missions/MM8.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM8.sqf @@ -42,7 +42,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/missions/MM9.sqf b/@ExileServer/addons/a3_dms/missions/MM9.sqf index 5224646..85fe94e 100644 --- a/@ExileServer/addons/a3_dms/missions/MM9.sqf +++ b/@ExileServer/addons/a3_dms/missions/MM9.sqf @@ -40,7 +40,7 @@ uiSleep 1; ["standardHintRequest",["Mission has ended, good job!"]] call ExileServer_system_network_send_broadcast; // Run Cleanup -[_pos] call DMS_CleanUp; +[_pos,_crate] call DMS_CleanUp; uiSleep 150; diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf index 016b1b0..b598e87 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf @@ -1,5 +1,6 @@ -private ["_pos"]; +private ["_pos","_crate"]; _pos = _this select 0; +_crate = _this select 0; deleteMarker "DMS_MainMarker"; deleteMarker "DMS_MainDot"; uiSleep DMS_CleanUpTimer; @@ -16,7 +17,7 @@ uiSleep DMS_CleanUpTimer; _x removeAllEventHandlers "GetIn"; _x removeAllEventHandlers "Local"; // clearVehicleInit _this; - deleteVehicle _x; + deleteVehicle _crate; deleteGroup (group _x); _x = nil; diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 3552276de63891d341b78488519530baa6e5c50a..58333223ecfa740615cfd1a40d50d8ae20b915e1 100644 GIT binary patch delta 561 zcmX?bka6uH#tmGI#!)N`U~qZb{ZJ4)H?z1nGe565#@E--K(Dwk4J_M-q^fVSEu%zu zE0PF^jik>Qt__bO6S$&IB$GNPuVIwnU5q5Mc=AP{Z9PaLAU2Y1=GYBFRb&BI)Qx0P z_hbhq3EpNTk><&%O!B-|%#bi)ntngjYV$-UO)++z_~fF*lGMou6~#9f>H9ElmX%Uu zMiLd>94wp10u$JLP_Y`$0qL3i#aMrHlbS8Epz~%;TSmso(V}vj6?JUjh5_|DF>ao3 zUj0@UG8$4>OJ&b5c)i0J0GouW>Hq)$ delta 478 zcmZ2`i1ENd#tmGI#=$HMV6ds}ekh2Yn^|0(nV(l2)t30zSVl1WXI*Dy-(&Os8HGx;LWwpJt&5F5!hbLQ*84=i58a02PH%|C(7o57~-4f>1#7? zmQc222J`aOa=^lq=jrQgzH7nCI5}QaYO{-u4McjLekMdZUrm4V3H`{;YfYYkWuWRE zku@_iZqBrWXaq`YO`fO5%~OzHtQ2d_%M}k~Y*u&5V`8k>Jj Date: Thu, 27 Aug 2015 23:06:04 +0200 Subject: [PATCH 14/18] Changed 0 to 1. --- @ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf index b598e87..4a96636 100644 --- a/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf +++ b/@ExileServer/addons/a3_dms/scripts/DMS_cleanup.sqf @@ -1,6 +1,6 @@ private ["_pos","_crate"]; _pos = _this select 0; -_crate = _this select 0; +_crate = _this select 1; deleteMarker "DMS_MainMarker"; deleteMarker "DMS_MainDot"; uiSleep DMS_CleanUpTimer; From 6ee90ee97d28053a20d7b6f5b0d377c6b0fd5a6b Mon Sep 17 00:00:00 2001 From: Defent Date: Thu, 27 Aug 2015 23:06:33 +0200 Subject: [PATCH 15/18] Same here. --- Pre-Packed PBO/a3_dms.pbo | Bin 24877 -> 24877 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 58333223ecfa740615cfd1a40d50d8ae20b915e1..13e77747a1f64a3d4cea606f8695df00e97aeb09 100644 GIT binary patch delta 51 zcmV-30L=fb!U3(q0kDh$0n@XM0;)d*F*^+klMYW7vr$6G9ux*r*{7boG45?cf1?9L J0;=J)Y2gDh6yX2> delta 51 zcmV-30L=fb!U3(q0kDh$0Rpp)0;)d*FgpzjlMYW7vr$6G9u$uDR?bp8P#Vk}C>qsu J9nYZaxI^E>6P^G7 From 59ca6f5bd2e3fe2c929d6fcde0ab7cec675ec7cc Mon Sep 17 00:00:00 2001 From: Onefox Date: Sat, 29 Aug 2015 13:50:08 +0200 Subject: [PATCH 16/18] Update README.md changed link to a new installation post. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d28200d..8608623 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -http://www.exilemod.com/forums/topic/dms-defents-mission-system/#post-10434 +http://www.exilemod.com/forums/topic/dms-defents-mission-system/page/5/#post-12008 -To install. \ No newline at end of file +To install. From 88b94305689a5698735bbcac45a11a12ebf9ec38 Mon Sep 17 00:00:00 2001 From: Defent Date: Sat, 29 Aug 2015 19:48:32 +0200 Subject: [PATCH 17/18] Fixed for duping. --- .../addons/a3_dms/crates/DMS_CreateBox.sqf | 66 +++++++++---------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf b/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf index 005616f..c54f08f 100644 --- a/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf +++ b/@ExileServer/addons/a3_dms/crates/DMS_CreateBox.sqf @@ -12,45 +12,45 @@ private ["_type","_crate"]; // Intermediate loot case 1: { - _crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",6]; - _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",2]; - _crate addMagazineCargoGlobal ["Exile_Item_WoodDoorwayKit",1]; - _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; - _crate addWeaponCargoGlobal ["Exile_Melee_Axe",2]; - _crate addMagazineCargoGlobal ["Exile_Item_BBQSandwich",2]; - _crate addMagazineCargoGlobal ["Exile_Item_Beer",3]; - _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",3]; - _crate addMagazineCargoGlobal ["Exile_Item_CampFireKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_InstaDoc",5]; - _crate addMagazineCargoGlobal ["Exile_Item_JunkMetal",2]; - _crate addMagazineCargoGlobal ["Exile_Item_SafeKit",1]; - _crate addMagazineCargoGlobal ["Exile_Item_MetalBoard",2]; - _crate addMagazineCargoGlobal ["Exile_Item_DuctTape",2]; - _crate addMagazineCargoGlobal ["Exile_Item_ExtensionCord",2]; - _crate addMagazineCargoGlobal ["Exile_Item_PortableGeneratorkit",1]; + _crate addItemCargoGlobal ["Exile_Item_WoodWallKit",6]; + _crate addItemCargoGlobal ["Exile_Item_WoodWallHalfKit",2]; + _crate addItemCargoGlobal ["Exile_Item_WoodDoorwayKit",1]; + _crate addItemCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; + _crate addItemCargoGlobal ["Exile_Melee_Axe",2]; + _crate addItemCargoGlobal ["Exile_Item_BBQSandwich",2]; + _crate addItemCargoGlobal ["Exile_Item_Beer",3]; + _crate addItemCargoGlobal ["Exile_Item_CamoTentKit",3]; + _crate addItemCargoGlobal ["Exile_Item_CampFireKit",5]; + _crate addItemCargoGlobal ["Exile_Item_InstaDoc",5]; + _crate addItemCargoGlobal ["Exile_Item_JunkMetal",2]; + _crate addItemCargoGlobal ["Exile_Item_SafeKit",1]; + _crate addItemCargoGlobal ["Exile_Item_MetalBoard",2]; + _crate addItemCargoGlobal ["Exile_Item_DuctTape",2]; + _crate addItemCargoGlobal ["Exile_Item_ExtensionCord",2]; + _crate addItemCargoGlobal ["Exile_Item_PortableGeneratorkit",1]; }; // Much loot case 2: { - _crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_WoodDoorwayKit",1]; - _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; - _crate addWeaponCargoGlobal ["Exile_Melee_Axe",5]; - _crate addMagazineCargoGlobal ["Exile_Item_BBQSandwich",5]; - _crate addMagazineCargoGlobal ["Exile_Item_Beer",5]; - _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_CampFireKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_InstaDoc",5]; - _crate addMagazineCargoGlobal ["Exile_Item_JunkMetal",5]; - _crate addMagazineCargoGlobal ["Exile_Item_SafeKit",5]; - _crate addMagazineCargoGlobal ["Exile_Item_MetalBoard",5]; - _crate addMagazineCargoGlobal ["Exile_Item_DuctTape",5]; - _crate addMagazineCargoGlobal ["Exile_Item_ExtensionCord",5]; - _crate addMagazineCargoGlobal ["Exile_Item_PortableGeneratorkit",5]; + _crate addItemCargoGlobal ["Exile_Item_WoodWallKit",5]; + _crate addItemCargoGlobal ["Exile_Item_WoodWallHalfKit",5]; + _crate addItemCargoGlobal ["Exile_Item_WoodDoorwayKit",1]; + _crate addItemCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; + _crate addItemCargoGlobal ["Exile_Melee_Axe",5]; + _crate addItemCargoGlobal ["Exile_Item_BBQSandwich",5]; + _crate addItemCargoGlobal ["Exile_Item_Beer",5]; + _crate addItemCargoGlobal ["Exile_Item_CamoTentKit",5]; + _crate addItemCargoGlobal ["Exile_Item_CampFireKit",5]; + _crate addItemCargoGlobal ["Exile_Item_InstaDoc",5]; + _crate addItemCargoGlobal ["Exile_Item_JunkMetal",5]; + _crate addItemCargoGlobal ["Exile_Item_SafeKit",5]; + _crate addItemCargoGlobal ["Exile_Item_MetalBoard",5]; + _crate addItemCargoGlobal ["Exile_Item_DuctTape",5]; + _crate addItemCargoGlobal ["Exile_Item_ExtensionCord",5]; + _crate addItemCargoGlobal ["Exile_Item_PortableGeneratorkit",5]; }; // add more cases if you want. }; - \ No newline at end of file + From 69c6acd47a470293835dfcde0b1bda0e93e80efd Mon Sep 17 00:00:00 2001 From: Defent Date: Sat, 29 Aug 2015 19:52:31 +0200 Subject: [PATCH 18/18] Updated ad --- Pre-Packed PBO/a3_dms.pbo | Bin 24877 -> 24770 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Pre-Packed PBO/a3_dms.pbo b/Pre-Packed PBO/a3_dms.pbo index 13e77747a1f64a3d4cea606f8695df00e97aeb09..50cad955f55272a32ec18a08ccc3a4f80ee4e1cc 100644 GIT binary patch delta 863 zcmZ2`i1E-t#t9M32E30ZM$3Vz8YM8bP@V%Q7|O%Iz%V(FO=98$Rs#l3AO{G-fZ`x_ zZf0?DW`16AjIXbuUU6X>STc$QOfdj8PZniV2AMV4nh|W~GM$f3zU{* zf~dEH(#cGkU~~GJ6nKpo;pT@LP2R(#1D1Ksqzk5{nT^48ATva~f!P4;4UnG6v)E+? zz?v19;ATvI$_zGpvmlEH2a9J(YVPDj9t#L#A&(7&At-1KlaidAE2s_Qh)izdm4$I6 zCw~y+o!rbXgb*+gVw=pxha_OjCy$V=Mds|~lYz)QFO*CKK=v#61QI4>7xW|~H3ad2u; zS!$7{LPm0{$ayv$XR113FLo>P4C zV^=Al@LyLMGnlZxzJgn3USdvWRVqlx#Wy(KCqFSIHAR6F2y7Kfib_+hfikr~qSkt{ jyr1~yM7JGMBF8@$%<7q>&S3FwyWcYRYpbtUe=G$6cn9{s delta 1040 zcmX?fka6uH#t9M3j+^dIjFw~G+i`zljS`r*P@V%Q7|O%Iz%V(FO=98$R)Z=|AO{Gx ze!3S5V&`TS7iZ?@703Ac8tN4nrhz4+Sils+CeLD*6##2iV1k&D-En{NQ)W%(Y3=tn3$l1{ zaQG&sCst+VrB1%cD>-?A0LSDy9&vO*!O4etgir+^2q>Wn$O~$-g{LMKivQ6)K< zm{8%Kd=gpPM?R&=jKU(QZZ;Ce2pz7;<-%yT?d0d5ycJ#WJHOcEU&3aS1N6f;cZwJp zh;ngerfFmr2d5U5r50%_lw_plDO69sBR~_o{MjAd}wj1 zFEk%1aB|uzloXYwT7y-BWL;8AQj<&kQWJ~96H8Ky6p$2v)hL8y=B5@ED`e&=6sIQV z=cN=+E^w8Z-0LbM2$Y8?am&n0%*m`uoxImol7)-2)_U_D*Gp0&Y(Y1d&)Z}8F4wt! OF|!NPs)t)M9|8cOU1h`o