summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map_athena.conf7
-rw-r--r--data/new_24-1.wlkbin0 -> 22504 bytes
-rw-r--r--data/new_25-1.wlkbin0 -> 22504 bytes
-rw-r--r--data/new_7-1.wlkbin26004 -> 26004 bytes
-rw-r--r--npc/eastern-desert-pass/monsters.txt2
-rw-r--r--npc/eastern-desert-pass/npcs.txt136
-rw-r--r--npc/eastern-desert-pass/passages.txt84
7 files changed, 229 insertions, 0 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf
index 77d5a1f6..e1c24859 100644
--- a/conf/map_athena.conf
+++ b/conf/map_athena.conf
@@ -29,6 +29,8 @@ mapreg_txt: save/mapreg.txt
// Maps
+map: new_25-1.gat
+map: new_24-1.gat
map: new_23-1.gat
map: new_22-1.gat
map: new_21-1.gat
@@ -90,6 +92,11 @@ npc: npc/eastern-desert/monsters.txt
npc: npc/eastern-desert/passages.txt
npc: npc/eastern-desert/npcs.txt
+// Eastern desert pass 24-1 / 25-1
+npc: npc/eastern-desert-pass/monsters.txt
+npc: npc/eastern-desert-pass/passages.txt
+npc: npc/eastern-desert-pass/npcs.txt
+
// Woodland 9-1
npc: npc/woodland/alchemist.txt
npc: npc/woodland/monsters.txt
diff --git a/data/new_24-1.wlk b/data/new_24-1.wlk
new file mode 100644
index 00000000..1bd55d3e
--- /dev/null
+++ b/data/new_24-1.wlk
Binary files differ
diff --git a/data/new_25-1.wlk b/data/new_25-1.wlk
new file mode 100644
index 00000000..75a52421
--- /dev/null
+++ b/data/new_25-1.wlk
Binary files differ
diff --git a/data/new_7-1.wlk b/data/new_7-1.wlk
index 2fda8b90..c1433d31 100644
--- a/data/new_7-1.wlk
+++ b/data/new_7-1.wlk
Binary files differ
diff --git a/npc/eastern-desert-pass/monsters.txt b/npc/eastern-desert-pass/monsters.txt
new file mode 100644
index 00000000..78afe530
--- /dev/null
+++ b/npc/eastern-desert-pass/monsters.txt
@@ -0,0 +1,2 @@
+new_24-1.gat,0,0,0,0 monster MountainSnake 1026,60,0,0,0
+new_25-1.gat,0,0,0,0 monster MountainSnake 1026,50,0,0,0
diff --git a/npc/eastern-desert-pass/npcs.txt b/npc/eastern-desert-pass/npcs.txt
new file mode 100644
index 00000000..3452e124
--- /dev/null
+++ b/npc/eastern-desert-pass/npcs.txt
@@ -0,0 +1,136 @@
+new_24-1.gat,39,27,0 script Mika 114,{
+ mes "[Mika]";
+ mes "My father told me about a man living in this desert who makes clothes out of snake skin.";
+ next;
+ mes "[Mika]";
+ mes "Maybe you can find him, but be careful you don't get lost in the tunnels!";
+ close;
+}
+
+new_24-1.gat,23,100,0 script Pachua 143,{
+ mes "[Chief Pachua]";
+ mes "How!";
+ next;
+
+ mes "[Chief Pachua]";
+ mes "For generations my tribe has been crafting special clothes out of different items.";
+ next;
+
+ if((countitem(610)>0 && countitem(641)>9) && (countitem(524)>0 && countitem(641)>1)) goto L_Super_store;
+ if(countitem(610)>0 && countitem(641)>9) goto L_Chaps_store;
+ if(countitem(524)>0 && countitem(641)>1) goto L_Cowboy_store;
+ goto L_Mysterious;
+
+ L_Mysterious:
+ mes "[Chief Pachua]";
+ mes "Maybe if you bring me the right materials I can make something for you?";
+ close;
+
+ L_CheckStuff:
+ mes "[Chief Pachua]";
+ mes "Let me see what you have there.";
+ next;
+ return;
+
+ L_Super_store:
+ callsub L_CheckStuff;
+ mes "[Chief Pachua]";
+ mes "Ahh you have lots of good items to work with.";
+ mes "";
+ mes "With them I can make you either";
+ mes "a Cowboy hat or Snake Skin Chaps";
+ next;
+ menu "Cowboy hat, please.",L_Cowboy_store2,"Snake Skin Chaps sound good.",L_Chaps_store2,"Not now, maybe later.",L_NoDeal;
+
+ L_Cowboy_store:
+ callsub L_CheckStuff;
+ goto L_Cowboy_store2;
+
+ L_Chaps_store:
+ callsub L_CheckStuff;
+ goto L_Chaps_store2;
+
+ L_Cowboy_store2:
+ mes "[Chief Pachua]";
+ mes "To make you a Cowboy hat I will need:";
+ mes "1 Fancy hat";
+ mes "2 Snake skins";
+ mes "5.000 GP";
+ mes "";
+ mes "Do we have a deal?";
+ next;
+ menu "Yes, that's fine.",L_BuyCowboy,"On second thoughts, maybe later.",L_NoDeal;
+
+ L_Chaps_store2:
+ mes "[Chief Pachua]";
+ mes "To make you a pair of Snake Skin Chaps I will need:";
+ mes "1 Jeans Shorts";
+ mes "10 Snake skins";
+ mes "10.000 GP";
+ mes "";
+ mes "Do we have a deal?";
+ next;
+ menu "Yes, that's fine.",L_BuyChaps,"On second thoughts, maybe later.",L_NoDeal;
+
+ L_BuyChaps:
+ if (zeny<10000) goto L_NoMoney;
+ if (countitem(610)<1) goto L_NoJeans;
+ if (countitem(641)<10) goto L_NoSkin;
+ set zeny, zeny-10000;
+ delitem 641,10;
+ delitem 610,1;
+ getitem 642,1;
+ goto L_DealDone;
+
+ L_BuyCowboy:
+ if (zeny<5000) goto L_NoMoney;
+ if (countitem(524)<1) goto L_NoFancy;
+ if (countitem(641)<2) goto L_NoSkin;
+ set zeny, zeny-5000;
+ delitem 641,2;
+ delitem 524,1;
+ set @temp,rand(2);
+ if(@temp == 0) goto L_Cowboy_white;
+ goto L_Cowboy_black;
+
+ L_Cowboy_white:
+ getitem 643,1;
+ goto L_DealDone;
+
+ L_Cowboy_black:
+ getitem 644,1;
+ goto L_DealDone;
+
+ L_DealDone:
+ mes "[Chief Pachua]";
+ mes "Here you are!";
+ mes "";
+ mes "Come back any time.";
+ close;
+
+ L_NoDeal:
+ mes "[Chief Pachua]";
+ mes "Alright, but you wont get a better deal anywhere else!";
+ close;
+
+ L_NoMoney:
+ mes "[Chief Pachua]";
+ mes "Oh dear, it seems you don't have enough money.";
+ close;
+
+ L_NoJeans:
+ mes "[Chief Pachua]";
+ mes "Oh dear, it seems you don't have enough jeans shorts.";
+ close;
+
+ L_NoFancy:
+ mes "[Chief Pachua]";
+ mes "Oh dear, it seems you don't have enough fancy hats.";
+ close;
+
+ L_NoSkins:
+ mes "[Chief Pachua]";
+ mes "Oh dear, it seems you don't have enough snake skins.";
+ close;
+
+}
diff --git a/npc/eastern-desert-pass/passages.txt b/npc/eastern-desert-pass/passages.txt
new file mode 100644
index 00000000..989fc22a
--- /dev/null
+++ b/npc/eastern-desert-pass/passages.txt
@@ -0,0 +1,84 @@
+new_7-1.gat,162,103 warp toMountainPass 0,0,new_24-1.gat,20,33
+new_7-1.gat,163,102 warp toMountainPass 0,0,new_24-1.gat,21,32
+new_7-1.gat,164,101 warp toMountainPass 0,0,new_24-1.gat,22,31
+new_7-1.gat,165,100 warp toMountainPass 0,0,new_24-1.gat,23,30
+new_7-1.gat,166,99 warp toMountainPass 0,0,new_24-1.gat,24,29
+new_7-1.gat,167,98 warp toMountainPass 0,0,new_24-1.gat,25,28
+new_7-1.gat,168,97 warp toMountainPass 0,0,new_24-1.gat,26,27
+new_7-1.gat,169,96 warp toMountainPass 0,0,new_24-1.gat,27,26
+new_7-1.gat,170,95 warp toMountainPass 0,0,new_24-1.gat,28,25
+new_7-1.gat,171,94 warp toMountainPass 0,0,new_24-1.gat,29,24
+new_7-1.gat,172,93 warp toMountainPass 0,0,new_24-1.gat,30,23
+new_7-1.gat,173,92 warp toMountainPass 0,0,new_24-1.gat,31,22
+new_7-1.gat,174,91 warp toMountainPass 0,0,new_24-1.gat,32,21
+
+new_24-1.gat,19,32 warp toEastDesert 0,0,new_7-1.gat,160,101
+new_24-1.gat,20,31 warp toEastDesert 0,0,new_7-1.gat,161,100
+new_24-1.gat,21,30 warp toEastDesert 0,0,new_7-1.gat,162,99
+new_24-1.gat,22,29 warp toEastDesert 0,0,new_7-1.gat,163,98
+new_24-1.gat,23,28 warp toEastDesert 0,0,new_7-1.gat,164,97
+new_24-1.gat,24,27 warp toEastDesert 0,0,new_7-1.gat,165,96
+new_24-1.gat,25,26 warp toEastDesert 0,0,new_7-1.gat,166,95
+new_24-1.gat,26,25 warp toEastDesert 0,0,new_7-1.gat,167,94
+new_24-1.gat,27,24 warp toEastDesert 0,0,new_7-1.gat,168,93
+new_24-1.gat,28,23 warp toEastDesert 0,0,new_7-1.gat,169,92
+new_24-1.gat,29,22 warp toEastDesert 0,0,new_7-1.gat,170,91
+new_24-1.gat,30,21 warp toEastDesert 0,0,new_7-1.gat,171,90
+new_24-1.gat,31,20 warp toEastDesert 0,0,new_7-1.gat,172,89
+
+new_24-1.gat,40,26 warp toMountainCave 0,0,new_25-1.gat,40,27
+new_25-1.gat,40,26 warp toMountainPass 0,0,new_24-1.gat,40,27
+
+new_24-1.gat,55,27 warp toMountainCave 0,0,new_25-1.gat,55,28
+new_25-1.gat,55,27 warp toMountainPass 0,0,new_24-1.gat,55,28
+
+new_24-1.gat,62,30 warp toMountainCave 0,0,new_25-1.gat,62,31
+new_25-1.gat,62,30 warp toMountainPass 0,0,new_24-1.gat,62,31
+
+new_24-1.gat,86,24 warp toMountainCave 0,0,new_25-1.gat,86,25
+new_25-1.gat,86,24 warp toMountainPass 0,0,new_24-1.gat,86,25
+
+new_24-1.gat,91,24 warp toMountainCave 0,0,new_25-1.gat,91,25
+new_25-1.gat,91,24 warp toMountainPass 0,0,new_24-1.gat,91,25
+
+new_24-1.gat,122,24 warp toMountainCave 0,0,new_25-1.gat,122,25
+new_25-1.gat,122,24 warp toMountainPass 0,0,new_24-1.gat,122,25
+
+new_24-1.gat,77,44 warp toMountainCave 0,0,new_25-1.gat,77,45
+new_25-1.gat,77,44 warp toMountainPass 0,0,new_24-1.gat,77,45
+
+new_24-1.gat,104,44 warp toMountainCave 0,0,new_25-1.gat,104,45
+new_25-1.gat,104,44 warp toMountainPass 0,0,new_24-1.gat,104,45
+
+new_24-1.gat,114,49 warp toMountainCave 0,0,new_25-1.gat,114,50
+new_25-1.gat,114,49 warp toMountainPass 0,0,new_24-1.gat,114,50
+
+new_24-1.gat,110,56 warp toMountainCave 0,0,new_25-1.gat,110,57
+new_25-1.gat,110,56 warp toMountainPass 0,0,new_24-1.gat,110,57
+
+new_24-1.gat,125,59 warp toMountainCave 0,0,new_25-1.gat,125,60
+new_25-1.gat,125,59 warp toMountainPass 0,0,new_24-1.gat,125,60
+
+new_24-1.gat,60,58 warp toMountainCave 0,0,new_25-1.gat,60,69
+new_25-1.gat,60,68 warp toMountainPass 0,0,new_24-1.gat,60,59
+
+new_24-1.gat,92,63 warp toMountainCave 0,0,new_25-1.gat,92,64
+new_25-1.gat,92,63 warp toMountainPass 0,0,new_24-1.gat,92,64
+
+new_24-1.gat,112,74 warp toMountainCave 0,0,new_25-1.gat,112,75
+new_25-1.gat,112,74 warp toMountainPass 0,0,new_24-1.gat,112,75
+
+new_24-1.gat,51,90 warp toMountainCave 0,0,new_25-1.gat,51,91
+new_25-1.gat,51,90 warp toMountainPass 0,0,new_24-1.gat,51,91
+
+new_24-1.gat,74,90 warp toMountainCave 0,0,new_25-1.gat,74,91
+new_25-1.gat,74,90 warp toMountainPass 0,0,new_24-1.gat,74,91
+
+new_24-1.gat,38,121 warp toMountainCave 0,0,new_25-1.gat,38,122
+new_25-1.gat,38,121 warp toMountainPass 0,0,new_24-1.gat,38,122
+
+new_24-1.gat,79,120 warp toMountainCave 0,0,new_25-1.gat,79,121
+new_25-1.gat,79,120 warp toMountainPass 0,0,new_24-1.gat,79,121
+
+new_24-1.gat,121,110 warp toMountainCave 0,0,new_25-1.gat,121,111
+new_25-1.gat,121,110 warp toMountainPass 0,0,new_24-1.gat,121,111
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-09 14:57:38 +0000