From 36782396b897a0a137117d5a21ff214bf169967d Mon Sep 17 00:00:00 2001 From: Skaronator Date: Fri, 8 Nov 2013 19:55:01 +0100 Subject: [PATCH 1/3] Add GlobalVar for Freshspawns --- SQF/dayz_code/system/player_monitor.fsm | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index e414bf8fa..c275132d6 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -1,4 +1,4 @@ -/*%FSM*/ +/*%FSM*/ /*%FSM*/ /* item0[] = {"init",0,250,-75.000000,-350.000000,25.000000,-300.000000,0.000000,"init"}; @@ -36,7 +36,7 @@ item31[] = {"ERROR__Bad_Versi",2,250,175.000000,800.000000,275.000000,850.000000 item32[] = {"Display_Ready",4,218,-175.000000,1050.000000,-75.000000,1100.000000,0.000000,"Display" \n "Ready"}; item33[] = {"Preload_Display",2,250,-75.000000,1100.000000,25.000000,1150.000000,0.000000,"Preload" \n "Display"}; item34[] = {"Preload_Done",4,218,-175.000000,1150.000000,-75.000000,1200.000000,0.000000,"Preload" \n "Done"}; -item35[] = {"Initialize",2,4346,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"}; +item35[] = {"Initialize",2,250,-75.000000,1200.000000,25.000000,1250.000000,0.000000,"Initialize"}; item36[] = {"Finish",1,250,-75.000000,1300.000000,25.000000,1350.000000,0.000000,"Finish"}; item37[] = {"True",8,218,25.000000,1250.000000,125.000000,1300.000000,0.000000,"True"}; item38[] = {"Too_Long",4,218,300.000000,150.000000,400.000000,200.000000,0.000000,"Too" \n "Long"}; @@ -46,7 +46,7 @@ item41[] = {"Too_Long",4,218,300.000000,800.000000,400.000000,850.000000,0.00000 item42[] = {"Enable_Sim",2,250,-75.000000,-100.000000,25.000000,-50.000000,0.000000,"Enable Sim"}; item43[] = {"Initialized",4,218,-175.000000,-150.000000,-75.000000,-100.000000,0.000000,"Initialized"}; item44[] = {"New_Character",4,218,-500.000000,375.000000,-400.000000,425.000000,5.000000,"New" \n "Character"}; -item45[] = {"Gender_Selection",2,250,-500.000000,500.000000,-400.000000,550.000000,0.000000,"Gender Selection" \n "Dialog"}; +item45[] = {"Gender_Selection",2,4346,-500.000000,500.000000,-400.000000,550.000000,0.000000,"Gender Selection" \n "Dialog"}; item46[] = {"Selected",4,218,-400.000000,600.000000,-300.000000,650.000000,0.000000,"Selected"}; item47[] = {"Process",2,250,-275.000000,600.000000,-175.000000,650.000000,0.000000,"Process"}; item48[] = {"no_PlayerID",4,218,50.000000,-100.000000,150.000000,-50.000000,2.000000,"no PlayerID"}; @@ -152,8 +152,8 @@ link77[] = {66,59}; link78[] = {67,15}; link79[] = {68,69}; link80[] = {69,20}; -globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-456.463867,742.098633,1289.049438,106.611221,892,880,1}; -window[] = {2,-1,-1,-1,-1,1014,234,1606,234,3,910}; +globals[] = {25.000000,1,0,0,0,640,480,1,131,6316128,1,-570.582947,400.252716,1016.060913,24.546000,892,911,1}; +window[] = {2,-1,-1,-1,-1,830,50,1422,50,3,910}; *//*%FSM*/ class FSM { @@ -537,7 +537,7 @@ class FSM "_isHiveOk = false;" \n "_newPlayer = false;" \n "_isInfected = false;" \n - "" \n + "freshSpawn = 0;" \n "if (count _msg > 7) then {" \n " _isHiveOk = _msg select 7;" \n " _newPlayer = _msg select 8;" \n @@ -1395,7 +1395,8 @@ class FSM init = /*%FSM*/"dayz_selectGender = ""Survivor2_DZ"";" \n "1 cutText ["""", ""BLACK"",0];" \n "endLoadingScreen;" \n - "createDialog ""RscDisplayGenderSelect"";"/*%FSM*/; + "createDialog ""RscDisplayGenderSelect"";" \n + "freshSpawn = 2;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { @@ -1658,7 +1659,8 @@ class FSM { name = "Player_Zombie__S"; init = /*%FSM*/"_zssupported = [""pz_policeman"",""pz_suit1"",""pz_suit2"",""pz_worker1"",""pz_worker2"",""pz_worker3"",""pz_doctor"",""pz_teacher"",""pz_hunter"",""pz_villager1"",""pz_villager2"",""pz_villager3"",""pz_priest""];" \n - "_model = (_zssupported select floor(random(count _zssupported)));"/*%FSM*/; + "_model = (_zssupported select floor(random(count _zssupported)));" \n + "freshSpawn = 1;"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links { From 2d0025608f82b89ff211ea22c2773edf31108c7e Mon Sep 17 00:00:00 2001 From: Skaronator Date: Fri, 8 Nov 2013 21:11:26 +0100 Subject: [PATCH 2/3] Split compiles a bit, diff sell ranges for Vehicles, air-vehicles and boats --- SQF/dayz_code/actions/dayz_spaceInterrupt.sqf | 131 +++++++++++++++++ SQF/dayz_code/actions/trade_any_bicycle.sqf | 2 +- SQF/dayz_code/actions/trade_any_boat.sqf | 2 +- SQF/dayz_code/actions/trade_any_vehicle.sqf | 8 +- SQF/dayz_code/init/compiles.sqf | 135 +----------------- SQF/dayz_code/init/variables.sqf | 12 +- .../MPMissions/DayZ_Epoch_1.Takistan/init.sqf | 4 + .../DayZ_Epoch_10.Mountains_ACR/init.sqf | 4 + .../DayZ_Epoch_11.Chernarus/init.sqf | 4 + .../DayZ_Epoch_12.isladuala/init.sqf | 4 + .../MPMissions/DayZ_Epoch_13.Tavi/init.sqf | 4 + .../MPMissions/DayZ_Epoch_15.namalsk/init.sqf | 4 + .../DayZ_Epoch_16.Panthera2/init.sqf | 4 + .../DayZ_Epoch_17.Chernarus/init.sqf | 4 + .../MPMissions/DayZ_Epoch_18.Sara/init.sqf | 4 + .../DayZ_Epoch_19.FDF_Isle1_a/init.sqf | 4 + .../MPMissions/DayZ_Epoch_2.Utes/init.sqf | 4 + .../MPMissions/DayZ_Epoch_20.fapovo/init.sqf | 4 + .../MPMissions/DayZ_Epoch_21.Caribou/init.sqf | 4 + .../DayZ_Epoch_3.Shapur_BAF/init.sqf | 4 + .../MPMissions/DayZ_Epoch_4.Zargabad/init.sqf | 4 + .../DayZ_Epoch_5.Bootcamp_ACR/init.sqf | 4 + .../MPMissions/DayZ_Epoch_6.Dingor/init.sqf | 4 + .../MPMissions/DayZ_Epoch_7.Lingor/init.sqf | 4 + .../DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf | 4 + .../DayZ_Epoch_9.Woodland_ACR/init.sqf | 4 + Server Files/MPMissions/TEMPLATE/init.sqf | 4 + 27 files changed, 234 insertions(+), 140 deletions(-) create mode 100644 SQF/dayz_code/actions/dayz_spaceInterrupt.sqf diff --git a/SQF/dayz_code/actions/dayz_spaceInterrupt.sqf b/SQF/dayz_code/actions/dayz_spaceInterrupt.sqf new file mode 100644 index 000000000..f64a78d69 --- /dev/null +++ b/SQF/dayz_code/actions/dayz_spaceInterrupt.sqf @@ -0,0 +1,131 @@ +private ["_dikCode", "_handled"]; +_dikCode = _this select 1; + +_handled = false; + +if (_dikCode in[0x58,0x57,0x44,0x43,0x42,0x41,0x40,0x3F,0x3E,0x3D,0x3C,0x3B,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05]) then { + _handled = true; +}; + +if (_dikCode in actionKeys "MoveForward") exitWith {r_interrupt = true}; +if (_dikCode in actionKeys "MoveLeft") exitWith {r_interrupt = true}; +if (_dikCode in actionKeys "MoveRight") exitWith {r_interrupt = true}; +if (_dikCode in actionKeys "MoveBack") exitWith {r_interrupt = true}; + +//Prevent exploit of drag body +if ((_dikCode in actionKeys "Prone") and r_drag_sqf) exitWith { force_dropBody = true; }; +if ((_dikCode in actionKeys "Crouch") and r_drag_sqf) exitWith { force_dropBody = true; }; + +_shift = _this select 2; +_ctrl = _this select 3; +_alt = _this select 4; + +//diag_log format["Keypress: %1", _this]; + + +if (_dikCode in (actionKeys "GetOver")) then { + + if (player isKindOf "PZombie_VB") then { + _handled = true; + DZE_PZATTACK = true; + } else { + _nearbyObjects = nearestObjects[getPosATL player, dayz_disallowedVault, 8]; + if (count _nearbyObjects > 0) then { + if((diag_tickTime - dayz_lastCheckBit > 4)) then { + [objNull, player, rSwitchMove,"GetOver"] call RE; + player playActionNow "GetOver"; + dayz_lastCheckBit = diag_tickTime; + } else { + _handled = true; + }; + }; + }; +}; +//if (_dikCode == 57) then {_handled = true}; // space +//if (_dikCode in actionKeys 'MoveForward' or _dikCode in actionKeys 'MoveBack') then {r_interrupt = true}; +if (_dikCode == 210) then { + _nill = execvm "\z\addons\dayz_code\actions\playerstats.sqf"; +}; + +if (_dikCode in actionKeys "ForceCommandingMode") then {_handled = true}; +if (_dikCode in actionKeys "PushToTalk" and (diag_tickTime - dayz_lastCheckBit > 10)) then { + dayz_lastCheckBit = diag_tickTime; + [player,50,true,(getPosATL player)] spawn player_alertZombies; +}; +if (_dikCode in actionKeys "VoiceOverNet" and (diag_tickTime - dayz_lastCheckBit > 10)) then { + dayz_lastCheckBit = diag_tickTime; + [player,50,true,(getPosATL player)] spawn player_alertZombies; +}; +if (_dikCode in actionKeys "PushToTalkDirect" and (diag_tickTime - dayz_lastCheckBit > 10)) then { + dayz_lastCheckBit = diag_tickTime; + [player,15,false,(getPosATL player)] spawn player_alertZombies; +}; +if (_dikCode in actionKeys "Chat" and (diag_tickTime - dayz_lastCheckBit > 10)) then { + dayz_lastCheckBit = diag_tickTime; + [player,15,false,(getPosATL player)] spawn player_alertZombies; +}; +if (_dikCode in actionKeys "User20" and (diag_tickTime - dayz_lastCheckBit > 5)) then { + dayz_lastCheckBit = diag_tickTime; + _nill = execvm "\z\addons\dayz_code\actions\playerstats.sqf"; +}; + +// numpad 8 0x48 now pgup 0xC9 1 +if ((_dikCode == 0xC9 and (!_alt or !_ctrl)) or (_dikCode in actionKeys "User15")) then { + DZE_Q = true; +}; +// numpad 2 0x50 now pgdn 0xD1 +if ((_dikCode == 0xD1 and (!_alt or !_ctrl)) or (_dikCode in actionKeys "User16")) then { + DZE_Z = true; +}; + + +// numpad 8 0x48 now pgup 0xC9 0.1 +if ((_dikCode == 0xC9 and (_alt and !_ctrl)) or (_dikCode in actionKeys "User13")) then { + DZE_Q_alt = true; +}; +// numpad 2 0x50 now pgdn 0xD1 +if ((_dikCode == 0xD1 and (_alt and !_ctrl)) or (_dikCode in actionKeys "User14")) then { + DZE_Z_alt = true; +}; + + +// numpad 8 0x48 now pgup 0xC9 0.01 +if ((_dikCode == 0xC9 and (!_alt and _ctrl)) or (_dikCode in actionKeys "User7")) then { + DZE_Q_ctrl = true; +}; +// numpad 2 0x50 now pgdn 0xD1 +if ((_dikCode == 0xD1 and (!_alt and _ctrl)) or (_dikCode in actionKeys "User8")) then { + DZE_Z_ctrl = true; +}; + + + + +// numpad 4 0x4B now Q 0x10 +if (_dikCode == 0x10 or (_dikCode in actionKeys "User17")) then { + DZE_4 = true; +}; +// numpad 6 0x4D now E 0x12 +if (_dikCode == 0x12 or (_dikCode in actionKeys "User18")) then { + DZE_6 = true; +}; +// numpad 5 0x4C now space 0x39 +if (_dikCode == 0x39 or (_dikCode in actionKeys "User19")) then { + DZE_5 = true; +}; + +// esc +if (_dikCode == 0x01) then { + DZE_cancelBuilding = true; +}; + +if ((_dikCode == 0x3E or _dikCode == 0x0F or _dikCode == 0xD3) and (diag_tickTime - dayz_lastCheckBit > 10)) then { + dayz_lastCheckBit = diag_tickTime; + call dayz_forceSave; +}; +/* +if (_dikCode in actionKeys "IngamePause") then { + _idOnPause = [] spawn dayz_onPause; +}; +*/ +_handled diff --git a/SQF/dayz_code/actions/trade_any_bicycle.sqf b/SQF/dayz_code/actions/trade_any_bicycle.sqf index 8b4a0c186..9b4a14bf2 100644 --- a/SQF/dayz_code/actions/trade_any_bicycle.sqf +++ b/SQF/dayz_code/actions/trade_any_bicycle.sqf @@ -74,7 +74,7 @@ if (_qty >= _qty_in) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; } else { - _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance]; + _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle]; _qty = count _obj; }; diff --git a/SQF/dayz_code/actions/trade_any_boat.sqf b/SQF/dayz_code/actions/trade_any_boat.sqf index eb73e8112..9fdb53707 100644 --- a/SQF/dayz_code/actions/trade_any_boat.sqf +++ b/SQF/dayz_code/actions/trade_any_boat.sqf @@ -24,7 +24,7 @@ _bos = 0; if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; } else { - _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance]; + _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_boat]; _qty = count _obj; _bos = 1; }; diff --git a/SQF/dayz_code/actions/trade_any_vehicle.sqf b/SQF/dayz_code/actions/trade_any_vehicle.sqf index 399b52a59..31dd9ed4d 100644 --- a/SQF/dayz_code/actions/trade_any_vehicle.sqf +++ b/SQF/dayz_code/actions/trade_any_vehicle.sqf @@ -74,8 +74,12 @@ if (_qty >= _qty_in) then { if(_buy_o_sell == "buy") then { _qty = {_x == _part_in} count magazines player; } else { - _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance]; - _qty = count _obj; + if (_part_in isKindOf "AIR") then { + _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_air]; + } else { + _obj = nearestObjects [(getPosATL player), [_part_in], dayz_sellDistance_vehicle]; + }; + _qty = count _obj; }; if (_qty >= _qty_in) then { diff --git a/SQF/dayz_code/init/compiles.sqf b/SQF/dayz_code/init/compiles.sqf index 2c0324fe6..13a4d44a2 100644 --- a/SQF/dayz_code/init/compiles.sqf +++ b/SQF/dayz_code/init/compiles.sqf @@ -23,6 +23,7 @@ if (!isDedicated) then { building_spawnLoot = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\building_spawnLoot.sqf"; // player_taskHint = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_taskHint.sqf"; building_spawnZombies = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\building_spawnZombies.sqf"; + dayz_spaceInterrupt = compile preprocessFileLineNumbers "\z\addons\dayz_code\actions\dayz_spaceInterrupt.sqf"; //animal_monitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\animal_monitor.sqf"; // building_monitor = compile preprocessFileLineNumbers "\z\addons\dayz_code\system\building_monitor.sqf"; player_fired = compile preprocessFileLineNumbers "\z\addons\dayz_code\compile\player_fired.sqf"; //Runs when player fires. Alerts nearby Zeds depending on calibre and audial rating @@ -267,141 +268,7 @@ if (!isDedicated) then { } forEach _this; _counter }; - - dayz_spaceInterrupt = { - private ["_dikCode", "_handled"]; - _dikCode = _this select 1; - - _handled = false; - if (_dikCode in[0x58,0x57,0x44,0x43,0x42,0x41,0x40,0x3F,0x3E,0x3D,0x3C,0x3B,0x0B,0x0A,0x09,0x08,0x07,0x06,0x05]) then { - _handled = true; - }; - - if (_dikCode in actionKeys "MoveForward") exitWith {r_interrupt = true}; - if (_dikCode in actionKeys "MoveLeft") exitWith {r_interrupt = true}; - if (_dikCode in actionKeys "MoveRight") exitWith {r_interrupt = true}; - if (_dikCode in actionKeys "MoveBack") exitWith {r_interrupt = true}; - - //Prevent exploit of drag body - if ((_dikCode in actionKeys "Prone") and r_drag_sqf) exitWith { force_dropBody = true; }; - if ((_dikCode in actionKeys "Crouch") and r_drag_sqf) exitWith { force_dropBody = true; }; - - _shift = _this select 2; - _ctrl = _this select 3; - _alt = _this select 4; - - //diag_log format["Keypress: %1", _this]; - - - if (_dikCode in (actionKeys "GetOver")) then { - - if (player isKindOf "PZombie_VB") then { - _handled = true; - DZE_PZATTACK = true; - } else { - _nearbyObjects = nearestObjects[getPosATL player, dayz_disallowedVault, 8]; - if (count _nearbyObjects > 0) then { - if((diag_tickTime - dayz_lastCheckBit > 4)) then { - [objNull, player, rSwitchMove,"GetOver"] call RE; - player playActionNow "GetOver"; - dayz_lastCheckBit = diag_tickTime; - } else { - _handled = true; - }; - }; - }; - }; - //if (_dikCode == 57) then {_handled = true}; // space - //if (_dikCode in actionKeys 'MoveForward' or _dikCode in actionKeys 'MoveBack') then {r_interrupt = true}; - if (_dikCode == 210) then { - _nill = execvm "\z\addons\dayz_code\actions\playerstats.sqf"; - }; - - if (_dikCode in actionKeys "ForceCommandingMode") then {_handled = true}; - if (_dikCode in actionKeys "PushToTalk" and (diag_tickTime - dayz_lastCheckBit > 10)) then { - dayz_lastCheckBit = diag_tickTime; - [player,50,true,(getPosATL player)] spawn player_alertZombies; - }; - if (_dikCode in actionKeys "VoiceOverNet" and (diag_tickTime - dayz_lastCheckBit > 10)) then { - dayz_lastCheckBit = diag_tickTime; - [player,50,true,(getPosATL player)] spawn player_alertZombies; - }; - if (_dikCode in actionKeys "PushToTalkDirect" and (diag_tickTime - dayz_lastCheckBit > 10)) then { - dayz_lastCheckBit = diag_tickTime; - [player,15,false,(getPosATL player)] spawn player_alertZombies; - }; - if (_dikCode in actionKeys "Chat" and (diag_tickTime - dayz_lastCheckBit > 10)) then { - dayz_lastCheckBit = diag_tickTime; - [player,15,false,(getPosATL player)] spawn player_alertZombies; - }; - if (_dikCode in actionKeys "User20" and (diag_tickTime - dayz_lastCheckBit > 5)) then { - dayz_lastCheckBit = diag_tickTime; - _nill = execvm "\z\addons\dayz_code\actions\playerstats.sqf"; - }; - - // numpad 8 0x48 now pgup 0xC9 1 - if ((_dikCode == 0xC9 and (!_alt or !_ctrl)) or (_dikCode in actionKeys "User15")) then { - DZE_Q = true; - }; - // numpad 2 0x50 now pgdn 0xD1 - if ((_dikCode == 0xD1 and (!_alt or !_ctrl)) or (_dikCode in actionKeys "User16")) then { - DZE_Z = true; - }; - - - // numpad 8 0x48 now pgup 0xC9 0.1 - if ((_dikCode == 0xC9 and (_alt and !_ctrl)) or (_dikCode in actionKeys "User13")) then { - DZE_Q_alt = true; - }; - // numpad 2 0x50 now pgdn 0xD1 - if ((_dikCode == 0xD1 and (_alt and !_ctrl)) or (_dikCode in actionKeys "User14")) then { - DZE_Z_alt = true; - }; - - - // numpad 8 0x48 now pgup 0xC9 0.01 - if ((_dikCode == 0xC9 and (!_alt and _ctrl)) or (_dikCode in actionKeys "User7")) then { - DZE_Q_ctrl = true; - }; - // numpad 2 0x50 now pgdn 0xD1 - if ((_dikCode == 0xD1 and (!_alt and _ctrl)) or (_dikCode in actionKeys "User8")) then { - DZE_Z_ctrl = true; - }; - - - - - // numpad 4 0x4B now Q 0x10 - if (_dikCode == 0x10 or (_dikCode in actionKeys "User17")) then { - DZE_4 = true; - }; - // numpad 6 0x4D now E 0x12 - if (_dikCode == 0x12 or (_dikCode in actionKeys "User18")) then { - DZE_6 = true; - }; - // numpad 5 0x4C now space 0x39 - if (_dikCode == 0x39 or (_dikCode in actionKeys "User19")) then { - DZE_5 = true; - }; - - // esc - if (_dikCode == 0x01) then { - DZE_cancelBuilding = true; - }; - - if ((_dikCode == 0x3E or _dikCode == 0x0F or _dikCode == 0xD3) and (diag_tickTime - dayz_lastCheckBit > 10)) then { - dayz_lastCheckBit = diag_tickTime; - call dayz_forceSave; - }; - /* - if (_dikCode in actionKeys "IngamePause") then { - _idOnPause = [] spawn dayz_onPause; - }; - */ - _handled - }; - player_setDate = { private ["_setdatebool"]; _setdatebool = false; diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index 0cc8f547b..c5c746974 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -421,9 +421,17 @@ if(isNil "DZE_TRADER_SPAWNMODE") then { if(isNil "dayz_tameDogs") then { dayz_tameDogs = false; }; -if(isNil "dayz_sellDistance") then { - dayz_sellDistance = 20; + +if(isNil "dayz_sellDistance_vehicle") then { + dayz_sellDistance_vehicle = 10; }; +if(isNil "dayz_sellDistance_boat") then { + dayz_sellDistance_boat = 30; +}; +if(isNil "dayz_sellDistance_air") then { + dayz_sellDistance_air = 40; +}; + if(isNil "dayz_paraSpawn") then { dayz_paraSpawn = false; }; diff --git a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf index b136bc3fb..b640bc6d4 100644 --- a/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_1.Takistan/init.sqf @@ -33,6 +33,10 @@ dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 DynamicVehicleDamageHigh = 100; // Default: 100 +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + EpochEvents = [["any","any","any","any",30,"crash_spawner"],["any","any","any","any",0,"crash_spawner"],["any","any","any","any",15,"supply_drop"]]; dayz_fullMoonNights = true; diff --git a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf index 09eae0e42..94c3f4646 100644 --- a/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_10.Mountains_ACR/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf index db51f803a..f68eccc08 100644 --- a/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_11.Chernarus/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 30; // Default = 30 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf index b2869239d..9e155220e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_12.isladuala/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf index bb0f5fffe..acf79842c 100644 --- a/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_13.Tavi/init.sqf @@ -33,6 +33,10 @@ dayz_fullMoonNights = true; dayz_minpos = -26000; dayz_maxpos = 26000; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_paraSpawn = false; dayz_maxAnimals = 8; // Default: 8 diff --git a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf index 1f11ff465..04133c989 100644 --- a/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_15.namalsk/init.sqf @@ -31,6 +31,10 @@ dayz_fullMoonNights = true; // new stuff dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf index e28b15bc1..d42a56447 100644 --- a/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_16.Panthera2/init.sqf @@ -28,6 +28,10 @@ dayz_MapArea = 12000; // Default = 10000 // new stuff dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf index db51f803a..f68eccc08 100644 --- a/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_17.Chernarus/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 30; // Default = 30 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf b/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf index 318eb921d..28d74d220 100644 --- a/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_18.Sara/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf index b9433dbf8..7f7ce67b8 100644 --- a/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_19.FDF_Isle1_a/init.sqf @@ -27,6 +27,10 @@ dayz_MapArea = 7000; // Default = 10000 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf index ea73eb298..dec8cd6cb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_2.Utes/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf index c8c72f7f6..5675b955e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_20.fapovo/init.sqf @@ -27,6 +27,10 @@ dayz_MapArea = 6000; // Default = 10000 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf index b299e1eaf..4ea6f2a2e 100644 --- a/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_21.Caribou/init.sqf @@ -27,6 +27,10 @@ dayz_MapArea = 6000; // Default = 10000 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf index a40b9d0db..a5e9cbd75 100644 --- a/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_3.Shapur_BAF/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf index 5fc078e9f..d82f5bb3d 100644 --- a/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_4.Zargabad/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 30; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf index 194a5320e..c17eb13eb 100644 --- a/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_5.Bootcamp_ACR/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf index 23c7222b6..e8d7b4d38 100644 --- a/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_6.Dingor/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf index 7fe616bb3..bda1d3661 100644 --- a/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_7.Lingor/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf index c49acc56a..159e30b92 100644 --- a/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_8.ProvingGrounds_PMC/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf index f11b95f7c..26508b7a3 100644 --- a/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf +++ b/Server Files/MPMissions/DayZ_Epoch_9.Woodland_ACR/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 diff --git a/Server Files/MPMissions/TEMPLATE/init.sqf b/Server Files/MPMissions/TEMPLATE/init.sqf index 8880a0acd..73a1c7935 100644 --- a/Server Files/MPMissions/TEMPLATE/init.sqf +++ b/Server Files/MPMissions/TEMPLATE/init.sqf @@ -28,6 +28,10 @@ dayz_maxLocalZombies = 40; // Default = 40 dayz_paraSpawn = false; +dayz_sellDistance_vehicle = 10; +dayz_sellDistance_boat = 30; +dayz_sellDistance_air = 40; + dayz_maxAnimals = 8; // Default: 8 dayz_tameDogs = true; DynamicVehicleDamageLow = 0; // Default: 0 From 6a4846747c63a8b23047854d500f47440ade6320 Mon Sep 17 00:00:00 2001 From: Skaronator Date: Fri, 8 Nov 2013 21:11:57 +0100 Subject: [PATCH 3/3] typo --- SQF/dayz_code/init/variables.sqf | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/SQF/dayz_code/init/variables.sqf b/SQF/dayz_code/init/variables.sqf index c5c746974..8a7149398 100644 --- a/SQF/dayz_code/init/variables.sqf +++ b/SQF/dayz_code/init/variables.sqf @@ -393,13 +393,13 @@ PVDZE_plr_DeathB = []; //DayZ settings dayz_dawn = 6; dayz_dusk = 18; -if(isNil "dayz_maxAnimals") then { - dayz_maxAnimals = 8; -}; DAYZ_agentnumber = 0; dayz_animalDistance = 800; dayz_zSpawnDistance = 1000; +if(isNil "dayz_maxAnimals") then { + dayz_maxAnimals = 8; +}; if(isNil "dayz_maxLocalZombies") then { dayz_maxLocalZombies = 15; }; @@ -421,7 +421,6 @@ if(isNil "DZE_TRADER_SPAWNMODE") then { if(isNil "dayz_tameDogs") then { dayz_tameDogs = false; }; - if(isNil "dayz_sellDistance_vehicle") then { dayz_sellDistance_vehicle = 10; }; @@ -431,7 +430,6 @@ if(isNil "dayz_sellDistance_boat") then { if(isNil "dayz_sellDistance_air") then { dayz_sellDistance_air = 40; }; - if(isNil "dayz_paraSpawn") then { dayz_paraSpawn = false; };