W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 04:23:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

0.996c

Browse Source 
+ Removed cfgtowngenerator /stream_locationCheck; loop entirely. Tests
show to have improved fps.
+ Added disabling zombies servers side for server side performance
increase/testing.
+ Fixed crafting error from 0.996b.
+ Revert helicopter intel removal test.
This commit is contained in:
vbawol
2013-03-12 13:31:50 -05:00
parent 4316696b85
commit 9768ca96f0
7 changed files with 41 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dayz_code/actions/player_craftItem.sqf
View File

@@ -73,10 +73,10 @@ if (inflamed cursorTarget and _canDo) then {
// Moved all recipes input and outputs to configs // Moved all recipes input and outputs to configs
_selectedRecipeOutput = getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Crafting" >> "output") select 0; _selectedRecipeOutput = getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Crafting" >> "output");
_selectedRecipe = getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Crafting" >> "input") select 0; _selectedRecipeInput = getArray (configFile >> "cfgMagazines" >> _this >> "ItemActions" >> "Crafting" >> "input");
diag_log format["Selected Recipe Input: %1", _selectedRecipe]; diag_log format["Selected Recipe Input: %1", _selectedRecipeInput];
diag_log format["Selected Recipe Output: %1", _selectedRecipeOutput]; diag_log format["Selected Recipe Output: %1", _selectedRecipeOutput];
_proceed = true; _proceed = true;
@@ -95,7 +95,7 @@ if (inflamed cursorTarget and _canDo) then {
if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; }; if(_qty < _countIn) exitWith { _missing = _itemIn; _missingQty = (_countIn - _qty); _proceed = false; };
} forEach _selectedRecipe; } forEach _selectedRecipeInput;
if (_proceed) then { if (_proceed) then {
player playActionNow "Medic"; player playActionNow "Medic";
@@ -121,7 +121,7 @@ if (inflamed cursorTarget and _canDo) then {
} forEach magazines player; } forEach magazines player;
} forEach _selectedRecipe; } forEach _selectedRecipeInput;
// Put items // Put items
{ {

58
dayz_code/cfgVehicles.hpp
View File

@@ -154,9 +154,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 50; transportMaxMagazines = 50;
transportmaxbackpacks = 10; transportmaxbackpacks = 10;
@@ -184,9 +184,9 @@ class Citizen1; // External class reference
typicalCargo[] = {}; typicalCargo[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 50; transportMaxMagazines = 50;
transportmaxbackpacks = 10; transportmaxbackpacks = 10;
@@ -219,9 +219,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 5; transportMaxWeapons = 5;
transportMaxMagazines = 25; transportMaxMagazines = 25;
transportmaxbackpacks = 4; transportmaxbackpacks = 4;
@@ -261,9 +261,9 @@ class Citizen1; // External class reference
class TransportWeapons{}; class TransportWeapons{};
weapons[] = {}; weapons[] = {};
magazines[] = {}; magazines[] = {};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 3; transportMaxWeapons = 3;
transportMaxMagazines = 10; transportMaxMagazines = 10;
transportmaxbackpacks = 2; transportmaxbackpacks = 2;
@@ -277,9 +277,9 @@ class Citizen1; // External class reference
displayName = "CH-47F"; displayName = "CH-47F";
crew = ""; crew = "";
typicalCargo[] = {}; typicalCargo[] = {};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 200; transportMaxMagazines = 200;
transportmaxbackpacks = 5; transportmaxbackpacks = 5;
@@ -571,9 +571,9 @@ class Citizen1; // External class reference
class TransportWeapons{}; class TransportWeapons{};
weapons[] = {}; weapons[] = {};
magazines[] = {}; magazines[] = {};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 3; transportMaxWeapons = 3;
transportMaxMagazines = 20; transportMaxMagazines = 20;
transportmaxbackpacks = 5; transportmaxbackpacks = 5;
@@ -956,7 +956,7 @@ class Citizen1; // External class reference
mapsize = 2; mapsize = 2;
model = "\ca\weapons_e\AmmoBoxes\backpack_tk_alice.p3d"; model = "\ca\weapons_e\AmmoBoxes\backpack_tk_alice.p3d";
transportMaxWeapons = 2; transportMaxWeapons = 2;
transportMaxMagazines = 16; transportMaxMagazines = 0;
}; };
class DZ_TK_Assault_Pack_EP1 : Bag_Base_BAF class DZ_TK_Assault_Pack_EP1 : Bag_Base_BAF
@@ -968,7 +968,7 @@ class Citizen1; // External class reference
icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa"; icon = "\ca\weapons_e\data\icons\mapIcon_backpack_CA.paa";
model = "\ca\weapons_e\AmmoBoxes\backpack_civil_assault.p3d"; model = "\ca\weapons_e\AmmoBoxes\backpack_civil_assault.p3d";
transportMaxWeapons = 2; transportMaxWeapons = 2;
transportMaxMagazines = 16; transportMaxMagazines = 0;
}; };
class DZ_British_ACU : Bag_Base_BAF class DZ_British_ACU : Bag_Base_BAF
@@ -1022,9 +1022,9 @@ class Citizen1; // External class reference
weapons[] = {}; weapons[] = {};
magazines[] = {}; magazines[] = {};
gunnerHasFlares = false; gunnerHasFlares = false;
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 10; transportMaxWeapons = 10;
transportMaxMagazines = 80; transportMaxMagazines = 80;
transportmaxbackpacks = 15; transportmaxbackpacks = 15;
@@ -1174,9 +1174,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 5; transportMaxWeapons = 5;
transportMaxMagazines = 25; transportMaxMagazines = 25;
transportmaxbackpacks = 4; transportmaxbackpacks = 4;
@@ -1191,9 +1191,9 @@ class Citizen1; // External class reference
hiddenSelections[] = {}; hiddenSelections[] = {};
class TransportMagazines{}; class TransportMagazines{};
class TransportWeapons{}; class TransportWeapons{};
commanderCanSee = 2; commanderCanSee = 2+16+32;
gunnerCanSee = 2; gunnerCanSee = 2+16+32;
driverCanSee = 2; driverCanSee = 2+16+32;
transportMaxWeapons = 5; transportMaxWeapons = 5;
transportMaxMagazines = 25; transportMaxMagazines = 25;
transportmaxbackpacks = 4; transportmaxbackpacks = 4;

2
dayz_code/compile/zombie_generate.sqf
View File

@@ -30,6 +30,8 @@ if (_doLoiter) then {
}; };
//diag_log ("Spawned: " + str([_type, _position, [], _radius, _method])); //diag_log ("Spawned: " + str([_type, _position, [], _radius, _method]));
_agent = createAgent [_type, _position, [], _radius, _method]; _agent = createAgent [_type, _position, [], _radius, _method];
dayzSpawnZed = [_agent];
publicVariableServer "dayzSpawnZed";
if (_doLoiter) then { if (_doLoiter) then {
_agent setPosATL _position; _agent setPosATL _position;

3
dayz_code/init/publicEH.sqf
View File

@@ -43,6 +43,9 @@ if (isServer) then {
"dayzDeleteObj" addPublicVariableEventHandler {(_this select 1) spawn server_deleteObj}; "dayzDeleteObj" addPublicVariableEventHandler {(_this select 1) spawn server_deleteObj};
"atp" addPublicVariableEventHandler { _array = _this select 1; diag_log format["TELEPORT REVERT: %1 (%2) from %3 to %4 now at %5", _array select 0, _array select 1, _array select 2, _array select 3, _array select 4];}; "atp" addPublicVariableEventHandler { _array = _this select 1; diag_log format["TELEPORT REVERT: %1 (%2) from %3 to %4 now at %5", _array select 0, _array select 1, _array select 2, _array select 3, _array select 4];};
// disable zombies server side
"dayzSpawnZed" addPublicVariableEventHandler {(_this select 1) spawn server_handleZedSpawn};
// Dayz epoch custom // Dayz epoch custom
"dayzPublishVeh" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh}; "dayzPublishVeh" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh};
"dayzPublishVeh2" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh2}; "dayzPublishVeh2" addPublicVariableEventHandler {(_this select 1) spawn server_publishVeh2};

4
dayz_code/init/variables.sqf
View File

@@ -430,8 +430,8 @@ if(!isDedicated) then {
dayz_Locations set [count dayz_Locations, [_location,_locHdr,_size]]; dayz_Locations set [count dayz_Locations, [_location,_locHdr,_size]];
}; };
}; };
_cfgLocation = configFile >> "CfgTownGenerator"; //_cfgLocation = configFile >> "CfgTownGenerator";
_cfgLocation call _funcGetLocation; //_cfgLocation call _funcGetLocation;
dayz_buildingMonitor = []; //Buildings to check dayz_buildingMonitor = []; //Buildings to check
dayz_bodyMonitor = []; dayz_bodyMonitor = [];

6
dayz_code/system/player_monitor.fsm
View File

@@ -1112,12 +1112,6 @@ class FSM
" };" \n " };" \n
"};" \n "};" \n
"" \n "" \n
"dayz_locationCheck = [] spawn {" \n
" while {true} do {" \n
" call stream_locationCheck;" \n
" sleep 2;" \n
" };" \n
"};" \n
"dayz_friendliesCheck = [] spawn {" \n "dayz_friendliesCheck = [] spawn {" \n
" while {true} do {" \n " while {true} do {" \n
" call player_friendliesCheck;" \n " call player_friendliesCheck;" \n

1
dayz_server/compile/server_handleZedSpawn.sqf
View File

@@ -1,4 +1,3 @@
private["_zed"]; private["_zed"];
_zed = _this select 0; _zed = _this select 0;
_zed enableSimulation false; _zed enableSimulation false;