summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconf/map_athena.conf1
-rw-r--r--data/new_21-1.wlkbin0 -> 10004 bytes
-rw-r--r--data/resnametable.txt1
-rwxr-xr-xdb/item_db.txt4
-rw-r--r--npc/ice-cave/monsters.txt5
-rw-r--r--npc/ice-cave/passages.txt3
6 files changed, 13 insertions, 1 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 52a6125b..77580989 100755
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -29,6 +29,7 @@ mapreg_txt: save/mapreg.txt
// Maps
+map: new_21-1.gat
map: new_20-1.gat
map: new_19-1.gat
map: new_18-1.gat
diff --git a/data/new_21-1.wlk b/data/new_21-1.wlk
new file mode 100644
index 00000000..1b81c28a
--- /dev/null
+++ b/data/new_21-1.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 8411c5e2..a9439b32 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -74,6 +74,7 @@ new_17-1.gat#new_17-1.wlk#
new_18-1.gat#new_18-1.wlk#
new_19-1.gat#new_19-1.wlk#
new_20-1.gat#new_20-1.wlk#
+new_21-1.gat#new_21-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/db/item_db.txt b/db/item_db.txt
index 4d96a00c..888b83b3 100755
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -103,6 +103,10 @@
624, VNeckSweater, V Neck Sweater, 5, 6000, 3000, 10, , 8, , 0, 10477567, 2, 512, , 0, 19, {}, {}
625, ChainmailChestArmor, Chainmail Chest Armor, 5, 15000, 1500, 250, , 20, , 0, 10477567, 2, 512, , 0, 25, {}, {}
626, PlatemailChestArmor, Platemail Chest Armor, 5, 50000, 2500, 240, , 25, , 0, 10477567, 2, 512, , 0, 26, {}, {}
+627, TopHat, Top Hat, 5, 2500, 1250, 10, , 15, , 0, 10477567, 2, 256, , 0, 33, {}, {}
+628, FunkyHat, Funky Hat, 5, 3000, 1500, 10, , 18, , 0, 10477567, 2, 256, , 0, 34, {}, {}
+629, MushroomHat, Mushroom Hat, 5, 2500, 1250, 10, , 15, , 0, 10477567, 2, 256, , 0, 35, {}, {}
+630, ShroomHat, Shroom Hat, 5, 3000, 1500, 10, , 18, , 0, 10477567, 2, 256, , 0, 36, {}, {}
1199, Arrow, Arrow, 10, 3, 1, 1, 25, 0, 0, 0, 10477567, 2, 32768, , , , {}, {}
1200, Bow, Bow, 4, 1000, 500, 200, 20, , 5, 0, 10477567, 2, 34, 1, 4, 31, {}, {}
1201, Knife, Knife, 4, 50, 25, 100, 5, , 1, 0, 10477567, 2, 2, 1, 1, 30, {}, {}
diff --git a/npc/ice-cave/monsters.txt b/npc/ice-cave/monsters.txt
index aad55f7d..f46ecd65 100644
--- a/npc/ice-cave/monsters.txt
+++ b/npc/ice-cave/monsters.txt
@@ -1,2 +1,5 @@
new_12-1.gat,0,0,0,0 monster Bat 1017,20,0,0,0
-new_12-1.gat,0,0,0,0 monster Violet 1018,10,0,0,0 \ No newline at end of file
+new_12-1.gat,0,0,0,0 monster Violet 1018,10,0,0,0
+
+new_21-1.gat,0,0,0,0 monster Bat 1017,5,0,0,0
+new_21-1.gat,0,0,0,0 monster Fluffy 1020,15,0,0,0 \ No newline at end of file
diff --git a/npc/ice-cave/passages.txt b/npc/ice-cave/passages.txt
index 4be2752b..6aa808e8 100644
--- a/npc/ice-cave/passages.txt
+++ b/npc/ice-cave/passages.txt
@@ -1 +1,4 @@
new_12-1.gat,31,25 warp totown 2,1,new_11-1.gat,76,36
+new_12-1.gat,26,23 warp toice2 1,0,new_21-1.gat,37,36
+
+new_21-1.gat,36,34 warp toice1 1,0,new_12-1.gat,26,25