From 54fc40fbe31f9d5f42943dec0dc4a2bf46aa6002 Mon Sep 17 00:00:00 2001 From: icomrade Date: Tue, 28 Mar 2017 11:52:12 -0400 Subject: [PATCH] Fix DZE_defaultSkin --- CHANGE LOG 1.0.6.2.txt | 1 + SQF/dayz_code/system/player_monitor.fsm | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/CHANGE LOG 1.0.6.2.txt b/CHANGE LOG 1.0.6.2.txt index b74664ed1..a9a7c5093 100644 --- a/CHANGE LOG 1.0.6.2.txt +++ b/CHANGE LOG 1.0.6.2.txt @@ -18,6 +18,7 @@ [FIXED] Death messages sometimes showing RunOver when they should not due to dayz_hitBy variable not resetting after being runover. @oiad [FIXED] CFGMoves/Animation CTD on server. Thanks Choc [FIXED] DayZ_RollingMessage FPS impact. #1926 @BigEgg17 +[FIXED] Random skin selection on new character creation with DZE_defaultSkin = [["Male skin1","Male skin2"],["Female skin1","Female skin2"]]; [NOTE] Fixes below are included in the mission file and server pbo as part of server package 1.0.6.1A (March 10th 2017) [FIXED] Fixed food and drink going down 10x faster from melee and other "working" actions. diff --git a/SQF/dayz_code/system/player_monitor.fsm b/SQF/dayz_code/system/player_monitor.fsm index 355264b13..772209bd8 100644 --- a/SQF/dayz_code/system/player_monitor.fsm +++ b/SQF/dayz_code/system/player_monitor.fsm @@ -243,8 +243,8 @@ link127[] = {107,32}; link128[] = {108,109}; link129[] = {109,110}; link130[] = {110,64}; -globals[] = {0.000000,0,0,0,0,640,480,3,262,6316128,1,-398.479370,434.610596,1408.302368,243.848480,890,1244,1}; -window[] = {2,-1,-1,-1,-1,604,78,1098,78,3,908}; +globals[] = {0.000000,0,0,0,0,640,480,3,262,6316128,1,-406.909515,81.978119,1232.519287,318.468689,656,918,1}; +window[] = {2,-1,-1,-32000,-32000,1350,829,2787,260,1,674}; *//*%FSM*/ class FSM { @@ -610,18 +610,18 @@ class FSM name = "Phase_One"; itemno = 17; init = /*%FSM*/"if (_debug == 1) then {diag_log [diag_tickTime,'Phase_One'];};" \n - "if ((!isNil ""DZE_defaultSkin"") && _isNew && (_isInfected == 0)) then {" \n + "if ((!isNil ""dayz_selectGender"") && {(!isNil ""DZE_defaultSkin"") && (_isInfected == 0)}) then {" \n " if (dayz_selectGender == ""Survivor2_DZ"") then {" \n " _rand = (DZE_defaultSkin select 0) call BIS_fnc_selectRandom;" \n " _model = getText (configFile >> ""CfgMagazines"" >> ""Skins"" >> _rand >> ""playerModel""); //MALE" \n " if (_model == """") then {" \n - " _model = _rand;" \n + " _model = _rand;" \n " };" \n " } else {" \n " _rand = (DZE_defaultSkin select 1) call BIS_fnc_selectRandom;" \n " _model = getText (configFile >> ""CfgMagazines"" >> ""Skins"" >> _rand >> ""playerModel""); //FEMALE" \n " if (_model == """") then {" \n - " _model = _rand;" \n + " _model = _rand;" \n " };" \n " };" \n "};" \n @@ -1202,7 +1202,7 @@ class FSM init = /*%FSM*/"diag_log 'player_forceSave called from fsm';" \n "//call player_forceSave;" \n "" \n - "//Check for bad controls at login" \n + "//Check for bad controls at login" \n "false spawn ui_updateControls;" \n "" \n "publicVariableServer ""PVDZ_plr_LoginRecord"";"/*%FSM*/; @@ -1965,12 +1965,12 @@ class FSM "//Other Counters" \n " dayz_currentGlobalAnimals = count entities ""CAAnimalBase"";" \n " dayz_currentGlobalZombies = count entities ""zZombie_Base"";" \n - "" \n - "{" \n - " call compile preprocessFileLineNumbers (""\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\""+_x+"".sqf""); " \n - "} count infectedWaterHoles;" \n - " " \n - "diag_log (infectedWaterHoles);"/*%FSM*/; + "" \n + "{" \n + " call compile preprocessFileLineNumbers (""\z\addons\dayz_code\system\mission\chernarus\infectiousWaterholes\""+_x+"".sqf""); " \n + "} count infectedWaterHoles;" \n + " " \n + "diag_log (infectedWaterHoles);"/*%FSM*/; precondition = /*%FSM*/""/*%FSM*/; class Links {