summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2019-01-04 21:06:41 -0200
committerJesusaves <cpntb1@ymail.com>2019-01-04 21:06:41 -0200
commit14f72a5dbfbb36f46e727bfd86b9b4c4de9729d7 (patch)
tree35a243d3f04a6632571106e4b664c719996673ca /npc
parent88baf3f332d6966fd8f0a6905d266507febfb74e (diff)
downloadserverdata-14f72a5dbfbb36f46e727bfd86b9b4c4de9729d7.tar.gz
serverdata-14f72a5dbfbb36f46e727bfd86b9b4c4de9729d7.tar.bz2
serverdata-14f72a5dbfbb36f46e727bfd86b9b4c4de9729d7.tar.xz
serverdata-14f72a5dbfbb36f46e727bfd86b9b4c4de9729d7.zip
Improve magic arpan dialog (mostly)
Diffstat (limited to 'npc')
-rw-r--r--npc/000-0-0/sailors.txt2
-rw-r--r--npc/002-1/arpan.txt27
-rw-r--r--npc/002-1/chest.txt5
3 files changed, 20 insertions, 14 deletions
diff --git a/npc/000-0-0/sailors.txt b/npc/000-0-0/sailors.txt
index 127a816f9..f62661d4b 100644
--- a/npc/000-0-0/sailors.txt
+++ b/npc/000-0-0/sailors.txt
@@ -74,7 +74,7 @@ OnSlow:
next;
mesn;
mesc l("(Click on me to hear the conversation and advance. I am a NPC, and NPCs can be interact by clicking.)");
- mesc l("(By the way, it is rude to not listen when people are speaking to you. Read the dialogs! Important stuff can be found on them.)"), 1;
+ mesc l("(That was already explained on the intro. Read the dialogs! Important stuff can be found on them.)");
addtimer(30000,"Elmo#sailors::OnSlow");
close;
diff --git a/npc/002-1/arpan.txt b/npc/002-1/arpan.txt
index b11c4d96c..d8ea11bfc 100644
--- a/npc/002-1/arpan.txt
+++ b/npc/002-1/arpan.txt
@@ -10,6 +10,10 @@
// 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.
@@ -58,7 +62,7 @@ L_GetCloth:
close;
L_EquipDone:
- setq ShipQuests_Arpan, 3;
+ setq1 ShipQuests_Arpan, 3;
close;
}
@@ -85,7 +89,7 @@ L_GetCloth:
close;
L_EquipDone:
- setq ShipQuests_Arpan, 3;
+ setq1 ShipQuests_Arpan, 3;
close;
}
@@ -94,6 +98,8 @@ L_EquipDone:
showavatar NPC_MAGIC_ARPAN;
.@q = getq(ShipQuests_Arpan);
+ .@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;
@@ -102,7 +108,7 @@ OnTalk:
mesn;
if (.@q > 0) goto L_Menu;
- setq ShipQuests_Arpan, 1;
+ setq ShipQuests_Arpan, 1, 0;
deltimer("Magic Arpan::OnSlow");
mesq lg("Yeye, you are really lucky to be alive. You are in good enough shape for walking, do you remember what happened?");
@@ -159,13 +165,13 @@ L_Menu:
.@equipped = getequipid(equip_torso) == 1300 && getequipid(equip_legs) == 2200;
menu
- lg("Could you tell me where I am?"), L_Where,
- lg("Where can I find Juliet?"), L_Julia,
- l("Who are you?"), L_Who,
- l("I need a tutorial, where can I find help?"), L_Trainer,
+ 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,
+ rif(!.@n, l("I need a tutorial, where can I find help?"), L_Trainer,
rif(!getq(ShipQuests_ArpanMoney), lg("Do you know what happened to the gold I had when you guys saved me?")), L_WhereMoney,
- 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."), -;
closedialog;
@@ -230,7 +236,6 @@ L_WhereMoney:
if (BaseLevel < 4) goto L_Apana;
setq ShipQuests_ArpanMoney, 1;
- .@q = getq(ShipQuests_Arpan);
Zeny = Zeny + 35;
message strcharinfo(0), l("You receive @@ GP!", 35);
@@ -261,7 +266,7 @@ L_BeforeMenu:
goto L_Menu;
L_EquipDone:
- setq ShipQuests_Arpan, 3;
+ setq1 ShipQuests_Arpan, 3;
goto L_Menu;
OnSlow:
diff --git a/npc/002-1/chest.txt b/npc/002-1/chest.txt
index 031a578de..248efba01 100644
--- a/npc/002-1/chest.txt
+++ b/npc/002-1/chest.txt
@@ -1,3 +1,4 @@
+// TMW2 Script modified by Jesusalva
// Evol scripts.
// Authors:
// 4144
@@ -27,7 +28,7 @@
if (.@questState <= 1)
{
inventoryplace CreasedShirt, 2;
- setq ShipQuests_Arpan, 2;
+ setq1 ShipQuests_Arpan, 2;
getitem CreasedShirt, 1;
getitem CreasedShorts, 1;
npctalk3 l("You take the clothes from the chest.");
@@ -67,6 +68,6 @@ OnTouch:
end;
OnInit:
- .distance = 2;
+ .distance = 3;
end;
}