tavi mission.sqf + fixes

This commit is contained in:
vbawol
2013-05-24 14:44:20 -05:00
parent 8139f3a490
commit 2903abd32e
7 changed files with 94 additions and 94 deletions

View File

@@ -132,15 +132,6 @@ if (true) then
_this setPos [11904.381, 21054.619, 26.211685]; _this setPos [11904.381, 21054.619, 26.211685];
}; };
_vehicle_30 = objNull;
if (true) then
{
_this = createVehicle ["TK_GUE_WarfareBVehicleServicePoint_EP1", [11893.93, 21026.619, 1.2397766e-005], [], 0, "CAN_COLLIDE"];
_vehicle_30 = _this;
_this setDir -91.20948;
_this setPos [11893.93, 21026.619, 1.2397766e-005];
};
_vehicle_32 = objNull; _vehicle_32 = objNull;
if (true) then if (true) then
{ {
@@ -199,7 +190,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [11886.055, 21036.699, -6.3896179e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [11886.055, 21036.699, -6.3896179e-005], [], 0, "CAN_COLLIDE"];
_vehicle_42 = _this; _vehicle_42 = _this;
_this setDir 50.418365; _this setDir 50.418365;
_this setVehicleInit "this allowDammage false; this enableSimulation false"; _this setVehicleInit "this allowDammage false;";
_this setPos [11886.055, 21036.699, -6.3896179e-005]; _this setPos [11886.055, 21036.699, -6.3896179e-005];
}; };
@@ -2596,7 +2587,7 @@ if (true) then
_vehicle_586 = _this; _vehicle_586 = _this;
_this setDir -86.933929; _this setDir -86.933929;
_this setVehicleLock "LOCKED"; _this setVehicleLock "LOCKED";
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [16160.226, 13579.342, 0.048036814]; _this setPos [16160.226, 13579.342, 0.048036814];
}; };
@@ -4473,7 +4464,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [10172.08, 18716.92, 3.8146973e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [10172.08, 18716.92, 3.8146973e-005], [], 0, "CAN_COLLIDE"];
_vehicle_1010 = _this; _vehicle_1010 = _this;
_this setDir -29.006971; _this setDir -29.006971;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [10172.08, 18716.92, 3.8146973e-005]; _this setPos [10172.08, 18716.92, 3.8146973e-005];
}; };
@@ -4483,7 +4474,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [8125.7231, 21316.494, 4.5776367e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [8125.7231, 21316.494, 4.5776367e-005], [], 0, "CAN_COLLIDE"];
_vehicle_1012 = _this; _vehicle_1012 = _this;
_this setDir -12.10274; _this setDir -12.10274;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [8125.7231, 21316.494, 4.5776367e-005]; _this setPos [8125.7231, 21316.494, 4.5776367e-005];
}; };
@@ -4502,7 +4493,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [10399.53, 16856.883, -1.1444092e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [10399.53, 16856.883, -1.1444092e-005], [], 0, "CAN_COLLIDE"];
_vehicle_1016 = _this; _vehicle_1016 = _this;
_this setDir -4.3650527; _this setDir -4.3650527;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [10399.53, 16856.883, -1.1444092e-005]; _this setPos [10399.53, 16856.883, -1.1444092e-005];
}; };
@@ -4530,7 +4521,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [16159.999, 13585.844, 7.6293945e-006], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [16159.999, 13585.844, 7.6293945e-006], [], 0, "CAN_COLLIDE"];
_vehicle_1021 = _this; _vehicle_1021 = _this;
_this setDir -88.974411; _this setDir -88.974411;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [16159.999, 13585.844, 7.6293945e-006]; _this setPos [16159.999, 13585.844, 7.6293945e-006];
}; };
@@ -4549,7 +4540,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [16438.418, 11485.899, 3.8146973e-006], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [16438.418, 11485.899, 3.8146973e-006], [], 0, "CAN_COLLIDE"];
_vehicle_1025 = _this; _vehicle_1025 = _this;
_this setDir 184.43353; _this setDir 184.43353;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [16438.418, 11485.899, 3.8146973e-006]; _this setPos [16438.418, 11485.899, 3.8146973e-006];
}; };
@@ -4568,7 +4559,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [15314.632, 9367.6123, 2.0980835e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [15314.632, 9367.6123, 2.0980835e-005], [], 0, "CAN_COLLIDE"];
_vehicle_1028 = _this; _vehicle_1028 = _this;
_this setDir 92.250443; _this setDir 92.250443;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [15314.632, 9367.6123, 2.0980835e-005]; _this setPos [15314.632, 9367.6123, 2.0980835e-005];
}; };
@@ -4587,7 +4578,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [16449.633, 8330.2139, -1.5258789e-005], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [16449.633, 8330.2139, -1.5258789e-005], [], 0, "CAN_COLLIDE"];
_vehicle_1031 = _this; _vehicle_1031 = _this;
_this setDir -0.3754791; _this setDir -0.3754791;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [16449.633, 8330.2139, -1.5258789e-005]; _this setPos [16449.633, 8330.2139, -1.5258789e-005];
}; };
@@ -4606,7 +4597,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [6995.0059, 8294.9717], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [6995.0059, 8294.9717], [], 0, "CAN_COLLIDE"];
_vehicle_1034 = _this; _vehicle_1034 = _this;
_this setDir 219.52061; _this setDir 219.52061;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [6995.0059, 8294.9717]; _this setPos [6995.0059, 8294.9717];
}; };
@@ -4616,7 +4607,7 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [5556.7646, 8750.1543], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [5556.7646, 8750.1543], [], 0, "CAN_COLLIDE"];
_vehicle_1036 = _this; _vehicle_1036 = _this;
_this setDir 217.35687; _this setDir 217.35687;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [5556.7646, 8750.1543]; _this setPos [5556.7646, 8750.1543];
}; };
@@ -4626,8 +4617,17 @@ if (true) then
_this = createVehicle ["Info_Board_EP1", [3223.3574, 7563.1914, 3.8146973e-006], [], 0, "CAN_COLLIDE"]; _this = createVehicle ["Info_Board_EP1", [3223.3574, 7563.1914, 3.8146973e-006], [], 0, "CAN_COLLIDE"];
_vehicle_1038 = _this; _vehicle_1038 = _this;
_this setDir 64.711594; _this setDir 64.711594;
_this setVehicleInit "this allowDammage false; this enableSimulation false;"; _this setVehicleInit "this allowDammage false;";
_this setPos [3223.3574, 7563.1914, 3.8146973e-006]; _this setPos [3223.3574, 7563.1914, 3.8146973e-006];
}; };
_vehicle_1040 = objNull;
if (true) then
{
_this = createVehicle ["RU_WarfareBUAVterminal", [11893.605, 21028.477, -0.0001449585], [], 0, "CAN_COLLIDE"];
_vehicle_1040 = _this;
_this setDir 5.5085564;
_this setPos [11893.605, 21028.477, -0.0001449585];
};
processInitCommands; processInitCommands;

View File

@@ -136,7 +136,6 @@ if (_qty >= _qty_in) then {
_obj = _obj select 0; _obj = _obj select 0;
//check to make sure vehicle has no more than 75% average tire damage //check to make sure vehicle has no more than 75% average tire damage
_hitpoints = _obj call vehicle_getHitpoints; _hitpoints = _obj call vehicle_getHitpoints;
_okToSell = true; _okToSell = true;

View File

@@ -94,18 +94,18 @@ if (_qty >= _qty_in) then {
if(dayzTradeResult == "PASS") then { if(dayzTradeResult == "PASS") then {
if(_buy_o_sell == "buy") then { if(_buy_o_sell == "buy") then {
for "_x" from 1 to _qty_in do {
player removeMagazine _part_in; _num_removed = ([player,_part_in,_qty_in] call BIS_fnc_invRemove);
}; if(_num_removed == _qty_in) then {
removeBackpack player; removeBackpack player;
player addBackpack _part_out; player addBackpack _part_out;
};
} else { } else {
// Sell // Sell
removeBackpack player;
for "_x" from 1 to _qty_out do { for "_x" from 1 to _qty_out do {
player addMagazine _part_out; player addMagazine _part_out;
}; };
removeBackpack player;
// player addBackpack _part_out;
}; };
cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"]; cutText [format[("Traded %1 %2 for %3 %4"),_qty_in,_textPartIn,_qty_out,_textPartOut], "PLAIN DOWN"];

View File

@@ -112,8 +112,6 @@ if(!_cancel) then {
if(_removed == 1) then { if(_removed == 1) then {
player removeMagazine _item;
//call dayz_forceSave; //call dayz_forceSave;
_dir = round(direction player); _dir = round(direction player);

View File

@@ -34,6 +34,8 @@ while {r_doLoop} do {
r_doLoop = false; r_doLoop = false;
if (_finished) then { if (_finished) then {
_num_removed = ([player,"ItemMorphine"] call BIS_fnc_invRemove);
if(_num_removed == 1) then {
if (_unit == player) then { if (_unit == player) then {
//Self Healing //Self Healing
_id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf"; _id = [player,player] execVM "\z\addons\dayz_code\medical\publicEH\medMorphine.sqf";
@@ -42,11 +44,10 @@ if (_finished) then {
[player,50] call player_humanityChange; [player,50] call player_humanityChange;
}; };
player removeMagazine "ItemMorphine";
//["usecMorphine",[_unit,player]] call broadcastRpcCallAll; //["usecMorphine",[_unit,player]] call broadcastRpcCallAll;
usecMorphine = [_unit,player]; usecMorphine = [_unit,player];
publicVariable "usecMorphine"; publicVariable "usecMorphine";
};
} else { } else {
r_interrupt = false; r_interrupt = false;
[objNull, player, rSwitchMove,""] call RE; [objNull, player, rSwitchMove,""] call RE;

View File

@@ -8,6 +8,9 @@ _unit setVariable ["USEC_inPain", false, true];
call fnc_usec_medic_removeActions; call fnc_usec_medic_removeActions;
r_action = false; r_action = false;
_num_removed = ([player,"ItemPainkiller"] call BIS_fnc_invRemove);
if(_num_removed == 1) then {
if (vehicle player == player) then { if (vehicle player == player) then {
//not in a vehicle //not in a vehicle
player playActionNow "Gear"; player playActionNow "Gear";
@@ -21,10 +24,9 @@ if (_unit == player) then {
[player,20] call player_humanityChange; [player,20] call player_humanityChange;
}; };
player removeMagazine "ItemPainkiller";
sleep 1; sleep 1;
//clear the healed player's vision //clear the healed player's vision
//["usecPainK",[_unit,player]] call broadcastRpcCallAll; //["usecPainK",[_unit,player]] call broadcastRpcCallAll;
usecPainK = [_unit,player]; usecPainK = [_unit,player];
publicVariable "usecPainK"; publicVariable "usecPainK";
};

View File

@@ -42,15 +42,15 @@ if (_finished) then {
_unit setVariable["USEC_lowBlood",false,true]; _unit setVariable["USEC_lowBlood",false,true];
player removeMagazine "ItemBloodbag"; player removeMagazine "ItemBloodbag";
//disableSerialization; _num_removed = ([player,"ItemBloodbag"] call BIS_fnc_invRemove);
//call dayz_forceSave; if(_num_removed == 1) then {
//["usecTransfuse",[_unit,player]] call broadcastRpcCallAll; //["usecTransfuse",[_unit,player]] call broadcastRpcCallAll;
usecTransfuse = [_unit,player]; usecTransfuse = [_unit,player];
publicVariable "usecTransfuse"; publicVariable "usecTransfuse";
//dayzHumanity = [player,100]; //dayzHumanity = [player,100];
[player,100] call player_humanityChange; [player,100] call player_humanityChange;
};
} else { } else {
r_interrupt = false; r_interrupt = false;
player switchMove ""; player switchMove "";