mirror of
https://github.com/EpochModTeam/DayZ-Epoch.git
synced 2026-02-07 00:32:55 +03:00
1.7.5.D1208
This commit is contained in:
@@ -48,7 +48,6 @@ if (!isDedicated) then {
|
||||
player_throwObject = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_throwObject.sqf";
|
||||
player_alertZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_alertZombies.sqf";
|
||||
player_fireMonitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\fire_monitor.sqf";
|
||||
player_tameDog = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_tameDog.sqf";
|
||||
|
||||
//Objects
|
||||
object_roadFlare = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\object_roadFlare.sqf";
|
||||
@@ -59,6 +58,9 @@ if (!isDedicated) then {
|
||||
zombie_loiter = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_loiter.sqf"; //Server compile, used for loiter behaviour
|
||||
zombie_generate = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\zombie_generate.sqf"; //Server compile, used for loiter behaviour
|
||||
|
||||
//Dogs
|
||||
dog_findTargetAgent = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\dog_findTargetAgent.sqf";
|
||||
|
||||
// Vehicle damage fix
|
||||
vehicle_handleDamage = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_handleDamage.sqf";
|
||||
vehicle_handleKilled = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\vehicle_handleKilled.sqf";
|
||||
@@ -223,7 +225,7 @@ if (!isDedicated) then {
|
||||
_btnRespawn ctrlEnable false;
|
||||
};
|
||||
|
||||
/*
|
||||
|
||||
dayz_disableAbort = {
|
||||
private["_display","_btnAbort","_combattimeout"];
|
||||
_combattimeout = player getVariable["combattimeout",0];
|
||||
@@ -236,7 +238,7 @@ if (!isDedicated) then {
|
||||
_btnAbort = _display displayCtrl 104;
|
||||
_btnAbort ctrlEnable false;
|
||||
};
|
||||
*/
|
||||
|
||||
|
||||
dayz_spaceInterrupt = {
|
||||
private ["_dikCode", "_handled"];
|
||||
|
||||
43
dayz_code/init/loot_init.sqf
Normal file
43
dayz_code/init/loot_init.sqf
Normal file
@@ -0,0 +1,43 @@
|
||||
private["_cfgCount","_i","_j","_k","_l","_config","_defaultCfg","_itemTypes","_itemChances","_itemCount","_weighted","_weight"];
|
||||
dayz_CBLChances = [];
|
||||
dayz_CBLCounts = [];
|
||||
|
||||
_cfgCount = count (configFile >> "CfgBuildingLoot");
|
||||
for "_i" from 0 to ((_cfgCount) - 1) do {
|
||||
_config = (configFile >> "CfgBuildingLoot") select _i;
|
||||
if ((count (getArray (_config >> "ItemChance"))) > 0) then {
|
||||
_itemChances = getArray (_config >> "itemChance");
|
||||
_itemCount = count _itemChances;
|
||||
if ((dayz_CBLCounts find _itemCount) < 0) then {
|
||||
_weighted = [];
|
||||
_j = 0;
|
||||
for "_l" from 0 to ((count _itemChances) - 1) do {
|
||||
_weight = round ((_itemChances select _l) * 100);
|
||||
for "_k" from 0 to _weight - 1 do {
|
||||
_weighted set [_j + _k, _l];
|
||||
};
|
||||
_j = _j + _weight;
|
||||
};
|
||||
dayz_CBLCounts set [count dayz_CBLCounts, _itemCount];
|
||||
dayz_CBLChances set [count dayz_CBLChances, _weighted];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
dayz_CLChances = [];
|
||||
dayz_CLBase = [];
|
||||
_config = configFile >> "cfgLoot";
|
||||
for "_i" from 0 to ((count (_config)) - 1) do {
|
||||
_itemChances = (getArray (_config select _i)) select 1;
|
||||
_weighted = [];
|
||||
_j = 0;
|
||||
for "_l" from 0 to ((count _itemChances) - 1) do {
|
||||
_weight = round ((_itemChances select _l) * 100);
|
||||
for "_k" from 0 to _weight - 1 do {
|
||||
_weighted set [_j + _k, _l];
|
||||
};
|
||||
_j = _j + _weight;
|
||||
};
|
||||
dayz_CLBase set [count dayz_CLBase, configName (_config select _i)];
|
||||
dayz_CLChances set [count dayz_CLChances, _weighted];
|
||||
};
|
||||
7
dayz_code/init/object_generator.sqf
Normal file
7
dayz_code/init/object_generator.sqf
Normal file
@@ -0,0 +1,7 @@
|
||||
private["_holder","_type","_classname","_name"];
|
||||
_holder = _this select 0;
|
||||
_type = _this select 1;
|
||||
_classname = _this select 2;
|
||||
_name = getText (configFile >> _type >> _classname >> "displayName");
|
||||
null = _holder addAction [format[(localize "STR_DAYZ_CODE_1"),_name], "\z\addons\dayz_code\actions\object_pickup.sqf",[_type,_classname,_holder], 20, true, true];
|
||||
player reveal _holder;
|
||||
@@ -22,22 +22,23 @@
|
||||
|
||||
//Server only
|
||||
if (isServer) then {
|
||||
"dayzDeath" addPublicVariableEventHandler {(_this select 1) call server_playerDied};
|
||||
"dayzDeath" addPublicVariableEventHandler {(_this select 1) call server_playerDied};
|
||||
"dayzDiscoAdd" addPublicVariableEventHandler {dayz_disco set [count dayz_disco,(_this select 1)];};
|
||||
"dayzDiscoRem" addPublicVariableEventHandler {dayz_disco = dayz_disco - [(_this select 1)];};
|
||||
"dayzPlayerSave" addPublicVariableEventHandler {(_this select 1) call server_playerSync;};
|
||||
"dayzPlayerSave" addPublicVariableEventHandler {(_this select 1) call server_playerSync;};
|
||||
"dayzPublishObj" addPublicVariableEventHandler {(_this select 1) call server_publishObj};
|
||||
"dayzUpdateVehicle" addPublicVariableEventHandler {(_this select 1) call server_updateObject};
|
||||
"dayzDeleteObj" addPublicVariableEventHandler {(_this select 1) call local_deleteObj};
|
||||
"dayzDeleteObj" addPublicVariableEventHandler {(_this select 1) call local_deleteObj};
|
||||
"dayzPublishVeh" addPublicVariableEventHandler {(_this select 1) call server_publishVeh}; // for vehicle traders
|
||||
"dayzTradeObject" addPublicVariableEventHandler {(_this select 1) call server_tradeObj}; // for vehicle traders
|
||||
"dayzTraderMenu" addPublicVariableEventHandler {(_this select 1) call server_traders}; // for all traders
|
||||
"dayzLogin" addPublicVariableEventHandler {(_this select 1) call server_playerLogin};
|
||||
"dayzLogin" addPublicVariableEventHandler {(_this select 1) call server_playerLogin};
|
||||
"dayzLogin2" addPublicVariableEventHandler {(_this select 1) call server_playerSetup};
|
||||
// "dayzPlayerMorph" addPublicVariableEventHandler {(_this select 1) call server_playerMorph};
|
||||
// "dayzUpdate" addPublicVariableEventHandler {_id = (_this select 1) spawn dayz_processUpdate};
|
||||
"dayzLoginRecord" addPublicVariableEventHandler {(_this select 1) call dayz_recordLogin};
|
||||
// "dayzCharSave" addPublicVariableEventHandler {(_this select 1) call server_playerSync};
|
||||
"dayzCharDisco" addPublicVariableEventHandler {(_this select 1) call server_characterSync};
|
||||
"dayzLoginRecord" addPublicVariableEventHandler {(_this select 1) call dayz_recordLogin};
|
||||
// "dayzCharSave" addPublicVariableEventHandler {(_this select 1) call server_playerSync};
|
||||
"dayzCharDisco" addPublicVariableEventHandler {(_this select 1) call server_characterSync};
|
||||
};
|
||||
|
||||
//Client only
|
||||
|
||||
@@ -72,6 +72,16 @@ dayz_resetSelfActions = {
|
||||
s_player_deleteBuild = -1;
|
||||
s_player_forceSave = -1;
|
||||
s_player_flipveh = -1;
|
||||
s_player_movedog = -1;
|
||||
s_player_speeddog = -1;
|
||||
s_player_calldog = -1;
|
||||
s_player_feeddog = -1;
|
||||
s_player_waterdog = -1;
|
||||
s_player_staydog = -1;
|
||||
s_player_trackdog = -1;
|
||||
s_player_barkdog = -1;
|
||||
s_player_warndog = -1;
|
||||
s_player_followdog = -1;
|
||||
};
|
||||
call dayz_resetSelfActions;
|
||||
|
||||
@@ -115,6 +125,22 @@ r_action_repair = false;
|
||||
r_action_targets = [];
|
||||
r_pitchWhine = false;
|
||||
r_isBandit = false;
|
||||
|
||||
//ammo routine
|
||||
r_player_actions2 = [];
|
||||
r_action2 = false;
|
||||
r_player_lastVehicle = objNull;
|
||||
r_player_lastSeat = [];
|
||||
r_player_removeActions2 = {
|
||||
if (!isNull r_player_lastVehicle) then {
|
||||
{
|
||||
r_player_lastVehicle removeAction _x;
|
||||
} forEach r_player_actions2;
|
||||
r_player_actions2 = [];
|
||||
r_action2 = false;
|
||||
};
|
||||
};
|
||||
|
||||
USEC_woundHit = [
|
||||
"",
|
||||
"body",
|
||||
@@ -146,6 +172,17 @@ DAYZ_woundHit_ok = [
|
||||
0.2
|
||||
]
|
||||
];
|
||||
DAYZ_woundHit_dog = [
|
||||
[
|
||||
"body",
|
||||
"hands",
|
||||
"legs"
|
||||
],[
|
||||
0.1,
|
||||
0.45,
|
||||
0.35
|
||||
]
|
||||
];
|
||||
USEC_MinorWounds = [
|
||||
"hands",
|
||||
"legs"
|
||||
@@ -176,6 +213,7 @@ dayzPublishObj = []; //used for eventhandler to spawn a mirror of players tent
|
||||
dayzHideBody = objNull;
|
||||
|
||||
dayzPublishVeh = []; // for vehicle traders
|
||||
dayzTradeObject = []; // For all traders increment qty
|
||||
dayzTraderMenu = []; // For all traders
|
||||
|
||||
//DayZ settings
|
||||
@@ -192,13 +230,13 @@ if(isnil "dayz_maxLocalZombies") then {
|
||||
|
||||
dayz_spawnPos = getPosATL player;
|
||||
|
||||
//init global arrays for Loot Chances
|
||||
call compile preprocessFileLineNumbers "\z\addons\dayz_code\init\loot_init.sqf";
|
||||
|
||||
if(isServer) then {
|
||||
dayz_disco = [];
|
||||
dayz_players = [];
|
||||
dead_bodyCleanup = [];
|
||||
needUpdate_objects = [];
|
||||
botPlayers = [];
|
||||
};
|
||||
|
||||
if(!isDedicated) then {
|
||||
|
||||
Reference in New Issue
Block a user