From 5b7b1d69bde961b92764c262ec816a847f190840 Mon Sep 17 00:00:00 2001 From: ebaydayz Date: Tue, 13 Dec 2016 19:50:22 -0500 Subject: [PATCH] Add HALO spawn height config var Height can be changed without overwriting player_monitor.fsm now. Also fixed my mistake from 3257d0f, need to HALO directly from debug pos for antiTP compatibility. --- CHANGE LOG 1.0.6.1.txt | 18 +++++++++++------- SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf | 7 ++++++- SQF/dayz_code/configVariables.sqf | 3 ++- SQF/dayz_code/system/player_monitor.fsm | 10 ++++++++-- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/CHANGE LOG 1.0.6.1.txt b/CHANGE LOG 1.0.6.1.txt index 5315eaa89..f65a59f65 100644 --- a/CHANGE LOG 1.0.6.1.txt +++ b/CHANGE LOG 1.0.6.1.txt @@ -1,10 +1,8 @@ -[CHANGED] Added NWAF tent camp to Chernarus points of interests and removed trains POI for now. -[CHANGED] Turbo and HoldBreath keybindings are now allowed again @icomrade +[NEW] Added config variable DZE_HaloSpawnHeight. @ebayShopper + +[CHANGED] Added NWAF tent camp to Chernarus points of interests and removed trains POI for now. +[CHANGED] Turbo and HoldBreath keybindings are now allowed again. @icomrade -[FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. (updated ServerFiles with hotfix already released) @icomrade -[FIXED] Error with object publishing when snap building is disabled. (updated ServerFiles with hotfix already released) @ebayShopper -[FIXED] Error handling upgraded 1051 databases that resulted in a value for "rh_factor" and array for "bloodtype" in character_data medical field. @ebayShopper -[FIXED] Error in server_playerSetup that resulted in a value for dayz_onBack in character_data inventory if player had no weapon on back. @ebayShopper [FIXED] Wrong texture for z_hunter zombie. #1805 @schwanzkopfhegel @ebayShopper [FIXED] Refuel with generator at gas station not working. #1806 @Helios27 @ebayShopper [FIXED] Issue where Arma cheats could still be entered under certain conditions without pressing LeftShift at the same time as NumPadMinus. @ebayShopper @@ -20,8 +18,14 @@ [FIXED] Swimming in ground glitch when relogging at certain positions on certain maps like Napf and Tavi. @ebayShopper [FIXED] No damage from hitting ground after HALO jump when DZE_HaloOpenChuteHeight was set to -1. @ebayShopper [FIXED] Added back missing call to Epoch player_antiWall function for preventing base glitching. #1817 @ndavalos @ebayShopper -[FIXED] HALO fresh spawns stuck in air or failing to start correctly sometimes due to player simulation disabled. #1809 @oiad @ebayShopper +[FIXED] HALO fresh spawns stuck swimming in air on Napf and failing to start correctly sometimes. #1809 @oiad @ebayShopper [FIXED] Self actions sometimes duplicating when changing clothes and looking at a safe. @jOoPs @ebayShopper [FIXED] Wrong bleeding icon on vanilla status UI. @jOoPs @ebayShopper +[NOTE] Updated server files were released with the four hotfixes below on December 11th, 2016 (http://dayzepoch.com/a2dayzepoch.php) +[FIXED] Hive child 309 errors that resulted in broken saving of newly built storage object inventory. @icomrade +[FIXED] Error with object publishing when snap building is disabled. @ebayShopper +[FIXED] Error handling upgraded 1051 databases that resulted in a value for "rh_factor" and array for "bloodtype" in character_data medical field. @ebayShopper +[FIXED] Error in server_playerSetup that resulted in a value for dayz_onBack in character_data inventory if player had no weapon on back. @ebayShopper + [INFO] See Documents\CHANGE LOG 1.0.6.txt for the full list of 1.0.5.1 --> 1.0.6 changes. \ No newline at end of file diff --git a/SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf b/SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf index bc783c251..5a8cd102a 100644 --- a/SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf +++ b/SQF/dayz_code/compile/BIS_fnc/fn_halo.sqf @@ -239,9 +239,14 @@ if (typename _this == typename []) then { //--- Free fall if (count _this == 2) exitwith { //Fresh spawn calling from player_monitor.fsm _alt = _this select 1; + _unit allowDamage false; _paraPosition = [_unit] call FNC_GetPos; - _unit setpos [(_paraPosition select 0),(_paraPosition select 1),_alt]; + //_paraPosition set [2,_alt]; + _para = createVehicle ["ParachuteWest", _paraPosition, [], 0, "CAN_COLLIDE"]; + _para setpos _paraPosition; + _unit moveindriver _para; //Workaround for stuck swimming in air on maps with respawn_west in water. Can't setPos to ground first because antiTP blocks it. _unit setvariable ["bis_fnc_halo_now",true]; + _unit allowDamage true; _unit spawn bis_fnc_halo; }; //------------- diff --git a/SQF/dayz_code/configVariables.sqf b/SQF/dayz_code/configVariables.sqf index 651225d8c..36355d94a 100644 --- a/SQF/dayz_code/configVariables.sqf +++ b/SQF/dayz_code/configVariables.sqf @@ -51,7 +51,8 @@ MaxMineVeins = 50; // Max number of random mine veins to spawn around the map // HALO Jump DZE_HaloAltitudeMeter = false; // Display altitude and speed on screen while in halo jump. -DZE_HaloOpenChuteHeight = 180; // Automatically open chute at specified height. Set to -1 to disable this feature. +DZE_HaloOpenChuteHeight = 180; // Automatically open chute at specified height. Set to -1 to disable this feature. +DZE_HaloSpawnHeight = 2000; // This is the altitude fresh spawn players start at when HALO spawn is enabled. DZE_HaloJump = true; // Enable halo jumping out of air vehicles above 400m // Trader Menu diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 286c81cef..ffee10f2a 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -990,7 +990,13 @@ class FSM "} count allMissionObjects ""SpawnableWreck"";" \n "{deleteVehicle _x} count (_setPos nearEntities [""zZombie_Base"",30]);" \n "player setDir _setDir;" \n - "player setPosATL [_setPos select 0,_setPos select 1,(_setPos select 2)+.1]; //Prevents swimming in ground glitch" \n + "" \n + "if (dayz_paraSpawn && freshSpawn == 2) then {" \n + " player setPosATL [_setPos select 0,_setPos select 1,DZE_HaloSpawnHeight];" \n + "} else {" \n + " player setPosATL [_setPos select 0,_setPos select 1,(_setPos select 2)+.1]; //Prevents swimming in ground glitch" \n + "};" \n + "" \n "player setVelocity [0,0,0.5];" \n "{player reveal _x} count _torev4l;" \n "dayz_myPosition = _setPos;" \n @@ -1169,7 +1175,7 @@ class FSM "{ _x call fnc_veh_ResetEH; } forEach vehicles;" \n "player allowDamage true;" \n "player enableSimulation true;" \n - "if (dayz_paraSpawn && freshSpawn == 2) then {[player,2000] spawn BIS_fnc_halo;};"/*%FSM*/; + "if (dayz_paraSpawn && freshSpawn == 2) then {[player,DZE_HaloSpawnHeight] spawn BIS_fnc_halo;}; //Start after enableSimulation"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links {