Tweak arpan dialogs and sailors dialogs.

1 files changed, 31 insertions, 4 deletions

diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index b6a61f4b..5adc7c00 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -24,12 +24,11 @@
     close;
 }
 
-000-2-1.gat,37,32,0,1	script	LeftBarrierCheck	0,0,1,{
+000-2-1.gat,37,32,0,1	script	LeftBarrierCheck	0,0,2,{
     set @q, geta2(ShipQuests, ShipQuests_Arpan);
     if (@q > 2) close;
     if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs)) goto l_EquipDone;
     if (@q == 1) goto l_GetCloth;
-    mes "b";
     doevent "Magic_Arpan::OnClothNotTaken";
     //doevent "Magic_Arpan::OnEquip";
     warp "000-2-1.gat", 39, 32;
@@ -45,12 +44,32 @@ l_EquipDone:
     close;
 }
 
+000-2-1.gat,46,32,0,1	script	RightBarrierCheck	0,0,2,{
+    set @q, geta2(ShipQuests, ShipQuests_Arpan);
+    if (@q > 2) close;
+    if (@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs)) goto l_EquipDone;
+    if (@q == 1) goto l_GetCloth;
+    doevent "Magic_Arpan::OnClothNotTaken";
+    //doevent "Magic_Arpan::OnEquip";
+    warp "000-2-1.gat", 45, 32;
+    close;
+
+l_GetCloth:
+    warp "000-2-1.gat", 45, 32;
+    doevent "Magic_Arpan::OnClothNotTaken";
+    close;
+
+l_EquipDone:
+    seta2 ShipQuests, ShipQuests_Arpan, 3;
+    close;
+}
+
 000-2-1.gat,41,37,0,1	script	Box	999,{
     mesn l("Box");
 	set @q, geta2(ShipQuests, ShipQuests_Arpan);
 	if (@q == 1) goto l_Give;
     if (@q > 1) goto l_Empty;
-    mes l("The box is locked.");
+    mes l("This box is empty.");
     close;
     
 l_Give:
@@ -89,7 +108,6 @@ OnClothNotTaken:
     close;
 
 OnEquip:
-    mes "a";
     mesn;
     mes g(l("Open your inventory (F3 key), select these cloths one by one and equip them.#0"), l("Open your inventory (F3 key), select these cloths one by one and equip them.#1"));
     close;
@@ -104,10 +122,12 @@ l_Story:
     next;
     mes g(l("Also, we took your cloths, as they were... Yeyeye... In bad condition, go check the box around your bed, there is some cloths inside.#0"), l("Also, we took your cloths, as they were... Yeyeye... In bad condition, go check the box around your bed, there is some cloths inside.#1"));
 l_Menu:
+    mes l("What yeye could I do for you today?");
     menu
         l("Could you say me where am I?"), l_Where,
         l("Where can I found this Julia?"), l_Julia,
         l("Who are you?"), l_Who,
+        l("What should I add after taking these cloths?"), l_WhatCloth,
         l("Thank you, I go take them."), l_Quit;
     close;
 
@@ -116,6 +136,7 @@ l_Where:
     mes g(l("You are on our ship, we are actually ending our long merchant traveling to the city of Artis!#0"), l("You are on our ship, we are actually ending our long merchant traveling to the city of Artis!#1"));
     next;
     mes g(l("We will be there in some days, so it's there that we will depose you. You will see, citizens are polite and you can still ask for help in the warrior guild, they can found you a job or maybe to help you to found what happened to you on the sea!#0"), l("We will be there in some days, so it's there that we will depose you. You will see, citizens are polite and you can still ask for help in the warrior guild, they can found you a job or maybe to help you to found what happened to you on the sea!#1"));
+    next;
     goto l_Menu;
 
 l_Julia:
@@ -127,6 +148,12 @@ l_Julia:
 
 l_Who:
     mes l("Sorry! I forget to present myself, I'm called Arpan, but other sailors call me Magic_Arpan because that I know one or two magic spells.");
+    next;
+    goto l_Menu;
+
+l_WhatCloth:
+    mes l("Click on your inventory icons or press F3, and equip them with clicking on the icon and press 'Equip'.");
+    next;
     goto l_Menu;
 
 l_Quit: