diff --git a/data/XML/quests.xml b/data/XML/quests.xml index 395280c..04a040f 100644 --- a/data/XML/quests.xml +++ b/data/XML/quests.xml @@ -404,7 +404,7 @@ - + @@ -420,6 +420,14 @@ + + + + + + + + diff --git a/data/creaturescripts/scripts/killing_in_the_name_of.lua b/data/creaturescripts/scripts/killing_in_the_name_of.lua index 8a35c5d..f58ae1f 100644 --- a/data/creaturescripts/scripts/killing_in_the_name_of.lua +++ b/data/creaturescripts/scripts/killing_in_the_name_of.lua @@ -35,13 +35,23 @@ local tasks = { ['dragon lord'] = {taskerStorage = 17608, progressStorage = 17629, killsRequired = 600}, ['hand of cursed fate'] = {taskerStorage = 17608, progressStorage = 17630, killsRequired = 200}, ['juggernaut'] = {taskerStorage = 17608, progressStorage = 17631, killsRequired = 200}, + ['frost troll'] = {taskerStorage = 17608, progressStorage = 17697, killsRequired = 100}, + ['swamp troll'] = {taskerStorage = 17608, progressStorage = 17698, killsRequired = 100}, + ['rat'] = {taskerStorage = 17608, progressStorage = 17699, killsRequired = 100}, + ['cave rat'] = {taskerStorage = 17608, progressStorage = 17699, killsRequired = 100}, + ['wolf'] = {taskerStorage = 17608, progressStorage = 17700, killsRequired = 100}, + ['wasp'] = {taskerStorage = 17608, progressStorage = 17701, killsRequired = 100}, + ['larva'] = {taskerStorage = 17608, progressStorage = 17702, killsRequired = 100}, + ['dwarf'] = {taskerStorage = 17608, progressStorage = 17703, killsRequired = 100}, + ['skeleton'] = {taskerStorage = 17608, progressStorage = 17704, killsRequired = 100}, + ['ghoul'] = {taskerStorage = 17608, progressStorage = 17704, killsRequired = 100}, -- Daniel Steelsoul ['troll'] = {taskerStorage = 17632, progressStorage = 17633, killsRequired = 100}, ['goblin'] = {taskerStorage = 17632, progressStorage = 17634, killsRequired = 150}, ['rotworm'] = {taskerStorage = 17632, progressStorage = 17635, killsRequired = 150}, ['carrion worm'] = {taskerStorage = 17632, progressStorage = 17635, killsRequired = 150}, - ['cyclops'] = {taskerStorage = 17632, progressStorage = 17636, killsRequired = 500}, + ['cyclops'] = {taskerStorage = 17632, progressStorage = 17636, killsRequired = 150}, -- Young Vocation Tasks ['amazon'] = {taskerStorage = 17644, progressStorage = 17645, killsRequired = 50}, diff --git a/data/npc/daniel.npc b/data/npc/daniel.npc index d91660d..3c9a23a 100644 --- a/data/npc/daniel.npc +++ b/data/npc/daniel.npc @@ -96,12 +96,12 @@ Topic=3,"goblin" -> Amount=17634, "It's not only the trolls invading from the we "If you could kill 150 goblins for us, that'd be a good start. Would you be willing to help us in this matter?", Topic=4 Topic=3,"rotworm" -> Amount=17635, "Maybe you have noticed the numerous rotworms that burrowed under Edron. They're quite a pest. You look strong enough to be able to vanquish a few for us. Do you think you can kill 150 rotworms?", Topic=4 Topic=3,"cyclop" -> Amount=17636, "We've successfully driven the minotaurs off this island, but the underground city of the cyclopes - Cyclopolis - is still standing. ...", - "We're always looking for adventurers who'd help us decimate the number of cyclopes. Will you assist the city of Edron by killing 500 of them?", Topic=4 + "We're always looking for adventurers who'd help us decimate the number of cyclopes. Will you assist the city of Edron by killing 150 of them?", Topic=4 "task",QuestValue(17633)=100 -> Amount=20*QuestValue(17633)*ExperienceStage(49)*5/100, Price=2000, "Very nice, %N. That will push the trolls' forces back a little. Here is your reward!", SetQuestValue(QuestValue(17632),99999), SetQuestValue(17632,0), Experience(Amount), CreateMoney "task",QuestValue(17634)=150 -> Amount=25*QuestValue(17634)*ExperienceStage(49)*5/100, Price=2500, "Congratulations, you've fought well against the goblin plague. Thank you! Here is your reward!", SetQuestValue(QuestValue(17632),99999), SetQuestValue(17632,0), Experience(Amount), CreateMoney "task",QuestValue(17635)=150 -> Amount=55*QuestValue(17635)*ExperienceStage(49)*5/100, Price=3000, "Well done! Thanks to you the city is a bit safer. Here's your reward!", SetQuestValue(QuestValue(17632),99999), SetQuestValue(17632,0), Experience(Amount), CreateMoney -"task",QuestValue(17636)=500 -> Amount=150*QuestValue(17636)*ExperienceStage(49)*5/100, Price=10000, "Very good job, %N. You've been a great help. Here's your reward!", SetQuestValue(QuestValue(17632),99999), SetQuestValue(17632,0), Experience(Amount), CreateMoney +"task",QuestValue(17636)=150 -> Amount=150*QuestValue(17636)*ExperienceStage(49)*5/100, Price=10000, "Very good job, %N. You've been a great help. Here's your reward!", SetQuestValue(QuestValue(17632),99999), SetQuestValue(17632,0), Experience(Amount), CreateMoney # Speaks "task",QuestValue(17632)>0 -> "Your current task is in progress. Follow the status of your task in the quest log. If you wish to cancel your in-progress task then don't be afraid and feel free to cancel." diff --git a/data/npc/grizzlyadamsankrahmun.npc b/data/npc/grizzlyadamsankrahmun.npc new file mode 100644 index 0000000..8d96c1e --- /dev/null +++ b/data/npc/grizzlyadamsankrahmun.npc @@ -0,0 +1,11 @@ +# GIMUD - Graphical Interface Multi User Dungeon +# 17608 - any task in progress + +Name = "Grizzly Adams" +Outfit = (144,97-97-94-97-3) +Home = [33132,32830,7] +Radius = 3 + +Behaviour = { +@"killing-tasks.ndb" +} diff --git a/data/npc/grizzlyadamscarlin.npc b/data/npc/grizzlyadamscarlin.npc new file mode 100644 index 0000000..b6e434f --- /dev/null +++ b/data/npc/grizzlyadamscarlin.npc @@ -0,0 +1,11 @@ +# GIMUD - Graphical Interface Multi User Dungeon +# 17608 - any task in progress + +Name = "Grizzly Adams" +Outfit = (144,97-97-94-97-3) +Home = [32348,31786,5] +Radius = 3 + +Behaviour = { +@"killing-tasks.ndb" +} diff --git a/data/npc/grizzlyadamsporthope.npc b/data/npc/grizzlyadamsporthope.npc new file mode 100644 index 0000000..44a912a --- /dev/null +++ b/data/npc/grizzlyadamsporthope.npc @@ -0,0 +1,11 @@ +# GIMUD - Graphical Interface Multi User Dungeon +# 17608 - any task in progress + +Name = "Grizzly Adams" +Outfit = (144,97-97-94-97-3) +Home = [32693,32767,6] +Radius = 3 + +Behaviour = { +@"killing-tasks.ndb" +} diff --git a/data/npc/grizzlyadamsthais.npc b/data/npc/grizzlyadamsthais.npc new file mode 100644 index 0000000..0d47d83 --- /dev/null +++ b/data/npc/grizzlyadamsthais.npc @@ -0,0 +1,11 @@ +# GIMUD - Graphical Interface Multi User Dungeon +# 17608 - any task in progress + +Name = "Grizzly Adams" +Outfit = (144,97-97-94-97-3) +Home = [32359,32232,7] +Radius = 3 + +Behaviour = { +@"killing-tasks.ndb" +} diff --git a/data/npc/grizzlyadamsvenore.npc b/data/npc/grizzlyadamsvenore.npc new file mode 100644 index 0000000..976ff79 --- /dev/null +++ b/data/npc/grizzlyadamsvenore.npc @@ -0,0 +1,11 @@ +# GIMUD - Graphical Interface Multi User Dungeon +# 17608 - any task in progress + +Name = "Grizzly Adams" +Outfit = (144,97-97-94-97-3) +Home = [32929,32077,10] +Radius = 3 + +Behaviour = { +@"killing-tasks.ndb" +} diff --git a/data/npc/grizzlyadams.npc b/data/npc/killing-tasks.ndb similarity index 84% rename from data/npc/grizzlyadams.npc rename to data/npc/killing-tasks.ndb index 90918d5..b66e186 100644 --- a/data/npc/grizzlyadams.npc +++ b/data/npc/killing-tasks.ndb @@ -1,12 +1,3 @@ -# GIMUD - Graphical Interface Multi User Dungeon -# 17608 - any task in progress - -Name = "Grizzly Adams" -Outfit = (144,97-97-94-97-3) -Home = [32693,32767,6] -Radius = 3 - -Behaviour = { ADDRESS,"hello$",QuestValue(17615)>99,! -> "Welcome back elite hunter %N of the 'Paw and Fur - Hunting Elite'. Feel free to do tasks for us." ADDRESS,"hi$",QuestValue(17615)>99,! -> * ADDRESS,"hello$",QuestValue(17615)>69,! -> "Welcome back trophy hunter %N of the 'Paw and Fur - Hunting Elite'. Feel free to do tasks for us." @@ -51,6 +42,14 @@ Topic=1,"carniphila" -> Amount=17611, "Damn walking weed-thingies! You'll find t Topic=1,"ape" -> Amount=17612, "You'll find the apes deeper in the jungle. Hunt 100 merlkins, kongras or sibangs to complete this task. Alright?", Topic=2 Topic=1,"tortoise" -> Amount=17613, "You'll find them on the Laguna Islands. Hunt 100 of them. Interested?", Topic=2 Topic=1,"gargoyle" -> Amount=17614, "They can be found all over Tibia. Hunt 65 of them. Interested?", Topic=2 +Topic=1,"frost","troll" -> Amount=17697, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 +Topic=1,"swamp","troll" -> Amount=17698, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 +Topic=1,"rat" -> Amount=17699, "They can be found all over Tibia. Hunt 25 of them. Interested?", Topic=2 +Topic=1,"wolves" -> Amount=17700, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 +Topic=1,"wasp" -> Amount=17701, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 +Topic=1,"larva" -> Amount=17702, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 +Topic=1,"dwarf" -> Amount=17703, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 +Topic=1,"undead" -> Amount=17704, "They can be found all over Tibia. Hunt 100 of them. Interested?", Topic=2 Topic=1 -> "Maybe next time." "task",QuestValue(17609)=100 -> Data=1, Amount=40*QuestValue(17609)*ExperienceStage(49)*5/100, Price=3000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 @@ -59,6 +58,14 @@ Topic=1 -> "Maybe next time." "task",QuestValue(17612)=100 -> Data=1, Amount=115*QuestValue(17612)*ExperienceStage(49)*5/100, Price=4000, "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(49)*5/100, Price=4000, "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(49)*5/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(17614)*ExperienceStage(49)*5/100, Price=5000, "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(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17699)=25 -> Data=1, Amount=7*QuestValue(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17700)=100 -> Data=2, Amount=18*QuestValue(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17701)=100 -> Data=2, Amount=24*QuestValue(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17702)=100 -> Data=2, Amount=44*QuestValue(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17703)=100 -> Data=2, Amount=45*QuestValue(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 +"task",QuestValue(17704)=100 -> Data=2, Amount=60*QuestValue(17614)*ExperienceStage(49)*5/100, Price=5000, "Spiffing work, old chap. What would you like to get for reward: %A EXP or %P gold?", Topic=4 # Level 50-79 "task",QuestValue(17607)=1,QuestValue(17608)=0,level>49,level<80 -> "Alright, what would you like to hunt? Quara scouts, ancient scarabs, wyverns, bonebeasts or dragons.", Topic=5 @@ -131,6 +138,4 @@ Topic=3 -> "Good! Speak to me again when you are done hunting." "rank",QuestValue(17607)=1 -> Amount=QuestValue(17615), "At this time, you have %A points and your rank is Member." "point",QuestValue(17607)=1 -> * -"mission" -> "We prefer to call that 'task' in the society of the 'Paw and Fur - Hunting Elite'." - -} +"mission" -> "We prefer to call that 'task' in the society of the 'Paw and Fur - Hunting Elite'." \ No newline at end of file