From ebb40bfba7bb61358f1f4a1e03e3816a89d8de9a Mon Sep 17 00:00:00 2001 From: ErikasKontenis Date: Sat, 21 Dec 2019 14:21:10 +0200 Subject: [PATCH] finish first part of oriental addon --- New Text Document.txt | 2 +- data/movements/movements.xml | 6 +++++ .../scripts/calassa/calassa_back.lua | 16 ++++++++++++ .../scripts/calassa/calassa_enter.lua | 23 +++++++++++++++++ data/npc/habdel.npc | 24 +++++++++++++++++- data/npc/ishina.npc | 24 +++++++++++++++++- data/npc/marina.npc | 2 ++ data/world/map.otbm | Bin 79807746 -> 79807289 bytes 8 files changed, 94 insertions(+), 3 deletions(-) create mode 100644 data/movements/scripts/calassa/calassa_back.lua create mode 100644 data/movements/scripts/calassa/calassa_enter.lua diff --git a/New Text Document.txt b/New Text Document.txt index b6bc9d8..07f2018 100644 --- a/New Text Document.txt +++ b/New Text Document.txt @@ -1 +1 @@ -next: 17551 \ No newline at end of file +next: 17557 \ No newline at end of file diff --git a/data/movements/movements.xml b/data/movements/movements.xml index 2df3eb6..1f7d07f 100644 --- a/data/movements/movements.xml +++ b/data/movements/movements.xml @@ -424,6 +424,12 @@ + + + + + + diff --git a/data/movements/scripts/calassa/calassa_back.lua b/data/movements/scripts/calassa/calassa_back.lua new file mode 100644 index 0000000..2ecccf1 --- /dev/null +++ b/data/movements/scripts/calassa/calassa_back.lua @@ -0,0 +1,16 @@ +function onStepIn(creature, item, position, fromPosition) + local player = creature:getPlayer() + if not player then + return true + end + + doRelocate(item:getPosition(),{x = 31914, y = 32713, z = 6}) + item:getPosition():sendMagicEffect(11) + Game.sendMagicEffect({x = 31914, y = 32713, z = 6}, 11) +end + +function onAddItem(item, tileitem, position) + doRelocate(item:getPosition(),{x = 31914, y = 32713, z = 6}) + item:getPosition():sendMagicEffect(11) + Game.sendMagicEffect({x = 31914, y = 32713, z = 6}, 11) +end diff --git a/data/movements/scripts/calassa/calassa_enter.lua b/data/movements/scripts/calassa/calassa_enter.lua new file mode 100644 index 0000000..123f7a5 --- /dev/null +++ b/data/movements/scripts/calassa/calassa_enter.lua @@ -0,0 +1,23 @@ +function onStepIn(creature, item, position, fromPosition) + local player = creature:getPlayer() + if not player then + return true + end + + local headItem = player:getSlotItem(CONST_SLOT_HEAD) + if headItem and isInArray({5460}, headItem.itemid) then + player:teleportTo(Position(31915, 32716, 12)) + player:getPosition():sendMagicEffect(2) + player:getPosition():sendMagicEffect(CONST_ME_LOSEENERGY) + else + position.y = position.y - 3 + player:teleportTo(position) + player:getPosition():sendMagicEffect(CONST_ME_TELEPORT) + end + return true +end + +function onAddItem(item, tileitem, position) + doRelocate(item:getPosition(),{x = 31915, y = 32716, z = 12}) + Game.sendMagicEffect({x = 31915, y = 32716, z = 12}, 2) +end \ No newline at end of file diff --git a/data/npc/habdel.npc b/data/npc/habdel.npc index 5b1a3cb..75a94fa 100644 --- a/data/npc/habdel.npc +++ b/data/npc/habdel.npc @@ -2,7 +2,7 @@ # Habdel.npc: Datenbank für den Waffenhändler Habdel Name = "Habdel" -Outfit = (129,95-2-0-97) +Outfit = (146,95-2-0-58-1) Home = [33225,32434,7] Radius = 0 @@ -106,4 +106,26 @@ Topic=2,"yes",Count(Type)>=Amount -> "Fine. Here is your money.", Delete(Type), Topic=2,"yes" -> "Sorry, you do not have one." Topic=2,"yes",Amount>1 -> "Sorry, you do not have that many." Topic=2 -> "Maybe next time." + +"addon",female -> "My scimitar? Yes, that is a true masterpiece. Only a true man can wear it." +"outfit",female -> * + +"addon",QuestValue(17555)=0,male -> "My scimitar? Yes, that is a true masterpiece. Of course I could make one for you, but I have a small request. Would you fulfill a task for me?", Topic=3 +"outfit",QuestValue(17555)=0,male -> * +"mission",QuestValue(17555)=0,male -> * +"task",QuestValue(17555)=0,male -> * +Topic=3,"yes" -> "Listen, um... I know that Ishina has been wanting a comb for a long time... not just any comb, but a mermaid's comb. She said it prevents split ends... or something. ...", + "Do you think you could get one for me so I can give it to her? I really would appreciate it.", Topic=4 +Topic=3 -> "Maybe another time." +Topic=4,"yes" -> "Brilliant! I will wait for you to return with a mermaid's comb then.", SetQuestValue(17555,1) +Topic=4 -> "Maybe another time." + +"comb",QuestValue(17555)=1,male -> Type=5945, Amount=1, "Have you brought a mermaid's comb for Ishina?", Topic=5 +"mission",QuestValue(17555)=1,male -> * +"task",QuestValue(17555)=1,male -> * +Topic=5,"yes",Count(Type)>=Amount -> "Yeah! That's it! I can't wait to give it to her! Oh - but first, I'll fulfil my promise: Here is your scimitar! Thanks again!", Delete(Type), SetQuestValue(17555,2), AddOutfitAddon(146,1), AddOutfitAddon(150,1), EffectOpp(13) +Topic=5 -> "Maybe another time." + +"mission",QuestValue(17555)=2 -> "Sorry but I don't have any tasks for you." +"task",QuestValue(17555)=2 -> * } diff --git a/data/npc/ishina.npc b/data/npc/ishina.npc index 7211219..35b011b 100644 --- a/data/npc/ishina.npc +++ b/data/npc/ishina.npc @@ -2,7 +2,7 @@ # ishina.npc: Datenbank für die Juwelierin Ishina Name = "Ishina" -Outfit = (138,95-9-87-95) +Outfit = (150,95-9-87-95-1) Home = [33231,32423,7] Radius = 0 @@ -79,4 +79,26 @@ Topic=2,"yes",Count(Type)>=Amount -> "Ok. Here is your money.", Delete(Type), Cr Topic=2,"yes" -> "Sorry, you do not have one." Topic=2,"yes",Amount>1 -> "Sorry, you do not have so many." Topic=2 -> "Maybe next time." + +"addon",male -> "My jewelled belt? Yes, that is a true masterpiece. However, this accessory is for lady only." +"outfit",male -> * + +"addon",QuestValue(17555)=0,female -> "My jewelled belt? Yes, that is a true masterpiece. Of course I could make one for you, but I have a small request. Would you fulfill a task for me?", Topic=3 +"outfit",QuestValue(17555)=0,female -> * +"mission",QuestValue(17555)=0,female -> * +"task",QuestValue(17555)=0,female -> * +Topic=3,"yes" -> "Listen, um... I was wanting a comb for a long time... not just any comb, but a mermaid's comb. ...", + "Do you think you could get one for me? I really would appreciate it.", Topic=4 +Topic=3 -> "Maybe another time." +Topic=4,"yes" -> "Brilliant! I will wait for you to return with a mermaid's comb then.", SetQuestValue(17555,1) +Topic=4 -> "Maybe another time." + +"comb",QuestValue(17555)=1,female -> Type=5945, Amount=1, "Have you brought a mermaid's comb?", Topic=5 +"mission",QuestValue(17555)=1,female -> * +"task",QuestValue(17555)=1,female -> * +Topic=5,"yes",Count(Type)>=Amount -> "Yeah! That's it! I can't wait to comb my hair! Oh - but first, I'll fulfil my promise: Here is your jewelled belt! Thanks again!", Delete(Type), SetQuestValue(17555,2), AddOutfitAddon(146,1), AddOutfitAddon(150,1), EffectOpp(13) +Topic=5 -> "Maybe another time." + +"mission",QuestValue(17555)=2 -> "Sorry but I don't have any tasks for you." +"task",QuestValue(17555)=2 -> * } diff --git a/data/npc/marina.npc b/data/npc/marina.npc index 6f707f7..aac7094 100644 --- a/data/npc/marina.npc +++ b/data/npc/marina.npc @@ -16,6 +16,8 @@ VANISH,! -> "How rude." "bye" -> "Good bye, %N.", Idle +"comb" -> "Sorry, I don't have a spare comb. I lost my favourite one when diving around in Calassa." + # The Mermaid Marina Quest "silk","yarn",QuestValue(17504)=0 -> "Um. You mean, you really want me to touch that gooey spider silk just because you need yarn? Well... do you think that I'm pretty?", Topic=1 Topic=1,"yes" -> "Well, everyone would say that in your position. Do you think that I'm really, absolutely the most stunning being that you have ever seen?", Topic=2 diff --git a/data/world/map.otbm b/data/world/map.otbm index 5766ed964c3edb7f3719761aaa684bca4097f721..d0b3d0274349809776e7d0d56f7bfd162a705137 100644 GIT binary patch delta 6072 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