diff --git a/New Text Document.txt b/New Text Document.txt index 946421b..307ada9 100644 --- a/New Text Document.txt +++ b/New Text Document.txt @@ -1 +1 @@ -next: 17562 \ No newline at end of file +next: 17563 \ No newline at end of file diff --git a/data/actions/scripts/misc/chests.lua b/data/actions/scripts/misc/chests.lua index d42b938..a00ae1a 100644 --- a/data/actions/scripts/misc/chests.lua +++ b/data/actions/scripts/misc/chests.lua @@ -1,6 +1,10 @@ function onUse(player, item, fromPosition, target, toPosition) local chestQuestNumber = item:getAttribute(ITEM_ATTRIBUTE_CHESTQUESTNUMBER) + if chestQuestNumber == 0 then + return false + end + if player:getStorageValue(chestQuestNumber) > 0 then player:sendTextMessage(MESSAGE_INFO_DESCR, "The " .. item:getName() .. " is empty.") return true diff --git a/data/movements/movements.xml b/data/movements/movements.xml index 1f7d07f..a8893db 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -395,6 +395,9 @@ + + + diff --git a/data/movements/scripts/laguna_islands/erayo_hut_stairs.lua b/data/movements/scripts/laguna_islands/erayo_hut_stairs.lua new file mode 100644 index 0000000..1c7a7d1 --- /dev/null +++ b/data/movements/scripts/laguna_islands/erayo_hut_stairs.lua @@ -0,0 +1,16 @@ +function onStepIn(creature, item, position, fromPosition) + if creature:getCondition(CONDITION_INVISIBLE, CONDITIONID_COMBAT) or creature:getCondition(CONDITION_INVISIBLE, CONDITIONID_RING) then + if item:getId() == 485 then + doRelocate(item:getPosition(),{x = 32517, y = 32910, z = 8}) + elseif item:getId() == 1947 then + doRelocate(item:getPosition(),{x = 32517, y = 32908, z = 7}) + end + + return true + end + + doRelocate(item:getPosition(),{x = 32519, y = 32914, z = 7}) + item:getPosition():sendMagicEffect(11) + Game.sendMagicEffect({x = 32519, y = 32914, z = 7}, 11) + creature:say("Why are you sneaking around in my house? Think I don't see you?", TALKTYPE_MONSTER_SAY, false, 0, creature:getPosition()) +end \ No newline at end of file diff --git a/data/npc/raymondstriker.npc b/data/npc/raymondstriker.npc index 54aea70..369798b 100644 --- a/data/npc/raymondstriker.npc +++ b/data/npc/raymondstriker.npc @@ -76,5 +76,5 @@ Topic=1,"mermaid" -> "The mermaid is the most beautiful creatu "So take this as your very own ship. Oh, and remind me about the pirate outfit sometime.", Create(Type), SetQuestValue(17520,11) "mission" -> "Sorry, I don't have any missions for you." -"outfit",QuestValue(17520)=11 -> "Ah, right! The pirate outfit! Here you go, now you are truly one of us.", AddOutfit(155), AddOutfit(151), SetQuestValue(17520,12) +"outfit",QuestValue(17520)=11 -> "Ah, right! The pirate outfit! Here you go, now you are truly one of us.", AddOutfit(155), AddOutfit(151), SetQuestValue(17520,12), EffectOpp(13) } diff --git a/data/npc/vescu.npc b/data/npc/vescu.npc index bc3c200..be7c16d 100644 --- a/data/npc/vescu.npc +++ b/data/npc/vescu.npc @@ -19,5 +19,69 @@ VANISH,! -> "Oh, two t-trolls. Hellooo, wittle twolls. " "bye" -> "T-time for another b-beer. ", Idle "farewell" -> * +"sober",QuestValue(17562)=0 -> "I wish there was like a potion which makes you sober in an instant. Dwarven rings wear off so fast. ", Topic=1 +Topic=1,"potion" -> "It's so hard to know the exact time when to stop drinking.hicks; C-could you help me to brew such a potion?", Topic=2 +Topic=1 -> "I don't think so. " +Topic=2,"yes" -> "You're a true buddy. I promise I will t-try to avoid killing you even if someone asks me to. hicks ...", + "Listen, I have this old formula from my grandma. It says... 30 beholder eyes... 10 red dragon scales. ...", + "Then 30 lizard scales... 20 fish fins - ew, this sounds disgusting, I wonder if this is really a potion or rather a cleaning agent. ...", + "Add 20 ounces of vampire dust, 10 ounces of demon dust and mix well with one flask of warrior's sweat. ...", + "Okayyy, this is a lot... we'll take this step by step. Will you help me gathering 30 beholder eyes?", Topic=3 +Topic=2 -> "Then not. " +Topic=3,"yes" -> "G-good. Go get them, I'll have a beer in the meantime.", SetQuestValue(17562,1) +Topic=3 -> "Then not. " + +"beholder","eye",QuestValue(17562)=1 -> Type=5898, Amount=30, "Have you really managed to bring me 30 beholder eyes? ", Topic=4 +"mission",QuestValue(17562)=1 -> * +"task",QuestValue(17562)=1 -> * +Topic=4,"yes",Count(Type)>=Amount -> "Aw-awsome! Squishy! Now, please bring me 10 red dragon scales.", Delete(Type), SetQuestValue(17562,2) +Topic=4,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=4 -> "Then not. " + +"red","dragon","scale",QuestValue(17562)=2 -> Type=5882, Amount=10, "D-did you get all of the 10 red dragon scales? ", Topic=5 +"mission",QuestValue(17562)=2 -> * +"task",QuestValue(17562)=2 -> * +Topic=5,"yes",Count(Type)>=Amount -> "G-good work, ... wha-what's your name again? Anyway... come back with 30 lizard scales.", Delete(Type), SetQuestValue(17562,3) +Topic=5,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=5 -> "Then not. " + +"lizard","scale",QuestValue(17562)=3 -> Type=5881, Amount=30, "Ah, are those - - the 30 lizard scales?", Topic=6 +"mission",QuestValue(17562)=3 -> * +"task",QuestValue(17562)=3 -> * +Topic=6,"yes",Count(Type)>=Amount -> "This potion will become p-pretty scaly. I'm not sure yet if I want to d-drink that. I think the 20 fish fins which come next won't really improve it. ", Delete(Type), SetQuestValue(17562,4) +Topic=6,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=6 -> "Then not. " + +"fish","fin",QuestValue(17562)=4 -> Type=5895, Amount=20, "Eww, is that disgusting smell coming from the 20 fish fins? ", Topic=7 +"mission",QuestValue(17562)=4 -> * +"task",QuestValue(17562)=4 -> * +Topic=7,"yes",Count(Type)>=Amount -> "Alrrrrrrright! Thanks for the f-fish. Get me the 20 ounces of vampire dust now. I'll have another b-beer.", Delete(Type), SetQuestValue(17562,5) +Topic=7,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=7 -> "Then not. " + +"vampire","dust",QuestValue(17562)=5 -> Type=5905, Amount=20, "Have you collected 20 ounces of vampire d-dust? ", Topic=8 +"mission",QuestValue(17562)=5 -> * +"task",QuestValue(17562)=5 -> * +Topic=8,"yes",Count(Type)>=Amount -> "Tha-thank you. Trolls are good for something a-after all. Bring me the 10 ounces of demon dust now. ", Delete(Type), SetQuestValue(17562,6) +Topic=8,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=8 -> "Then not. " + +"demon","dust",QuestValue(17562)=6 -> Type=5906, Amount=10, "Have you slain enough d-demons to gather 10 ounces of demon dust? ", Topic=9 +"mission",QuestValue(17562)=6 -> * +"task",QuestValue(17562)=6 -> * +Topic=9,"yes",Count(Type)>=Amount -> "G-great. You're a reeeal k-killer like me, eh? I think I'll g-give you something fun when the potion is complete. But first, b-bring me warrior's sweat.", Delete(Type), SetQuestValue(17562,7) +Topic=9,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=9 -> "Then not. " + +"warrior","sweat",QuestValue(17562)=7 -> Type=5885, Amount=1, "This s-smells even worse than the fish fins. Is that warrior's sweat?", Topic=10 +"mission",QuestValue(17562)=7 -> * +"task",QuestValue(17562)=7 -> * +Topic=10,"yes",Count(Type)>=Amount -> "Yahaha! Here we g-go. I'll just take a small sip - . Okay, this is disgusting, but it seems to work. I'll teach you something fun, remind me to tell you a secret sometime.", Delete(Type), SetQuestValue(17562,8) +Topic=10,"yes" -> "Next time you lie to me I'll k-kill you. Don't think I can't aim well just because I'm d-drunk." +Topic=10 -> "Then not. " + +"secret",QuestValue(17562)=8 -> "Right. Since you helped me to b-brew that potion and thus ensured the high quality of my work , I'll give you my old assassin costume. It lacks the head part, but it's almost like new. Don't pretend to be me though, 'kay? ", AddOutfit(152), AddOutfit(156), EffectOpp(13), SetQuestValue(17562,9) + +"secret",QuestValue(17562)>8 -> "What secret? " } diff --git a/data/world/map.otbm b/data/world/map.otbm index d0b3d02..7afaec8 100644 Binary files a/data/world/map.otbm and b/data/world/map.otbm differ