summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/re/map_zone_db.conf2
-rw-r--r--npc/002-5/main.txt1
-rw-r--r--npc/012-1/_import.txt1
-rw-r--r--npc/012-1/ship.txt18
-rw-r--r--npc/016-1/_import.txt1
-rw-r--r--npc/016-1/marine.txt100
-rw-r--r--npc/016-6/_import.txt1
-rw-r--r--npc/016-6/main.txt39
8 files changed, 162 insertions, 1 deletions
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index a413962a6..451b09ab4 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -143,7 +143,7 @@ zones: (
disabled_skills: {
MG_FIREBALL: "ALL"
- SN_SHARPSHOOTER: "ALL"
+ SN_SHARPSHOOTING: "ALL"
SM_BASH: "ALL"
}
diff --git a/npc/002-5/main.txt b/npc/002-5/main.txt
index ca412dd3c..b51d5e558 100644
--- a/npc/002-5/main.txt
+++ b/npc/002-5/main.txt
@@ -3,6 +3,7 @@
// Imported by Jesusalva
002-5,28,27,0 script #NardShip NPC_HIDDEN,117,29,{
+ //if (PC_DEST$ != "" && @timer_navio_running == 0) goto L_Timer;
end;
OnEvent:
diff --git a/npc/012-1/_import.txt b/npc/012-1/_import.txt
index 70918df18..1c82193bc 100644
--- a/npc/012-1/_import.txt
+++ b/npc/012-1/_import.txt
@@ -10,5 +10,6 @@
"npc/012-1/locamit.txt",
"npc/012-1/mapflags.txt",
"npc/012-1/richard.txt",
+"npc/012-1/ship.txt",
"npc/012-1/soul-menhir.txt",
"npc/012-1/statue.txt",
diff --git a/npc/012-1/ship.txt b/npc/012-1/ship.txt
new file mode 100644
index 000000000..01a7c7b64
--- /dev/null
+++ b/npc/012-1/ship.txt
@@ -0,0 +1,18 @@
+// TMW2 scripts.
+// Authors:
+// Jesusalva
+// Description:
+// This script controls access to Marine's Ship, fixing variables.
+
+012-1,0,0,0 script HurnsShip NPC_HIDDEN,0,0,{
+
+OnTouch:
+ LOCATION$="Hurns";
+ goto L_Warp;
+
+L_Warp:
+ //warp "016-1", 0, 0;
+ warp "016-6@"+LOCATION$, 31, 28;
+ closedialog;
+ close;
+}
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;
+
+}
diff --git a/npc/016-6/_import.txt b/npc/016-6/_import.txt
index 8161f0b9a..62a745b54 100644
--- a/npc/016-6/_import.txt
+++ b/npc/016-6/_import.txt
@@ -1,4 +1,5 @@
// Map 016-6: Ocean
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/016-6/_mobs.txt",
+"npc/016-6/main.txt",
"npc/016-6/mapflags.txt",
diff --git a/npc/016-6/main.txt b/npc/016-6/main.txt
new file mode 100644
index 000000000..8c67a59a5
--- /dev/null
+++ b/npc/016-6/main.txt
@@ -0,0 +1,39 @@
+// TMW2 script
+// Originals from TMW-BR
+// Imported by Jesusalva
+
+016-6,0,0,0 script #MarineShip NPC_HIDDEN,117,29,{
+ end;
+
+OnEvent:
+ if (@timer_navio_running == 0) end;
+ if (PC_DEST$ == "Hurns") goto L_Hurns;
+ else if (PC_DEST$ == "Tulim") goto L_Tulim;
+ else goto L_Error;
+ end;
+
+L_Hurns:
+ PC_DEST$ = "";
+ LOCATION$ = "Hurns";
+ @timer_navio_running = 0;
+ warp "014-1", 141, 65;
+ message strcharinfo(0), l("@@ disembarks at Hurnscald.", strcharinfo(0));
+ end;
+
+L_Tulim:
+ PC_DEST$ = "";
+ LOCATION$ = "Tulim";
+ @timer_navio_running = 0;
+ warp "003-1", 81, 68;
+ message strcharinfo(0), l("@@ disembarks at Tulimshar.", strcharinfo(0));
+ end;
+
+L_Error:
+ debugmes "ERROR: PLAYER INVALID PC_DEST ON #NardShip: " + PC_DEST$;
+ PC_DEST$ = "";
+ @timer_navio_running = 0;
+ warp "000-1", 22, 22;
+ dispbottom l("An error on your travel happened. Please report.");
+ end;
+}
+