diff --git a/data/actions/actions.xml b/data/actions/actions.xml index 2992ba6..64c4096 100644 --- a/data/actions/actions.xml +++ b/data/actions/actions.xml @@ -164,6 +164,7 @@ + @@ -306,6 +307,9 @@ + + + diff --git a/data/actions/scripts/misc/christmas_card.lua b/data/actions/scripts/misc/christmas_card.lua new file mode 100644 index 0000000..dfaac29 --- /dev/null +++ b/data/actions/scripts/misc/christmas_card.lua @@ -0,0 +1,5 @@ +function onUse(player, item, fromPosition, target, toPosition) + item:getPosition():sendMagicEffect(CONST_ME_SOUND_YELLOW) + item:getPosition():sendMonsterSay("Merry Christmas, " .. player:getName() .. "!") + return true +end diff --git a/data/actions/scripts/misc/food.lua b/data/actions/scripts/misc/food.lua index 334b273..94f48b2 100644 --- a/data/actions/scripts/misc/food.lua +++ b/data/actions/scripts/misc/food.lua @@ -42,7 +42,10 @@ local foods = { [5678] = "Gulp.", -- tortoise egg [6125] = "Gulp.", -- tortoise egg from Nargor [6277] = "Mmmm.", -- cake - [6278] = "Mmmm." -- cake + [6278] = "Mmmm.", -- cake + [6392] = "Mmmm.", -- valentine's cake + [6393] = "Mmmm.", -- cream cake + [6500] = "Mmmm.", -- gingerbreadman } function onUse(player, item, fromPosition, target, toPosition) diff --git a/data/items792/items.srv b/data/items792/items.srv index bcb7391..99eeb21 100644 --- a/data/items792/items.srv +++ b/data/items792/items.srv @@ -16168,7 +16168,7 @@ Attributes = {Weight=500} TypeID = 3549 Name = "soft boots" Flags = {Take,Expire,ShowDetail} -Attributes = {Weight=800,SlotType=FEET,ExpireTarget=0,TotalExpireTime=14400,HealthGain=1,HealthTicks=2000,ManaGain=2,ManaTicks=1000} +Attributes = {Weight=800,DeEquipTarget=6529,SlotType=FEET,ExpireTarget=6530,TotalExpireTime=14400,HealthGain=1,HealthTicks=2000,ManaGain=2,ManaTicks=1000} TypeID = 3550 Name = "patched boots" @@ -26205,7 +26205,7 @@ TypeID = 5803 Name = "an arbalest" Description = "It is a bit heavy due to the iron mounting, but very precise" Flags = {Take,Distance} -Attributes = {Weight=9500,SlotType=TWOHANDED,Range=6,AmmoType=BOLT} +Attributes = {Weight=9500,SlotType=TWOHANDED,Range=7,AmmoType=BOLT} TypeID = 5804 Name = "a nose ring" @@ -26904,7 +26904,7 @@ Attributes = {Weight=3500} TypeID = 5944 Name = "a soul orb" Description = "This strange object seems to be made of half spirit, half metal. It is unknown to most smiths" -Flags = {Take} +Flags = {Cumulative,Take} Attributes = {Weight=20} TypeID = 5945 @@ -28915,8 +28915,6 @@ Description = "Use it in your house to construct a bookcase" Flags = {UseEvent,Avoid,Take,Height} Attributes = {Weight=2500} -# TODO: pradeti nuo cia - TypeID = 6373 Name = "debris" Flags = {Clip,Unmove} @@ -28971,12 +28969,12 @@ Flags = {Clip,Unmove} TypeID = 6386 Name = "a greeting card" -Flags = {Take} -Attributes = {Weight=100} +Flags = {Text,WriteOnce,Take} +Attributes = {maxLength=1024,Weight=100} TypeID = 6387 Name = "a christmas card" -Flags = {Take} +Flags = {UseEvent,Take} Attributes = {Weight=100} TypeID = 6388 @@ -28986,14 +28984,14 @@ Attributes = {Waypoints=100} TypeID = 6389 Name = "an ornamented fountain" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,Unpass,Unmove,Unlay} Attributes = {FluidSource=WATER} TypeID = 6390 Name = "a nightmare shield" Description = "It was crafted by the ancient order of the nightmare knights" -Flags = {Take} -Attributes = {Weight=3200} +Flags = {Take,Shield} +Attributes = {Weight=3200,Defense=37,Brightness=4,LightColor=186} TypeID = 6391 Name = "a hawser" @@ -29002,12 +29000,12 @@ Flags = {Unmove} TypeID = 6392 Name = "a valentine's cake" Flags = {Take} -Attributes = {Weight=500} +Attributes = {Nutrition=15,Weight=500} TypeID = 6393 Name = "a cream cake" Flags = {Take} -Attributes = {Weight=500} +Attributes = {Nutrition=15,Weight=500} TypeID = 6394 Name = "bones" @@ -29155,17 +29153,17 @@ Flags = {Top,Unmove} TypeID = 6430 Name = "a branch" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 6431 Name = "a branch" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 6432 Name = "a necromancer shield" Description = "It is enchanted with unholy, necromantic powers" -Flags = {Take} -Attributes = {Weight=3200} +Flags = {Take,Shield} +Attributes = {Weight=3200,Defense=37,Brightness=4,LightColor=103} TypeID = 6433 Name = "a blue tapestry" @@ -29177,155 +29175,191 @@ Flags = {Unmove} TypeID = 6435 Name = "a framework window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6437} TypeID = 6436 Name = "a framework window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6438} TypeID = 6437 Name = "a framework window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6435} TypeID = 6438 Name = "a framework window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6436} TypeID = 6439 Name = "a brick window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6441} TypeID = 6440 Name = "a brick window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6442} TypeID = 6441 Name = "a brick window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6439} TypeID = 6442 Name = "a brick window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6440} TypeID = 6443 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6445} TypeID = 6444 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6446} TypeID = 6445 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6443} TypeID = 6446 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6444} TypeID = 6447 Name = "a marble window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 6448 Name = "a marble window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,Unpass,Unmove,Unlay} TypeID = 6449 Name = "a tree window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6451} TypeID = 6450 Name = "a tree window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6452} TypeID = 6451 Name = "a tree window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6449} TypeID = 6452 Name = "a tree window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6450} TypeID = 6453 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6455} TypeID = 6454 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6456} TypeID = 6455 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6453} TypeID = 6456 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6454} TypeID = 6457 Name = "a bamboo window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6459} TypeID = 6458 Name = "a bamboo window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6460} TypeID = 6459 Name = "a bamboo window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6457} TypeID = 6460 Name = "a bamboo window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6458} TypeID = 6461 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6463} TypeID = 6462 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6464} TypeID = 6463 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6461} TypeID = 6464 Name = "a sandstone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6462} TypeID = 6465 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6467} TypeID = 6466 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6468} TypeID = 6467 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6465} TypeID = 6468 Name = "a stone window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6466} TypeID = 6469 Name = "a wooden window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6471} TypeID = 6470 Name = "a wooden window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unthrow,Unlay} +Attributes = {ChangeTarget=6472} TypeID = 6471 Name = "a wooden window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6469} TypeID = 6472 Name = "a wooden window" -Flags = {Bottom,Unpass,Unmove} +Flags = {Bottom,ChangeUse,Unpass,Unmove,Unlay} +Attributes = {ChangeTarget=6470} TypeID = 6473 Name = "wooden planks" @@ -29389,13 +29423,13 @@ Flags = {Clip,Unmove} TypeID = 6488 Name = "a christmas branch" -Flags = {Take} -Attributes = {Weight=1800} +Flags = {ChangeUse,Take} +Attributes = {ChangeTarget=6489,Weight=1800,Brightness=2,LightColor=206} TypeID = 6489 Name = "a christmas branch" -Flags = {Take} -Attributes = {Weight=1800} +Flags = {ChangeUse,Take} +Attributes = {ChangeTarget=6488,Weight=1800,Brightness=0,LightColor=0} TypeID = 6490 Name = "a firefly" @@ -29404,7 +29438,7 @@ Attributes = {ExpireTarget=6493,TotalExpireTime=8} TypeID = 6491 Name = "a bat decoration" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=200} TypeID = 6492 @@ -29438,7 +29472,7 @@ Flags = {Top,Unmove} TypeID = 6498 Name = "a certificate" Description = "You have mastered the Dream Challenge and may apply for joining the order of the Nightmare Knights" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=150} TypeID = 6499 @@ -29450,26 +29484,26 @@ Attributes = {Weight=100} TypeID = 6500 Name = "a gingerbreadman" Flags = {Take} -Attributes = {Weight=500} +Attributes = {Nutrition=20,Weight=500} TypeID = 6501 Name = "a christmas wreath" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=1000} TypeID = 6502 Name = "a christmas garland" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=500} TypeID = 6503 Name = "a red christmas garland" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=500} TypeID = 6504 Name = "a blue christmas garland" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=500} TypeID = 6505 @@ -29554,6 +29588,11 @@ Name = "a dead plaguesmith" Flags = {Corpse,Expire} Attributes = {ExpireTarget=0,TotalExpireTime=600} +TypeID = 6522 +Name = "a parchment" +Flags = {Take} +Attributes = {Weight=200} + TypeID = 6523 Name = "a skeleton" Flags = {Unmove} @@ -29564,7 +29603,7 @@ Flags = {Unmove} TypeID = 6525 Name = "a skeleton decoration" -Flags = {Take} +Flags = {Take,Hang} Attributes = {Weight=1000} TypeID = 6526 @@ -29576,23 +29615,31 @@ Attributes = {Weight=5} TypeID = 6527 Name = "the avenger" Description = "This holy blade was forged of shattered dreams" -Flags = {Take} -Attributes = {Weight=6400} +Flags = {MultiUse,Take,Weapon} +Attributes = {Weight=6400,SlotType=TWOHANDED,WeaponType=SWORD,Attack=38,Defense=50} TypeID = 6528 Name = "an infernal bolt" -Flags = {Cumulative,Take} -Attributes = {Weight=90} +Flags = {Cumulative,Take,Ammo} +Attributes = {MinimumLevel=70,Weight=90,AmmoType=BOLT,Attack=43,MissileEffect=16,Fragility=100} TypeID = 6529 Name = "pair of soft boots" +Flags = {Take,ExpireStop,ShowDetail} +Attributes = {Weight=800,EquipTarget=3549,SlotType=FEET} + +TypeID = 6530 +Name = "a worn soft boots" +Description = "Someone specialised in shoes might be able to repair them for you" Flags = {Take} Attributes = {Weight=800} TypeID = 6531 Name = "a santa hat" -Flags = {Take} -Attributes = {Weight=750} +Flags = {Take,Armor} +Attributes = {Weight=750,SlotType=HEAD,ArmorValue=1} + +# TODO: Pradeti nuo cia TypeID = 6532 Name = "a dead defiler" diff --git a/data/movements/movements.xml b/data/movements/movements.xml index c72d58d..4cc5c84 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -746,6 +746,7 @@ + diff --git a/data/npc/aldo.npc b/data/npc/aldo.npc index 455186f..935f64d 100644 --- a/data/npc/aldo.npc +++ b/data/npc/aldo.npc @@ -60,4 +60,11 @@ VANISH,! -> "Yeah, get lost." Topic=1,"yes",CountMoney>=Price -> "Here. I hope that's it now.", DeleteMoney, Create(Type) Topic=1,"yes" -> "At last, someone poorer than me." Topic=1,"no" -> "Good decision!" + +"soft","boots",ClientVersion>=790 -> Type=6530, Amount=1, Price=10000, "You want me to repair your soft boots? I'm not sure if I want to touch this stinking mess. 10000 gold, deal?", Topic=2 +"repair",ClientVersion>=790 -> * +Topic=2,"yes",CountMoney>=Price,Count(Type)>=Amount -> "Here. I hope that's it now.", DeleteMoney, Delete(Type), Create(6529) +Topic=2,"yes" -> "At last, someone poorer than me." +Topic=2,"no" -> "Good decision!" + } diff --git a/data/npc/bigben.npc b/data/npc/bigben.npc index fa76652..6133559 100644 --- a/data/npc/bigben.npc +++ b/data/npc/bigben.npc @@ -74,6 +74,12 @@ Topic=6,"yes",Count(Type)>=Amount -> "Cling clang!", Delete(Type), Type=5892, Am Topic=6,"yes" -> "You not have stuff me want for." Topic=6 -> "Silly lil' one you are." +"soul","orb",ClientVersion>=790 -> "Uh. Me can make some nasty lil' bolt from soul orbs. Lil' one want to trade all?", Topic=7 +Topic=7,"yes",QuestValue(17500)<2,! -> "Wait. Me work no cheap is. Do favour for me first, yes?", Topic=2 +Topic=7,"yes",Count(5944)>=1 -> "Cling clang!", Amount=Count(5944)*3, DeleteAmount(5944, Count(5944)), Type=6528, Create(Type) +Topic=7,"yes" -> "You not have stuff me want for." +Topic=7 -> "Silly lil' one you are." + Topic=2,"yes" -> "Me need gift for woman. We dance, so me want to give her bast skirt. But she big is. So I need many to make big one. Bring three okay? Me wait.", SetQuestValue(17500,1), SetQuestValue(17595,1) "bast skirt",QuestValue(17500)=1 -> Type=3560, Amount=3, "Lil' one bring three bast skirts?", Topic=3 diff --git a/data/npc/gorn.npc b/data/npc/gorn.npc index 70608a0..e7c8f9e 100644 --- a/data/npc/gorn.npc +++ b/data/npc/gorn.npc @@ -91,6 +91,7 @@ VANISH,! -> "Good bye." "pick" -> Type=3456, Amount=1, Price=50, "Do you want to buy a pick for %P gold?", Topic=1 "shovel" -> Type=3457, Amount=1, Price=50, "Do you want to buy a shovel for %P gold?", Topic=1 "rod" -> Type=3483, Amount=1, Price=150, "Do you want to buy a fishing rod for %P gold?", Topic=1 +"greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 %1,1<%1,"torch" -> Type=2920, Amount=%1, Price=2*%1, "Do you want to buy %A torches for %P gold?", Topic=1 %1,1<%1,"bag" -> Type=2853, Amount=%1, Price=5*%1, "Do you want to buy %A bags for %P gold?", Topic=1 @@ -116,6 +117,7 @@ VANISH,! -> "Good bye." %1,1<%1,"pick" -> Type=3456, Amount=%1, Price=50*%1, "Do you want to buy %A picks for %P gold?", Topic=1 %1,1<%1,"shovel" -> Type=3457, Amount=%1, Price=50*%1, "Do you want to buy %A shovels for %P gold?", Topic=1 %1,1<%1,"rod" -> Type=3483, Amount=%1, Price=150*%1, "Do you want to buy %A fishing rods for %P gold?", Topic=1 +%1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 "worm" -> "I sell worms only in sixpacks for 5 gold each, how many sixpacks of worms do you want to buy?" "worms" -> * diff --git a/data/npc/maria.npc b/data/npc/maria.npc index 4ec8725..d057c1e 100644 --- a/data/npc/maria.npc +++ b/data/npc/maria.npc @@ -54,6 +54,7 @@ VANISH,! -> "Visit us again." "cookie" -> Type=3598, Amount=1, Price=5, "Do you want to buy a cookie for %P gold?", Topic=1 "egg" -> Type=3606, Amount=1, Price=2, "Do you want to buy an egg for %P gold?", Topic=1 "tomato" -> Type=3596, Amount=1, Price=5, "Do you want to buy a tomato for %P gold?", Topic=1 +"valentine",ClientVersion>=790 -> Type=6392, Amount=1, Price=100, "Do you want to buy a valentine's cake for %P gold?", Topic=1 %1,1<%1,"bread" -> Type=3600, Amount=%1, Price=4*%1, "Do you wanna buy %A breads for %P gold?", Topic=1 %1,1<%1,"cheese" -> Type=3607, Amount=%1, Price=6*%1, "Do you wanna buy %A cheese for %P gold?", Topic=1 @@ -62,7 +63,7 @@ VANISH,! -> "Visit us again." %1,1<%1,"cookie" -> Type=3598, Amount=%1, Price=5*%1, "Do you wanna buy %A cookies for %P gold?", Topic=1 %1,1<%1,"egg" -> Type=3606, Amount=%1, Price=2*%1, "Do you want to buy %A eggs for %P gold?", Topic=1 %1,1<%1,"tomato" -> Type=3596, Amount=%1, Price=5*%1, "Do you want to buy %A tomatoes for %P gold?", Topic=1 - +%1,1<%1,"valentine",ClientVersion>=790 -> Type=6392, Amount=%1, Price=100*%1, "Do you want to buy %A valentine's cakes for %P gold?", Topic=1 "lemonade" -> Type=2880, Data=12, Amount=1, Price=2, "Do you want to buy a mug of lemonade for %P gold?", Topic=1 "beer" -> Type=2880, Data=3, Amount=1, Price=2, "Do you want to buy a mug of beer for %P gold?", Topic=1 diff --git a/data/npc/perod.npc b/data/npc/perod.npc index fcdbb41..90af9fa 100644 --- a/data/npc/perod.npc +++ b/data/npc/perod.npc @@ -82,6 +82,7 @@ VANISH,! -> "Good bye." "pick" -> Type=3456, Amount=1, Price=50, "Do you want to buy a pick for %P gold?", Topic=1 "shovel" -> Type=3457, Amount=1, Price=50, "Do you want to buy a shovel for %P gold?", Topic=1 "rod" -> Type=3483, Amount=1, Price=150, "Do you want to buy a fishing rod for %P gold?", Topic=1 +"greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 %1,1<%1,"torch" -> Type=2920, Amount=%1, Price=2*%1, "Do you want to buy %A torches for %P gold?", Topic=1 %1,1<%1,"bag" -> Type=2864, Amount=%1, Price=5*%1, "Do you want to buy %A bags for %P gold?", Topic=1 @@ -107,6 +108,7 @@ VANISH,! -> "Good bye." %1,1<%1,"pick" -> Type=3456, Amount=%1, Price=50*%1, "Do you want to buy %A picks for %P gold?", Topic=1 %1,1<%1,"shovel" -> Type=3457, Amount=%1, Price=50*%1, "Do you want to buy %A shovels for %P gold?", Topic=1 %1,1<%1,"rod" -> Type=3483, Amount=%1, Price=150*%1, "Do you want to buy %A fishing rods for %P gold?", Topic=1 +%1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 "worm" -> "I sell worms only in sixpacks for 5 gold each, how many sixpacks of worms would you like to buy?" "worms" -> * diff --git a/data/npc/shiantis.npc b/data/npc/shiantis.npc index e1f8465..2f2e537 100644 --- a/data/npc/shiantis.npc +++ b/data/npc/shiantis.npc @@ -56,6 +56,7 @@ VANISH,! -> "Good bye." "small","book" -> Type=2839, Amount=1, Price=15, "Do you want to buy a small book for %P gold?", Topic=1 "watch" -> Type=2906, Amount=1, Price=20, "Do you want to buy one of my high quality watches for %P gold?", Topic=1 "football" -> Type=2990, Amount=1, Price=111, "Do you want to buy a football for %P gold?", Topic=1 +"greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 %1,1<%1,"torch" -> Type=2920, Amount=%1, Price=2*%1, "Do you wanna buy %A torches for %P gold?", Topic=1 %1,1<%1,"candelabr" -> Type=2911, Amount=%1, Price=8*%1, "Do you wanna buy %A candelabra for %P gold?", Topic=1 @@ -73,6 +74,7 @@ VANISH,! -> "Good bye." %1,1<%1,"small","book" -> Type=2839, Amount=%1, Price=15*%1, "Do you want to buy %A small books for %P gold?", Topic=1 %1,1<%1,"watch" -> Type=2906, Amount=%1, Price=20*%1, "Do you want to buy %A of my high quality watches for %P gold?", Topic=1 %1,1<%1,"football" -> Type=2990, Amount=%1, Price=111*%1, "Do you want to buy %A footballs for %P gold?", Topic=1 +%1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 Topic=1,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Come back, when you have enough money." diff --git a/data/npc/thomas.npc b/data/npc/thomas.npc index 74d9a54..489c69d 100644 --- a/data/npc/thomas.npc +++ b/data/npc/thomas.npc @@ -45,6 +45,7 @@ VANISH,! -> "Bye." "black","book" -> Type=2838, Amount=1, Price=15, "Do you want to buy a black book for %P gold?", Topic=1 "small","book" -> Type=2839, Amount=1, Price=15, "Do you want to buy a small book for %P gold?", Topic=1 "inkwell" -> Type=3509, Amount=1, Price=8, "Do you want to buy an inkwell for %P gold?", Topic=1 +"greeting","card",ClientVersion>=790 -> Type=6386, Amount=1, Price=30, "Do you want to buy a greeting card for %P gold?", Topic=1 %1,1<%1,"scroll" -> Type=2815, Amount=%1, Price=5*%1, "Do you want to buy %A scrolls for %P gold?", Topic=1 %1,1<%1,"document" -> Type=2834, Amount=%1, Price=12*%1, "Do you want to buy %A documents for %P gold?", Topic=1 @@ -54,6 +55,7 @@ VANISH,! -> "Bye." %1,1<%1,"black","book" -> Type=2838, Amount=%1, Price=15*%1, "Do you want to buy %A black books for %P gold?", Topic=1 %1,1<%1,"small","book" -> Type=2839, Amount=%1, Price=15*%1, "Do you want to buy %A small books for %P gold?", Topic=1 %1,1<%1,"inkwell" -> Type=3509, Amount=%1, Price=8*%1, "Do you want to buy %A inkwells for %P gold?", Topic=1 +%1,1<%1,"greeting","card",ClientVersion>=790 -> Type=6386, Amount=%1, Price=30*%1, "Do you want to buy %A greeting cards for %P gold?", Topic=1 Topic=1,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Come back, when you have enough money."