W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2026-02-15 12:42:57 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

more private array updates

Browse Source
This commit is contained in:
vbawol
2013-05-26 19:37:39 -05:00
parent 59905c1d18
commit e563e8a848
13 changed files with 32 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dayz_code/init/variables.sqf
View File

@@ -401,7 +401,7 @@ if(isNil "dayz_maxpos") then {
}; };
if(isNil "dayz_zedsAttackVehicles") then { if(isNil "dayz_zedsAttackVehicles") then {
dayz_zedsAttackVehicles = false; dayz_zedsAttackVehicles = true;
}; };
// update objects // update objects

26
dayz_server/compile/server_playerLogin.sqf
View File

@@ -1,4 +1,4 @@
private["_isInfected","_botActive","_int","_newModel","_doLoop","_wait","_hiveVer","_isHiveOk","_playerID","_playerObj","_randomSpot","_publishTo","_primary","_secondary","_key","_result","_charID","_playerObj","_playerName","_finished","_spawnPos","_spawnDir","_items","_counter","_magazines","_weapons","_group","_backpack","_worldspace","_direction","_newUnit","_score","_position","_isNew","_inventory","_backpack","_medical","_survival","_stats","_state"]; private ["_isInfected","_doLoop","_hiveVer","_isHiveOk","_playerID","_playerObj","_primary","_key","_charID","_playerName","_backpack","_isNew","_inventory","_survival","_model","_mags","_wpns","_bcpk","_config","_newPlayer"];
//Set Variables //Set Variables
diag_log ("STARTING LOGIN: " + str(_this)); diag_log ("STARTING LOGIN: " + str(_this));
@@ -6,7 +6,7 @@ diag_log ("STARTING LOGIN: " + str(_this));
_playerID = _this select 0; _playerID = _this select 0;
_playerObj = _this select 1; _playerObj = _this select 1;
_playerName = name _playerObj; _playerName = name _playerObj;
_worldspace = []; //_worldspace = [];
if (_playerName == '__SERVER__' || _playerID == '' || local player) exitWith {}; if (_playerName == '__SERVER__' || _playerID == '' || local player) exitWith {};
@@ -17,18 +17,18 @@ if (count _this > 2) then {
//Variables //Variables
_inventory = []; _inventory = [];
_backpack = []; _backpack = [];
_items = []; //_items = [];
_magazines = []; //_magazines = [];
_weapons = []; //_weapons = [];
_medicalStats = []; //_medicalStats = [];
_survival = [0,0,0]; _survival = [0,0,0];
_tent = []; //_tent = [];
_state = []; //_state = [];
_direction = 0; //_direction = 0;
_isInfected = 0; _isInfected = 0;
_model = ""; _model = "";
_newUnit = objNull; //_newUnit = objNull;
_botActive = false; //_botActive = false;
if (_playerID == "") then { if (_playerID == "") then {
_playerID = getPlayerUID _playerObj; _playerID = getPlayerUID _playerObj;
@@ -66,7 +66,7 @@ if ((_primary select 0) == "ERROR") exitWith {
_newPlayer = _primary select 1; _newPlayer = _primary select 1;
_isNew = count _primary < 7; //_result select 1; _isNew = count _primary < 7; //_result select 1;
_charID = _primary select 2; _charID = _primary select 2;
_randomSpot = false; //_randomSpot = false;
//diag_log ("LOGIN RESULT: " + str(_primary)); //diag_log ("LOGIN RESULT: " + str(_primary));
@@ -113,7 +113,7 @@ if (!_isNew) then {
if(!isNil "DefaultBackpack") then { if(!isNil "DefaultBackpack") then {
_bcpk = DefaultBackpack; _bcpk = DefaultBackpack;
}; };
_randomSpot = true; //_randomSpot = true;
//Wait for HIVE to be free //Wait for HIVE to be free
_key = format["CHILD:203:%1:%2:%3:",_charID,[_wpns,_mags],[_bcpk,[],[]]]; _key = format["CHILD:203:%1:%2:%3:",_charID,[_wpns,_mags],[_bcpk,[],[]]];

2
dayz_server/compile/server_playerStat.sqf
View File

@@ -1,4 +1,4 @@
private[]; private ["_unit","_variable","_change"];
_unit = _this select 0; _unit = _this select 0;
_variable = _this select 1; _variable = _this select 1;
_change = _this select 2; _change = _this select 2;

2
dayz_server/compile/server_playerSync.sqf
View File

@@ -1,4 +1,4 @@
private["_character","_magazines","_force","_characterID","_charPos","_isInVehicle","_timeSince","_humanity","_debug","_distance","_isNewMed","_isNewPos","_isNewGear","_playerPos","_playerGear","_playerBackp","_medical","_distanceFoot","_lastPos","_backpack","_kills","_killsB","_killsH","_headShots","_lastTime","_timeGross","_timeLeft","_currentWpn","_currentAnim","_config","_onLadder","_isTerminal","_wpnDisabled","_currentModel","_modelChk","_muzzles","_temp","_currentState","_array","_key","_pos"]; private ["_character","_magazines","_force","_characterID","_charPos","_isInVehicle","_timeSince","_humanity","_debug","_distance","_isNewMed","_isNewPos","_isNewGear","_playerPos","_playerGear","_playerBackp","_medical","_distanceFoot","_lastPos","_backpack","_kills","_killsB","_killsH","_headShots","_lastTime","_timeGross","_timeLeft","_currentWpn","_currentAnim","_config","_onLadder","_isTerminal","_currentModel","_modelChk","_muzzles","_temp","_currentState","_array","_key","_pos","_forceGear"];
//[player,array] //[player,array]
//diag_log ("UPDATE: " + str(_this) ); //diag_log ("UPDATE: " + str(_this) );

2
dayz_server/compile/server_publishObject.sqf
View File

@@ -1,4 +1,4 @@
private ["_class","_uid","_charID","_object","_worldspace","_key"]; private ["_class","_uid","_charID","_object","_worldspace","_key","_allowed"];
//[dayz_characterID,_tent,[_dir,_location],"TentStorage"] //[dayz_characterID,_tent,[_dir,_location],"TentStorage"]
_charID = _this select 0; _charID = _this select 0;
_object = _this select 1; _object = _this select 1;

2
dayz_server/compile/server_publishVehicle.sqf
View File

@@ -1,4 +1,4 @@
private["_object","_worldspace","_location","_dir","_character","_tent","_class","_id","_uid","_dam","_hitpoints","_selection","_array","_damage","_randFuel","_fuel","_key","_result","_outcome","_totaldam","_parts","_retry","_done","_spawnDMG"]; private ["_object","_worldspace","_location","_dir","_class","_uid","_dam","_hitpoints","_selection","_array","_damage","_fuel","_key","_totaldam","_spawnDMG","_characterID"];
//[_veh,[_dir,_location],"V3S_Civ",true] //[_veh,[_dir,_location],"V3S_Civ",true]
_object = _this select 0; _object = _this select 0;
_worldspace = _this select 1; _worldspace = _this select 1;

2
dayz_server/compile/server_spawnCrashSite.sqf
View File

@@ -1,4 +1,4 @@
private["_position","_num","_config","_itemType","_itemChance","_weights","_index","_iArray","_crashModel","_lootTable","_guaranteedLoot","_randomizedLoot","_frequency","_variance","_spawnChance","_spawnMarker","_spawnRadius","_spawnFire","_permanentFire","_crashName"]; private ["_position","_num","_config","_itemType","_weights","_index","_crashModel","_lootTable","_guaranteedLoot","_randomizedLoot","_frequency","_variance","_spawnChance","_spawnMarker","_spawnRadius","_spawnFire","_crashName","_nearby","_itemTypes","_cntWeights","_fadeFire"];
//_crashModel = _this select 0; //_crashModel = _this select 0;
//_lootTable = _this select 1; //_lootTable = _this select 1;

2
dayz_server/compile/server_townDeZombify.sqf
View File

@@ -1,4 +1,4 @@
private["_position","_size","_loot","_zeds","_groups","_group"]; private ["_position","_size","_loot","_zeds","_groups","_group","_type","_town"];
_position = _this select 0; _position = _this select 0;
_size = _this select 1; _size = _this select 1;
_type = _this select 2; _type = _this select 2;

2
dayz_server/compile/server_townZombify.sqf
View File

@@ -1,4 +1,4 @@
private["_town","_spot","_buildings","_list","_size","_numZeds","_impt","_position","_buildings","_totalBuildings","_numGroups","_building","_type"]; private ["_town","_spot","_buildings","_list","_size","_numZeds","_impt","_position","_totalBuildings","_numGroups","_building","_type","_nearMen","_i","_trigger","_code","_val"];
//has town //has town
_town = _this; _town = _this;
_type = type _town; _type = type _town;

13
dayz_server/compile/server_tradeObject.sqf
View File

@@ -1,25 +1,18 @@
private["_character","_traderid","_buyorsell","_data","_result","_oid","_key","_outcome"]; private ["_character","_traderid","_buyorsell","_data","_result","_key","_outcome","_clientID"];
_character = _this select 0; _character = _this select 0;
_traderid = _this select 1; _traderid = _this select 1;
_buyorsell = _this select 2; _buyorsell = _this select 2;
diag_log format["DEBUG PVEH: %1", _character];
_clientID = owner _character; _clientID = owner _character;
diag_log ("TRADE: Trade Request by ClientID: "+ str(_clientID));
_oid = "ERROR"; diag_log format["TRADE: Trade Request by ClientID: %1 Character: %2 TraderID: %3 BuyOrSell: %4", _clientID, _character,_traderid,_buyorsell];
//Send request //Send request
_key = format["CHILD:398:%1:%2:",_traderid,_buyorsell]; _key = format["CHILD:398:%1:%2:",_traderid,_buyorsell];
diag_log ("TRADE: WRITE: "+ str(_key));
_data = "HiveEXT" callExtension _key; _data = "HiveEXT" callExtension _key;
_result = call compile format ["%1",_data]; _result = call compile format ["%1",_data];
// diag_log ("TRADE: RES: "+ str(_result));
diag_log ("TRADE: RES: "+ str(_result));
_outcome = _result select 0; _outcome = _result select 0;
dayzTradeResult = _outcome; dayzTradeResult = _outcome;

5
dayz_server/compile/server_traders.sqf
View File

@@ -1,4 +1,4 @@
private["_type","_location","_clientID","_character","_tent","_traderid","_id","_outcome","_retrader"]; private ["_clientID","_character","_traderid","_retrader","_data","_result","_status","_val","_key"];
//[dayz_characterID,_tent,[_dir,_location],"TentStorage"] //[dayz_characterID,_tent,[_dir,_location],"TentStorage"]
_character = _this select 0; _character = _this select 0;
_traderid = _this select 1; _traderid = _this select 1;
@@ -17,7 +17,6 @@ diag_log "HIVE: Request sent";
_result = call compile format ["%1",_data]; _result = call compile format ["%1",_data];
_status = _result select 0; _status = _result select 0;
_myArray = [];
if (_status == "ObjectStreamStart") then { if (_status == "ObjectStreamStart") then {
_val = _result select 1; _val = _result select 1;
//Stream Objects //Stream Objects
@@ -37,4 +36,4 @@ if (_status == "ObjectStreamStart") then {
diag_log(_retrader); diag_log(_retrader);
dayzTraderMenuResult = _retrader; dayzTraderMenuResult = _retrader;
_clientID publicVariableClient "dayzTraderMenuResult"; _clientID publicVariableClient "dayzTraderMenuResult";
_retrader _retrader;

10
dayz_server/init/server_functions.sqf
View File

@@ -66,7 +66,7 @@ object_handleServerKilled = {
}; };
check_publishobject = { check_publishobject = {
private["_allowed","_object","_playername","_allowedObjects"]; private["_allowed","_object","_playername"];
_object = _this select 0; _object = _this select 0;
_playername = _this select 1; _playername = _this select 1;
@@ -160,7 +160,7 @@ RoadList = MarkerPosition nearRoads DynamicVehicleArea;
BuildingList = MarkerPosition nearObjects ["House",DynamicVehicleArea]; BuildingList = MarkerPosition nearObjects ["House",DynamicVehicleArea];
spawn_vehicles = { spawn_vehicles = {
private["_weights","_isOverLimit","_isAbort","_counter","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition"]; private ["_weights","_isOverLimit","_isAbort","_counter","_index","_vehicle","_velimit","_qty","_isAir","_isShip","_position","_dir","_istoomany","_veh","_objPosition","_marker","_iClass","_itemTypes","_cntWeights","_itemType","_num","_allCfgLoots"];
if (isDedicated) then { if (isDedicated) then {
waituntil {!isnil "fnc_buildWeightedArray"}; waituntil {!isnil "fnc_buildWeightedArray"};
@@ -300,7 +300,7 @@ spawn_vehicles = {
}; };
spawn_roadblocks = { spawn_roadblocks = {
private["_position","_veh","_num","_config","_itemType","_itemChance","_weights","_index","_iArray","_isRoad","_roadlist","_istoomany"]; private ["_position","_veh","_num","_config","_itemType","_itemChance","_weights","_index","_iArray","_istoomany","_marker","_spawnloot","_nearby","_spawnveh","_WreckList"];
_WreckList = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"]; _WreckList = ["SKODAWreck","HMMWVWreck","UralWreck","datsun01Wreck","hiluxWreck","datsun02Wreck","UAZWreck","Land_Misc_Garb_Heap_EP1","Fort_Barricade_EP1","Rubbish2"];
waitUntil{!isNil "BIS_fnc_selectRandom"}; waitUntil{!isNil "BIS_fnc_selectRandom"};
@@ -392,14 +392,14 @@ if(isnil "DynamicVehicleFuelHigh") then {
// Damage generator function // Damage generator function
generate_new_damage = { generate_new_damage = {
private ["_damage"]; private ["_damage"];
_damage = (random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow) / 100; _damage = ((random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow))+DynamicVehicleDamageLow) / 100;
_damage; _damage;
}; };
// Damage generator fuction // Damage generator fuction
generate_exp_damage = { generate_exp_damage = {
private ["_damage"]; private ["_damage"];
_damage = (random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow)+DynamicVehicleDamageLow) / 100; _damage = ((random(DynamicVehicleDamageHigh-DynamicVehicleDamageLow))+DynamicVehicleDamageLow) / 100;
// limit this to 85% since vehicle would blow up otherwise. // limit this to 85% since vehicle would blow up otherwise.
//if(_damage >= 0.85) then { //if(_damage >= 0.85) then {

1
dayz_server/system/server_monitor.sqf
View File

@@ -1,3 +1,4 @@
private ["_result","_status","_val","_pos","_wsDone","_dir","_block","_isOK","_countr","_objWpnTypes","_objWpnQty","_dam","_selection","_totalvehicles","_object","_idKey","_type","_ownerID","_worldspace","_intentory","_hitPoints","_fuel","_damage","_date","_id","_script","_key","_myArray","_outcome","_vehLimit"];
[]execVM "\z\addons\dayz_server\system\s_fps.sqf"; //server monitor FPS (writes each ~181s diag_fps+181s diag_fpsmin*) []execVM "\z\addons\dayz_server\system\s_fps.sqf"; //server monitor FPS (writes each ~181s diag_fps+181s diag_fpsmin*)
dayz_versionNo = getText(configFile >> "CfgMods" >> "DayZ" >> "version"); dayz_versionNo = getText(configFile >> "CfgMods" >> "DayZ" >> "version");