Fix a typo. Add several scripts to aid with La Marine. Pirate attack still isn't

being taken in account, I am waiting @Saulc to finish it %%G

2 files changed, 101 insertions, 0 deletions

diff --git a/npc/016-1/_import.txt b/npc/016-1/_import.txt
index 1edea7a42..a366f8e21 100644
--- a/npc/016-1/_import.txt
+++ b/npc/016-1/_import.txt
@@ -1,3 +1,4 @@
 // Map 016-1: La Marine First Deck
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/016-1/_mobs.txt",
+"npc/016-1/marine.txt",
diff --git a/npc/016-1/marine.txt b/npc/016-1/marine.txt
new file mode 100644
index 000000000..b1dbe24df
--- /dev/null
+++ b/npc/016-1/marine.txt
@@ -0,0 +1,100 @@
+// TMW2 scripts.
+// Authors:
+//    Jesusalva
+// Description:
+//    Temporary, placeholder.
+
+016-1,19,29,0	script	Captain	NPC_NARD,{
+    .@price=1500;
+
+    if (BaseLevel < 20)
+        goto L_TooWeak;
+
+    if (nard_reputation() >= 11)
+            .@price-=1000;
+    else if (nard_reputation() >= 9)
+            .@price-=750;
+    else if (nard_reputation() >= 7)
+            .@price-=500;
+    else if (nard_reputation() >= 5)
+            .@price-=250;
+    mesn;
+    mesq l("Hi @@.", strcharinfo(0));
+    next;
+    mesq l("You are currently at @@.", LOCATION$);
+    mes "";
+    mes l("A ship travel will cost you @@ GP.", .@price);
+
+    if (Zeny >= .@price) {
+        menu
+            rif(LOCATION$ != "Tulim", l("To Tulimshar.")), L_TTulim,
+            rif(LOCATION$ != "Hurns", l("To Hurnscald.")), L_THurns,
+            l("No, I'll save my money."), -;
+    } else {
+        mes l("You still need @@ GP to afford it.", (.@price-Zeny));
+    }
+
+    close;
+
+L_THurns:
+    Zeny=Zeny-.@price;
+    PC_DEST$="Hurns";
+
+    mes "";
+    mesn;
+    mesq l("Hurns Island, then? Yes, that is a pretty island, right?");
+    next;
+    mesq l("I was planning to go there soon, anyway. All aboard!");
+    close2;
+    addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent";
+    @timer_navio_running = 1;
+    warp "016-6", 40, 32;
+    end;
+
+L_TTulim:
+    Zeny=Zeny-.@price;
+    PC_DEST$="Tulim";
+    addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent";
+    @timer_navio_running = 1;
+
+    mes "";
+    mesn;
+    mesq l("Tulimshar, right? The oldest human city-state!");
+    next;
+    mesq l("I was planning to go there soon, anyway. All aboard!");
+    close2;
+    addtimer nard_time(PC_DEST$), "#MarineShip::OnEvent";
+    @timer_navio_running = 1;
+    warp "016-6", 40, 32;
+    end;
+
+L_TooWeak:
+    mesn;
+    mesq l("The sea route I take is very dangerous, and full of pirates. You're too weak to travel with me.");
+    close;
+
+L_Close:
+    close;
+
+OnInit:
+    .sex = G_MALE;
+    .distance = 5;
+    end;
+
+
+OnInterIfInit:
+    // Tulim Instance
+    .TULIM_INSTID = instance_create("016-1@TulimInst", 0, IOT_NONE);
+    instance_attachmap("016-1", .TULIM_INSTID, 0, "016-1@Tulim");
+    instance_set_timeout(1000000, 1000000, .TULIM_INSTID);
+    instance_init(.TULIM_INSTID);
+    end;
+
+    // Hurns Instance
+    .HURNS_INSTID = instance_create("016-1@HurnsInst", 0, IOT_NONE);
+    instance_attachmap("016-1", .HURNS_INSTID, 0, "016-1@Hurns");
+    instance_set_timeout(1000000, 1000000, .HURNS_INSTID);
+    instance_init(.HURNS_INSTID);
+    end;
+
+}