finish more 7.92 items

data/actions/actions.xml

@@ -93,11 +93,12 @@
 	<action fromid="6087" toid="6090" script="liberty_bay/cult_hymn.lua"/>
 	<action actionid="33216" script="liberty_bay/cult_piano_teleport.lua"/>
 	
-	<!-- Nostalrius Default Actions -->
+	<!-- Sabrehaven Default Actions -->
 	<!-- 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" />
+	<action fromid="6371" toid="6372" script="misc/furniture_parcels.lua" />
 	
 	<!-- Instruments -->
 	<action fromid="2948" toid="2950" script="misc/instruments.lua" />

data/actions/scripts/misc/baking.lua

@@ -1,5 +1,5 @@
 local ovens = {
-	2535, 2537, 2539, 2541, 3510
+	2535, 2537, 2539, 2541, 3510, 6355, 6357, 6359, 6361
 }
 
 local milestone = {

data/actions/scripts/misc/furniture_parcels.lua

@@ -42,6 +42,8 @@ local parcels = {
 	[5088] = 5056,
 	[6114] = 6111,
 	[6115] = 6109,
+	[6371] = 6355,
+	[6372] = 6367,
 }
 
 function onUse(player, item, fromPosition, target, toPosition)

data/items792/items.srv

@@ -28470,8 +28470,6 @@ Description = "It is nicely decorated with fruits, icing and a candle. Someone i
 Flags       = {UseEvent,Take}
 Attributes  = {Weight=500}
 
-# TODO: pradeti nuo cia
-
 TypeID      = 6280
 Name        = "a broken brick wall"
 Flags       = {Bottom,Unpass,Unmove,Unthrow,Unlay}
@@ -28497,10 +28495,10 @@ Name        = "some cracks"
 Flags       = {Clip,Unmove}
 
 TypeID      = 6286
-Name        = ""
+Name        = "" # this is nothing in client
 
 TypeID      = 6287
-Name        = ""
+Name        = "" # this is nothing in client
 
 TypeID      = 6288
 Name        = "a burning wall"
@@ -28548,14 +28546,14 @@ Flags       = {Clip,Unmove}
 
 TypeID      = 6299
 Name        = "a death ring"
-Flags       = {Take}
+Flags       = {Take,ExpireStop,ShowDetail}
-Attributes  = {Weight=80}
+Attributes  = {Weight=80,SlotType=RING,EquipTarget=6300}
 
 TypeID      = 6300
 Name        = "a death ring"
 Description = "Wearing it makes you feel a little weaker than usual"
-Flags       = {Take,Expire}
+Flags       = {Take,Expire,ShowDetail}
-Attributes  = {Weight=80,ExpireTarget=0,TotalExpireTime=480}
+Attributes  = {Weight=80,SlotType=RING,ShieldBoost=-10,ExpireTarget=0,TotalExpireTime=480,DeEquipTarget=6299}
 
 TypeID      = 6301
 Name        = "a dead wyvern"
@@ -28808,7 +28806,7 @@ Flags       = {Take,Corpse,Expire}
 Attributes  = {Weight=1000,ExpireTarget=0,TotalExpireTime=600}
 
 TypeID      = 6351
-Name        = ""
+Name        = "" # this is nothing in client
 
 TypeID      = 6352
 Name        = "swamp"
@@ -28827,27 +28825,43 @@ Attributes  = {Weight=10000,ExpireTarget=0,TotalExpireTime=600}
 
 TypeID      = 6355
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6356,RotateTarget=6357,Brightness=3,LightColor=199}
 
 TypeID      = 6356
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6355,RotateTarget=6358}
 
 TypeID      = 6357
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6358,RotateTarget=6359,Brightness=3,LightColor=193}
 
 TypeID      = 6358
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6357,RotateTarget=6360}
 
 TypeID      = 6359
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6360,RotateTarget=6361,Brightness=3,LightColor=193}
 
 TypeID      = 6360
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6359,RotateTarget=6362}
 
 TypeID      = 6361
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6362,RotateTarget=6355,Brightness=3,LightColor=193}
 
 TypeID      = 6362
 Name        = "an oven"
+Flags       = {ChangeUse,Rotate,Height}
+Attributes  = {ChangeTarget=6361,RotateTarget=6356}
 
 TypeID      = 6363
 Name        = "a dead diabolic imp"
@@ -28871,36 +28885,38 @@ Attributes  = {ExpireTarget=0,TotalExpireTime=600}
 
 TypeID      = 6367
 Name        = "a bookcase"
-Flags       = {Container,Unpass}
+Flags       = {Container,Unpass,Rotate}
-Attributes  = {Capacity=6}
+Attributes  = {Capacity=6,RotateTarget=6368}
 
 TypeID      = 6368
 Name        = "a bookcase"
-Flags       = {Container,Unpass}
+Flags       = {Container,Unpass,Rotate}
-Attributes  = {Capacity=6}
+Attributes  = {Capacity=6,RotateTarget=6369}
 
 TypeID      = 6369
 Name        = "a bookcase"
-Flags       = {Container,Unpass}
+Flags       = {Container,Unpass,Rotate}
-Attributes  = {Capacity=6}
+Attributes  = {Capacity=6,RotateTarget=6370}
 
 TypeID      = 6370
 Name        = "a bookcase"
-Flags       = {Container,Unpass}
+Flags       = {Container,Unpass,Rotate}
-Attributes  = {Capacity=6}
+Attributes  = {Capacity=6,RotateTarget=6367}
 
 TypeID      = 6371
 Name        = "an oven kit"
 Description = "Use it in your house to construct an oven"
-Flags       = {Take}
+Flags       = {Take,Height}
 Attributes  = {Weight=2500}
 
 TypeID      = 6372
 Name        = "a bookcase kit"
 Description = "Use it in your house to construct a bookcase"
-Flags       = {Take}
+Flags       = {Take,Height}
 Attributes  = {Weight=2500}
 
+# TODO: pradeti nuo cia
+
 TypeID      = 6373
 Name        = "debris"
 Flags       = {Clip,Unmove}
@@ -29778,11 +29794,6 @@ Name        = "a party trumpet"
 Flags       = {Take}
 Attributes  = {Weight=50}
 
-TypeID      = 6572
-Name        = "a party trumpet"
-Flags       = {Take,Expire}
-Attributes  = {Weight=50,ExpireTarget=6572,TotalExpireTime=4}
-
 TypeID      = 6574
 Name        = "a bar of chocolate"
 Flags       = {Take}

data/movements/movements.xml

@@ -800,4 +800,8 @@
 	<movevent event="Equip" itemid="3098" slot="ring" function="onEquipItem" />
 	<movevent event="Equip" itemid="3100" slot="ring" function="onEquipItem" />
 	<movevent event="DeEquip" itemid="3100" slot="ring" function="onDeEquipItem" />
+	<movevent event="Equip" itemid="6299" slot="ring" function="onEquipItem" />
+	<movevent event="DeEquip" itemid="6299" slot="ring" function="onDeEquipItem" />
+	<movevent event="Equip" itemid="6300" slot="ring" function="onEquipItem" />
+	<movevent event="DeEquip" itemid="6300" slot="ring" function="onDeEquipItem" />
 </movements>

data/npc/gen-t-furniture-containers-s.ndb

@@ -18,6 +18,9 @@
 "barrel"          -> Type=2793, Amount=1, Price=12, "Do you want to buy a barrel for %P gold?", Topic=81
 "trough"          -> Type=2792, Amount=1, Price=7,  "Do you want to buy a trough for %P gold?", Topic=81
 "trunk"           -> Type=2794, Amount=1, Price=10, "Do you want to buy a trunk for %P gold?", Topic=81
+"armor","rack"           -> Type=6114, Amount=1, Price=90, "Do you want to buy an armor rack for %P gold?", Topic=81
+"weapon","rack"           -> Type=6115, Amount=1, Price=90, "Do you want to buy a weapon rack for %P gold?", Topic=81
+"bookcase"           -> Type=6372, Amount=1, Price=70, "Do you want to buy a bookcase for %P gold?", Topic=81
 
 Topic=81,"yes",Premium,CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type)
 Topic=81,"yes",CountMoney>=Price         -> "I'm sorry, but you need a premium account if you want to buy furniture."

data/npc/gen-t-furniture-pottery-s.ndb

@@ -13,6 +13,7 @@
 "large", "amphora" -> Type=2805, Amount=1, Price=50,  "Do you want to buy a large amphora for %P gold?", Topic=81
 "amphora"          -> Type=2893, Amount=1, Price=4,  "Do you want to buy an amphora for %P gold?", Topic=81
 "coal","basin"     -> Type=2806, Amount=1, Price=25, "Do you want to buy a coal basin for %P gold?", Topic=81
+"oven"     -> Type=6371, Amount=1, Price=80, "Do you want to buy an oven for %P gold?", Topic=81
 
 Topic=81,"yes",Premium,CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type)
 Topic=81,"yes",CountMoney>=Price         -> "I'm sorry, but you need a premium account if you want to buy furniture."