W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-14 12:12:34 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

more fixes

Browse Source
This commit is contained in:
[VB]AWOL
2013-08-26 13:30:31 -05:00
parent 38cca1cb77
commit d8043f942b
9 changed files with 45 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
SQF/dayz_code/Configs/CfgVehicles/DZE/Doors.hpp
View File

@@ -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]";
};
};
};

2
SQF/dayz_code/Configs/cfgVehicles.hpp
View File

@@ -2418,7 +2418,7 @@ class CfgVehicles {
transportMaxWeapons = 0;
transportMaxBackpacks = 0;
offset[] = {0,1.5,0.5};
lockable = 3;
lockable = 2;
unlockedClass = "LockboxStorage";
};

2
SQF/dayz_code/Configs/deathboards.hpp
View File

@@ -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;

12
SQF/dayz_code/Configs/safegui.hpp
View File

@@ -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
{

12
SQF/dayz_code/actions/player_build.sqf
View File

@@ -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;
};
};

10
SQF/dayz_code/actions/vault_combination_1.sqf
View File

@@ -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;

4
SQF/dayz_code/compile/player_zombieCheck.sqf
View File

@@ -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;

BIN
SQF/dayz_epoch/models/wood_ladder.p3d
View File

Binary file not shown.

2
Server Files/Battleye/setpos.txt
View File

@@ -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.