Rewrite Arpan accordingly. Tutorial reward is a Piou Leg. No experience is gained.

You got a whole level on tutorial? Reverted.

2 files changed, 7 insertions, 124 deletions

diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 704a1374b..b2794433a 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -34,7 +34,7 @@ L_Step0:
         goto L_Skip;
     }
     savepoint "000-0-0", 30, 37;
-    setq1 ShipQuests_Arpan, 1;
+    setq ShipQuests_Arpan, 1;
 
 // Tutorial accepted
 L_Step1:
@@ -203,7 +203,7 @@ L_Step5:
     goto L_Ready;
 
 L_Skip:
-    setq1 ShipQuests_Arpan, 5;
+    setq ShipQuests_Arpan, 5;
     getitem CreasedShirt, 1;
     getitem CreasedShorts, 1;
     equip(CreasedShirt);
diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index f62184ba9..bd5d50004 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -6,93 +6,22 @@
 //    Ablu
 //    Qwerty Dragon
 // Description:
-//    Explains to the player how he got here.
-//    Modified for TMW2 by Jesusalva.
-// Variable:
-//    0 ShipQuests_Arpan
-//          0 -> Need to talk with Arpan
-//          1 -> Need to take clothes
-//          2 -> Got the clothes
-//          3 -> Equipment Done
-//    1 ShipQuests_Julia
-// Values:
-//    00   Has not talked to Arpan yet.
-//    01   Talked to Arpan and needs to get the clothes.
-//    02   Has the clothes.
-//    03   Has and equipped the clothes.
-//    10   Has not talked to Julia
-//    11   Need to see Julia
-//    12   Has been registered by Julia
-// Translation
-//    FR translated
+//    Introduction NPC
 
 002-1,49,36,0	script	LeftDoorCheck	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
-    if (.@q == 0) doevent "Magic Arpan::OnTalk";
+    if (.@q == 5) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
 002-1,54,36,0	script	RightDoorCheck	NPC_HIDDEN,0,0,{
     .@q = getq(ShipQuests_Arpan);
-    if (.@q == 0) doevent "Magic Arpan::OnTalk";
+    if (.@q == 5) doevent "Magic Arpan::OnTalk";
 
     close;
 }
 
-002-1,47,32,0	script	LeftBarrierCheck	NPC_HIDDEN,0,2,{
-    .@q = getq(ShipQuests_Arpan);
-    if (.@q > 2) close;
-    if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
-    if (.@q == 2) goto L_Equip;
-    if (.@q == 1) goto L_GetCloth;
-
-    doevent "Magic Arpan::OnClothNotTaken";
-
-L_Equip:
-    slide 49, 32;
-    doevent "Magic Arpan::OnEquip";
-
-    close;
-
-L_GetCloth:
-    slide 49, 32;
-    doevent "Magic Arpan::OnClothNotTaken";
-
-    close;
-
-L_EquipDone:
-    setq1 ShipQuests_Arpan, 3;
-
-    close;
-}
-
-002-1,56,32,0	script	RightBarrierCheck	NPC_HIDDEN,0,2,{
-    .@q = getq(ShipQuests_Arpan);
-    if (.@q > 2) close;
-    if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
-    if (.@q == 2) goto L_Equip;
-    if (.@q == 1) goto L_GetCloth;
-
-    doevent "Magic Arpan::OnClothNotTaken";
-
-L_Equip:
-    slide 55, 32;
-    doevent "Magic Arpan::OnEquip";
-
-    close;
-
-L_GetCloth:
-    slide 55, 32;
-    doevent "Magic Arpan::OnClothNotTaken";
-
-    close;
-
-L_EquipDone:
-    setq1 ShipQuests_Arpan, 3;
-
-    close;
-}
 
 002-1,49,33,0	script	Magic Arpan	NPC_MAGIC_ARPAN,{
     showavatar NPC_MAGIC_ARPAN;
@@ -101,14 +30,13 @@ L_EquipDone:
     .@s = getq2(ShipQuests_Arpan);
     .@n = getq(General_Narrator);
     .@q_julia = getq(ShipQuests_Julia);
-    if (.@q == 2 && getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200) goto L_EquipDone;
 
 OnTalk:
     showavatar NPC_MAGIC_ARPAN;
     mesn;
 
-    if (.@q > 0) goto L_Menu;
-    setq ShipQuests_Arpan, 1, 0;
+    if (.@q > 5) goto L_Menu;
+    setq ShipQuests_Arpan, 6;
     deltimer("Magic Arpan::OnSlow");
 
     mesq lg("Yeye, are you finally ready to go?");
@@ -136,41 +64,14 @@ OnTalk:
         setq ShipQuests_Julia, 1;
     mesq lg("Yaya, you should go see her! She'll be happy to help you again.");
     next;
-    mesn;
-    mesq lg("Also, we took your yayed clothes, as they were... Yeyeye... In a bad shape. Go check the chest near your bed, there are some other ones inside.");
-    setcamnpc "Chest";
     goto L_Menu;
 
 
-OnClothNotTaken:
-    showavatar NPC_MAGIC_ARPAN;
-    mesn;
-    mesq lg("Yeye, you still did not get your new clothes from the chest next to your bed!");
-    next;
-    mesn;
-    mesq lg("It will be a problem if you run around naked!");
-
-    close;
-
-OnEquip:
-    mesn "Narrator";
-    mesc l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client.");
-    next;
-    mesc l("When your inventory is open, you can equip an item by selecting it and clicking 'Equip'. You can do the same to remove an item by clicking on 'Unequip'.");
-    next;
-    mesc l("Items have different effects. Some will heal you, some can be used as weapons or armor, and some can be sold for gold.");
-
-    close;
-
-
 L_Menu:
     mesq l("What yeye could I do for you today?");
     next;
-    .@equipped = getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
 
     menu
-        rif(!.@equipped && .@q < 3, lg("What should I do after taking these clothes?")), L_WhatCloth,
-        rif(!.@equipped && .@q < 3, l("Thank you, I'll take them and put them on.")), -,
         rif(.@q_julia < 2, lg("Where can I find Juliet?")), L_Julia,
         rif(!.@n, lg("Could you tell me where I am?")), L_Where,
         rif(!.@n, l("Who are you?")), L_Who,
@@ -251,28 +152,10 @@ L_Apana:
     next;
     goto L_Menu;
 
-L_WhatCloth:
-    mes "";
-    mesn;
-    mesq lg("Oh yeyeye... As they are not edible, you can maybe try to equip them?");
-    next;
-
-    mesn "Narrator";
-    mesc l("To open your inventory, use the F3 key or use your mouse to select it in the above menu in your client.");
-    next;
-    mesc l("When your inventory is open, you can equip an item by selecting it and clicking 'Equip'. You can do the same to unequip an item by clicking on 'Unequip'.");
-    next;
-    mesc l("Items have different effects. Some will heal you, some can be used as weapons or armor, and some can be sold for gold.");
-    next;
-
 L_BeforeMenu:
     mesn;
     goto L_Menu;
 
-L_EquipDone:
-    setq1 ShipQuests_Arpan, 3;
-    goto L_Menu;
-
 OnSlow:
     npctalk3 l("@@, do you need help? Are you lost? Click me!", strcharinfo(0));
     /*