Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

6 files changed, 108 insertions, 0 deletions

diff --git a/npc/036-2/_import.txt b/npc/036-2/_import.txt
new file mode 100644
index 00000000..9f6bc03f
--- /dev/null
+++ b/npc/036-2/_import.txt
@@ -0,0 +1,7 @@
+// Map 036-2: None
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/036-2/casino.txt",
+"npc/036-2/emblems.txt",
+"npc/036-2/koga-candor.txt",
+"npc/036-2/mapflags.txt",
+"npc/036-2/shops.txt",
diff --git a/npc/036-2/casino.txt b/npc/036-2/casino.txt
new file mode 100644
index 00000000..158ecfae
--- /dev/null
+++ b/npc/036-2/casino.txt
@@ -0,0 +1,9 @@
+036-2,34,37,0	script	Slots#6	NPC400,{
+    callfunc "SlotMachine";
+    close;
+}
+
+036-2,36,37,0	script	Slots#7	NPC400,{
+    callfunc "SlotMachine";
+    close;
+}
diff --git a/npc/036-2/emblems.txt b/npc/036-2/emblems.txt
new file mode 100644
index 00000000..de61902b
--- /dev/null
+++ b/npc/036-2/emblems.txt
@@ -0,0 +1,26 @@
+036-2,29,27,0	script	#k2city1e	NPC412,{
+  end;
+  OnInit:
+    disablenpc "#k2city1e";
+  end;
+}
+036-2,29,27,0	script	#k2city1d	NPC413,{
+  end;
+}
+
+036-2,31,27,0	script	#k2city2e	NPC416,{
+  end;
+  OnInit:
+    disablenpc "#k2city2e";
+  end;
+}
+036-2,31,27,0	script	#k2city2d	NPC417,{
+  end;
+}
+
+036-2,32,27,0	script	#k2sound	NPC127,{
+  end;
+  OnCommandDing:
+    specialeffect 402;
+    end;
+}
diff --git a/npc/036-2/koga-candor.txt b/npc/036-2/koga-candor.txt
new file mode 100644
index 00000000..bd34564b
--- /dev/null
+++ b/npc/036-2/koga-candor.txt
@@ -0,0 +1,28 @@
+
+036-2,39,29,0	script	#KogaCandorExit	NPC45,0,1,{
+    mes "Disembark the ferry for "+$@CandorDocks$[$@CandorCurrentDock]+"?";
+    menu
+        "Yes.", L_Leave,
+        "Nevermind", L_close;
+
+L_Leave:
+    if ($@CandorCurrentDock == 0)
+        goto L_Candor;
+    if ($@CandorCurrentDock == 1)
+        goto L_Hurnscald;
+    goto L_close;
+
+L_Hurnscald:
+    EnterTown("Hurns");
+    warp "008-1", 136, 75;
+    goto L_close;
+
+L_Candor:
+    EnterTown("Candor");
+    warp "029-1", 46, 109;
+    goto L_close;
+
+L_close:
+    closeclientdialog;
+    close;
+}
diff --git a/npc/036-2/mapflags.txt b/npc/036-2/mapflags.txt
new file mode 100644
index 00000000..0a2e8b08
--- /dev/null
+++ b/npc/036-2/mapflags.txt
@@ -0,0 +1,2 @@
+//036-2	mapflag	town
+//036-2	mapflag	resave	036-2,20,21
diff --git a/npc/036-2/shops.txt b/npc/036-2/shops.txt
new file mode 100644
index 00000000..15292e15
--- /dev/null
+++ b/npc/036-2/shops.txt
@@ -0,0 +1,36 @@
+
+036-2,23,38,0	script	Chef Armand	NPC211,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem Beer;
+    sellitem Steak, 250;
+    sellitem CasinoCoins;
+    .distance = 5;
+    end;
+}
+
+036-2,35,22,0	script	Gunney	NPC138,{
+    shop .name$;
+    goodbye;
+    close;
+
+OnInit:
+    tradertype(NST_ZENY);
+    sellitem Arrow, 3;
+    sellitem IronArrow, 4;
+    .distance = 5;
+    end;
+}
+
+036-2,23,35,0	script	Bunkmaster Daban	NPC212,{
+    @npcname$ = "Bunkmaster Daban";
+    @Cost = 100;
+    callfunc "Inn";
+    @npcname$ = "";
+    @Cost = 0;
+    close;
+}