summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/003-1/sailors.txt115
-rw-r--r--npc/003-3/malindou.txt9
2 files changed, 104 insertions, 20 deletions
diff --git a/npc/003-1/sailors.txt b/npc/003-1/sailors.txt
index 4a79e8b47..e6ca095ea 100644
--- a/npc/003-1/sailors.txt
+++ b/npc/003-1/sailors.txt
@@ -5,14 +5,21 @@
// The major reward from this one is knowledge about secret passages on Tulimshar.
// The quest pays what you spend, except for travel fees. The real reward here
// is knowledge, the fishing rod you'll need to make anyway, 150 XP and 20 JExp.
+// 1 - First Quest assigned
+// 2 - First Quest Complete
+// 3 - Second Quest assigned
+// 4 - Second Quest Complete
003-1,112,93,0 script Sailors#003-1 NPC_ELVEN_MAN_TRADER_SITTING,{
if (BaseLevel < 12) goto L_Complete;
.@q = getq(TulimsharQuest_Sailors);
- if (.@q == 1)
- goto L_Report;
- if (.@q == 2)
+ if (.@q == 4)
goto L_Complete;
+
+ if (.@q == 1)
+ goto L_Report1;
+ if (.@q == 3)
+ goto L_Report2;
mesn;
mesq lg("Hey, pal. This spot is very good, I can see the whole town from here.");
next;
@@ -21,7 +28,8 @@
next;
mesn strcharinfo(0);
menu
- l("What do you need?"), L_Quest,
+ rif(.@q == 0, l("What do you need?")), L_Quest1,
+ rif(.@q == 2, l("What do you need?")), L_Quest2,
l("Maybe another time."), -;
close;
@@ -29,7 +37,7 @@ L_Complete:
hello;
end;
-L_Quest:
+L_Quest1:
mes "";
mesn;
mesq l("You're willing to help? Perfect. We need 3 @@, 4 @@ and 10 @@ for travel.", getitemlink(FishBox), getitemlink(CroconutBox), getitemlink(CottonCloth));
@@ -49,14 +57,14 @@ L_Quest:
mesc l("Take care: Secret passages can be dangerous places (or not).");
close;
-L_Report:
- mesn;
- mes l("@@/3 @@", countitem(FishBox), getitemlink(FishBox));
- mes l("@@/4 @@", countitem(CroconutBox), getitemlink(CroconutBox));
- mes l("@@/10 @@", countitem(CottonCloth), getitemlink(CottonCloth));
- if (countitem(FishBox) < 3 ||
- countitem(CroconutBox) < 4 ||
- countitem(CottonCloth) < 10)
+L_Report1:
+ mesn;
+ mes l("@@/1 @@", countitem(FishBox), getitemlink(FishBox));
+ mes l("@@/1 @@", countitem(CroconutBox), getitemlink(CroconutBox));
+ mes l("@@/2 @@", countitem(CottonCloth), getitemlink(CottonCloth));
+ if (countitem(FishBox) < 1 ||
+ countitem(CroconutBox) < 1 ||
+ countitem(CottonCloth) < 2)
close;
next;
select
@@ -65,9 +73,9 @@ L_Report:
mes "";
if (@menu == 2)
close;
- if (countitem(FishBox) < 3 ||
- countitem(CroconutBox) < 4 ||
- countitem(CottonCloth) < 10) {
+ if (countitem(FishBox) < 1 ||
+ countitem(CroconutBox) < 1 ||
+ countitem(CottonCloth) < 2) {
mesn;
mesq l("Liar. Where are the goods? Are you trying to cheat me?!");
next;
@@ -82,11 +90,11 @@ L_Report:
close;
}
inventoryplace Dagger, 1, CottonShirt, 1;
- delitem FishBox, 3; // 7.500 GP → 3.750 GP
- delitem CroconutBox, 4; // 12.000 GP → 10.600~11.800 GP
- delitem CottonCloth, 10; // 2.000 GP
+ delitem FishBox, 1; // 7.500 GP → 3.750 GP
+ delitem CroconutBox, 1; // 12.000 GP → 10.600~11.800 GP
+ delitem CottonCloth, 2; // 2.000 GP
getexp 1508, 15;
- Zeny=Zeny+18750; // Profit: 1800 GP → 2.400~1.200 GP
+ Zeny=Zeny+3750; // Profit: 1800 GP → 2.400~1.200 GP
getitem Dagger, 1;
getitem CottonShirt, 1;
setq TulimsharQuest_Sailors, 2;
@@ -97,6 +105,73 @@ L_Report:
mesq l("Take care. Here, take this @@. You can sell it for some quick-spot cash, or use it as a weapon.", getitemlink(Dagger));
close;
+// Second Quest
+L_Quest2:
+ mes "";
+ mesn;
+ mesq l("You're willing to help? Perfect. We need 3 @@, 4 @@ and 10 @@ for travel.", getitemlink(FishBox), getitemlink(CroconutBox), getitemlink(CottonCloth));
+ next;
+ mesn;
+ mesq l("Cotton Cloth is sold at Candor, Croconut Boxes can be bought at the market. Fish, however, is a little more tricky.");
+ next;
+ mesn;
+ mesq l("If you hug the wall, there's a secret passage somewhere there. Well, there are many secret passages at Tulimshar.");
+ next;
+ mesn;
+ mesq l("You will find a fisher, maybe he is having a good time and can sell you a few boxes. And remember to keep your eye open.");
+ setq TulimsharQuest_Sailors, 3;
+ next;
+ mesn;
+ mesq l("There are secret caves on this city. In fact, Tulimshar holds many misteries.");
+ mesc l("Take care: Secret passages can be dangerous places (or not).");
+ close;
+
+L_Report2:
+ mesn;
+ mes l("@@/2 @@", countitem(FishBox), getitemlink(FishBox));
+ mes l("@@/3 @@", countitem(CroconutBox), getitemlink(CroconutBox));
+ mes l("@@/8 @@", countitem(CottonCloth), getitemlink(CottonCloth));
+ if (countitem(FishBox) < 2 ||
+ countitem(CroconutBox) < 3 ||
+ countitem(CottonCloth) < 8)
+ close;
+ next;
+ select
+ l("[Deliver all goods.]"),
+ l("[Maybe another time.]");
+ mes "";
+ if (@menu == 2)
+ close;
+ if (countitem(FishBox) < 2 ||
+ countitem(CroconutBox) < 3 ||
+ countitem(CottonCloth) < 8) {
+ mesn;
+ mesq l("Liar. Where are the goods? Are you trying to cheat me?!");
+ next;
+ mesn;
+ mesq l("You know Jesus Saves hates cheaters, right? If Saulc didn't asked me to double-check stuff...");
+ next;
+ mesn;
+ mesq l("For short, you would have lost all your items, wouldn't get anything, and there would be no refunds.");
+ next;
+ mesn;
+ mesq l("That's just a friendly advise. That's how things works around here.");
+ close;
+ }
+ delitem FishBox, 2; // 7.500 GP → 3.750 GP
+ delitem CroconutBox, 3; // 12.000 GP → 10.600~11.800 GP
+ delitem CottonCloth, 8; // 2.000 GP
+ getexp 1508, 15;
+ Zeny=Zeny+15750; // Profit: 1800 GP → 2.400~1.200 GP
+ setq TulimsharQuest_Sailors, 4;
+ mesn;
+ mesq lg("Many thanks, your help has been invaluable. We're now capable to travel at ease.");
+ next;
+ mesn;
+ mesq l("Take care. Here, take this @@. You can sell it for some quick-spot cash, or use it as a weapon.", getitemlink(Dagger));
+ close;
+
+
OnInit:
.sex = G_OTHER;
.distance = 5;
diff --git a/npc/003-3/malindou.txt b/npc/003-3/malindou.txt
index 5e574978e..22f0bcd5a 100644
--- a/npc/003-3/malindou.txt
+++ b/npc/003-3/malindou.txt
@@ -390,6 +390,15 @@ OnInit:
debugmes "* picklog options Update";
debugmes "";
}
+ // Current UPDATE value: Sex Jun 21 13:20:21 -03 2019
+ // Tulimshar Sailors quest was split in two
+ if ($UPDATE < 1561134021) {
+ query_sql("UPDATE `quest` SET `count1` = '4' WHERE `quest`.`quest_id`="+TulimsharQuest_Sailors+" AND `count1` >= '2'");
+ $UPDATE=1561134021;
+ debugmes "";
+ debugmes "* Tulimshar Sailors split in two";
+ debugmes "";
+ }