finish first part of oriental addon

New Text Document.txt

@@ -1 +1 @@
-next: 17551
+next: 17557

data/movements/movements.xml

@@ -424,6 +424,12 @@
 	<movevent event="StepIn" movementid="17527" script="goroma/back_ferumbras_floor.lua" />
 	<movevent event="AddItem" movementid="17527" tileitem="1" script="goroma/back_ferumbras_floor.lua" />
 	
+	<!-- Calassa -->
+	<movevent event="StepIn" frommovementid="14429" tomovementid="14430" script="calassa/calassa_enter.lua" />
+	<movevent event="AddItem" frommovementid="14429" tomovementid="14430" tileitem="1" script="calassa/calassa_enter.lua" />
+	<movevent event="StepIn" movementid="14431" script="calassa/calassa_back.lua" />
+	<movevent event="AddItem" movementid="14431" tileitem="1" script="calassa/calassa_back.lua" />
+	
 	<!-- Liberty Bay -->
 	<movevent event="StepIn" movementid="33217" script="liberty_bay/back_cult_piano.lua" />
 	<movevent event="AddItem" movementid="33217" tileitem="1" script="liberty_bay/back_cult_piano.lua" />

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

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

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 -> *
 }

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 -> *
 }

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