mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2025-12-17 17:20:26 +03:00
0.998 released
Final testing started on 0.998. Patch notes so far: + Crafting now only requires a fire within 2m. + Safe should now drop items on ground when packed. + Changed humanity gains/losses based on player death so that humanity is accounted for. + Fixed broken humanity hit and freetarget with player damage since 1.7.6.1. + Potential fix for swimming in ground. + !isNull and Distance checks for player zombie "feed" option. + Added open crate option for supply crates. Requires crowbar in toolbelt. + fixed Auto Refueling Station (Dingor) #234 + Added new pink clothes option to loot tables. + Added medic animation to complete trades to selling/buying weapons, toolbelt items, backpacks, and vehicles. + Added medic animation to complete siphon, refueling, and fill jerry. + Changed number of possible siphon and refuel is based on quantity of empty or full jerry cans. + Changed Player zombies V or getover animation to walkforward instead of sitdown. This will cause the player to be stuck walking until an attack is issued. + Fixed serveral lingor/dingor buildings that had incorrect classnames in loot tables causing no loot to spawn with more recent builds. + Added a few building loot spawns for tavi 1.0 + updated server SQL with latest copy from server.
This commit is contained in:
@@ -1,51 +1,105 @@
|
||||
private["_vehicle","_curFuel","_newFuel","_timeLeft"];
|
||||
_vehicle = cursorTarget;
|
||||
|
||||
// if ((count (crew _vehicle)) > 0) exitWith {cutText ["You may not sihpon fuel while someone is in the vehicle", "PLAIN DOWN"]};
|
||||
_fillCounter = 0;
|
||||
_abort = false;
|
||||
|
||||
_canSize = getNumber(configFile >> "cfgMagazines" >> "ItemJerrycan" >> "fuelQuantity");
|
||||
_configVeh = configFile >> "cfgVehicles" >> TypeOf(_vehicle);
|
||||
_capacity = getNumber(_configVeh >> "fuelCapacity");
|
||||
_nameType = getText(_configVeh >> "displayName");
|
||||
_curFuel = ((fuel _vehicle) * _capacity);
|
||||
_newFuel = (_curFuel - _canSize);
|
||||
|
||||
// calculate minimum needed fuel
|
||||
_newFuel = (_newFuel / _capacity);
|
||||
// Get number of empty jerry cans
|
||||
_siphonQty = {_x == "ItemJerrycanEmpty"} count magazines player;
|
||||
|
||||
if (_newFuel > 0) then {
|
||||
// attempt to siphon for each empty jerry can
|
||||
for "_x" from 1 to _siphonQty do {
|
||||
|
||||
player removeMagazine "ItemJerrycanEmpty";
|
||||
player addMagazine "ItemJerrycan";
|
||||
_curFuel = ((fuel _vehicle) * _capacity);
|
||||
_newFuel = (_curFuel - _canSize);
|
||||
|
||||
//disableSerialization;
|
||||
//call dayz_forceSave;
|
||||
// calculate minimum needed fuel
|
||||
_newFuel = (_newFuel / _capacity);
|
||||
|
||||
player playActionNow "Medic";
|
||||
[player,"refuel",0,false] call dayz_zombieSpeak;
|
||||
|
||||
_id = [player,20,true,(getPosATL player)] spawn player_alertZombies;
|
||||
|
||||
sleep 6;
|
||||
|
||||
//apply newFuel to vehicle on every peer
|
||||
//["dayzSetFuel",[_vehicle,_newFuel]] call broadcastRpcCallAll;
|
||||
|
||||
dayzSetFuel = [_vehicle,_newFuel];
|
||||
if (local _vehicle) then {
|
||||
dayzSetFuel spawn local_setFuel;
|
||||
if(_newFuel <= 0) exitWith {
|
||||
cutText [format["%1 does not have enough fuel.",_nameType], "PLAIN DOWN"];
|
||||
};
|
||||
publicVariable "dayzSetFuel";
|
||||
|
||||
cutText [format["%1 has been drained for %2 litres of Fuel",_nameType,_canSize], "PLAIN DOWN"];
|
||||
|
||||
|
||||
|
||||
sleep 1;
|
||||
if (_newFuel > 0) then {
|
||||
|
||||
call fnc_usec_medic_removeActions;
|
||||
r_action = false;
|
||||
_fillCounter = _fillCounter + 1;
|
||||
|
||||
} else {
|
||||
cutText [format["%1 has no fuel.",_nameType], "PLAIN DOWN"];
|
||||
if(_siphonQty == 1) then {
|
||||
cutText ["Preparing to siphon, stand still to fill empty jerry can.", "PLAIN DOWN"];
|
||||
} else {
|
||||
cutText [format[("Preparing to siphon, stand still to fill empty jerry can %1 of %2."),_fillCounter,_siphonQty] , "PLAIN DOWN"];
|
||||
};
|
||||
|
||||
// force animation
|
||||
player playActionNow "Medic";
|
||||
// Play sound and alert zombies
|
||||
[player,"refuel",0,false] call dayz_zombieSpeak;
|
||||
[player,20,true,(getPosATL player)] spawn player_alertZombies;
|
||||
|
||||
r_interrupt = false;
|
||||
_animState = animationState player;
|
||||
r_doLoop = true;
|
||||
_started = false;
|
||||
_finished = false;
|
||||
|
||||
while {r_doLoop} do {
|
||||
_animState = animationState player;
|
||||
_isMedic = ["medic",_animState] call fnc_inString;
|
||||
if (_isMedic) then {
|
||||
_started = true;
|
||||
};
|
||||
if (_started and !_isMedic) then {
|
||||
r_doLoop = false;
|
||||
_finished = true;
|
||||
};
|
||||
if (r_interrupt) then {
|
||||
r_doLoop = false;
|
||||
};
|
||||
sleep 0.1;
|
||||
};
|
||||
r_doLoop = false;
|
||||
|
||||
if (!_finished) exitWith {
|
||||
r_interrupt = false;
|
||||
[objNull, player, rSwitchMove,""] call RE;
|
||||
player playActionNow "stop";
|
||||
cutText ["Canceled siphon." , "PLAIN DOWN"];
|
||||
_abort = true;
|
||||
};
|
||||
|
||||
if (_finished) then {
|
||||
|
||||
if ("ItemJerrycanEmpty" in magazines player) then {
|
||||
|
||||
player removeMagazine "ItemJerrycanEmpty";
|
||||
player addMagazine "ItemJerrycan";
|
||||
|
||||
//apply newFuel to vehicle on every peer
|
||||
//["dayzSetFuel",[_vehicle,_newFuel]] call broadcastRpcCallAll;
|
||||
|
||||
dayzSetFuel = [_vehicle,_newFuel];
|
||||
if (local _vehicle) then {
|
||||
dayzSetFuel spawn local_setFuel;
|
||||
};
|
||||
publicVariable "dayzSetFuel";
|
||||
|
||||
cutText [format["%1 has been drained for %2 litres of Fuel",_nameType,_canSize], "PLAIN DOWN"];
|
||||
|
||||
call fnc_usec_medic_removeActions;
|
||||
r_action = false;
|
||||
|
||||
sleep 1;
|
||||
|
||||
} else {
|
||||
_abort = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
if(_abort) exitWith {};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user