Digitalstack/SabrehavenServer
2
0
Fork 0
mirror of https://github.com/ErikasKontenis/SabrehavenServer.git synced 2025-04-30 01:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

finish many new 7.92 items and missing todo items from 7.8

Browse Source
This commit is contained in:
ErikasKontenis 2020-03-03 20:16:20 +02:00
parent d8c1eed4f0
commit 3cb71f9127
9 changed files with 190 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
data/actions/actions.xml
View File

@ -97,6 +97,7 @@
<!-- Furniture Parcels -->
<action fromid="2775" toid="2812" script="misc/furniture_parcels.lua" />
<action fromid="5086" toid="5088" script="misc/furniture_parcels.lua" />
<action fromid="6114" toid="6115" script="misc/furniture_parcels.lua" />
<!-- Instruments -->
<action fromid="2948" toid="2950" script="misc/instruments.lua" />
@ -159,6 +160,7 @@
<action itemid="3114" script="misc/skull_candle.lua" />
<action itemid="5957" script="misc/lottery_ticket.lua" />
<action itemid="5776" script="misc/sabrehaven_talon.lua" />
<action itemid="5928" script="misc/catch_fish.lua" />
<!-- Dolls -->
<action itemid="5080" script="misc/dolls.lua" />
@ -174,6 +176,7 @@
<action itemid="2668" script="misc/time.lua" />
<action itemid="2771" script="misc/time.lua" />
<action itemid="2906" script="misc/time.lua" />
<action itemid="6092" script="misc/time.lua" />
<!-- Tools -->
<action itemid="3003" script="misc/rope.lua" />
@ -325,6 +328,10 @@
<action itemid="5280" script="misc/doors.lua" />
<action itemid="5732" script="misc/doors.lua" />
<action itemid="5735" script="misc/doors.lua" />
<action itemid="6191" script="misc/doors.lua" />
<action itemid="6194" script="misc/doors.lua" />
<action itemid="6248" script="misc/doors.lua" />
<action itemid="6251" script="misc/doors.lua" />
<!-- Level Doors -->
<action itemid="1646" script="misc/doors.lua" />
@ -341,6 +348,10 @@
<action itemid="5129" script="misc/doors.lua" />
<action itemid="5291" script="misc/doors.lua" />
<action itemid="5293" script="misc/doors.lua" />
<action itemid="6205" script="misc/doors.lua" />
<action itemid="6207" script="misc/doors.lua" />
<action itemid="6262" script="misc/doors.lua" />
<action itemid="6264" script="misc/doors.lua" />
<!-- Quest Doors -->
<action itemid="1642" script="misc/doors.lua" />
@ -359,6 +370,10 @@
<action itemid="5289" script="misc/doors.lua" />
<action itemid="5745" script="misc/doors.lua" />
<action itemid="5749" script="misc/doors.lua" />
<action itemid="6201" script="misc/doors.lua" />
<action itemid="6203" script="misc/doors.lua" />
<action itemid="6258" script="misc/doors.lua" />
<action itemid="6260" script="misc/doors.lua" />
<!-- Closed Normal Doors -->
<action itemid="2177" script="misc/doors.lua" />
@ -400,6 +415,14 @@
<action itemid="5516" script="misc/doors.lua" />
<action itemid="5733" script="misc/doors.lua" />
<action itemid="5736" script="misc/doors.lua" />
<action itemid="6192" script="misc/doors.lua" />
<action itemid="6195" script="misc/doors.lua" />
<action itemid="6197" script="misc/doors.lua" />
<action itemid="6199" script="misc/doors.lua" />
<action itemid="6249" script="misc/doors.lua" />
<action itemid="6252" script="misc/doors.lua" />
<action itemid="6254" script="misc/doors.lua" />
<action itemid="6256" script="misc/doors.lua" />
<!-- Open Vertical Doors -->
<action itemid="1630" script="misc/doors.lua" />
@ -437,6 +460,14 @@
<action itemid="5515" script="misc/doors.lua" />
<action itemid="5737" script="misc/doors.lua" />
<action itemid="5748" script="misc/doors.lua" />
<action itemid="6193" script="misc/doors.lua" />
<action itemid="6198" script="misc/doors.lua" />
<action itemid="6202" script="misc/doors.lua" />
<action itemid="6206" script="misc/doors.lua" />
<action itemid="6250" script="misc/doors.lua" />
<action itemid="6255" script="misc/doors.lua" />
<action itemid="6259" script="misc/doors.lua" />
<action itemid="6263" script="misc/doors.lua" />
<!-- Open Horizontal Doors -->
<action itemid="1633" script="misc/doors.lua" />
@ -474,4 +505,12 @@
<action itemid="5517" script="misc/doors.lua" />
<action itemid="5734" script="misc/doors.lua" />
<action itemid="5746" script="misc/doors.lua" />
<action itemid="6196" script="misc/doors.lua" />
<action itemid="6200" script="misc/doors.lua" />
<action itemid="6204" script="misc/doors.lua" />
<action itemid="6208" script="misc/doors.lua" />
<action itemid="6253" script="misc/doors.lua" />
<action itemid="6257" script="misc/doors.lua" />
<action itemid="6261" script="misc/doors.lua" />
<action itemid="6265" script="misc/doors.lua" />
</actions>

16
data/actions/scripts/misc/catch_fish.lua Normal file
View File

@ -0,0 +1,16 @@
function onUse(player, item, fromPosition, target, toPosition, isHotkey)
if target.itemid ~= 5553 then
return false
end
if math.random(2) ~= 1 then
player:say("The golden fish escaped.", TALKTYPE_MONSTER_SAY)
return true
end
player:say("You catch a golden fish in the bowl.", TALKTYPE_MONSTER_SAY)
item:transform(5929)
target:remove()
toPosition:sendMagicEffect(CONST_ME_MAGIC_BLUE)
return true
end

34
data/actions/scripts/misc/doors.lua
View File

@ -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
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
}
local closedNormalDoors = {
@ -43,6 +43,14 @@ local closedNormalDoors = {
[5516] = 5517,
[5733] = 5734,
[5736] = 5737,
[6192] = 6193,
[6195] = 6196,
[6197] = 6198,
[6199] = 6200,
[6249] = 6250,
[6252] = 6253,
[6254] = 6255,
[6256] = 6257,
}
local openVerticalDoors = {
@ -81,6 +89,14 @@ local openVerticalDoors = {
[5515] = 5514,
[5737] = 5736,
[5748] = 5749,
[6193] = 6192,
[6198] = 6197,
[6202] = 6201,
[6206] = 6205,
[6250] = 6249,
[6255] = 6254,
[6259] = 6258,
[6263] = 6262,
}
local openHorizontalDoors = {
@ -119,6 +135,14 @@ local openHorizontalDoors = {
[5517] = 5516,
[5734] = 5733,
[5746] = 5745,
[6196] = 6195,
[6200] = 6199,
[6204] = 6203,
[6208] = 6207,
[6253] = 6252,
[6257] = 6256,
[6261] = 6260,
[6265] = 6264,
}
local levelDoors = {
@ -137,6 +161,10 @@ local levelDoors = {
[5129] = 5130,
[5291] = 5292,
[5293] = 5294,
[6205] = 6206,
[6207] = 6208,
[6262] = 6263,
[6264] = 6265,
}
local questDoors = {
@ -155,6 +183,10 @@ local questDoors = {
[5289] = 5290,
[5745] = 5746,
[5749] = 5748,
[6201] = 6202,
[6203] = 6204,
[6258] = 6259,
[6260] = 6261,
}
local passthrough = {

2
data/actions/scripts/misc/furniture_parcels.lua
View File

@ -40,6 +40,8 @@ local parcels = {
[5086] = 5046,
[5087] = 5055,
[5088] = 5056,
[6114] = 6111,
[6115] = 6109,
}
function onUse(player, item, fromPosition, target, toPosition)

12
data/actions/scripts/misc/key.lua
View File

@ -39,6 +39,14 @@ local closedDoors = {
[5733] = 5732,
[5735] = 5737,
[5736] = 5735,
[6191] = 6193,
[6192] = 6191,
[6194] = 6196,
[6195] = 6194,
[6248] = 6250,
[6249] = 6248,
[6251] = 6253,
[6252] = 6251,
}
local openDoors = {
@ -62,6 +70,10 @@ local openDoors = {
[5282] = 5280,
[5734] = 5732,
[5737] = 5735,
[6193] = 6191,
[6196] = 6194,
[6250] = 6248,
[6253] = 6251,
}
function onUse(player, item, fromPosition, target, toPosition)

10
data/items780/items.srv
View File

@ -26816,7 +26816,7 @@ Flags = {Container,Take}
Attributes = {Capacity=8,Weight=800,SlotType=BACKPACK}
TypeID = 5928
Name = "an empty goldfish bowl" # TODO: implement functionality like in tibia wiki
Name = "an empty goldfish bowl"
Flags = {Take}
Attributes = {Weight=3200}
@ -26971,7 +26971,7 @@ Attributes = {Weight=200}
TypeID = 5957
Name = "a lottery ticket"
Description = "It has not been used yet" # TODO: Implement like in tibia wiki
Description = "It has not been used yet"
Flags = {Take}
Attributes = {Weight=120}
@ -27649,7 +27649,7 @@ Attributes = {Weight=50}
TypeID = 6092
Name = "a very noble-looking watch"
Flags = {Take,Expire}
Attributes = {Weight=50,ExpireTarget=6091,TotalExpireTime=259200} # TODO: Implement functionality like in tibia wiki
Attributes = {Weight=50,ExpireTarget=6091,TotalExpireTime=259200}
TypeID = 6093
Name = "a crystal ring"
@ -27762,13 +27762,13 @@ Attributes = {Weight=50}
TypeID = 6114
Name = "an armor rack kit"
Description = "Use it in your house to construct an armor rack" # TODO: Implement like in tibia wiki
Description = "Use it in your house to construct an armor rack"
Flags = {Take,Unpass}
Attributes = {Weight=3500}
TypeID = 6115
Name = "a weapon rack kit"
Description = "Use it in your house to construct a weapon rack" # TODO: Implement like in tibia wiki
Description = "Use it in your house to construct a weapon rack"
Flags = {Take,Unpass}
Attributes = {Weight=3500}

119
data/items792/items.srv
View File

@ -26816,7 +26816,7 @@ Flags = {Container,Take}
Attributes = {Capacity=8,Weight=800,SlotType=BACKPACK}
TypeID = 5928
Name = "an empty goldfish bowl" # TODO: implement functionality like in tibia wiki
Name = "an empty goldfish bowl"
Flags = {Take}
Attributes = {Weight=3200}
@ -26971,7 +26971,7 @@ Attributes = {Weight=200}
TypeID = 5957
Name = "a lottery ticket"
Description = "It has not been used yet" # TODO: Implement like in tibia wiki
Description = "It has not been used yet"
Flags = {Take}
Attributes = {Weight=120}
@ -27649,7 +27649,7 @@ Attributes = {Weight=50}
TypeID = 6092
Name = "a very noble-looking watch"
Flags = {Take,Expire}
Attributes = {Weight=50,ExpireTarget=6091,TotalExpireTime=259200} # TODO: Implement functionality like in tibia wiki
Attributes = {Weight=50,ExpireTarget=6091,TotalExpireTime=259200}
TypeID = 6093
Name = "a crystal ring"
@ -27762,13 +27762,13 @@ Attributes = {Weight=50}
TypeID = 6114
Name = "an armor rack kit"
Description = "Use it in your house to construct an armor rack" # TODO: Implement like in tibia wiki
Description = "Use it in your house to construct an armor rack"
Flags = {Take,Unpass}
Attributes = {Weight=3500}
TypeID = 6115
Name = "a weapon rack kit"
Description = "Use it in your house to construct a weapon rack" # TODO: Implement like in tibia wiki
Description = "Use it in your house to construct a weapon rack"
Flags = {Take,Unpass}
Attributes = {Weight=3500}
@ -28030,30 +28030,29 @@ TypeID = 6174
Name = "a tree archway"
Flags = {Top,Unmove}
# TODO: nuo cia reikia pradeti tikrinti
TypeID = 6175
Name = "a tree archway"
Flags = {Top,Unmove}
TypeID = 6176
Name = "a branch"
Flags = {Bottom,Unpass,Unmove}
Flags = {Bottom,Unpass,Unmove,Unlay}
TypeID = 6177
Name = "a tree hole"
Flags = {Bottom,Unpass,Unmove}
Flags = {Bottom,Unpass,Unmove,Unlay}
TypeID = 6178
Name = "a tree hole"
Flags = {Bottom,Unpass,Unmove}
Flags = {Bottom,Unpass,Unmove,Unlay}
TypeID = 6179
Name = "a tree"
Flags = {Unpass,Unmove}
Flags = {Unpass,Unmove,Unlay}
TypeID = 6180
Name = "a tree"
Flags = {Unpass,Unmove}
Flags = {Unpass,Unmove,Unlay}
TypeID = 6181
Name = "a large branch"
@ -28089,83 +28088,89 @@ Flags = {Top,Unmove}
TypeID = 6189
Name = "a branch"
Flags = {Bottom,Unpass,Unmove}
Flags = {Bottom,Unpass,Unmove,Unlay}
TypeID = 6190
Name = "a branch"
Flags = {Bottom,Unpass,Unmove}
Flags = {Bottom,Unpass,Unmove,Unlay}
TypeID = 6191
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "It is locked"
Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6192
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6193
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6194
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "It is locked"
Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6195
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6196
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6197
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6198
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6199
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6200
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6201
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "The door seems to be sealed against unwanted intruders"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6202
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 6203
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "The door seems to be sealed against unwanted intruders"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6204
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 6205
Name = "a gate of expertise"
Flags = {Unpass,Unmove}
Description = "Only the worthy may pass"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6206
Name = "a gate of expertise"
Flags = {Top,Unmove}
Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 6207
Name = "a gate of expertise"
Flags = {Unpass,Unmove}
Description = "Only the worthy may pass"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6208
Name = "a gate of expertise"
Flags = {Top,Unmove}
Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 6209
Name = "a rope bridge"
@ -28174,11 +28179,11 @@ Attributes = {Waypoints=100}
TypeID = 6210
Name = "a rope bridge"
Flags = {Clip,Unpass,Unmove}
Flags = {Clip,Unpass,Unmove,Unlay}
TypeID = 6211
Name = "a rope bridge"
Flags = {Clip,Unpass,Unmove}
Flags = {Clip,Unpass,Unmove,Unlay}
TypeID = 6212
Name = "a rope bridge"
@ -28187,11 +28192,11 @@ Attributes = {Waypoints=100}
TypeID = 6213
Name = "a rope bridge"
Flags = {Clip,Unpass,Unmove}
Flags = {Clip,Unpass,Unmove,Unlay}
TypeID = 6214
Name = "a rope bridge"
Flags = {Clip,Unpass,Unmove}
Flags = {Clip,Unpass,Unmove,Unlay}
TypeID = 6215
Name = "grass"
@ -28327,75 +28332,81 @@ Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6248
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "It is locked"
Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6249
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6250
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6251
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "It is locked"
Flags = {UseEvent,Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6252
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6253
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6254
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6255
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6256
Name = "a closed door"
Flags = {Unpass,Unmove}
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6257
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,Door,Unmove}
TypeID = 6258
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "The door seems to be sealed against unwanted intruders"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6259
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 6260
Name = "a closed door"
Flags = {Unpass,Unmove}
Description = "The door seems to be sealed against unwanted intruders"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6261
Name = "an open door"
Flags = {Top,Unmove}
Flags = {Top,SeparationEvent,Door,Unmove}
TypeID = 6262
Name = "a gate of expertise"
Flags = {Unpass,Unmove}
Description = "Only the worthy may pass"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6263
Name = "a gate of expertise"
Flags = {Top,Unmove}
Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 6264
Name = "a gate of expertise"
Flags = {Unpass,Unmove}
Description = "Only the worthy may pass"
Flags = {Door,Unpass,Unmove,Unthrow,Unlay}
TypeID = 6265
Name = "a gate of expertise"
Flags = {Top,Unmove}
Flags = {Door,Top,SeparationEvent,Unmove}
TypeID = 6266
Name = "metal trash"
@ -28437,6 +28448,8 @@ TypeID = 6275
Name = "an archway"
Flags = {Top,Unmove}
# TODO: pradeti nuo cia
TypeID = 6276
Name = "a lump of cake dough"
Flags = {Cumulative,Take}

8
data/movements/movements.xml
View File

@ -676,6 +676,14 @@
<movevent event="StepOut" itemid="5294" script="misc/doors.lua" />
<movevent event="StepOut" itemid="5746" script="misc/doors.lua" />
<movevent event="StepOut" itemid="5748" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6202" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6204" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6206" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6208" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6259" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6261" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6263" script="misc/doors.lua" />
<movevent event="StepOut" itemid="6265" script="misc/doors.lua" />
<!-- Magic Fields -->
<movevent event="StepIn" itemid="1998" function="onStepInField" />

8
data/movements/scripts/misc/doors.lua
View File

@ -14,6 +14,10 @@ local verticalDoors = {
[5288] = 5287,
[5292] = 5291,
[5748] = 5749,
[6202] = 6201,
[6206] = 6205,
[6259] = 6258,
[6263] = 6262,
}
local horizontalDoors = {
@ -32,6 +36,10 @@ local horizontalDoors = {
[5290] = 5289,
[5294] = 5293,
[5746] = 5745,
[6204] = 6203,
[6208] = 6207,
[6261] = 6260,
[6265] = 6264,
}
function onStepOut(creature, item, fromPosition, toPosition)