summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog.txt4
-rw-r--r--conf/map_athena.conf9
-rw-r--r--data/new_14-1.wlkbin18604 -> 18604 bytes
-rw-r--r--data/new_22-1.wlkbin13924 -> 13924 bytes
-rw-r--r--data/new_23-1.wlkbin0 -> 11774 bytes
-rw-r--r--data/resnametable.txt5
-rw-r--r--npc/dimonds-cove/dimonds.txt135
-rw-r--r--npc/dimonds-cove/doug.txt90
-rw-r--r--npc/dimonds-cove/passages.txt21
-rw-r--r--npc/dimonds-cove/workers.txt9
10 files changed, 269 insertions, 4 deletions
diff --git a/changelog.txt b/changelog.txt
index b5f71d51..650004ad 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -75,4 +75,6 @@
14.02.07: * Crush: Added new versions of snow maps.
-26.01.08: * Crush: Fixed warp from desert to woodland. \ No newline at end of file
+26.01.08: * Crush: Fixed warp from desert to woodland.
+
+08.02.08: * Crush: Fixed warp from desert to woodland. \ No newline at end of file
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 519ee66d..a6608db3 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -29,6 +29,7 @@ mapreg_txt: save/mapreg.txt
// Maps
+map: new_23-1.gat
map: new_22-1.gat
map: new_21-1.gat
map: new_20-1.gat
@@ -155,6 +156,12 @@ npc: npc/woodland-village/shops.txt
npc: npc/woodland-village/forestbowquest.txt
npc: npc/woodland-village/scythequest.txt
+//Dimonds Cove
+npc: npc/dimonds-cove/passages.txt
+npc: npc/dimonds-cove/dimonds.txt
+npc: npc/dimonds-cove/doug.txt
+npc: npc/dimonds-cove/workers.txt
+
// Christmas 2006
//npc: npc/xmas/xmas1.txt
//npc: npc/xmas/xmas2.txt
@@ -182,4 +189,4 @@ npc: npc/woodland-village/scythequest.txt
//npc: npc/halloween/2007/summon.txt
// Christmas 2007
-npc: npc/xmas2007/after-xmas.txt
+npc: npc/xmas2007/after-xmas.txt \ No newline at end of file
diff --git a/data/new_14-1.wlk b/data/new_14-1.wlk
index 994d858c..edc3c77c 100644
--- a/data/new_14-1.wlk
+++ b/data/new_14-1.wlk
Binary files differ
diff --git a/data/new_22-1.wlk b/data/new_22-1.wlk
index fcf2af80..c76eca74 100644
--- a/data/new_22-1.wlk
+++ b/data/new_22-1.wlk
Binary files differ
diff --git a/data/new_23-1.wlk b/data/new_23-1.wlk
new file mode 100644
index 00000000..a1df1bfc
--- /dev/null
+++ b/data/new_23-1.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 2627285d..3019fba6 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -75,7 +75,8 @@ 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_22-1.gat#new_22-1.wlk#2
+new_22-1.gat#new_22-1.wlk#
+new_23-1.gat#new_23-1.wlk#
new_1-2.gat#new_zone02.gat#
new_2-2.gat#new_zone02.gat#
new_3-2.gat#new_zone02.gat#
@@ -615,4 +616,4 @@ job_sage.gnd#job_wiz.gnd#
job_cru.rsw#job_prist.rsw#
job_cru.gat#job_prist.gat#
job_cru.gnd#job_prist.gnd#
-À¯ÀúÀÎÅÍÆäÀ̽º\map\job_cru.bmp#À¯ÀúÀÎÅÍÆäÀ̽º\map\job_prist.bmp# \ No newline at end of file
+À¯ÀúÀÎÅÍÆäÀ̽º\map\job_cru.bmp#À¯ÀúÀÎÅÍÆäÀ̽º\map\job_prist.bmp#
diff --git a/npc/dimonds-cove/dimonds.txt b/npc/dimonds-cove/dimonds.txt
new file mode 100644
index 00000000..9527f280
--- /dev/null
+++ b/npc/dimonds-cove/dimonds.txt
@@ -0,0 +1,135 @@
+new_23-1.gat,34,38,0 script Host 112,{
+ mes "Welcome to Dimonds Cove!";
+ next;
+ mes "Talk to the waitress to get some Food.";
+ next;
+ mes "Shops are located on the 2nd Floor.";
+ next;
+ mes "The INN is on the 3rd Floor.";
+ close;
+}
+
+new_23-1.gat,40,34,0 script Phill 102,{
+ mes "We're having problems with our equipment!";
+ next;
+ mes "I don't know if we can play any songs!";
+ close;
+}
+
+new_23-1.gat,40,37,0 script Jerry 117,{
+ mes "I don't know what wrong.";
+ next;
+ mes "We should be able to play you music in the future!";
+ close;
+}
+
+new_23-1.gat,42,36,0 script Robert 120,{
+ mes "I hope we can figure something out!";
+ next;
+ mes "We are kinda useless if we can't play music.";
+ close;
+}
+
+new_23-1.gat,27,30,0 script Bar Rules 127,{
+ mes "Dimonds Cove Bar Rules";
+ next;
+ mes "No excessive drinking!";
+ mes "If your sprite starts to stagger we will ask you to leave.";
+ next;
+ mes "No offensive chat.";
+ mes "This is a nice establishment.";
+ mes "Crude and offensive behavior will be reported to TMW GM's.";
+ next;
+ mes "Please be respectfull of others.";
+ mes "Not everyone has the same experience and should all be treated";
+ mes "with equal respect.";
+ next;
+ mes "Thank You,";
+ mes "Dimonds Cove Management";
+ close;
+}
+
+new_23-1.gat,71,38,0 script Store Policy 127,{
+ mes "All sales are final.";
+ mes "Returns are subject to a 50% re-stocking fee.";
+ close;
+}
+
+new_23-1.gat,77,38,0 script Store Policy 127,{
+ mes "All sales are final.";
+ mes "returns are subject to a 50% re-stocking fee.";
+ close;
+}
+
+new_23-1.gat,36,30,0 script Directions 127,{
+ mes "This way to the Dimonds Cove Inn.";
+ mes "Five 5 Star accomidations for the weary traveler!";
+ close;
+}
+
+new_23-1.gat,80,32,0 script Dimonds Cove 1 127,{
+ mes "The Story of Dimonds Cove";
+ next;
+ mes "One day Dimond D. Stone dreamed of her own restaurant.";
+ mes "She sold her food alone in this spot for some time.";
+ mes "She longed for the day she would have a building.";
+ mes "She meet an adventurer named Merlin outside of the";
+ mes "desert mines one day.";
+ next;
+ mes "They became friends and Dimond told Merlin about her idea.";
+ mes "Merlin was a accomplished carpenter and wanted to make a new";
+ mes "place in the world. He told Dimond that he would make her";
+ mes "restaurant for her. He gathered the tools and after much";
+ mes "hard work, Dimonds Cove was built.";
+ next;
+ mes "(See Dimonds Cove 2)";
+ close;
+}
+
+new_23-1.gat,85,32,0 script Dimonds Cove 2 127,{
+ mes "List of Events at Dimonds Cove";
+ mes "January 2008 - Construction of Dimonds Cove.";
+ close;
+}
+
+
+new_23-1.gat,71,30,0 script INN 127,{
+ mes "Welcome to the Dimonds Cove Inn";
+ mes "Rooms are 200 gp a night.";
+ mes "Plese check in with Basil.";
+ close;
+}
+
+
+new_23-1.gat,24,27,0 shop Bartender 107,539:175,567:500,568:500
+
+new_23-1.gat,32,34,0 shop Waitress 139,519:40,533:150,534:90,562:500
+
+new_23-1.gat,85,41,0 shop Blacksmith 135,545:20000,529:5,625:20000,626:50000
+
+new_23-1.gat,65,41,0 shop General Store 137,586:1000,524:1600,544:10000,632:1000,528:1000
+
+new_23-1.gat,75,68,0 script Basil 107,{
+ mes "[Inn Keeper]";
+ mes "Welcome to the Inn.";
+ next;
+ mes "Would you like to rest? It's 200gp.";
+ next;
+ menu "Yes",-,"No",L_No;
+
+ if (zeny < 200) goto L_NoMoney;
+ mes "Sleep well!";
+ next;
+ set zeny,zeny-200;
+ heal 10000,10000;
+ close;
+
+L_No:
+ mes "See you.";
+ close;
+
+L_NoMoney:
+ mes "Hey! You don't have enough money!";
+ close;
+}
+
diff --git a/npc/dimonds-cove/doug.txt b/npc/dimonds-cove/doug.txt
new file mode 100644
index 00000000..241d94c0
--- /dev/null
+++ b/npc/dimonds-cove/doug.txt
@@ -0,0 +1,90 @@
+new_23-1.gat,68,87,0 script Doug 113,{
+ if(CaveSnakeLamp == 1) goto reas;
+ if(CaveSnakeLamp == 2) goto done;
+ set @TEMP,rand(3);
+ if(@TEMP == 1) goto L_1;
+ if(@TEMP == 2) goto L_2;
+ if(@TEMP == 3) goto L_3;
+ if(@TEMP == 0) goto L_4;
+
+L_1:
+ mes "[Doug]";
+ mes "I need 40 more [Cave Snake Lamps] to make my light!";
+ next;
+ goto main1;
+L_2:
+ mes "[Doug]";
+ mes "This lamp should light up this whole place! I just need [40 Cave Snake Lamps]";
+ next;
+ goto main1;
+L_3:
+ mes "[Doug]";
+ mes "This is gonna be bright! A must have for anyone! All i need is a few parts...";
+ goto main1;
+L_4:
+ mes "[Doug]";
+ mes "Can you get me 40 [Cave Snake Lamps]? I need them to get this light finished.";
+ next;
+ goto main1;
+
+main1:
+ mes "[Doug]";
+ mes "Will you help me find 40 [Cave Snake Lamps]?";
+ next;
+ menu "Yes",B_1,"No",B_2;
+B_1:
+ set CaveSnakeLamp,1;
+ set @TEMP,rand(3);
+ if(@TEMP == 1) goto J_1;
+ if(@TEMP == 2) goto J_2;
+ if(@TEMP == 3) goto J_3;
+ if(@TEMP == 0) goto J_4;
+J_1:
+ mes "[Doug]";
+ mes "Thank you!";
+ next;
+ goto main2;
+J_2:
+ mes "[Doug]";
+ mes "I don't know how to thank you enough!";
+ next;
+ goto main2;
+J_3:
+ mes "[Doug]";
+ mes "I will pay you when you get them!";
+ next;
+ goto main2;
+J_4:
+ mes "[Doug]";
+ mes "I'm sure I will give a small reward. :D";
+ next;
+ goto main2;
+main2:
+ mes "[Doug]";
+ mes "Now please go get me 40 [Cave Snake Lamps]";
+ close;
+reas:
+ if(countitem(612) >= 40) goto have;
+ mes "[Doug]";
+ mes "Please help me collect 40 [Cave Snake Lamps]!";
+ close;
+have:
+ mes "[Doug]";
+ mes "Cool! Now I can make this light!";
+ delitem 612,40;
+ next;
+ mes "[Doug]";
+ mes "Here's what I got to give you!";
+ next;
+ mes "Got 2000 GP";
+ set zeny,zeny+2000;
+ set CaveSnakeLamp,2;
+ close;
+done:
+ mes "[Doug]";
+ mes "Thanks for your help! Those snakes sure have bright lamps!";
+ close;
+B_2:
+ close;
+}
+
diff --git a/npc/dimonds-cove/passages.txt b/npc/dimonds-cove/passages.txt
new file mode 100644
index 00000000..5d9fcc8b
--- /dev/null
+++ b/npc/dimonds-cove/passages.txt
@@ -0,0 +1,21 @@
+new_14-1.gat,36,94 warp toDimondsCove 0,0,new_23-1.gat,32,44
+new_23-1.gat,32,46 warp fromDimondsCove 0,0,new_14-1.gat,36,95
+
+
+new_23-1.gat,27,24 warp toBasement 0,1,new_23-1.gat,35,68
+new_23-1.gat,37,68 warp fromBasement 0,1,new_23-1.gat,28,24
+
+new_23-1.gat,39,26 warp toSecond 0,0,new_23-1.gat,82,26
+new_23-1.gat,40,26 warp toSecond 0,0,new_23-1.gat,83,26
+new_23-1.gat,41,26 warp toSecond 0,0,new_23-1.gat,84,26
+new_23-1.gat,82,29 warp toFirst 0,0,new_23-1.gat,39,27
+new_23-1.gat,83,29 warp toFirst 0,0,new_23-1.gat,40,27
+new_23-1.gat,84,29 warp toFirst 0,0,new_23-1.gat,41,27
+
+new_23-1.gat,66,27 warp toThird 0,0,new_23-1.gat,66,71
+new_23-1.gat,67,27 warp toThird 0,0,new_23-1.gat,67,71
+new_23-1.gat,68,27 warp toThird 0,0,new_23-1.gat,68,71
+new_23-1.gat,66,73 warp toSecond 0,0,new_23-1.gat,66,28
+new_23-1.gat,67,73 warp toSecond 0,0,new_23-1.gat,67,28
+new_23-1.gat,68,73 warp toSecond 0,0,new_23-1.gat,68,28
+
diff --git a/npc/dimonds-cove/workers.txt b/npc/dimonds-cove/workers.txt
new file mode 100644
index 00000000..489888e5
--- /dev/null
+++ b/npc/dimonds-cove/workers.txt
@@ -0,0 +1,9 @@
+new_23-1.gat,23,70,0 script Josh 102,{
+ mes "We're working on getting the cellar pass open.";
+ close;
+}
+
+new_23-1.gat,39,75,0 script Zack 102,{
+ mes "My brother and I are fixing the cellar pass.";
+ close;
+}