diff --git a/800OTClient/data/things/792/Tibia.dat b/800OTClient/data/things/792/Tibia.dat index 0db655f..822a0d4 100644 Binary files a/800OTClient/data/things/792/Tibia.dat and b/800OTClient/data/things/792/Tibia.dat differ diff --git a/800OTClient/data/things/792/Tibia.spr b/800OTClient/data/things/792/Tibia.spr index f0c9d41..d8ee6fc 100644 Binary files a/800OTClient/data/things/792/Tibia.spr and b/800OTClient/data/things/792/Tibia.spr differ diff --git a/data/actions/actions.xml b/data/actions/actions.xml index dc3928a..886ba42 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -157,6 +157,8 @@ + + diff --git a/data/actions/scripts/misc/special_rights.lua b/data/actions/scripts/misc/special_rights.lua index 66551be..a6ce703 100644 --- a/data/actions/scripts/misc/special_rights.lua +++ b/data/actions/scripts/misc/special_rights.lua @@ -3,7 +3,7 @@ function onUse(player, item, fromPosition, target, toPosition) if item:getId() == 372 then item:transform(394, 1) item:decay() - elseif item:getId() == 386 or item:getId() == 421 then + elseif item:getId() == 386 or item:getId() == 421 or item:getId() == 17115 or item:getId() == 17137 then local relPos = item:getPosition():moveRel(0, 1, -1) player:teleportTo(relPos) elseif item:getId() == 593 then diff --git a/data/items800/items.srv b/data/items800/items.srv index 10139bd..d6e1e46 100644 --- a/data/items800/items.srv +++ b/data/items800/items.srv @@ -33931,4 +33931,263 @@ Attributes = {Capacity=10,Weight=105000,ExpireTarget=8112,TotalExpireTime=1800} TypeID = 8112 Name = "remains of a vampire lord" Flags = {Container,Take,Corpse,Expire} -Attributes = {Capacity=10,Weight=85000,ExpireTarget=0,TotalExpireTime=1800} \ No newline at end of file +Attributes = {Capacity=10,Weight=85000,ExpireTarget=0,TotalExpireTime=1800} + +TypeID = 17100 +Name = "green floor" +Flags = {Bank,Unmove} +Attributes = {Waypoints=150} + +TypeID = 17101 +Name = "green floor" +Flags = {Bank,Unmove} +Attributes = {Waypoints=100} + +TypeID = 17102 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17103 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17104 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17105 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17106 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17107 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17108 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17109 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17110 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17111 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17112 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17113 +Name = "green floor" +Flags = {Clip,Unmove} + +TypeID = 17114 +Name = "a hole" +Flags = {Bank,CollisionEvent,Unmove,Avoid} +Attributes = {Waypoints=130} + +TypeID = 17115 +Name = "green floor" +Description = "There is a hole in the ceiling" +Flags = {Bank,UseEvent,ForceUse,Unmove} +Attributes = {Waypoints=120} + +TypeID = 17116 +Name = "a human in a cobweb" +Flags = {Unmove} + +TypeID = 17117 +Name = "a cobweb" +Flags = {Unmove} + +TypeID = 17118 +Name = "a cobweb" +Flags = {Unmove} + +TypeID = 17119 +Name = "a cobweb" +Flags = {Unmove} + +TypeID = 17120 +Name = "a cobweb" +Flags = {Unmove} + +TypeID = 17121 +Name = "a spider egg" +Flags = {Bottom,Unpass,Unmove,Unlay} + +TypeID = 17122 +Name = "red floor" +Flags = {Bank,Unmove} +Attributes = {Waypoints=150} + +TypeID = 17123 +Name = "red floor" +Flags = {Bank,Unmove} +Attributes = {Waypoints=100} + +TypeID = 17124 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17125 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17126 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17127 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17128 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17129 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17130 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17131 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17134 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17135 +Name = "red floor" +Flags = {Clip,Unmove} + +TypeID = 17136 +Name = "a hole" +Flags = {Bank,CollisionEvent,Unmove,Avoid} +Attributes = {Waypoints=130} + +TypeID = 17137 +Name = "red floor" +Description = "There is a hole in the ceiling" +Flags = {Bank,UseEvent,ForceUse,Unmove} +Attributes = {Waypoints=120} + +TypeID = 17138 +Name = "earth" +Flags = {Bank,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17139 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17140 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17141 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17142 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17143 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17144 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17145 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17146 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17147 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17148 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17149 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17150 +Name = "a dirt wall" +Flags = {Bottom,Unpass,Unmove,Unthrow,Unlay} +Attributes = {Waypoints=0} + +TypeID = 17151 +Name = "a dead cyclops" +Flags = {Container,Corpse,Expire} +Attributes = {Capacity=10,FluidSource=BLOOD,ExpireTarget=17152,TotalExpireTime=1800} + +TypeID = 17152 +Name = "a dead cyclops" +Flags = {Corpse,Expire} +Attributes = {ExpireTarget=17153,TotalExpireTime=1800} + +TypeID = 17153 +Name = "a dead cyclops" +Flags = {Corpse,Expire} +Attributes = {ExpireTarget=0,TotalExpireTime=1800} + +TypeID = 17154 +Name = "a fire spider" +Flags = {Container,Corpse,Expire} +Attributes = {Capacity=10,FluidSource=SLIME,ExpireTarget=17155,TotalExpireTime=1800} + +TypeID = 17155 +Name = "a fire spider" +Flags = {Corpse,Expire} +Attributes = {ExpireTarget=17156,TotalExpireTime=1800} + +TypeID = 17156 +Name = "a fire spider" +Flags = {Corpse,Expire} +Attributes = {ExpireTarget=0,TotalExpireTime=1800} + +TypeID = 17157 +Name = "a blood graw" +Flags = {Container,Corpse,Expire} +Attributes = {Capacity=10,FluidSource=BLOOD,ExpireTarget=17158,TotalExpireTime=1800} + +TypeID = 17158 +Name = "a blood graw" +Flags = {Corpse,Expire} +Attributes = {ExpireTarget=0,TotalExpireTime=1800} diff --git a/data/movements/movements.xml b/data/movements/movements.xml index 510600a..aceabaf 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -691,6 +691,10 @@ + + + + diff --git a/data/movements/scripts/misc/floorchange.lua b/data/movements/scripts/misc/floorchange.lua index 77d520b..7fcfee7 100644 --- a/data/movements/scripts/misc/floorchange.lua +++ b/data/movements/scripts/misc/floorchange.lua @@ -96,6 +96,8 @@ local list = { [6923] = {x = 0, y = -1, z = 1}, [6924] = {x = 0, y = 1, z = 1}, [7053] = {x = 1, y = 0, z = 1}, + [17114] = {x = 0, y = 0, z = 1}, + [17136] = {x = 0, y = 0, z = 1}, } function onStepIn(creature, item, position, fromPosition)