diff --git a/New Text Document.txt b/New Text Document.txt index ab76566..925b915 100644 --- a/New Text Document.txt +++ b/New Text Document.txt @@ -1 +1 @@ -next: 17541 \ No newline at end of file +next: 17545 \ No newline at end of file diff --git a/data/monster/assassin.xml b/data/monster/assassin.xml index 5216846..6d4fc7b 100644 --- a/data/monster/assassin.xml +++ b/data/monster/assassin.xml @@ -1,7 +1,7 @@ - + diff --git a/data/monster/blackknight.xml b/data/monster/blackknight.xml index 30d13d1..338d3c9 100644 --- a/data/monster/blackknight.xml +++ b/data/monster/blackknight.xml @@ -1,7 +1,7 @@ - + diff --git a/data/monster/warlock.xml b/data/monster/warlock.xml index 46c54ef..47ce6aa 100644 --- a/data/monster/warlock.xml +++ b/data/monster/warlock.xml @@ -1,7 +1,7 @@ - + diff --git a/data/npc/ajax.npc b/data/npc/ajax.npc index 151bfd2..701efed 100644 --- a/data/npc/ajax.npc +++ b/data/npc/ajax.npc @@ -71,7 +71,7 @@ Topic=11 -> "Maybe another time." "addon",ExpiringQuestValue(17534)>0 -> "Wait! I making axes now. Come later, okey?" "axe",ExpiringQuestValue(17534)>0 -> * -"addon",ExpiringQuestValue(17534)<0,QuestValue(17532)=16 -> "Axe is done! For you. Take. Wear like me.", SetQuestValue(17532,17), AddOutfitAddon(147,1), AddOutfitAddon(143,1) +"addon",ExpiringQuestValue(17534)<0,QuestValue(17532)=16 -> "Axe is done! For you. Take. Wear like me.", SetQuestValue(17532,17), AddOutfitAddon(147,1), AddOutfitAddon(143,1), EffectOpp(13) "axe",ExpiringQuestValue(17534)<0,QuestValue(17532)=16 -> * "addon",QuestValue(17532)=17 -> "Nice axe. Nice axe." diff --git a/data/npc/amber.npc b/data/npc/amber.npc index da1f946..b00be3d 100644 --- a/data/npc/amber.npc +++ b/data/npc/amber.npc @@ -85,7 +85,7 @@ Topic=6 -> "Too bad." "addon",ExpiringQuestValue(18503)>0 -> "Please be patient! I am still working on the backpack details. Come back later, okey?" "backpack",ExpiringQuestValue(18503)>0 -> * -"addon",ExpiringQuestValue(18503)<0,QuestValue(18502)=2 -> "Just in time! Your backpack is finished. Here you go, I hope you like it.", SetQuestValue(18502,3), AddOutfitAddon(136,1), AddOutfitAddon(128,1) +"addon",ExpiringQuestValue(18503)<0,QuestValue(18502)=2 -> "Just in time! Your backpack is finished. Here you go, I hope you like it.", SetQuestValue(18502,3), AddOutfitAddon(136,1), AddOutfitAddon(128,1), EffectOpp(13) "backpack",ExpiringQuestValue(18503)<0,QuestValue(18502)=2 -> * "addon",QuestValue(18502)=3 -> "Oh, you also have a nice backpack just like me!" diff --git a/data/npc/bron.npc b/data/npc/bron.npc index 9e79511..ee4494d 100644 --- a/data/npc/bron.npc +++ b/data/npc/bron.npc @@ -74,7 +74,7 @@ Topic=9 -> "Maybe another time." "present",QuestValue(17532)=11 -> "Because you were such a great help, I have also a present for you. Will you accept it?", Topic=10 "help",QuestValue(17532)=11 -> * -Topic=10,"yes" -> "I have kept this traditional barbarian wig safe for many years now. It is now yours! I hope you will wear it proudly, friend.", AddOutfitAddon(147,2), AddOutfitAddon(143,2), SetQuestValue(17532,12) +Topic=10,"yes" -> "I have kept this traditional barbarian wig safe for many years now. It is now yours! I hope you will wear it proudly, friend.", AddOutfitAddon(147,2), AddOutfitAddon(143,2), SetQuestValue(17532,12), EffectOpp(13) Topic=10 -> "Okey, ask for it when you feel ready, friend." "axe",QuestValue(17532)=17 -> "I know it is you who helped with the present for me from my brother Ajax. Thank you! Wear your axe proudly!" diff --git a/data/npc/gregor.npc b/data/npc/gregor.npc index f7df62d..fe4a42c 100644 --- a/data/npc/gregor.npc +++ b/data/npc/gregor.npc @@ -2,7 +2,7 @@ # gregor.npc: Datenbank fuer den Ritter Gregor Name = "Gregor" -Outfit = (131,38-38-38-38) +Outfit = (131,38-38-38-38-2) Home = [32407,32202,6] Radius = 4 @@ -81,4 +81,58 @@ Topic=3,"yes",Level Amount=SpellLevel(String), "You hav Topic=3,"yes",CountMoney "Return when you have enough gold." Topic=3,"yes" -> "Here you are. Look in your spellbook for the pronunciation of this spell.", DeleteMoney, EffectOpp(13), TeachSpell(String) Topic=3 -> "Maybe next time." + +"outfit" -> "Only the bravest warriors may wear adorned helmets. They are traditionally awarded after having completed a difficult task for our guild." +"addon" -> * + +"task",QuestValue(17542)=0 -> "You mean, you would like to prove that you deserve to wear such a helmet?", Topic=4 +"mission",QuestValue(17542)=0 -> * +Topic=4,"yes" -> "Well then, listen closely. First, you will have to prove that you are a fierce and restless warrior by bringing me 100 perfect behemoth fangs. ...", + "Secondly, please retrieve a helmet for us which has been lost a long time ago. The famous Ramsay the Reckless wore it when exploring an ape settlement. ...", + "Third, we need a new flask of warrior's sweat. We've run out of it recently, but we need a small amount for the show battles in our arena. ...", + "Lastly, I will have our smith refine your helmet if you bring me royal steel, an especially noble metal. ...", + "Did you understand everything I told you and are willing to handle this task?", Topic=5 +Topic=4 -> "However." +Topic=5,"yes" -> "Alright then. Come back to me once you have collected 100 perfect behemoth fangs.", SetQuestValue(17542,1) +Topic=5 -> "Maybe another time." + +"behemoth","fang",QuestValue(17542)=1 -> Type=5893, Amount=100, "Have you really managed to fulfill the task and brought me 100 perfect behemoth fangs?", Topic=6 +"mission",QuestValue(17542)=1 -> * +"task",QuestValue(17542)=1 -> * +Topic=6,"yes",Count(Type)>=Amount,Knight -> "I'm deeply impressed, brave Knight %N. Now, please retrieve Ramsay's helmet.", Delete(Type), SetQuestValue(17542,2) +Topic=6,"yes",Count(Type)>=Amount -> "I'm deeply impressed, %N. Even if you are not a knight, you certainly possess knight qualities. Now, please retrieve Ramsay's helmet.", Delete(Type), SetQuestValue(17542,2) +Topic=6,"yes" -> "You don't have that many." +Topic=6 -> "Maybe another time." + +"reckless","helmet",QuestValue(17542)=2 -> Type=5924, Amount=1, "Did you recover the helmet of Ramsay the Reckless?", Topic=7 +"mission",QuestValue(17542)=2 -> * +"task",QuestValue(17542)=2 -> * +Topic=7,"yes",Count(Type)>=Amount,Knight -> "Good work, brave Knight %N! Even though it is damaged, it has a lot of sentimental value. Now, please bring me warrior's sweat.", Delete(Type), SetQuestValue(17542,3) +Topic=7,"yes",Count(Type)>=Amount -> "Good work, %N! Even though it is damaged, it has a lot of sentimental value. Now, please bring me warrior's sweat.", Delete(Type), SetQuestValue(17542,3) +Topic=7,"yes" -> "You don't have it." +Topic=7 -> "Maybe another time." + +"warriors","sweat",QuestValue(17542)=3 -> Type=5885, Amount=1, "Were you able to get hold of a flask with pure warrior's sweat?", Topic=8 +"mission",QuestValue(17542)=3 -> * +"task",QuestValue(17542)=3 -> * +Topic=8,"yes",Count(Type)>=Amount,Knight -> "Now that is a pleasant surprise, brave Knight %N! There is only one task left now: Obtain royal steel to have your helmet refined.", Delete(Type), SetQuestValue(17542,4) +Topic=8,"yes",Count(Type)>=Amount -> "Now that is a pleasant surprise, %N! There is only one task left now: Obtain royal steel to have your helmet refined.", Delete(Type), SetQuestValue(17542,4) +Topic=8,"yes" -> "You don't have it." +Topic=8 -> "Maybe another time." + +"royal","steel",QuestValue(17542)=4 -> Type=5887, Amount=1, "Ah, have you brought the royal steel?", Topic=9 +"mission",QuestValue(17542)=4 -> * +"task",QuestValue(17542)=4 -> * +Topic=9,"yes",Count(Type)>=Amount,Knight -> "You truly deserve to wear an adorned helmet, brave Knight %N. Please talk to Sam and tell him I sent you. I'm sure he will be glad to refine your helmet.", Delete(Type), SetQuestValue(17542,5) +Topic=9,"yes",Count(Type)>=Amount -> "You truly deserve to wear an adorned helmet, %N. Please talk to Sam and tell him I sent you. I'm sure he will be glad to refine your helmet.", Delete(Type), SetQuestValue(17542,5), SetExpiringQuestValue(17544, 7200000) +Topic=9,"yes" -> "You don't have it." +Topic=9 -> "Maybe another time." + +"helmet",QuestValue(17542)=5 -> "Please talk to Sam and tell him I sent you. I'm sure he will be glad to refine your helmet." +"mission",QuestValue(17542)=5 -> * +"task",QuestValue(17542)=5 -> * + +"helmet",QuestValue(17542)=6 -> "I see Sam did a great work with your helmet!" +"mission",QuestValue(17542)=6 -> "Sorry, but I don't have any task for you now." +"task",QuestValue(17542)=6 -> * } diff --git a/data/npc/hanna.npc b/data/npc/hanna.npc index d4b0c9d..6e8b8c8 100644 --- a/data/npc/hanna.npc +++ b/data/npc/hanna.npc @@ -85,7 +85,7 @@ Topic=3 -> "Maybe another time." "addon",QuestValue(18501)=1 -> "Oh, you're back already? Did you bring a legion helmet, 100 chicken feathers and 50 honeycombs?", Topic=4 "hat",QuestValue(18501)=1 -> * -Topic=4,"yes",Count(3374)>=1,Count(5890)>=100,Count(5902)>=50 -> "Great job! That must have taken a lot of work. Okay, you put it like this... then glue like this... here!", DeleteAmount(3374,1), DeleteAmount(5890,100), DeleteAmount(5902,50), SetQuestValue(18501,2), AddOutfitAddon(136,2), AddOutfitAddon(128,2) +Topic=4,"yes",Count(3374)>=1,Count(5890)>=100,Count(5902)>=50 -> "Great job! That must have taken a lot of work. Okay, you put it like this... then glue like this... here!", DeleteAmount(3374,1), DeleteAmount(5890,100), DeleteAmount(5902,50), SetQuestValue(18501,2), AddOutfitAddon(136,2), AddOutfitAddon(128,2), EffectOpp(13) Topic=4,"yes" -> "You don't have required ingredients." Topic=4 -> "Maybe another time." diff --git a/data/npc/lubo.npc b/data/npc/lubo.npc index de1ea4b..976a262 100644 --- a/data/npc/lubo.npc +++ b/data/npc/lubo.npc @@ -80,7 +80,7 @@ Topic=6 -> "Too bad." "addon",ExpiringQuestValue(18503)>0 -> "Uh... I didn't expect you to return that early. Sorry, but I'm not finished yet with your backpack. I'm doing the best I can, promised." "backpack",ExpiringQuestValue(18503)>0 -> * -"addon",ExpiringQuestValue(18503)<0,QuestValue(18502)=2 -> "Just in time! Your backpack is finished. Here you go, I hope you like it.", SetQuestValue(18502,3), AddOutfitAddon(136,1), AddOutfitAddon(128,1) +"addon",ExpiringQuestValue(18503)<0,QuestValue(18502)=2 -> "Just in time! Your backpack is finished. Here you go, I hope you like it.", SetQuestValue(18502,3), AddOutfitAddon(136,1), AddOutfitAddon(128,1), EffectOpp(13) "backpack",ExpiringQuestValue(18503)<0,QuestValue(18502)=2 -> * "addon",QuestValue(18502)=3 -> "Oh, you also have a nice backpack just like me!" diff --git a/data/npc/majesticwarwolf.npc b/data/npc/majesticwarwolf.npc index 2682eb0..e8592e9 100644 --- a/data/npc/majesticwarwolf.npc +++ b/data/npc/majesticwarwolf.npc @@ -18,7 +18,7 @@ VANISH,! -> "YOOOOUHHOOOUU!" "addon",QuestValue(17535)=9 -> "I can see in your eyes that you are a honest and friendly person, %N. You were patient enough to learn our language and I will grant you a special gift. Will you accept it?", Topic=1 "outfit",QuestValue(17535)=9 -> * -Topic=1,"yes", -> "From now on, you shall be known as %N, the bear warrior. You shall be strong and proud as Angros, the great dark bear. He shall guide your path.", SetQuestValue(17535,10), AddOutfitAddon(144,1), AddOutfitAddon(148,1) +Topic=1,"yes", -> "From now on, you shall be known as %N, the bear warrior. You shall be strong and proud as Angros, the great dark bear. He shall guide your path.", SetQuestValue(17535,10), AddOutfitAddon(144,1), AddOutfitAddon(148,1), EffectOpp(13) Topic=1 -> "Maybe another time." "addon",QuestValue(17535)=10 -> "I am proud to see you as strong as the Angros!" diff --git a/data/npc/morgan.npc b/data/npc/morgan.npc index 8226246..a08d7ed 100644 --- a/data/npc/morgan.npc +++ b/data/npc/morgan.npc @@ -26,4 +26,14 @@ Topic=1 -> "Maybe another time." "mission",QuestValue(17522)=1 -> "Please deliver my letter to Eremo as fast as you can." "mission",QuestValue(17522)=2 -> "Thank you for delivering my letter to Eremo. I have no more missions for you.", SetQuestValue(17522,3) "mission" -> "Sorry, I don't have any missions for you." + +"addon" -> "I can forge the finest weapons for knights and warriors. They may wear them proudly and visible to everyone." +"outfit" -> * + +"weapon", -> "Would you rather be interested in a knight's sword or in a warrior's sword?", Topic=2 +"forge", -> "What would you like me to forge for you? A knight's sword or a warrior's sword?", Topic=2 +Topic=2,"knight",QuestValue(17541)=0 -> "Great! Simply bring me 100 Iron Ore and one Crude Iron and I will happily forge it for you.", SetQuestValue(17541,1) +Topic=2,"knight",QuestValue(17541)=1,Count(5880)>=100,Count(5892)>=1 -> "Alright! As a matter of fact, I have one in store. Here you go!", DeleteAmount(5880,100), DeleteAmount(5892,1), SetQuestValue(17541,2), AddOutfitAddon(139,1), AddOutfitAddon(131,1), EffectOpp(13) +Topic=2,"knight",QuestValue(17541)=2 -> "Sorry since you already have one sword I will not forge more for you." +Topic=2 -> "Maybe another time." } diff --git a/data/npc/norma.npc b/data/npc/norma.npc index 03c1318..f896ca2 100644 --- a/data/npc/norma.npc +++ b/data/npc/norma.npc @@ -175,7 +175,7 @@ Topic=3 -> "Maybe another time." "addon",QuestValue(18501)=1 -> "Oh, you're back already? Did you bring a legion helmet, 100 chicken feathers and 50 honeycombs?", Topic=4 "hat",QuestValue(18501)=1 -> * -Topic=4,"yes",Count(3374)>=1,Count(5890)>=100,Count(5902)>=50 -> "Great job! That must have taken a lot of work. Okay, you put it like this... then glue like this... here!", DeleteAmount(3374,1), DeleteAmount(5890,100), DeleteAmount(5902,50), SetQuestValue(18501,2), AddOutfitAddon(136,2), AddOutfitAddon(128,2) +Topic=4,"yes",Count(3374)>=1,Count(5890)>=100,Count(5902)>=50 -> "Great job! That must have taken a lot of work. Okay, you put it like this... then glue like this... here!", DeleteAmount(3374,1), DeleteAmount(5890,100), DeleteAmount(5902,50), SetQuestValue(18501,2), AddOutfitAddon(136,2), AddOutfitAddon(128,2), EffectOpp(13) Topic=4,"yes" -> "You don't have required ingredients." Topic=4 -> "Maybe another time." diff --git a/data/npc/sam.npc b/data/npc/sam.npc index c928765..994c90e 100644 --- a/data/npc/sam.npc +++ b/data/npc/sam.npc @@ -184,6 +184,13 @@ Topic=5,"yes",Count(Type)>=Amount -> "Thank you verry much! This brings back goo Topic=5,"yes",Count(Type) "No, you don't have my old backpack. What a pity." Topic=5,"no" -> "What a pity." +"addon",ExpiringQuestValue(17544)>0 -> "Oh, Gregor sent you? I see. It will be my pleasure to adorn your helmet. Please give me some time to finish it." +"adorned","helmet",ExpiringQuestValue(17544)>0 -> * +"addon",ExpiringQuestValue(17544)<0,QuestValue(17542)=5 -> "Just in time, %N. Your helmet is finished, I hope you like it.", SetQuestValue(17542,6), AddOutfitAddon(139,2), AddOutfitAddon(131,2), EffectOpp(13) +"adorned","helmet",ExpiringQuestValue(17544)<0,QuestValue(17542)=5 -> * + +"addon",QuestValue(17542)=6 -> "Sorry, Gregor told me to adorn only one helmet for you and you have already received one." +"adorned","helmet",QuestValue(17542)=6 -> * } diff --git a/data/npc/tom.npc b/data/npc/tom.npc index 3aca645..896c6e7 100644 --- a/data/npc/tom.npc +++ b/data/npc/tom.npc @@ -77,7 +77,7 @@ Topic=2 -> "Maybe another time." "addon",QuestValue(18504)=1 -> "Have you brought 50 bear paws and 50 wolf paws?", Topic=3 "paws",QuestValue(18504)=1 -> * -Topic=3,"yes",Count(5897)>=50,Count(5896)>=50 -> "Excellent! Like promised, here are your bear paws.", DeleteAmount(5897,50), DeleteAmount(5896,50), SetQuestValue(18504,2), AddOutfitAddon(148,1), AddOutfitAddon(144,1) +Topic=3,"yes",Count(5897)>=50,Count(5896)>=50 -> "Excellent! Like promised, here are your bear paws.", DeleteAmount(5897,50), DeleteAmount(5896,50), SetQuestValue(18504,2), AddOutfitAddon(148,1), AddOutfitAddon(144,1), EffectOpp(13) Topic=3,"yes" -> "You don't have required ingredients." Topic=3 -> "Maybe another time." diff --git a/data/npc/ustan.npc b/data/npc/ustan.npc index 9f2e99f..5323905 100644 --- a/data/npc/ustan.npc +++ b/data/npc/ustan.npc @@ -161,7 +161,7 @@ Topic=4 -> "Maybe another time." "addon",QuestValue(18504)=1 -> "Have you brought 50 bear paws and 50 wolf paws?", Topic=5 "paws",QuestValue(18504)=1 -> * -Topic=5,"yes",Count(5897)>=50,Count(5896)>=50 -> "Excellent! Like promised, here are your bear paws.", DeleteAmount(5897,50), DeleteAmount(5896,50), SetQuestValue(18504,2), AddOutfitAddon(148,1), AddOutfitAddon(144,1) +Topic=5,"yes",Count(5897)>=50,Count(5896)>=50 -> "Excellent! Like promised, here are your bear paws.", DeleteAmount(5897,50), DeleteAmount(5896,50), SetQuestValue(18504,2), AddOutfitAddon(148,1), AddOutfitAddon(144,1), EffectOpp(13) Topic=5,"yes" -> "You don't have required ingredients." Topic=5 -> "Maybe another time." diff --git a/data/world/map.otbm b/data/world/map.otbm index 9b0744e..5766ed9 100644 Binary files a/data/world/map.otbm and b/data/world/map.otbm differ