diff --git a/New Text Document.txt b/New Text Document.txt index 2f81bf9..9ea74f3 100644 --- a/New Text Document.txt +++ b/New Text Document.txt @@ -1 +1 @@ -next: 17735 \ No newline at end of file +next: 17739 \ No newline at end of file diff --git a/data/XML/quests.xml b/data/XML/quests.xml index f5e6649..840be0d 100644 --- a/data/XML/quests.xml +++ b/data/XML/quests.xml @@ -458,6 +458,14 @@ + + + + + + + + diff --git a/data/creaturescripts/scripts/killing_in_the_name_of.lua b/data/creaturescripts/scripts/killing_in_the_name_of.lua index ac7743d..a3b2f92 100644 --- a/data/creaturescripts/scripts/killing_in_the_name_of.lua +++ b/data/creaturescripts/scripts/killing_in_the_name_of.lua @@ -56,6 +56,19 @@ local tasks = { ['hyaena'] = {taskerStorage = 17608, progressStorage = 17732, killsRequired = 30}, ['lion'] = {taskerStorage = 17608, progressStorage = 17733, killsRequired = 20}, ['bear'] = {taskerStorage = 17608, progressStorage = 17734, killsRequired = 35}, + ['slime'] = {taskerStorage = 17608, progressStorage = 17735, killsRequired = 100}, + ['beholder'] = {taskerStorage = 17608, progressStorage = 17736, killsRequired = 250}, + ['elder beholder'] = {taskerStorage = 17608, progressStorage = 17736, killsRequired = 250}, + ['green djinn'] = {taskerStorage = 17608, progressStorage = 17737, killsRequired = 500}, + ['blue djinn'] = {taskerStorage = 17608, progressStorage = 17737, killsRequired = 500}, + ['marid'] = {taskerStorage = 17608, progressStorage = 17737, killsRequired = 500}, + ['efreet'] = {taskerStorage = 17608, progressStorage = 17737, killsRequired = 500}, + ['pirate skeleton'] = {taskerStorage = 17608, progressStorage = 17738, killsRequired = 600}, + ['pirate marauder'] = {taskerStorage = 17608, progressStorage = 17738, killsRequired = 600}, + ['pirate cutthroat'] = {taskerStorage = 17608, progressStorage = 17738, killsRequired = 600}, + ['pirate ghost'] = {taskerStorage = 17608, progressStorage = 17738, killsRequired = 600}, + ['pirate buccaneer'] = {taskerStorage = 17608, progressStorage = 17738, killsRequired = 600}, + ['pirate corsair'] = {taskerStorage = 17608, progressStorage = 17738, killsRequired = 600}, ['orc spearman'] = {taskerStorage = 17608, progressStorage = 17712, killsRequired = 300}, ['orc shaman'] = {taskerStorage = 17608, progressStorage = 17712, killsRequired = 300}, ['orc rider'] = {taskerStorage = 17608, progressStorage = 17712, killsRequired = 300}, diff --git a/data/monster/781/pirate buccaneer.xml b/data/monster/781/pirate buccaneer.xml index d8d4697..c1123fe 100644 --- a/data/monster/781/pirate buccaneer.xml +++ b/data/monster/781/pirate buccaneer.xml @@ -30,20 +30,23 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/monster/781/pirate corsair.xml b/data/monster/781/pirate corsair.xml index e2a0e5d..c1ea8d8 100644 --- a/data/monster/781/pirate corsair.xml +++ b/data/monster/781/pirate corsair.xml @@ -47,4 +47,7 @@ + \ No newline at end of file diff --git a/data/monster/781/pirate cutthroat.xml b/data/monster/781/pirate cutthroat.xml index c89a9e6..54df4c3 100644 --- a/data/monster/781/pirate cutthroat.xml +++ b/data/monster/781/pirate cutthroat.xml @@ -43,4 +43,7 @@ + \ No newline at end of file diff --git a/data/monster/781/pirate ghost.xml b/data/monster/781/pirate ghost.xml index 0886ace..609cdea 100644 --- a/data/monster/781/pirate ghost.xml +++ b/data/monster/781/pirate ghost.xml @@ -48,4 +48,7 @@ + \ No newline at end of file diff --git a/data/monster/781/pirate marauder.xml b/data/monster/781/pirate marauder.xml index 3051600..f4453c1 100644 --- a/data/monster/781/pirate marauder.xml +++ b/data/monster/781/pirate marauder.xml @@ -45,4 +45,7 @@ + \ No newline at end of file diff --git a/data/monster/781/pirate skeleton.xml b/data/monster/781/pirate skeleton.xml index 489b2b2..cdbac7f 100644 --- a/data/monster/781/pirate skeleton.xml +++ b/data/monster/781/pirate skeleton.xml @@ -27,4 +27,7 @@ + \ No newline at end of file diff --git a/data/monster/beholder.xml b/data/monster/beholder.xml index 3beafa4..9ddbbce 100644 --- a/data/monster/beholder.xml +++ b/data/monster/beholder.xml @@ -67,4 +67,7 @@ + \ No newline at end of file diff --git a/data/monster/bluedjinn.xml b/data/monster/bluedjinn.xml index f5c16a7..42b4c65 100644 --- a/data/monster/bluedjinn.xml +++ b/data/monster/bluedjinn.xml @@ -61,4 +61,7 @@ + \ No newline at end of file diff --git a/data/monster/efreet.xml b/data/monster/efreet.xml index 792fbf3..65c1448 100644 --- a/data/monster/efreet.xml +++ b/data/monster/efreet.xml @@ -77,4 +77,7 @@ + \ No newline at end of file diff --git a/data/monster/elderbeholder.xml b/data/monster/elderbeholder.xml index 992f66a..2774cc5 100644 --- a/data/monster/elderbeholder.xml +++ b/data/monster/elderbeholder.xml @@ -73,4 +73,7 @@ + \ No newline at end of file diff --git a/data/monster/greendjinn.xml b/data/monster/greendjinn.xml index ac33dd8..61573ec 100644 --- a/data/monster/greendjinn.xml +++ b/data/monster/greendjinn.xml @@ -62,4 +62,7 @@ + \ No newline at end of file diff --git a/data/monster/marid.xml b/data/monster/marid.xml index 4bc26c9..a5b58dc 100644 --- a/data/monster/marid.xml +++ b/data/monster/marid.xml @@ -77,4 +77,7 @@ + \ No newline at end of file diff --git a/data/monster/slime.xml b/data/monster/slime.xml index ca7e4a5..3f6a843 100644 --- a/data/monster/slime.xml +++ b/data/monster/slime.xml @@ -30,4 +30,7 @@ + \ No newline at end of file diff --git a/data/npc/killing-tasks.ndb b/data/npc/killing-tasks.ndb index 1dc19c9..d9203bb 100644 --- a/data/npc/killing-tasks.ndb +++ b/data/npc/killing-tasks.ndb @@ -34,8 +34,8 @@ VANISH,! -> "Happy hunting, old chap!" "trade" -> * "sabrehaven","talon" -> "We as a hunting society know very interesting purposes of those magical talons. But only the loyal hunters of the 'Paw and Fur - Hunting Elite' are allowed to know." -"low","task",QuestValue(17607)=1,QuestValue(17608)=0 -> "You can hunt: Frost trolls, swamp trolls, lions, rats, hyaenas, bears, bugs, wolves, wasps, larvas, dwarfs, low undeads, crocodiles, tarantulas, carniphilas, apes, thornback tortoises, gargoyles, elves or outlaws.", Topic=5 -"medium","task",QuestValue(17607)=1,QuestValue(17608)=0 -> "You can hunt: Medium class orcs, high class minotaurs, lizards, high class dwarfs, medium undeads, quara scouts, ancient scarabs, wyverns, bonebeasts or dragons.", Topic=5 +"low","task",QuestValue(17607)=1,QuestValue(17608)=0 -> "You can hunt: Frost trolls, swamp trolls, lions, rats, hyaenas, bears, bugs, wolves, wasps, larvas, dwarfs, low undeads, crocodiles, tarantulas, carniphilas, apes, thornback tortoises, gargoyles, elves, outlaws or slimes.", Topic=5 +"medium","task",QuestValue(17607)=1,QuestValue(17608)=0 -> "You can hunt: Medium class orcs, high class minotaurs, lizards, high class dwarfs, medium undeads, quara scouts, ancient scarabs, wyverns, bonebeasts, beholders, djinns, pirates or dragons.", Topic=5 "high","task",QuestValue(17607)=1,QuestValue(17608)=0 -> "You can hunt: High class orcs, hero, necromancers, underwater quara, giant spiders, banshees, lichs or cults.", Topic=5 "very","high","task",QuestValue(17607)=1,QuestValue(17608)=0 -> "You can hunt: Nightmare, hydras, serpent spawns, behemoths, dragon lords, warlocks, hand of cursed fates, juggernauts, demons.", Topic=5 "task",QuestValue(17607)=1,QuestValue(17608)=0 -> "Alright, what would you like to hunt? I have low level tasks, medium level tasks, high level tasks and very high level tasks.", Topic=5 @@ -61,13 +61,14 @@ Topic=5,"outlaw" -> Amount=17731, "They can be found all over Tibia. Hunt 250 of Topic=5,"hyaena" -> Amount=17732, "They can be found all over Tibia. Hunt 30 of them. Interested?", Topic=2 Topic=5,"lion" -> Amount=17733, "They can be found all over Tibia. Hunt 20 of them. Interested?", Topic=2 Topic=5,"bear" -> Amount=17734, "They can be found all over Tibia. Hunt 35 of them. Interested?", Topic=2 +Topic=5,"slime" -> Amount=17735, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 Topic=5 -> "Maybe next time." "task",QuestValue(17609)=100 -> Data=1, Amount=40*QuestValue(17609)*ExperienceStage(29)*40/100, Price=2000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17610)=100 -> Data=2, Amount=120*QuestValue(17610)*ExperienceStage(29)*40/100, Price=6000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17611)=50 -> Data=2, Amount=150*QuestValue(17611)*ExperienceStage(29)*40/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17612)=100 -> Data=1, Amount=115*QuestValue(17612)*ExperienceStage(29)*40/100, Price=6000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 -"task",QuestValue(17613)=100 -> Data=2, Amount=150*QuestValue(17613)*ExperienceStage(29)*40/100, Price=7000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17613)=100 -> Data=2, Amount=150*QuestValue(17613)*ExperienceStage(29)*40/100, Price=6000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17614)=65 -> Data=3, Amount=150*QuestValue(17614)*ExperienceStage(29)*40/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17697)=100 -> Data=2, Amount=23*QuestValue(17697)*ExperienceStage(29)*40/100, Price=1000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17698)=100 -> Data=2, Amount=25*QuestValue(17698)*ExperienceStage(29)*40/100, Price=1100, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 @@ -83,6 +84,7 @@ Topic=5 -> "Maybe next time." "task",QuestValue(17732)=30 -> Data=1, Amount=20*QuestValue(17732)*ExperienceStage(29)*40/100, Price=350, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17733)=20 -> Data=1, Amount=30*QuestValue(17733)*ExperienceStage(29)*40/100, Price=600, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17734)=35 -> Data=1, Amount=23*QuestValue(17734)*ExperienceStage(29)*40/100, Price=400, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17735)=100 -> Data=1, Amount=160*QuestValue(17735)*ExperienceStage(29)*40/100, Price=7000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 # Recommended tasks for medium level Topic=5,"quara","scout" -> Amount=17616, "The scouts can be found on Malada, one of the Shattered Isles. Your task is to kill 200 quara scouts. I accept quara constrictor scouts, quara hydromancer scouts, quara mantassin scouts, quara pincher scouts and quara predator scouts, are you in?", Topic=2 @@ -95,6 +97,9 @@ Topic=5,"minotaur" -> Amount=17713, "They can be found all over Tibia. Hunt 300 Topic=5,"lizard" -> Amount=17714, "They can be found all over Tibia. Hunt 300 of them. Interested?", Topic=2 Topic=5,"high","dwarf" -> Amount=17715, "They can be found all over Tibia. Hunt 300 of them. Interested?", Topic=2 Topic=5,"medium","undead" -> Amount=17716, "They can be found all over Tibia. Hunt 200 of them. Interested?", Topic=2 +Topic=5,"beholder" -> Amount=17736, "They can be found all over Tibia. Hunt 250 of them. Interested?", Topic=2 +Topic=5,"djinn" -> Amount=17737, "They can be found all over Tibia. Hunt 500 of them. Interested?", Topic=2 +Topic=5,"pirate" -> Amount=17738, "They can be found all over Tibia. Hunt 600 of them. Interested?", Topic=2 "task",QuestValue(17616)=200 -> Data=2, Amount=430*QuestValue(17616)*ExperienceStage(49)*35/100, Price=13000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17617)=125 -> Data=2, Amount=720*QuestValue(17617)*ExperienceStage(49)*35/100, Price=13000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 @@ -106,6 +111,9 @@ Topic=5,"medium","undead" -> Amount=17716, "They can be found all over Tibia. Hu "task",QuestValue(17714)=300 -> Data=2, Amount=158*QuestValue(17714)*ExperienceStage(49)*35/100, Price=11500, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17715)=300 -> Data=2, Amount=166*QuestValue(17715)*ExperienceStage(49)*35/100, Price=11500, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 "task",QuestValue(17716)=200 -> Data=2, Amount=221*QuestValue(17716)*ExperienceStage(49)*35/100, Price=11000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17736)=250 -> Data=3, Amount=450*QuestValue(17736)*ExperienceStage(49)*35/100, Price=15000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17737)=500 -> Data=4, Amount=245*QuestValue(17737)*ExperienceStage(49)*35/100, Price=30000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17738)=600 -> Data=4, Amount=205*QuestValue(17738)*ExperienceStage(49)*35/100, Price=30000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 # Recommended tasks for high level Topic=5,"quara" -> Amount=17621, "As you wish. Seek out a quara settlement and hunt 600 quara, it doesn't matter which type you hunt except scouts. Alright?", Topic=2