Stuff fixed

dasd
This commit is contained in:
Defent 2015-08-26 20:05:12 +02:00
parent 8099f74a35
commit 6368ad64eb
14 changed files with 78 additions and 46 deletions

View File

@ -22,14 +22,12 @@ if(isServer) then {
// CONFIGS // CONFIGS
uiSleep 2; uiSleep 2;
call DMS_selectMission;
//[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf"; //[] call compile preprocessFileLineNumbers "\x\addons\dms\scripts\DMS_selectMission.sqf";
//[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf"; //[] execVM "\x\addons\dms\scripts\DMS_selectMission.sqf";
call DMS_selectMission; [] call DMS_selectMission;
diag_log "DMS :: Functions loaded - starting the rest of the script."; diag_log "DMS :: Functions loaded - starting the rest of the script.";

View File

@ -1,24 +1,56 @@
// The content of the boxes. // The content of the boxes.
DMS_Box1 = { private ["_type","_crate",];
private["_crate"]; _type = _this select 0;
_crate = _this select 0; _crate = _this select 1;
clearWeaponCargoGlobal _crate; clearWeaponCargoGlobal _crate;
clearMagazineCargoGlobal _crate; clearMagazineCargoGlobal _crate;
clearItemCargoGlobal _crate; clearItemCargoGlobal _crate;
_crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",6];
_crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",2]; switch (_type) do
_crate addMagazineCargoGlobal ["Exile_Item_DoorwayKit",1]; {
_crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5]; // Intermediate loot
_crate addMagazineCargoGlobal ["Exile_Melee_Axe",2]; case 1:
_crate addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",2]; {
_crate addMagazineCargoGlobal ["Exile_Item_Beer",3]; _crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",6];
_crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",3]; _crate addMagazineCargoGlobal ["Exile_Item_WoodWallHalfKit",2];
_crate addMagazineCargoGlobal ["Exile_Item_CampFireKit",5]; _crate addMagazineCargoGlobal ["Exile_Item_DoorwayKit",1];
_crate addMagazineCargoGlobal ["Exile_Item_InstaDoc",5]; _crate addMagazineCargoGlobal ["Exile_Item_PlasticBottleFreshWater",5];
_crate addMagazineCargoGlobal ["Exile_Item__JunkMetal",2]; _crate addMagazineCargoGlobal ["Exile_Melee_Axe",2];
_crate addMagazineCargoGlobal ["Exile_Item_SafeKit",1]; _crate addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",2];
_crate addMagazineCargoGlobal ["Exile_Item_MetalBoard",2]; _crate addMagazineCargoGlobal ["Exile_Item_Beer",3];
_crate addMagazineCargoGlobal ["Exile_Item_DuctTape",2]; _crate addMagazineCargoGlobal ["Exile_Item_CamoTentKit",3];
_crate addMagazineCargoGlobal ["Exile_Item_ExtensionCord",2]; _crate addMagazineCargoGlobal ["Exile_Item_CampFireKit",5];
_crate addMagazineCargoGlobal ["Exile_Item_PortableGeneratorkit",1]; _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];
};
// Much loot
case 2:
{
_crate addMagazineCargoGlobal ["Exile_Item_WoodWallKit",5];
_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 addMagazineCargoGlobal ["Exile_Item_BBQ_Sandwich",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];
};
// add more cases if you want.
};

View File

@ -7,7 +7,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 1"; _missname = "Main Mission 1";
diag_log format["DMS :: Main Mission 1 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 1 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -18,7 +18,7 @@ diag_log format["DMS :: Main Mission 1 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -11,7 +11,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 10"; _missname = "Main Mission 10";
diag_log format["DMS :: Main Mission 10 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 10 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -21,7 +21,7 @@ diag_log format["DMS :: Main Mission 10 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -11,7 +11,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 2"; _missname = "Main Mission 2";
diag_log format["DMS :: Main Mission 2 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 2 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -20,7 +20,7 @@ diag_log format["DMS :: Main Mission 2 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -8,10 +8,12 @@ _mainTimer = true;
// associate pos with find safe pos // associate pos with find safe pos
_pos = call DMS_findSafePos; _pos = call DMS_findSafePos;
_missname = "Main Mission 3"; _missname = "Main Mission 3";
diag_log format["DMS :: Main Mission 3 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 3 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -20,7 +22,7 @@ diag_log format["DMS :: Main Mission 3 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -11,7 +11,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 4"; _missname = "Main Mission 4";
diag_log format["DMS :: Main Mission 4 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 4 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -22,7 +22,7 @@ diag_log format["DMS :: Main Mission 4 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -10,7 +10,7 @@ _mainTimer = true;
_pos = call DMS_findSafePos; _pos = call DMS_findSafePos;
_missname = "Main Mission 5"; _missname = "Main Mission 5";
diag_log format["DMS :: Main Mission 5 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 5 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -22,7 +22,7 @@ diag_log format["DMS :: Main Mission 5 started at [%1]",_pos];
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
//[_crate] call createBox; //[_crate] call createBox;
// [_crate, amount of weapons, amount of ammo] call createBox; // [_crate, amount of weapons, amount of ammo] call createBox;
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;

View File

@ -11,7 +11,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 6"; _missname = "Main Mission 6";
diag_log format["DMS :: Main Mission 6 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 6 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -20,7 +20,7 @@ diag_log format["DMS :: Main Mission 6 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -12,7 +12,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 7"; _missname = "Main Mission 7";
diag_log format["DMS :: Main Mission 7 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 7 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -21,7 +21,7 @@ diag_log format["DMS :: Main Mission 7 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -11,7 +11,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 8"; _missname = "Main Mission 8";
diag_log format["DMS :: Main Mission 8 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 8 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -21,7 +21,7 @@ diag_log format["DMS :: Main Mission 8 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -11,7 +11,7 @@ _pos = call DMS_findSafePos;
_missname = "Main Mission 9"; _missname = "Main Mission 9";
diag_log format["DMS :: Main Mission 9 started at [%1]",_pos]; diag_log format ["DMS :: Main Mission 9 started at (%1)",_pos];
["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast; ["standardHintRequest",["Mission starting! Check your map"]] call ExileServer_system_network_send_broadcast;
@ -20,7 +20,7 @@ diag_log format["DMS :: Main Mission 9 started at [%1]",_pos];
// Spawn Box // Spawn Box
_crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"]; _crate = createVehicle ["Box_NATO_AmmoOrd_F",[(_pos select 0) - 10, _pos select 1,0],[], 0, "CAN_COLLIDE"];
[_crate] call DMS_Box1; [_crate] call DMS_createBox;
sleep 2; sleep 2;
//_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf"; //_crate = [_pos,40,4,2,2] execVM "mission\crates\MM_Box1.sqf";

View File

@ -1,4 +1,4 @@
DMS_CreateMarker = {
private["_mark","_name"]; private["_mark","_name"];
DMS_Cords = _this select 0; DMS_Cords = _this select 0;
DMS_MainName = _this select 1; DMS_MainName = _this select 1;
@ -13,4 +13,3 @@ DMS_CreateMarker = {
"DMS_MainDot" setMarkerColor "ColorBlack"; "DMS_MainDot" setMarkerColor "ColorBlack";
"DMS_MainDot" setMarkerType "mil_dot"; "DMS_MainDot" setMarkerType "mil_dot";
"DMS_MainDot" setMarkerText DMS_MainName; "DMS_MainDot" setMarkerText DMS_MainName;
};

View File

@ -30,3 +30,4 @@ if(isServer) then {
}; };