diff --git a/data/items/items.srv b/data/items/items.srv index d634e0e..4eff3e2 100644 --- a/data/items/items.srv +++ b/data/items/items.srv @@ -26518,7 +26518,7 @@ Flags = {Unmove} TypeID = 5874 Name = "a poison trickle" Flags = {Unmove} -# pradeti nuo cia ir nepamirsti implementuoti visiem npc ir monstram + TypeID = 5875 Name = "sniper gloves" Description = "They are the pride of the paladin guild" @@ -26549,7 +26549,7 @@ TypeID = 5880 Name = "an iron ore" Flags = {Cumulative,Take} Attributes = {Weight=200} - +# pradeti nuo cia ir nepamirsti implementuoti visiem npc ir monstram TypeID = 5881 Name = "a lizard scale" Flags = {Cumulative,Take} diff --git a/data/monster/dharalion.xml b/data/monster/dharalion.xml index 2bf3cea..eb151a1 100644 --- a/data/monster/dharalion.xml +++ b/data/monster/dharalion.xml @@ -65,6 +65,6 @@ - + \ No newline at end of file diff --git a/data/monster/dragon.xml b/data/monster/dragon.xml index 460d906..c5836b1 100644 --- a/data/monster/dragon.xml +++ b/data/monster/dragon.xml @@ -60,5 +60,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarf.xml b/data/monster/dwarf.xml index 76a934a..bf04a40 100644 --- a/data/monster/dwarf.xml +++ b/data/monster/dwarf.xml @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarfgeomancer.xml b/data/monster/dwarfgeomancer.xml index a1ed5ef..9d2fc7a 100644 --- a/data/monster/dwarfgeomancer.xml +++ b/data/monster/dwarfgeomancer.xml @@ -51,5 +51,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarfguard.xml b/data/monster/dwarfguard.xml index 7f03955..fb294f2 100644 --- a/data/monster/dwarfguard.xml +++ b/data/monster/dwarfguard.xml @@ -38,5 +38,6 @@ + \ No newline at end of file diff --git a/data/monster/dwarfsoldier.xml b/data/monster/dwarfsoldier.xml index c3e5c66..94171a5 100644 --- a/data/monster/dwarfsoldier.xml +++ b/data/monster/dwarfsoldier.xml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/data/monster/fernfang.xml b/data/monster/fernfang.xml index 8411d9d..17ce892 100644 --- a/data/monster/fernfang.xml +++ b/data/monster/fernfang.xml @@ -71,6 +71,6 @@ - + \ No newline at end of file diff --git a/data/monster/giantspider.xml b/data/monster/giantspider.xml index 74261a8..8f598f7 100644 --- a/data/monster/giantspider.xml +++ b/data/monster/giantspider.xml @@ -47,5 +47,6 @@ + \ No newline at end of file diff --git a/data/monster/grorlam.xml b/data/monster/grorlam.xml index 3b6cc9d..8a4b60a 100644 --- a/data/monster/grorlam.xml +++ b/data/monster/grorlam.xml @@ -46,5 +46,6 @@ + \ No newline at end of file diff --git a/data/monster/hornedfox.xml b/data/monster/hornedfox.xml index 6a7142f..e6d8269 100644 --- a/data/monster/hornedfox.xml +++ b/data/monster/hornedfox.xml @@ -56,6 +56,7 @@ - + + \ No newline at end of file diff --git a/data/monster/hunter.xml b/data/monster/hunter.xml index 47ea885..ebe821b 100644 --- a/data/monster/hunter.xml +++ b/data/monster/hunter.xml @@ -40,5 +40,6 @@ + \ No newline at end of file diff --git a/data/monster/lizardsentinel.xml b/data/monster/lizardsentinel.xml index 5b7f0e6..6fe7513 100644 --- a/data/monster/lizardsentinel.xml +++ b/data/monster/lizardsentinel.xml @@ -39,5 +39,6 @@ + \ No newline at end of file diff --git a/data/monster/lizardsnakecharmer.xml b/data/monster/lizardsnakecharmer.xml index e52f4f8..fc7ca52 100644 --- a/data/monster/lizardsnakecharmer.xml +++ b/data/monster/lizardsnakecharmer.xml @@ -54,5 +54,6 @@ + \ No newline at end of file diff --git a/data/monster/lizardtemplar.xml b/data/monster/lizardtemplar.xml index 191d5a0..2b5520f 100644 --- a/data/monster/lizardtemplar.xml +++ b/data/monster/lizardtemplar.xml @@ -36,5 +36,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaur.xml b/data/monster/minotaur.xml index b0bd3de..3d69955 100644 --- a/data/monster/minotaur.xml +++ b/data/monster/minotaur.xml @@ -37,5 +37,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaurarcher.xml b/data/monster/minotaurarcher.xml index c6dca5a..523948d 100644 --- a/data/monster/minotaurarcher.xml +++ b/data/monster/minotaurarcher.xml @@ -39,5 +39,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaurguard.xml b/data/monster/minotaurguard.xml index 1825c5d..52ea09d 100644 --- a/data/monster/minotaurguard.xml +++ b/data/monster/minotaurguard.xml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/data/monster/minotaurmage.xml b/data/monster/minotaurmage.xml index 32652f9..208e2b8 100644 --- a/data/monster/minotaurmage.xml +++ b/data/monster/minotaurmage.xml @@ -51,5 +51,6 @@ + \ No newline at end of file diff --git a/data/monster/murius.xml b/data/monster/murius.xml index 5bbf84e..5b5cc51 100644 --- a/data/monster/murius.xml +++ b/data/monster/murius.xml @@ -52,5 +52,6 @@ + \ No newline at end of file diff --git a/data/monster/necropharus.xml b/data/monster/necropharus.xml index 85e2b32..070a972 100644 --- a/data/monster/necropharus.xml +++ b/data/monster/necropharus.xml @@ -60,6 +60,6 @@ - + \ No newline at end of file diff --git a/data/monster/oldwidow.xml b/data/monster/oldwidow.xml index 087b508..3dd273c 100644 --- a/data/monster/oldwidow.xml +++ b/data/monster/oldwidow.xml @@ -58,5 +58,6 @@ + \ No newline at end of file diff --git a/data/monster/orshabaal.xml b/data/monster/orshabaal.xml index 52cfc1f..0e7fef1 100644 --- a/data/monster/orshabaal.xml +++ b/data/monster/orshabaal.xml @@ -119,6 +119,6 @@ - + \ No newline at end of file diff --git a/data/monster/stonegolem.xml b/data/monster/stonegolem.xml index 195fa52..847f3ff 100644 --- a/data/monster/stonegolem.xml +++ b/data/monster/stonegolem.xml @@ -35,5 +35,6 @@ + \ No newline at end of file diff --git a/data/npc/elane.npc b/data/npc/elane.npc index 90834f1..92cf4df 100644 --- a/data/npc/elane.npc +++ b/data/npc/elane.npc @@ -2,7 +2,7 @@ # elane.npc: Datenbank für die Paladinin Elane Name = "Elane" -Outfit = (137,113-63-120-119) +Outfit = (137,113-63-120-119-2) Home = [32343,32239,7] Radius = 4 @@ -47,6 +47,7 @@ VANISH,! -> "Bye." "lugri" -> "A follower of evil that will get what he deserves one day." "excalibug" -> "A weapon of myth. I don't believe that this weapon exists." "news" -> "I am a paladin, not a storyteller." +"Sniper gloves" -> "We are always looking for sniper gloves. They are supposed to raise accuracy. If you find a pair, bring them here. Maybe I can offer you a nice trade." "member" -> "Every paladin profits from his vocation. It has many advantages to be a paladin." "profit" -> "We will help you to improve your skills. Besides I offer spells for paladins." diff --git a/data/npc/tom.npc b/data/npc/tom.npc index 5e3f0c2..a397d1a 100644 --- a/data/npc/tom.npc +++ b/data/npc/tom.npc @@ -40,9 +40,10 @@ VANISH,! -> "Doh?" "rat",Questvalue(224)=0 -> Type=3994, Amount=1, Price=2, "I'll give you %P gold for a dead rat. Do you accept?", Topic=2 "rabbit",Questvalue(224)=0 -> Type=4173, Amount=1, Price=2, "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=2 -"rat" -> Type=3994, Amount=1, Price=2, "I'll give you %P gold for a dead rat. Do you accept?", Topic=1 -"rabbit" -> Type=4173, Amount=1, Price=2, "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=1 -"wolf" -> Type=4007, Amount=1, Price=5, "Do you want to sell a dead wolf for %P gold?", Topic=1 +"rat" -> Type=3994, Amount=1, Price=2, "I'll give you %P gold for a dead rat. Do you accept?", Topic=1 +"rabbit" -> Type=4173, Amount=1, Price=2, "I'll give you %P gold for a dead rabbit. Do you accept?", Topic=1 +"wolf" -> Type=4007, Amount=1, Price=5, "Do you want to sell a dead wolf for %P gold?", Topic=1 +"minotaur leather" -> Type=5878, Amount=1, Price=12, "Do you want to sell a minotaur leather for %P gold?", Topic=1 %1,1<%1,"rat",Questvalue(224)=0 -> Type=3994, Amount=%1, Price=2*%1, "I'll give you %P gold for %A dead rats. Do you accept?", Topic=2 %1,1<%1,"rabbit",Questvalue(224)=0 -> Type=4173, Amount=%1, Price=2*%1, "I'll give you %P gold for %A dead rabbits. Do you accept?", Topic=2 @@ -50,6 +51,7 @@ VANISH,! -> "Doh?" %1,1<%1,"rabbit" -> Type=4173, Amount=%1, Price=2*%1, "I'll give you %P gold for %A dead rabbits. Do you accept?", Topic=1 %1,1<%1,"wolf" -> Type=4007, Amount=%1, Price=5*%1, "Do you want to sell %A dead wolves for %P gold?", Topic=1 %1,1<%1,"wolves" -> Type=4007, Amount=%1, Price=5*%1, "Do you want to sell %A dead wolves for %P gold?", Topic=1 +%1,1<%1,"minotaur leather" -> Type=5878, Amount=%1, Price=12*%1, "Do you want to sell %A minotaur leathers for %P gold?", Topic=1 Topic=1,"yes",Count(Type)>=Amount -> "Ok. Corpse for me, gold for you.", Delete(Type), CreateMoney Topic=1,"yes" -> "Sorry, you do not have a fresh one." diff --git a/src/npc.cpp b/src/npc.cpp index ab92d7b..4d811e7 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -143,6 +143,7 @@ bool Npc::load() currentOutfit.lookBody = c[1]; currentOutfit.lookLegs = c[2]; currentOutfit.lookFeet = c[3]; + currentOutfit.lookAddons = c[4]; } else { currentOutfit.lookTypeEx = script.readNumber(); }