diff --git a/800OTClient/otclientv8.log b/800OTClient/otclientv8.log
index 8a09357..e1a9622 100644
--- a/800OTClient/otclientv8.log
+++ b/800OTClient/otclientv8.log
@@ -5400,3 +5400,29 @@ Login to 127.0.0.1:7172
Login to 127.0.0.1:7172
Login to 127.0.0.1:7172
Login to 127.0.0.1:7172
+GPU Radeon RX 580 Series (ATI Technologies Inc.)
+OpenGL 4.6.13596 Compatibility Profile Context 20.10.35.02 27.20.1034.6
+[Atlas] Texture size is: 4096x4096 (max: 16384x16384)
+Found work dir at 'C:/Users/erika/source/repos/Sabrehaven/800OTClient/'
+== application started at Apr 23 2022 19:23:11
+OTCv8 3.1 rev 163 (dev) made by otclient.net built on Mar 31 2022 for arch x86
+Connecting to: 127.0.0.1:7171
+Login to 127.0.0.1:7172
+WARNING: HTTP error for http://otclient.ovh/api/status.php: timeout
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Login to 127.0.0.1:7172
+Exiting application..
+GPU Radeon RX 580 Series (ATI Technologies Inc.)
+OpenGL 4.6.13596 Compatibility Profile Context 20.10.35.02 27.20.1034.6
+[Atlas] Texture size is: 4096x4096 (max: 16384x16384)
+Found work dir at 'C:/Users/erika/source/repos/Sabrehaven/800OTClient/'
+== application started at Apr 24 2022 12:52:14
+OTCv8 3.1 rev 163 (dev) made by otclient.net built on Mar 31 2022 for arch x86
+Connecting to: 127.0.0.1:7171
+Login to 127.0.0.1:7172
+Exiting application..
diff --git a/data/actions/actions.xml b/data/actions/actions.xml
index 0f42ae8..51775a2 100644
--- a/data/actions/actions.xml
+++ b/data/actions/actions.xml
@@ -391,6 +391,10 @@
+
+
+
+
@@ -411,6 +415,10 @@
+
+
+
+
@@ -433,6 +441,10 @@
+
+
+
+
@@ -482,6 +494,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -527,6 +549,15 @@
+
+
+
+
+
+
+
+
+
@@ -572,4 +603,13 @@
+
+
+
+
+
+
+
+
+
diff --git a/data/actions/scripts/misc/doors.lua b/data/actions/scripts/misc/doors.lua
index abd1654..4b9ae0a 100644
--- a/data/actions/scripts/misc/doors.lua
+++ b/data/actions/scripts/misc/doors.lua
@@ -1,5 +1,5 @@
local lockedDoors = {
- 1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007, 5097, 5106, 5115, 5124, 5133, 5136, 5139, 5142, 5277, 5280, 5732, 5735, 6191, 6194, 6248, 6251
+ 1628, 1631, 1650, 1653, 1668, 1671, 1682, 1691, 5006, 5007, 5097, 5106, 5115, 5124, 5133, 5136, 5139, 5142, 5277, 5280, 5732, 5735, 6191, 6194, 6248, 6251, 6891, 6900, 7033, 7042
}
local closedNormalDoors = {
@@ -51,6 +51,16 @@ local closedNormalDoors = {
[6252] = 6253,
[6254] = 6255,
[6256] = 6257,
+ [6892] = 6893,
+ [6894] = 6895,
+ [6901] = 6902,
+ [6903] = 6904,
+ [7034] = 7035,
+ [7036] = 7037,
+ [7043] = 7044,
+ [7045] = 7046,
+ [7054] = 7055,
+ [7056] = 7057,
}
local openVerticalDoors = {
@@ -97,6 +107,15 @@ local openVerticalDoors = {
[6255] = 6254,
[6259] = 6258,
[6263] = 6262,
+ [6902] = 6901,
+ [6904] = 6903,
+ [6906] = 6905,
+ [6908] = 6907,
+ [7044] = 7043,
+ [7046] = 7045,
+ [7048] = 7047,
+ [7050] = 7049,
+ [7055] = 7054,
}
local openHorizontalDoors = {
@@ -143,6 +162,15 @@ local openHorizontalDoors = {
[6257] = 6256,
[6261] = 6260,
[6265] = 6264,
+ [6893] = 6892,
+ [6895] = 6894,
+ [6897] = 6896,
+ [6899] = 6898,
+ [7035] = 7034,
+ [7037] = 7036,
+ [7039] = 7038,
+ [7041] = 7040,
+ [7057] = 7056,
}
local levelDoors = {
@@ -164,6 +192,10 @@ local levelDoors = {
[6207] = 6208,
[6262] = 6263,
[6264] = 6265,
+ [6896] = 6897,
+ [6905] = 6906,
+ [7038] = 7039,
+ [7047] = 7048,
}
local questDoors = {
@@ -187,6 +219,10 @@ local questDoors = {
[6203] = 6204,
[6258] = 6259,
[6260] = 6261,
+ [6898] = 6899,
+ [6907] = 6908,
+ [7040] = 7041,
+ [7049] = 7050,
}
local passthrough = {
diff --git a/data/items800/items.srv b/data/items800/items.srv
index e2338ed..3b415e3 100644
--- a/data/items800/items.srv
+++ b/data/items800/items.srv
@@ -31195,76 +31195,80 @@ Flags = {Unpass,Unmove}
TypeID = 6891
Name = "a closed door"
Description = "It is locked"
-Flags = {Unpass,Unmove}
+Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6892
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6893
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 6894
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6895
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 6896
Name = "a gate of expertise"
-Flags = {Unpass,Unmove}
+Description = "Only the worthy may pass"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6897
Name = "a gate of expertise"
-Flags = {Top,Unmove}
+Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 6898
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Description = "The door seems to be sealed against unwanted intruders"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6899
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 6900
Name = "a closed door"
Description = "It is locked"
-Flags = {Unpass,Unmove}
+Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6901
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6902
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 6903
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6904
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 6905
Name = "a gate of expertise"
-Flags = {Unpass,Unmove}
+Description = "Only the worthy may pass"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6906
Name = "a gate of expertise"
-Flags = {Top,Unmove}
+Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 6907
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Description = "The door seems to be sealed against unwanted intruders"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6908
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 6909
Name = "a ramp"
@@ -31774,76 +31778,80 @@ Flags = {Top,Unmove}
TypeID = 7033
Name = "a closed door"
Description = "It is locked"
-Flags = {Unpass,Unmove}
+Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7034
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7035
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 7036
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7037
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 7038
Name = "a gate of expertise"
-Flags = {Unpass,Unmove}
+Description = "Only the worthy may pass"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7039
Name = "a gate of expertise"
-Flags = {Top,Unmove}
+Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 7040
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Description = "The door seems to be sealed against unwanted intruders"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7041
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 7042
Name = "a closed door"
Description = "It is locked"
-Flags = {Unpass,Unmove}
+Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7043
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7044
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 7045
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7046
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 7047
Name = "a gate of expertise"
-Flags = {Unpass,Unmove}
+Description = "Only the worthy may pass"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7048
Name = "a gate of expertise"
-Flags = {Top,Unmove}
+Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 7049
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Description = "The door seems to be sealed against unwanted intruders"
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7050
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 7051
Name = "an ice wall window"
@@ -31855,24 +31863,24 @@ Flags = {Bottom,Unpass,Unmove}
TypeID = 7053
Name = "a trapdoor"
-Flags = {Bank,Unmove}
+Flags = {Bank,CollisionEvent,Unmove,Avoid}
Attributes = {Waypoints=100}
TypeID = 7054
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7055
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 7056
Name = "a closed door"
-Flags = {Unpass,Unmove}
+Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 7057
Name = "an open door"
-Flags = {Top,Unmove}
+Flags = {Top,Door,Unmove}
TypeID = 7058
Name = "a skull pillar"
diff --git a/data/movements/movements.xml b/data/movements/movements.xml
index 72aef2f..b4e3ce7 100644
--- a/data/movements/movements.xml
+++ b/data/movements/movements.xml
@@ -663,6 +663,8 @@
+
+
@@ -738,6 +740,14 @@
+
+
+
+
+
+
+
+
diff --git a/data/movements/scripts/misc/doors.lua b/data/movements/scripts/misc/doors.lua
index 34b65da..cccdefd 100644
--- a/data/movements/scripts/misc/doors.lua
+++ b/data/movements/scripts/misc/doors.lua
@@ -18,6 +18,10 @@ local verticalDoors = {
[6206] = 6205,
[6259] = 6258,
[6263] = 6262,
+ [6906] = 6905,
+ [6908] = 6907,
+ [7048] = 7047,
+ [7050] = 7049,
}
local horizontalDoors = {
@@ -40,6 +44,10 @@ local horizontalDoors = {
[6208] = 6207,
[6261] = 6260,
[6265] = 6264,
+ [6897] = 6896,
+ [6899] = 6898,
+ [7039] = 7038,
+ [7041] = 7040,
}
function onStepOut(creature, item, fromPosition, toPosition)
diff --git a/data/movements/scripts/misc/floorchange.lua b/data/movements/scripts/misc/floorchange.lua
index c3a7848..afd3e7c 100644
--- a/data/movements/scripts/misc/floorchange.lua
+++ b/data/movements/scripts/misc/floorchange.lua
@@ -83,6 +83,7 @@ local list = {
[6130] = {x = 0, y = 1, z = 1},
[6172] = {x = 0, y = 0, z = 1},
[6173] = {x = 0, y = 0, z = 1},
+ [7053] = {x = 0, y = 0, z = 1},
}
function onStepIn(creature, item, position, fromPosition)