summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconf/map_athena.conf5
-rw-r--r--data/new_10-1.wlkbin16388 -> 16388 bytes
-rw-r--r--data/new_11-1.wlkbin0 -> 16388 bytes
-rw-r--r--data/new_12-1.wlkbin0 -> 6404 bytes
-rw-r--r--data/new_4-1.wlkbin3604 -> 3604 bytes
-rw-r--r--data/new_5-1.wlkbin16388 -> 16388 bytes
-rw-r--r--data/resnametable.txt2
-rw-r--r--npc/xmas/startrek.txt17
8 files changed, 24 insertions, 0 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 59203a67..5dfd0129 100755
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -29,6 +29,8 @@ mapreg_txt: save/mapreg.txt
// Maps
+map: new_12-1.gat
+map: new_11-1.gat
map: new_10-1.gat
map: new_9-1.gat
map: new_8-1.gat
@@ -93,6 +95,9 @@ npc: npc/xmas/santa.txt
npc: npc/xmas/snowman.txt
npc: npc/xmas/taro.txt
+// Snow village 11-1
+npc: npc/xmas/startrek.txt
+
// Small cave (test map) 4-1
npc: npc/cave-small/hermit.txt
npc: npc/cave-small/monsters.txt
diff --git a/data/new_10-1.wlk b/data/new_10-1.wlk
index 94373c34..2f865a8e 100644
--- a/data/new_10-1.wlk
+++ b/data/new_10-1.wlk
Binary files differ
diff --git a/data/new_11-1.wlk b/data/new_11-1.wlk
new file mode 100644
index 00000000..f2006491
--- /dev/null
+++ b/data/new_11-1.wlk
Binary files differ
diff --git a/data/new_12-1.wlk b/data/new_12-1.wlk
new file mode 100644
index 00000000..ab7c41f8
--- /dev/null
+++ b/data/new_12-1.wlk
Binary files differ
diff --git a/data/new_4-1.wlk b/data/new_4-1.wlk
index de55e4e8..3966d12e 100644
--- a/data/new_4-1.wlk
+++ b/data/new_4-1.wlk
Binary files differ
diff --git a/data/new_5-1.wlk b/data/new_5-1.wlk
index d4cd8897..2e2e7b75 100644
--- a/data/new_5-1.wlk
+++ b/data/new_5-1.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 25dbeef9..68134142 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -64,6 +64,8 @@ new_7-1.gat#new_7-1.wlk#
new_8-1.gat#new_8-1.wlk#
new_9-1.gat#new_9-1.wlk#
new_10-1.gat#new_10-1.wlk#
+new_11-1.gat#new_11-1.wlk#
+new_12-1.gat#new_12-1.wlk#
new_1-2.gat#new_zone02.gat#
new_2-2.gat#new_zone02.gat#
new_3-2.gat#new_zone02.gat#
diff --git a/npc/xmas/startrek.txt b/npc/xmas/startrek.txt
new file mode 100644
index 00000000..b8437fe3
--- /dev/null
+++ b/npc/xmas/startrek.txt
@@ -0,0 +1,17 @@
+new_11-1.gat,79,77,0 script Kirk 133,{
+mes "[Capt. Kirk]";
+mes "Spock: We're breaking the prime directive.";
+mes "This is not the right way to have the first contact.";
+close;
+}
+
+new_11-1.gat,81,77,0 script Spock 134,{
+mes "[Spock]";
+mes "Live long and prosper captain.";
+next;
+mes "[Spock]";
+mes "trr...Spock to Scotty...";
+mes "Beam me to the elves village...";
+mes "I will hide there.";
+close;
+}