Merge branch 'master' into jesusalva/innsjesusalva/inns

4 files changed, 32 insertions, 5 deletions

diff --git a/npc/000-2-1/arpan.txt b/npc/000-2-1/arpan.txt
index 9b2b9665..8c06ce48 100644
--- a/npc/000-2-1/arpan.txt
+++ b/npc/000-2-1/arpan.txt
@@ -7,6 +7,7 @@
 // Variable:
 //    0 ShipQuests_Arpan
 //    1 ShipQuests_Julia
+//    2 ShipQuests_ArpanMoney
 // Values:
 //    00   Has not talked to Arpan yet.
 //    01   Talked to Arpan and needs to get the clothes.
@@ -15,6 +16,10 @@
 //    10   Has not talked to Julia
 //    11   Need to see Julia
 //    12   Has been registered by Julia
+//    20   Does not knows about money
+//    21   Has not taken possession from Arpan
+//    22   Took money from Arpan
+//    23   Took money and clothes (Legacy only)
 
 000-2-1,49,36,0	script	LeftDoorCheck	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
@@ -84,6 +89,7 @@ L_EquipDone:
     close;
 }
 
+/////////////////////////////////////////////////////////////////////////////
 000-2-1,49,33,0	script	Magic Arpan	NPC_MAGIC_ARPAN,{
     .@q = getq(ShipQuests_Arpan);
     .@q_nard = getq(ShipQuests_Nard);
@@ -152,6 +158,7 @@ L_Menu:
         l("Who are you?"), L_Who,
         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(getq(ShipQuests_ArpanMoney) == 2 && LEGACY, l("About my my old clothes...")), L_LegacyClothes,
         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."), -;
@@ -201,9 +208,28 @@ L_WhereOldClothes:
 
     setq ShipQuests_ArpanMoney, 2;
     .@q = getq(ShipQuests_Arpan);
-    Zeny = Zeny + 10;
+    Zeny += 10;
     message strcharinfo(0), l("You receive @@ E!", 10);
 
+    if (LEGACY)
+        goto L_LegacyClothes;
+
+    goto L_BeforeMenu;
+
+L_LegacyClothes:
+    if (LEGACY) {
+        mesn strcharinfo(0);
+        select
+            lg("But... I remember that my clothes were very dear to me..."),
+            l("Oh okay.");
+        mes "";
+        if (@menu == 1) {
+            mesn;
+            mesq l("Well, you can have them back, but they're yayaya, mostly destroyed. Not sure what yeye are going to do with that.");
+            getitem ClothesPack, 1;
+            setq ShipQuests_ArpanMoney, 3;
+        }
+    }
     goto L_BeforeMenu;
 
 L_WhereMoney:
@@ -214,7 +240,7 @@ L_WhereMoney:
 
     setq ShipQuests_ArpanMoney, 2;
     .@q = getq(ShipQuests_Arpan);
-    Zeny = Zeny + 10;
+    Zeny += 10;
     message strcharinfo(0), l("You receive @@ E!", 10);
 
     goto L_BeforeMenu;
diff --git a/npc/000-2-1/chefgado.txt b/npc/000-2-1/chefgado.txt
index 69570fcf..0039e094 100644
--- a/npc/000-2-1/chefgado.txt
+++ b/npc/000-2-1/chefgado.txt
@@ -161,7 +161,7 @@ L_PoisonJulia:
     mesq l("The usurper has been punished! This is a great day! Take this reward as a prize for your loyalty to the old commander!");
 
     setq ShipQuests_ChefGado, 4;
-    Zeny = Zeny + 200;
+    Zeny += 200;
     message strcharinfo(0), l("You receive @@ E!", 200);
     inventoryplace Bread, 1;
     getitem Bread, 1;
diff --git a/npc/000-2-1/dan.txt b/npc/000-2-1/dan.txt
index a60c88f1..31591734 100644
--- a/npc/000-2-1/dan.txt
+++ b/npc/000-2-1/dan.txt
@@ -63,7 +63,7 @@ L_QuestStory:
 L_She:
     mes "";
     mesn;
-    mesq l("She is a good friend of mine... We wanted to marry a few weeks before her accident but...");
+    mesq l("She is a good friend of mine... We wanted to move together a few weeks before her accident but...");
     next;
 
     goto L_Quit2;
diff --git a/npc/000-2-1/peter.txt b/npc/000-2-1/peter.txt
index eaade56e..06825f0c 100644
--- a/npc/000-2-1/peter.txt
+++ b/npc/000-2-1/peter.txt
@@ -256,6 +256,7 @@ OnTimeout:
 // It's not _buggy_, it is just reckless. I would like a setting to restrict it
 // to destroy only instances owned by the char, or to destroy by name :p
 OnDone:
+    warp "000-2-1", 72, 36;
     .@q3 = getq3(ShipQuests_Peter);
     //instance_destroy(.@q3);
     if (@peter)
@@ -285,7 +286,7 @@ OnDone:
         default: @peter=750; break;
     }
 
-    Zeny = Zeny + @peter;
+    Zeny += @peter;
     message strcharinfo(0), l("You receive @@ E!", @peter);
 
     // Some cleanup. Shouldn't cause bugs but it's absence causes a ugly behavior.