From b55a17c73532b237356459985cf9961d93120566 Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Mon, 23 Dec 2019 19:39:22 +0200 Subject: [PATCH] finish assasin outfit part --- New Text Document.txt | 2 +- data/actions/scripts/misc/chests.lua | 4 ++ data/movements/movements.xml | 3 + .../laguna_islands/erayo_hut_stairs.lua | 16 +++++ data/npc/raymondstriker.npc | 2 +- data/npc/vescu.npc | 64 ++++++++++++++++++ data/world/map.otbm | Bin 79807289 -> 79807297 bytes 7 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 data/movements/scripts/laguna_islands/erayo_hut_stairs.lua 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 d0b3d0274349809776e7d0d56f7bfd162a705137..7afaec8acbdc33e9c4061d492ff3a76b76af563b 100644 GIT binary patch delta 3638 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