From d8043f942b12f89bf9f5183ca3c1b03ed0e224db Mon Sep 17 00:00:00 2001 From: "[VB]AWOL" Date: Mon, 26 Aug 2013 13:30:31 -0500 Subject: [PATCH] more fixes --- .../Configs/CfgVehicles/DZE/Doors.hpp | 42 +++++++++--------- SQF/dayz_code/Configs/cfgVehicles.hpp | 2 +- SQF/dayz_code/Configs/deathboards.hpp | 2 +- SQF/dayz_code/Configs/safegui.hpp | 12 ++--- SQF/dayz_code/actions/player_build.sqf | 12 +++-- SQF/dayz_code/actions/vault_combination_1.sqf | 10 ++--- SQF/dayz_code/compile/player_zombieCheck.sqf | 4 +- SQF/dayz_epoch/models/wood_ladder.p3d | Bin 312224 -> 312224 bytes Server Files/Battleye/setpos.txt | 2 +- 9 files changed, 45 insertions(+), 41 deletions(-) diff --git a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp index 358f60483..4692e304c 100644 --- a/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp +++ b/SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp @@ -202,6 +202,13 @@ class Land_DZE_WoodDoorLocked: Land_DZE_WoodDoorLocked_Base { condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)"; statement="this animate [""Open_door"", 1]"; }; + class Close_Door : Open_Door + { + displayName="Close Door"; + //condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; + condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; + statement="this animate [""Open_door"", 0]"; + }; class Lock_Door : Open_Door { displayName="Lock Door"; @@ -223,13 +230,6 @@ class Land_DZE_WoodDoorLocked: Land_DZE_WoodDoorLocked_Base { condition="DZE_Lock_Door != (this getvariable['CharacterID','0'])"; statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;createdialog ""ComboLockUI"""; }; - class Close_Door : Open_Door - { - displayName="Close Door"; - //condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; - condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; - statement="this animate [""Open_door"", 0]"; - }; }; }; @@ -301,6 +301,13 @@ class Land_DZE_LargeWoodDoorLocked: Land_DZE_WoodDoorLocked_Base { condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)"; statement="this animate [""Open_door"", 1]"; }; + class Close_Door : Open_Door + { + displayName="Close Door"; + //condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; + condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; + statement="this animate [""Open_door"", 0]"; + }; class Lock_Door : Open_Door { displayName="Lock Door"; @@ -322,13 +329,6 @@ class Land_DZE_LargeWoodDoorLocked: Land_DZE_WoodDoorLocked_Base { condition="DZE_Lock_Door != (this getvariable['CharacterID','0'])"; statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;createdialog ""ComboLockUI"""; }; - class Close_Door : Open_Door - { - displayName="Close Door"; - //condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; - condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; - statement="this animate [""Open_door"", 0]"; - }; }; }; @@ -400,6 +400,13 @@ class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base { condition="(this animationPhase ""Open_door"" == 0) and (this animationPhase ""Open_hinge"" == 1)"; statement="this animate [""Open_door"", 1]"; }; + class Close_Door : Open_Door + { + displayName="Close Door"; + //condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; + condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; + statement="this animate [""Open_door"", 0]"; + }; class Lock_Door : Open_Door { displayName="Lock Door"; @@ -421,12 +428,5 @@ class Land_DZE_GarageWoodDoorLocked: Land_DZE_WoodDoorLocked_Base { condition="DZE_Lock_Door != (this getvariable['CharacterID','0'])"; statement="dayz_selectedDoor = this;DZE_topCombo = 0;DZE_midCombo = 0;DZE_botCombo = 0;createdialog ""ComboLockUI"""; }; - class Close_Door : Open_Door - { - displayName="Close Door"; - //condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; - condition="(this animationPhase ""Open_door"" == 1) and (this animationPhase ""Open_hinge"" == 1)"; - statement="this animate [""Open_door"", 0]"; - }; }; }; diff --git a/SQF/dayz_code/Configs/cfgVehicles.hpp b/SQF/dayz_code/Configs/cfgVehicles.hpp index c98a12980..c4694c4cb 100644 --- a/SQF/dayz_code/Configs/cfgVehicles.hpp +++ b/SQF/dayz_code/Configs/cfgVehicles.hpp @@ -2418,7 +2418,7 @@ class CfgVehicles { transportMaxWeapons = 0; transportMaxBackpacks = 0; offset[] = {0,1.5,0.5}; - lockable = 3; + lockable = 2; unlockedClass = "LockboxStorage"; }; diff --git a/SQF/dayz_code/Configs/deathboards.hpp b/SQF/dayz_code/Configs/deathboards.hpp index 271bafccc..da9d4f37e 100644 --- a/SQF/dayz_code/Configs/deathboards.hpp +++ b/SQF/dayz_code/Configs/deathboards.hpp @@ -34,7 +34,7 @@ class EpochDeathBoardDialog class RscText_1002: RscText { idc = -1; - text = "Player Deaths"; + text = "Murders"; x = 0.29042 * safezoneW + safezoneX; y = 0.293733 * safezoneH + safezoneY; w = 0.0540852 * safezoneW; diff --git a/SQF/dayz_code/Configs/safegui.hpp b/SQF/dayz_code/Configs/safegui.hpp index 272b5d966..05051ffc5 100644 --- a/SQF/dayz_code/Configs/safegui.hpp +++ b/SQF/dayz_code/Configs/safegui.hpp @@ -393,7 +393,7 @@ class ComboLockUI y = 0.243893; w = 0.1625; h = 0.135461; - onButtonClick = "[17734,0,""top""] call player_changeCombo"; + onButtonClick = "[17734,1,""top""] call player_changeCombo"; }; class top_right: main_combo { @@ -402,7 +402,7 @@ class ComboLockUI y = 0.241923; w = 0.147872; h = 0.135461; - onButtonClick = "[17734,1,""top""] call player_changeCombo"; + onButtonClick = "[17734,0,""top""] call player_changeCombo"; }; class mid_left: main_combo { @@ -411,7 +411,7 @@ class ComboLockUI y = 0.433018; w = 0.1625; h = 0.135461; - onButtonClick = "[17735,0,""mid""] call player_changeCombo"; + onButtonClick = "[17735,1,""mid""] call player_changeCombo"; }; class mid_right: main_combo { @@ -420,7 +420,7 @@ class ComboLockUI y = 0.427108; w = 0.153191; h = 0.135461; - onButtonClick = "[17735,1,""mid""] call player_changeCombo"; + onButtonClick = "[17735,0,""mid""] call player_changeCombo"; }; class bottom_left: main_combo { @@ -429,7 +429,7 @@ class ComboLockUI y = 0.637904; w = 0.1625; h = 0.135461; - onButtonClick = "[17736,0,""bot""] call player_changeCombo"; + onButtonClick = "[17736,1,""bot""] call player_changeCombo"; }; class bottom_right: main_combo { @@ -438,7 +438,7 @@ class ComboLockUI y = 0.633964; w = 0.155851; h = 0.133491; - onButtonClick = "[17736,1,""bot""] call player_changeCombo"; + onButtonClick = "[17736,0,""bot""] call player_changeCombo"; }; class exit_combo_btn: main_combo { diff --git a/SQF/dayz_code/actions/player_build.sqf b/SQF/dayz_code/actions/player_build.sqf index 6f882c6dd..91ff2d33b 100644 --- a/SQF/dayz_code/actions/player_build.sqf +++ b/SQF/dayz_code/actions/player_build.sqf @@ -2,7 +2,7 @@ DayZ Base Building Made for DayZ Epoch please ask permission to use/edit/distrubute email vbawol@veteranbastards.com. */ -private ["_location","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_findNearestPoles","_findNearestPole","_distance","_classnametmp","_ghost","_isPole","_needText","_lockable","_zheightchanged","_rotate","_combination_1","_combination_2","_combination_3","_combination_4","_combination"]; +private ["_location","_dir","_classname","_item","_hasrequireditem","_missing","_hastoolweapon","_cancel","_reason","_started","_finished","_animState","_isMedic","_dis","_sfx","_hasbuilditem","_tmpbuilt","_onLadder","_isWater","_require","_text","_offset","_IsNearPlot","_isOk","_location1","_location2","_counter","_limit","_proceed","_num_removed","_position","_object","_canBuildOnPlot","_friendlies","_nearestPole","_ownerID","_findNearestPoles","_findNearestPole","_distance","_classnametmp","_ghost","_isPole","_needText","_lockable","_zheightchanged","_rotate","_combination_1","_combination_2","_combination_3","_combination_4","_combination","_combination_1_Display","_combinationDisplay"]; if(TradeInprogress) exitWith { cutText ["Building already in progress." , "PLAIN DOWN"]; }; TradeInprogress = true; @@ -85,7 +85,7 @@ if(_IsNearPlot == 0) then { }; // _message -if(!_canBuildOnPlot) exitWith { TradeInprogress = false; cutText [format["Building requires %1 within %2m.",_needText,_distance] , "PLAIN DOWN"]; }; +if(!_canBuildOnPlot) exitWith { TradeInprogress = false; cutText [format["Unable to build %1 nearby.",_needText,_distance] , "PLAIN DOWN"]; }; _missing = ""; _hasrequireditem = true; @@ -217,6 +217,8 @@ if (_hasrequireditem) then { // Start Build _tmpbuilt = createVehicle [_classname, _location, [], 0, "CAN_COLLIDE"]; + + _tmpbuilt setdir _dir; // Get position based on player @@ -224,7 +226,7 @@ if (_hasrequireditem) then { _location = [(_location select 0),(_location select 1),(_position select 2)]; - hintSilent str (_location); + //hintSilent str (_location); _tmpbuilt setpos _location; @@ -311,6 +313,8 @@ if (_hasrequireditem) then { if(_lockable > 1) then { + _combinationDisplay = ""; + switch (_lockable) do { case 2: { // 2 lockbox @@ -344,8 +348,8 @@ if (_hasrequireditem) then { _combination_2 = floor(random 10); _combination_3 = floor(random 10); _combination_4 = floor(random 10); - _combinationDisplay = _combination; _combination = format["%1%2%3%4",_combination_1,_combination_2,_combination_3,_combination_4]; + _combinationDisplay = _combination; }; }; diff --git a/SQF/dayz_code/actions/vault_combination_1.sqf b/SQF/dayz_code/actions/vault_combination_1.sqf index deee26f0f..0cbd3d27f 100644 --- a/SQF/dayz_code/actions/vault_combination_1.sqf +++ b/SQF/dayz_code/actions/vault_combination_1.sqf @@ -6,11 +6,11 @@ dayz_combination = ""; if(!isNull dayz_selectedVault) then { - - - _ok = createdialog "KeypadUI"; - - // _ok = createdialog "SafeKeyPad"; + if ((typeOf dayz_selectedVault) == "VaultStorageLocked" or (typeOf dayz_selectedVault) == "VaultStorage") then { + _ok = createdialog "SafeKeyPad"; + } else { + _ok = createdialog "KeypadUI"; + }; }; s_player_unlockvault = -1; \ No newline at end of file diff --git a/SQF/dayz_code/compile/player_zombieCheck.sqf b/SQF/dayz_code/compile/player_zombieCheck.sqf index e05037db2..82b705bca 100644 --- a/SQF/dayz_code/compile/player_zombieCheck.sqf +++ b/SQF/dayz_code/compile/player_zombieCheck.sqf @@ -9,7 +9,7 @@ _attacked = false; if (alive _x && _continue) then { - if (local _x) then { + //if (local _x) then { _dist = (_x distance _refObj); @@ -85,7 +85,7 @@ _attacked = false; }; }; }; - }; + //}; }; } forEach _listTalk; diff --git a/SQF/dayz_epoch/models/wood_ladder.p3d b/SQF/dayz_epoch/models/wood_ladder.p3d index 801aaf0a1a218ab6c920a4ecebff3aae3285c489..4d9c79aad033994eb1e34a9f726be2b649e4e16e 100644 GIT binary patch delta 145 zcmZ3`F1(;!xS@ryg=q`(>HnrdACzn|+V9%cq%rMh00J=oMX7@WQ~5p+Kg7}9ol!YB zH77N>BsE2ufe9qIg+-jn##HM1z8=$PhZz>uV4dFHm$H MO}4i)u}B^S0Nv&>2LJ#7 delta 145 zcmZ3`F1(;!xS@ryg=q`(>HntlSOcsw+V9%cq%rMh00I#Isz;tf&zV#EK>QF#cXvkR z;MAPdWeaVDE}-%juQ#U1Owv_c51({27aJ7hjgUT5FEy&#id@*w{7 P|HjNF+uNB~Bo6`rVkI-} diff --git a/Server Files/Battleye/setpos.txt b/Server Files/Battleye/setpos.txt index 1f91ce932..60a1d6362 100644 --- a/Server Files/Battleye/setpos.txt +++ b/Server Files/Battleye/setpos.txt @@ -1,4 +1,4 @@ -5 "" !"FunctionsManager" !"Shot" !"z_doctor" !"z_hunter" !"z_new_villager1" !"z_new_villager2" !"z_new_villager3" !"z_new_villager4" !"z_new_worker1" !"z_new_worker2" !"z_new_worker3" !"z_new_worker4" !"z_policeman" !"z_priest" !"z_soldier_heavy" !"z_soldier_pilot" !"z_soldier" !"z_suit1" !"z_suit2" !"z_teacher" !"z_villager1" !"z_villager2" !"z_villager3" !"z_worker1" !"z_worker2" !"z_worker3" !"zZombie_Base" +5 "" !"FunctionsManager" !"Shot" !"z_doctor" !"z_hunter" !"z_new_villager1" !"z_new_villager2" !"z_new_villager3" !"z_new_villager4" !"z_new_worker1" !"z_new_worker2" !"z_new_worker3" !"z_new_worker4" !"z_policeman" !"z_priest" !"z_soldier_heavy" !"z_soldier_pilot" !"z_soldier" !"z_suit1" !"z_suit2" !"z_teacher" !"z_villager1" !"z_villager2" !"z_villager3" !"z_worker1" !"z_worker2" !"z_worker3" !"zZombie_Base" !"CSJ_GyroCover" !"CSJ_GyroP" 1 "" // Don't ban for BattleFieldClearance, it's injected by cheaters to legit players in order to disable clientside security. \ No newline at end of file