From fdc71b8b1d2ceb84ed64b436fb94e8f2e287e9ac Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Thu, 14 May 2020 23:50:19 +0300 Subject: [PATCH] introduce buying runes/potions via bp in all selling npcs --- data/npc/alexander.npc | 11 +++++ data/npc/asima.npc | 24 +++++++++- data/npc/digger.npc | 16 +++++++ data/npc/fenech.npc | 9 ++++ data/npc/frans.npc | 9 ++++ data/npc/frederik.npc | 22 +++++++++ data/npc/gen-t-magic-s.ndb | 23 ++++++++++ data/npc/gen-t-runes-free-s.ndb | 79 +++++++++++++++++++++++++++++++++ data/npc/gen-t-runes-prem-s.ndb | 36 +++++++++++++++ data/npc/hyacinth.npc | 10 +++++ data/npc/mehkesh.npc | 15 +++++++ data/npc/rachel.npc | 22 +++++++++ data/npc/sandra.npc | 14 ++++++ data/npc/shiriel.npc | 22 +++++++++ data/npc/sigurd.npc | 22 +++++++++ data/npc/tandros.npc | 20 +++++++++ data/npc/topsy.npc | 21 +++++++++ data/npc/xodet.npc | 22 +++++++++ src/behaviourdatabase.cpp | 2 +- 19 files changed, 397 insertions(+), 2 deletions(-) diff --git a/data/npc/alexander.npc b/data/npc/alexander.npc index a82b6a2..d540df1 100644 --- a/data/npc/alexander.npc +++ b/data/npc/alexander.npc @@ -41,6 +41,13 @@ VANISH,! -> "See you." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=1 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=1 + +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "life","ring" -> Type=3052, Amount=1, Price=900, "Do you want to buy a life ring for %P gold?", Topic=1 "crystal","ball" -> Type=3076, Amount=1, Price=530, "Do you want to buy a crystal ball for %P gold?", Topic=1 @@ -64,6 +71,10 @@ Topic=2,"yes" -> "Sorry, you do not have one." Topic=2,"yes",Amount>1 -> "Sorry, you do not have so many." Topic=2 -> "Maybe next time." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + @"gen-t-runes-prem-s.ndb" @"gen-t-wands-prem-s.ndb" } diff --git a/data/npc/asima.npc b/data/npc/asima.npc index 03d7fec..578f0fe 100644 --- a/data/npc/asima.npc +++ b/data/npc/asima.npc @@ -32,11 +32,25 @@ VANISH,! -> "Daraman's blessings." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=4 "spellbook" -> Type=3059, Amount=1, Price=150, "In a spellbook, your spells are listed. There you will find the pronunciation of each spell. Do you want to buy one for %P gold?", Topic=4 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=5 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=5 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=4 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "In a spellbook, your spells are listed. There you will find the pronunciation of each spell. Do you want to buy %A spellbooks for %P gold?", Topic=4 - + +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=6 "vial" -> * "flask" -> * @@ -56,4 +70,12 @@ Topic=6,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are Topic=6,"yes" -> "You don't have any empty vials." Topic=6 -> "Hmm, but please keep Tibia litter free." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + } diff --git a/data/npc/digger.npc b/data/npc/digger.npc index 774d304..08216fb 100644 --- a/data/npc/digger.npc +++ b/data/npc/digger.npc @@ -38,9 +38,20 @@ VANISH,! -> "Bye." "life","fluid" -> Type=2874, Data=11, Amount=1, Price=60, "Do you want to buy life fluid for %P gold?", Topic=2 "mana","fluid" -> Type=2874, Data=10, Amount=1, Price=55, "Do you want to buy mana fluid for %P gold?", Topic=2 + +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * + %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=2 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=3 "vial" -> * "flask" -> * @@ -50,4 +61,9 @@ Topic=2 -> "Don't overestimate my patience." Topic=3,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are ... %P gold.", Delete(2874), CreateMoney Topic=3 -> "Don't overestimate my patience." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + } diff --git a/data/npc/fenech.npc b/data/npc/fenech.npc index 85523da..64b563b 100644 --- a/data/npc/fenech.npc +++ b/data/npc/fenech.npc @@ -54,14 +54,23 @@ VANISH,! -> "May enlightenment be your path." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=1 "spellbook" -> Type=3059, Amount=1, Price=150, "Do you want to buy a spellbook for %P gold?", Topic=1 +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=2 +"bp","blank","rune" -> * %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=1 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?", Topic=1 +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=2 +%1,1<%1,"bp","blank","rune" -> * + Topic=1,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Come back, when you have enough money." Topic=1 -> "Maybe next time." +Topic=2,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=2,"yes" -> "Come back, when you have enough money." +Topic=2 -> "Hmm, but next time." + @"gen-t-runes-free-s.ndb" @"gen-t-wands-prem-s.ndb" } diff --git a/data/npc/frans.npc b/data/npc/frans.npc index 4147dfc..fe8e98c 100644 --- a/data/npc/frans.npc +++ b/data/npc/frans.npc @@ -39,14 +39,23 @@ VANISH,! -> "Bye." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do youuuu want to buy a blank ruuuune for %P gold?", Topic=1 "spellbook" -> Type=3059, Amount=1, Price=150, "Do youuuu want to buy a spellboooook for %P gold?", Topic=1 +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do youuuu want to buy a backpack of blank ruuuune for %P gold?", Topic=2 +"bp","blank","rune" -> * %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do youuuu want to buy %A blank ruuuunes for %P gold?", Topic=1 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do youuuu want to buy %A spellboooooks for %P gold?", Topic=1 +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do youuuu want to buy %A backpacks of blank ruuuunes for %P gold?", Topic=2 +%1,1<%1,"bp","blank","rune" -> * + Topic=1,"yes",CountMoney>=Price -> "And here it isssss! Almost like magiiiic, isn't it?", DeleteMoney, Create(Type) Topic=1,"yes" -> "Sorry, too many buttonssss and not enough gold in your pursssse." Topic=1 -> "Better not annoy a FRANS if you don't want to deeeeal with him!" +Topic=2,"yes",CountMoney>=Price -> "And here it isssss! Almost like magiiiic, isn't it?", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=2,"yes" -> "Sorry, too many buttonssss and not enough gold in your pursssse." +Topic=2 -> "Better not annoy a FRANS if you don't want to deeeeal with him!" + @"gen-t-runes-free-s.ndb" @"gen-t-wands-free-s.ndb" } diff --git a/data/npc/frederik.npc b/data/npc/frederik.npc index 70b5518..6a5f3e0 100644 --- a/data/npc/frederik.npc +++ b/data/npc/frederik.npc @@ -24,11 +24,25 @@ VANISH,! -> "However." "mana","fluid" -> Type=2874, Data=10, Amount=1, Price=55, "Do you want to buy mana fluid for %P gold?", Topic=3 "life","fluid" -> Type=2874, Data=11, Amount=1, Price=60, "Do you want to buy life fluid for %P gold?", Topic=3 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?",Topic=2 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A runes for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=3 %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=3 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "sell","talon" -> Type=3034, Amount=1, Price=320, "Do you want to sell one of the magic gems called talon for %P gold?", Topic=6 "sell",%1,1<%1,"talon" -> Type=3034, Amount=%1, Price=320*%1, "Do you want to sell %A magic gems called talon for %P gold?", Topic=6 @@ -52,6 +66,14 @@ Topic=6,"yes" -> "Sorry, you do not have one." Topic=6,"yes", Amount>1 -> "Sorry, you do not have so many." Topic=6 -> "Maybe next time." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + @"gen-t-runes-free-s.ndb" @"gen-t-wands-free-s.ndb" } diff --git a/data/npc/gen-t-magic-s.ndb b/data/npc/gen-t-magic-s.ndb index fc06e31..7ab35d3 100644 --- a/data/npc/gen-t-magic-s.ndb +++ b/data/npc/gen-t-magic-s.ndb @@ -10,10 +10,25 @@ "mana","fluid" -> Type=2874, Data=10, Amount=1, Price=100, "Do you want to buy mana fluid for %P gold?", Topic=30 "rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=31 "spellbook" -> Type=3059, Amount=1, Price=150, "Do you want to buy a spellbook for %P gold?", Topic=31 + %1,0<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=30 %1,0<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=100*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=30 %1,0<%1,"runes" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=31 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=34 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=34 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=33 +"bp","blank","rune" -> * + +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=34 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=34 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=33 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=32 "vial" -> * "flask" -> * @@ -29,3 +44,11 @@ Topic=30 -> "Hmm, but next time." Topic=32,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are ... %P gold.", Delete(2874), CreateMoney Topic=32,"yes" -> "You don't have any empty vials." Topic=32 -> "Hmm, but please keep Tibia litter free." + +Topic=33,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=33,"yes" -> "Come back, when you have enough money." +Topic=33 -> "Hmm, but next time." + +Topic=34,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=34,"yes" -> "Come back, when you have enough money." +Topic=34 -> "Hmm, but next time." diff --git a/data/npc/gen-t-runes-free-s.ndb b/data/npc/gen-t-runes-free-s.ndb index 3daddef..d4ac5cf 100644 --- a/data/npc/gen-t-runes-free-s.ndb +++ b/data/npc/gen-t-runes-free-s.ndb @@ -30,6 +30,43 @@ "sudden","death","rune" -> Type=3155, Data=1, Amount=1, Price=325, "Do you want to buy a sudden death rune for %P gold?", Topic=99 "energy","wall","rune" -> Type=3166, Data=4, Amount=1, Price=340, "Do you want to buy an energy wall rune for %P gold?", Topic=99 +"backpack","light","magic","missile","rune" -> Type=3174, Data=5, Amount=1, Price=41*20, "Do you want to buy a backpack of light magic missile rune for %P gold?", Topic=100 +"bp","light","magic","missile","rune" -> * +"backpack","poison","field","rune" -> Type=3172, Data=3, Amount=1, Price=66*20, "Do you want to buy a backpack of poison field rune for %P gold?", Topic=100 +"bp","poison","field","rune" -> * +"backpack","antidote","rune" -> Type=3153, Data=1, Amount=1, Price=66*20, "Do you want to buy a backpack of antidote rune for %P gold?", Topic=100 +"bp","antidote","rune" -> * +"backpack","fire","field","rune" -> Type=3188, Data=3, Amount=1, Price=86*20, "Do you want to buy a backpack of fire field rune for %P gold?", Topic=100 +"bp","fire","field","rune" -> * +"backpack","intense","healing","rune" -> Type=3152, Data=1, Amount=1, Price=96*20, "Do you want to buy a backpack of intense healing rune for %P gold?", Topic=100 +"bp","intense","healing","rune" -> * +"backpack","fireball","rune" -> Type=3189, Data=2, Amount=1, Price=96*20, "Do you want to buy a backpack of fireball rune for %P gold?", Topic=100 +"bp","fireball","rune" -> * +"backpack","destroy","field","rune" -> Type=3148, Data=3, Amount=1, Price=46*20, "Do you want to buy a backpack of destroy field rune for %P gold?", Topic=100 +"bp","destroy","field","rune" -> * +"backpack","heavy","magic","missile","rune" -> Type=3198, Data=5, Amount=1, Price=126*20, "Do you want to buy a backpack of heavy magic missile rune for %P gold?", Topic=100 +"bp","heavy","magic","missile","rune" -> * +"backpack","energy","field","rune" -> Type=3164, Data=3, Amount=1, Price=116*20, "Do you want to buy a backpack of energy field rune for %P gold?", Topic=100 +"bp","energy","field","rune" -> * +"backpack","ultimate","healing","rune" -> Type=3160, Data=1, Amount=1, Price=176*20, "Do you want to buy a backpack of ultimate healing rune for %P gold?", Topic=100 +"bp","ultimate","healing","rune" -> * +"backpack","convince","creature","rune" -> Type=3177, Data=1, Amount=1, Price=81*20, "Do you want to buy a backpack of convince creature rune for %P gold?", Topic=100 +"bp","convince","creature","rune" -> * +"backpack","great","fireball","rune" -> Type=3191, Data=2, Amount=1, Price=181*20, "Do you want to buy a backpack of great fireball rune for %P gold?", Topic=100 +"bp","great","fireball","rune" -> * +"backpack","chameleon","rune" -> Type=3178, Data=1, Amount=1, Price=211*20, "Do you want to buy a backpack of chameleon rune for %P gold?", Topic=100 +"bp","chameleon","rune" -> * +"backpack","fire","bomb","rune" -> Type=3192, Data=2, Amount=1, Price=236*20, "Do you want to buy a backpack of firebomb rune for %P gold?", Topic=100 +"bp","fire","bomb","rune" -> * +"backpack","poison","wall","rune" -> Type=3176, Data=4, Amount=1, Price=211*20, "Do you want to buy a backpack of poison wall rune for %P gold?", Topic=100 +"bp","poison","wall","rune" -> * +"backpack","explosion","rune" -> Type=3200, Data=3, Amount=1, Price=251*20, "Do you want to buy a backpack of explosion rune for %P gold?", Topic=100 +"bp","explosion","rune" -> * +"backpack","fire","wall","rune" -> Type=3190, Data=4, Amount=1, Price=246*20, "Do you want to buy a backpack of fire wall rune for %P gold?", Topic=100 +"bp","fire","wall","rune" -> * +"backpack","energy","wall","rune" -> Type=3166, Data=4, Amount=1, Price=341*20, "Do you want to buy a backpack of energy wall rune for %P gold?", Topic=100 +"bp","energy","wall","rune" -> * + "envenom","rune" -> "Sorry, but runes of this type can't be purchased here." "desintegrate","rune" -> * "poison","bomb","rune" -> * @@ -59,7 +96,49 @@ %1,1<%1,"sudden","death","rune" -> Type=3155, Data=1, Amount=%1, Price=325*%1, "Do you want to buy %A sudden death runes for %P gold?", Topic=99 %1,1<%1,"energy","wall","rune" -> Type=3166, Data=4, Amount=%1, Price=340*%1, "Do you want to buy %A energy wall runes for %P gold?", Topic=99 +%1,1<%1,"backpack","light","magic","missile","rune" -> Type=3174, Data=5, Amount=%1, Price=41*20*%1, "Do you want to buy %A backpacks of light magic missile runes for %P gold?", Topic=100 +%1,1<%1,"bp","light","magic","missile","rune" -> * +%1,1<%1,"backpack","poison","field","rune" -> Type=3172, Data=3, Amount=%1, Price=66*20*%1, "Do you want to buy %A backpacks of poison field runes for %P gold?", Topic=100 +%1,1<%1,"bp","poison","field","rune" -> * +%1,1<%1,"backpack","antidote","rune" -> Type=3153, Data=1, Amount=%1, Price=66*20*%1, "Do you want to buy %A backpacks of antidote runes for %P gold?", Topic=100 +%1,1<%1,"bp","antidote","rune" -> * +%1,1<%1,"backpack","fire","field","rune" -> Type=3188, Data=3, Amount=%1, Price=86*20*%1, "Do you want to buy %A backpacks of fire field runes for %P gold?", Topic=100 +%1,1<%1,"bp","fire","field","rune" -> * +%1,1<%1,"backpack","intense","healing","rune" -> Type=3152, Data=1, Amount=%1, Price=96*20*%1, "Do you want to buy %A backpacks of intense healing runes for %P gold?", Topic=100 +%1,1<%1,"bp","intense","healing","rune" -> * +%1,1<%1,"backpack","fireball","rune" -> Type=3189, Data=2, Amount=%1, Price=96*20*%1, "Do you want to buy %A backpacks of fireball runes for %P gold?", Topic=100 +%1,1<%1,"bp","fireball","rune" -> * +%1,1<%1,"backpack","destroy","field","rune" -> Type=3148, Data=3, Amount=%1, Price=46*20*%1, "Do you want to buy %A backpacks of destroy field runes for %P gold?", Topic=100 +%1,1<%1,"bp","destroy","field","rune" -> * +%1,1<%1,"backpack","heavy","magic","missile","rune" -> Type=3198, Data=5, Amount=%1, Price=126*20*%1, "Do you want to buy %A backpacks of heavy magic missile runes for %P gold?", Topic=100 +%1,1<%1,"bp","heavy","magic","missile","rune" -> * +%1,1<%1,"backpack","energy","field","rune" -> Type=3164, Data=3, Amount=%1, Price=116*20*%1, "Do you want to buy %A backpacks of energy field runes for %P gold?", Topic=100 +%1,1<%1,"bp","energy","field","rune" -> * +%1,1<%1,"backpack","ultimate","healing","rune" -> Type=3160, Data=1, Amount=%1, Price=176*20*%1, "Do you want to buy %A backpacks of ultimate healing runes for %P gold?", Topic=100 +%1,1<%1,"bp","ultimate","healing","rune" -> * +%1,1<%1,"backpack","convince","creature","rune" -> Type=3177, Data=1, Amount=%1, Price=81*20*%1, "Do you want to buy %A backpacks of convince creature runes for %P gold?", Topic=100 +%1,1<%1,"bp","convince","creature","rune" -> * +%1,1<%1,"backpack","great","fireball","rune" -> Type=3191, Data=2, Amount=%1, Price=181*20*%1, "Do you want to buy %A backpacks of great fireball runes for %P gold?", Topic=100 +%1,1<%1,"bp","great","fireball","rune" -> * +%1,1<%1,"backpack","chameleon","rune" -> Type=3178, Data=1, Amount=%1, Price=211*20*%1, "Do you want to buy %A backpacks of chameleon runes for %P gold?", Topic=100 +%1,1<%1,"bp","chameleon","rune" -> * +%1,1<%1,"backpack","fire","bomb","rune" -> Type=3192, Data=2, Amount=%1, Price=236*20*%1, "Do you want to buy %A backpacks of firebomb runes for %P gold?", Topic=100 +%1,1<%1,"bp","fire","bomb","rune" -> * +%1,1<%1,"backpack","poison","wall","rune" -> Type=3176, Data=4, Amount=%1, Price=211*20*%1, "Do you want to buy %A backpacks of poison wall runes for %P gold?", Topic=100 +%1,1<%1,"bp","poison","wall","rune" -> * +%1,1<%1,"backpack","explosion","rune" -> Type=3200, Data=3, Amount=%1, Price=251*20*%1, "Do you want to buy %A backpacks of explosion runes for %P gold?", Topic=100 +%1,1<%1,"bp","explosion","rune" -> * +%1,1<%1,"backpack","fire","wall","rune" -> Type=3190, Data=4, Amount=%1, Price=246*20*%1, "Do you want to buy %A backpacks of fire wall runes for %P gold?", Topic=100 +%1,1<%1,"bp","fire","wall","rune" -> * +%1,1<%1,"backpack","sudden","death","rune" -> Type=3155, Data=1, Amount=%1, Price=326*20*%1, "Do you want to buy %A backpacks of sudden death runes for %P gold?", Topic=100 +%1,1<%1,"bp","sudden","death","rune" -> * +%1,1<%1,"backpack","energy","wall","rune" -> Type=3166, Data=4, Amount=%1, Price=341*20*%1, "Do you want to buy %A backpacks of energy wall runes for %P gold?", Topic=100 +%1,1<%1,"bp","energy","wall","rune" -> * Topic=99,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=99,"yes" -> "Sorry, you don't have enough gold." Topic=99 -> "As you wish." + +Topic=100,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=100,"yes" -> "Sorry, you don't have enough gold." +Topic=100 -> "As you wish." \ No newline at end of file diff --git a/data/npc/gen-t-runes-prem-s.ndb b/data/npc/gen-t-runes-prem-s.ndb index 2c891ba..f48aa1e 100644 --- a/data/npc/gen-t-runes-prem-s.ndb +++ b/data/npc/gen-t-runes-prem-s.ndb @@ -13,6 +13,22 @@ "animate","dead","rune" -> Type=3203, Data=1, Amount=1, Price=375, "Do you want to buy an animate dead rune for %P gold?", Topic=99 "paralyze","rune" -> Type=3165, Data=1, Amount=1, Price=700, "Do you want to buy a paralyze rune for %P gold?", Topic=99 +"backpack","envenom","rune" -> Type=3179, Data=3, Amount=1, Price=131*20, "Do you want to buy a backpack of envenom rune for %P gold?", Topic=100 +"bp","envenom","rune" -> * +"backpack","desintegrate","rune" -> Type=3197, Data=3, Amount=1, Price=81*20, "Do you want to buy a backpack of desintegrate rune for %P gold?", Topic=100 +"bp","desintegrate","rune" -> * +"backpack","poison","bomb","rune" -> Type=3173, Data=2, Amount=1, Price=171*20, "Do you want to buy a backpack of poison bomb rune for %P gold?", Topic=100 +"bp","poison","bomb","rune" -> * +"backpack","soulfire","rune" -> Type=3195, Data=2, Amount=1, Price=211*20, "Do you want to buy a backpack of soulfire rune for %P gold?", Topic=100 +"bp","soulfire","rune" -> * +"backpack","energy","bomb","rune" -> Type=3149, Data=2, Amount=1, Price=326*20, "Do you want to buy a backpack of energybomb rune for %P gold?", Topic=100 +"bp","energy","bomb","rune" -> * +"backpack","magic","wall","rune" -> Type=3180, Data=3, Amount=1, Price=351*20, "Do you want to buy a backpack of magic wall rune for %P gold?", Topic=100 +"bp","magic","wall","rune" -> * +"backpack","animate","dead","rune" -> Type=3203, Data=1, Amount=1, Price=376*20, "Do you want to buy a backpack of animate dead rune for %P gold?", Topic=100 +"bp","animate","dead","rune" -> * +"backpack","paralyze","rune" -> Type=3165, Data=1, Amount=1, Price=701*20, "Do you want to buy a backpack of paralyze rune for %P gold?", Topic=100 +"bp","paralyze","rune" -> * %1,1<%1,"envenom","rune" -> Type=3179, Data=3, Amount=%1, Price=130*%1, "Do you want to buy %A envenom runes for %P gold?", Topic=99 %1,1<%1,"desintegrate","rune" -> Type=3197, Data=3, Amount=%1, Price=80*%1, "Do you want to buy %A desintegrate runes for %P gold?", Topic=99 @@ -23,6 +39,22 @@ %1,1<%1,"animate","dead","rune" -> Type=3203, Data=1, Amount=%1, Price=375*%1, "Do you want to buy %A animate dead runes for %P gold?", Topic=99 %1,1<%1,"paralyze","rune" -> Type=3165, Data=1, Amount=%1, Price=700*%1, "Do you want to buy %A paralyze runes for %P gold?", Topic=99 +%1,1<%1,"backpack","envenom","rune" -> Type=3179, Data=3, Amount=%1, Price=131*20*%1, "Do you want to buy %A backpacks of envenom runes for %P gold?", Topic=100 +%1,1<%1,"bp","envenom","rune" -> * +%1,1<%1,"backpack","desintegrate","rune" -> Type=3197, Data=3, Amount=%1, Price=81*20*%1, "Do you want to buy %A backpacks of desintegrate runes for %P gold?", Topic=100 +%1,1<%1,"bp","desintegrate","rune" -> * +%1,1<%1,"backpack","poison","bomb","rune" -> Type=3173, Data=2, Amount=%1, Price=171*20*%1, "Do you want to buy %A backpacks of poison bomb runes for %P gold?", Topic=100 +%1,1<%1,"bp","poison","bomb","rune" -> * +%1,1<%1,"backpack","soulfire","rune" -> Type=3195, Data=2, Amount=%1, Price=211*20*%1, "Do you want to buy %A backpacks of soulfire runes for %P gold?", Topic=100 +%1,1<%1,"bp","soulfire","rune" -> * +%1,1<%1,"backpack","energy","bomb","rune" -> Type=3149, Data=2, Amount=%1, Price=326*20*%1, "Do you want to buy %A backpacks of energybomb runes for %P gold?", Topic=100 +%1,1<%1,"bp","energy","bomb","rune" -> * +%1,1<%1,"backpack","magic","wall","rune" -> Type=3180, Data=3, Amount=%1, Price=351*20*%1, "Do you want to buy %A backpacks of magic wall runes for %P gold?", Topic=100 +%1,1<%1,"bp","magic","wall","rune" -> * +%1,1<%1,"backpack","animate","dead","rune" -> Type=3203, Data=1, Amount=%1, Price=376*20*%1, "Do you want to buy %A backpacks of animate dead runes for %P gold?", Topic=100 +%1,1<%1,"bp","animate","dead","rune" -> * +%1,1<%1,"backpack","paralyze","rune" -> Type=3165, Data=1, Amount=%1, Price=701*20*%1, "Do you want to buy %A backpacks of paralyze runes for %P gold?", Topic=100 +%1,1<%1,"bp","paralyze","rune" -> * "light","magic","missile","rune" -> "Sorry, but runes of this type can't be purchased here." "poison","field","rune" -> * @@ -48,3 +80,7 @@ Topic=99,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, Create(Type) Topic=99,"yes" -> "Sorry, you don't have enough gold." Topic=99 -> "As you wish." + +Topic=100,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=100,"yes" -> "Sorry, you don't have enough gold." +Topic=100 -> "As you wish." diff --git a/data/npc/hyacinth.npc b/data/npc/hyacinth.npc index fe74c84..c00277e 100644 --- a/data/npc/hyacinth.npc +++ b/data/npc/hyacinth.npc @@ -41,10 +41,20 @@ VANISH,! -> "May Crunor bless you." "life","fluid" -> Type=2874, Data=11, Amount=1, Price=60, "Do you want to buy life fluid for %P gold?", Topic=1 %1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=1 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * + +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * + Topic=1,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, Create(Type) Topic=1,"yes" -> "Come back, when you have enough money." Topic=1 -> "Hmm, but next time." +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=2 "vial" -> * "flask" -> * diff --git a/data/npc/mehkesh.npc b/data/npc/mehkesh.npc index 9871c22..9bf7c47 100644 --- a/data/npc/mehkesh.npc +++ b/data/npc/mehkesh.npc @@ -71,6 +71,16 @@ VANISH,! -> "May enlightenment be your path." %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=2 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * + +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=3 "vial" -> * "flask" -> * @@ -82,4 +92,9 @@ Topic=2 -> "Hmm, but next time." Topic=3,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are ... %P gold.", Delete(2874), CreateMoney Topic=3,"yes" -> "You don't have any empty vials." Topic=3 -> "Hmm, but please keep Tibia litter free." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + } diff --git a/data/npc/rachel.npc b/data/npc/rachel.npc index b9ac646..4686374 100644 --- a/data/npc/rachel.npc +++ b/data/npc/rachel.npc @@ -40,11 +40,25 @@ VANISH,! -> "These impatient young brats!" "mana","fluid" -> Type=2874, Data=10, Amount=1, Price=55, "Do you want to buy mana fluid for %P gold?", Topic=3 "life","fluid" -> Type=2874, Data=11, Amount=1, Price=60, "Do you want to buy life fluid for %P gold?", Topic=3 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?",Topic=2 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A runes for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=3 %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=3 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "sell","talon" -> Type=3034, Amount=1, Price=320, "Do you want to sell one of the magic gems called talon for %P gold?", Topic=6 "sell",%1,1<%1,"talon" -> Type=3034, Amount=%1, Price=320*%1, "Do you want to sell %A magic gems called talon for %P gold?", Topic=6 @@ -73,6 +87,14 @@ Topic=6,"yes" -> "Sorry, you do not have one." Topic=6,"yes", Amount>1 -> "Sorry, you do not have so many." Topic=6 -> "Maybe next time." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + @"gen-t-runes-free-s.ndb" @"gen-t-wands-free-s.ndb" } diff --git a/data/npc/sandra.npc b/data/npc/sandra.npc index 26f7475..22054e9 100644 --- a/data/npc/sandra.npc +++ b/data/npc/sandra.npc @@ -48,6 +48,16 @@ VANISH,! -> "Good bye and please come back soon." "oil" -> Type=2874, Data=7, Amount=1, Price=20, "Do you want to buy a potion of oil for %P gold?", Topic=2 "water" -> Type=2874, Data=1, Amount=1, Price=8, "Do you want to buy a potion of distilled water for %P gold?", Topic=2 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=11 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=11 +"bp","mana","fluid" -> * + +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=11 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=11 +%1,1<%1,"bp","mana","fluid" -> * + "deposit",QuestValue(17545)=1 -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=3 "vial",QuestValue(17545)=1 -> * "flask",QuestValue(17545)=1 -> * @@ -101,4 +111,8 @@ Topic=10 -> "Maybe another time." "winning","lottery","ticket",QuestValue(17546)=1 -> "I am sorry, but since you already have our potion belt we have no further prizes left for you. Maybe try to gift the winning lottery ticket for someone who really want to claim the accessory." "prize",QuestValue(17546)=1 -> * + +Topic=11,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=11,"yes" -> "Come back, when you have enough money." +Topic=11 -> "Hmm, but next time." } diff --git a/data/npc/shiriel.npc b/data/npc/shiriel.npc index 072479f..c263a39 100644 --- a/data/npc/shiriel.npc +++ b/data/npc/shiriel.npc @@ -45,11 +45,25 @@ VANISH,! -> "Asha Thrazi." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=1 "spellbook" -> Type=3059, Amount=1, Price=150, "Do you want to buy a spellbook for %P gold?", Topic=1 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=2 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=1 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?", Topic=1 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial, ok?", Data=0, Topic=3 "vial" -> * "flask" -> * @@ -66,6 +80,14 @@ Topic=3,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you Topic=3,"yes" -> "You don't have any empty vials." Topic=3 -> "Hmm, but please keep Tibia litter free." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + @"gen-t-runes-free-s.ndb" @"gen-t-wands-free-s.ndb" } diff --git a/data/npc/sigurd.npc b/data/npc/sigurd.npc index 6222166..c613ce3 100644 --- a/data/npc/sigurd.npc +++ b/data/npc/sigurd.npc @@ -36,11 +36,25 @@ VANISH,! -> "Good bye. Come back soon." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=4 "spellbook" -> Type=3059, Amount=1, Price=150, "In a spellbook, your spells are listed. There you will find the pronunciation of each spell. Do you want to buy one for %P gold?", Topic=4 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=5 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=5 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=4 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "In a spellbook, your spells are listed. There you will find the pronunciation of each spell. Do you want to buy %A spellbooks for %P gold?", Topic=4 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=6 "vial" -> * "flask" -> * @@ -60,4 +74,12 @@ Topic=6,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are Topic=6,"yes" -> "You don't have any empty vials." Topic=6 -> "Hmm, but please keep Tibia litter free." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + } diff --git a/data/npc/tandros.npc b/data/npc/tandros.npc index 8ca7e8a..6c9e92e 100644 --- a/data/npc/tandros.npc +++ b/data/npc/tandros.npc @@ -59,12 +59,25 @@ VANISH,! -> "Farewell." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=1 "spellbook" -> Type=3059, Amount=1, Price=150, "Do you want to buy a spellbook for %P gold?", Topic=1 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=2 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=1 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?", Topic=1 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=3 "vial" -> * "flask" -> * @@ -81,6 +94,13 @@ Topic=3,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are Topic=3,"yes" -> "You don't have any empty vials." Topic=3 -> "Hmm, but please keep Tibia litter free." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." @"gen-t-runes-free-s.ndb" @"gen-t-wands-prem-s.ndb" diff --git a/data/npc/topsy.npc b/data/npc/topsy.npc index 384ce4d..e5dd54f 100644 --- a/data/npc/topsy.npc +++ b/data/npc/topsy.npc @@ -70,12 +70,25 @@ Topic=4 -> "Really? Tststs." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=1 "spellbook" -> Type=3059, Amount=1, Price=150, "Do you want to buy a spellbook for %P gold?", Topic=1 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=2 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=1 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?", Topic=1 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=3 "vial" -> * "flask" -> * @@ -92,6 +105,14 @@ Topic=3,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are Topic=3,"yes" -> "You don't have any empty vials." Topic=3 -> "Hmm, but please keep Tibia litter free." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + @"gen-t-runes-free-s.ndb" @"gen-t-wands-free-s.ndb" } diff --git a/data/npc/xodet.npc b/data/npc/xodet.npc index d3e3d95..c4faf31 100644 --- a/data/npc/xodet.npc +++ b/data/npc/xodet.npc @@ -32,11 +32,25 @@ VANISH,! -> "Good bye." "blank","rune" -> Type=3147, Amount=1, Price=10, "Do you want to buy a blank rune for %P gold?", Topic=1 "spellbook" -> Type=3059, Amount=1, Price=150, "Do you want to buy a spellbook for %P gold?", Topic=1 +"backpack","life","fluid" -> Type=2874, Data=11, Amount=1, Price=61*20, "Do you want to buy a backpack of life fluid for %P gold?", Topic=8 +"bp","life","fluid" -> * +"backpack","mana","fluid" -> Type=2874, Data=10, Amount=1, Price=56*20, "Do you want to buy a backpack of mana fluid for %P gold?", Topic=8 +"bp","mana","fluid" -> * +"backpack","blank","rune" -> Type=3147, Amount=1, Price=11*20, "Do you want to buy a backpack of blank rune for %P gold?", Topic=7 +"bp","blank","rune" -> * + %1,1<%1,"life","fluid" -> Type=2874, Data=11, Amount=%1, Price=60*%1, "Do you want to buy %A potions of life fluid for %P gold?", Topic=2 %1,1<%1,"mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=55*%1, "Do you want to buy %A potions of mana fluid for %P gold?", Topic=2 %1,1<%1,"blank","rune" -> Type=3147, Amount=%1, Price=10*%1, "Do you want to buy %A blank runes for %P gold?", Topic=1 %1,1<%1,"spellbook" -> Type=3059, Amount=%1, Price=150*%1, "Do you want to buy %A spellbooks for %P gold?", Topic=1 +%1,1<%1,"backpack","life","fluid" -> Type=2874, Data=11, Amount=%1, Price=61*20*%1, "Do you want to buy %A backpacks of potions of life fluid for %P gold?", Topic=8 +%1,1<%1,"bp","life","fluid" -> * +%1,1<%1,"backpack","mana","fluid" -> Type=2874, Data=10, Amount=%1, Price=56*20*%1, "Do you want to buy %A backpacks of potions of mana fluid for %P gold?", Topic=8 +%1,1<%1,"bp","mana","fluid" -> * +%1,1<%1,"backpack","blank","rune" -> Type=3147, Amount=%1, Price=11*20*%1, "Do you want to buy %A backpacks of blank runes for %P gold?", Topic=7 +%1,1<%1,"bp","blank","rune" -> * + "deposit" -> "I will pay you 5 gold for every empty vial. Ok?", Data=0, Topic=3 "vial" -> * "flask" -> * @@ -53,6 +67,14 @@ Topic=3,"yes",Count(2874)>0 -> Amount=Count(2874), Price=Amount*5, "Here you are Topic=3,"yes" -> "You don't have any empty vials." Topic=3 -> "Hmm, but please keep Tibia litter free." +Topic=7,"yes",CountMoney>=Price -> "Here you are.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=7,"yes" -> "Come back, when you have enough money." +Topic=7 -> "Hmm, but next time." + +Topic=8,"yes",CountMoney>=Price -> "Here you are. There is a deposit of 5 gold on the vial.", DeleteMoney, CreateContainer(2854,Type,Data) +Topic=8,"yes" -> "Come back, when you have enough money." +Topic=8 -> "Hmm, but next time." + @"gen-t-runes-free-s.ndb" @"gen-t-wands-free-s.ndb" } diff --git a/src/behaviourdatabase.cpp b/src/behaviourdatabase.cpp index c63a10c..0351fa4 100644 --- a/src/behaviourdatabase.cpp +++ b/src/behaviourdatabase.cpp @@ -1113,7 +1113,7 @@ void BehaviourDatabase::checkAction(const NpcBehaviourAction* action, Player* pl Container* realContainer = container->getContainer(); for (int32_t c = 0; c < std::max(1, realContainer->capacity()); c++) { - Item* item = Item::CreateItem(itemId, data); + Item* item = Item::CreateItem(itemId, data == -1 ? 0 : data); if (!item) { std::cout << "[Error - BehaviourDatabase::checkAction]: CreateContainer - failed to create item" << std::endl; break;