more fixes

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

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

View File

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

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;

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
{