Merge branch 'Change_arpan_money_dialogue' into 'master'

change the arpan dialogue about money in old cloths sentence

Change Arpan money state of quest :
0 = no message about money in Arpan text, one message in Elmo text. (Elmo set quest to 1 when player respond to Elmo he don't has receive money from Arpan)
1 = message about money, one message in Elmo text. (Arpan set quest to 2 when player ask for money and receive the money)
2 = no message, end. one message money done in Elmo text.

Sentence about old cloth fit better with the original Elmo question.

See merge request !25

2 files changed, 18 insertions, 3 deletions

diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 3c3661fd..4d47c548 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -149,7 +149,8 @@ L_Menu:
         lg("Could you tell me where I am?"), L_Where,
         lg("Where can I find Julia?"), L_Julia,
         l("Who are you?"), L_Who,
-        rif(getq(ShipQuests_ArpanMoney) == 0, l("Where are my old clothes?")), L_WhereOldClothes,
+        rif(getq(ShipQuests_ArpanMoney) == 1, lg("Do you know what happened to the gold I had when you guys saved me?")), L_WhereMoney,
+        rif(getq(ShipQuests_ArpanMoney) < 2, l("Where are my old clothes?")), L_WhereOldClothes,
         rif(!.@equipped, lg("What should I do after taking these clothes?")), L_WhatCloth,
         rif(!.@equipped, l("Thank you, I'll take them and put them on.")), -,
         l("Nothing, sorry."), -;
@@ -197,7 +198,20 @@ L_WhereOldClothes:
     mes lg("Oh, now that I remember, we also found some money in your pockets, here it is!");
     next;
 
-    setq ShipQuests_ArpanMoney, 1;
+    setq ShipQuests_ArpanMoney, 2;
+    .@q = getq(ShipQuests_Arpan);
+    Zeny = Zeny + 10;
+    message strcharinfo(0), l("You receive @@ E!", 10);
+
+    goto L_BeforeMenu;
+
+L_WhereMoney:
+    mes "";
+    mesn;
+    mesq lg("Oh right, I totally forgot about that, here you go.");
+    next;
+
+    setq ShipQuests_ArpanMoney, 2;
     .@q = getq(ShipQuests_Arpan);
     Zeny = Zeny + 10;
     message strcharinfo(0), l("You receive @@ E!", 10);
diff --git a/npc/000-2-3/elmo.txt b/npc/000-2-3/elmo.txt
index 0ef588e9..74e5beec 100644
--- a/npc/000-2-3/elmo.txt
+++ b/npc/000-2-3/elmo.txt
@@ -21,7 +21,7 @@
         sailortalk;
     }
 
-    if (getq(ShipQuests_ArpanMoney) == 1)
+    if (getq(ShipQuests_ArpanMoney) == 2)
     {
         got_money;
     }
@@ -45,6 +45,7 @@
                 case 2:
                     speech 5,
                         l("Hehe, sometimes he gets his head in the clouds, You should go ask him about that.");
+                    setq ShipQuests_ArpanMoney, 1; 
                     break;
             }