summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/new_1-1.wlkbin40004 -> 40004 bytes
-rw-r--r--data/new_14-1.wlkbin19100 -> 18604 bytes
-rw-r--r--data/new_15-1.wlkbin0 -> 38004 bytes
-rw-r--r--data/new_16-1.wlkbin0 -> 17860 bytes
-rw-r--r--data/new_2-1.wlkbin16388 -> 16388 bytes
-rw-r--r--data/new_7-1.wlkbin40004 -> 26004 bytes
-rw-r--r--data/new_9-1.wlkbin19100 -> 19100 bytes
-rw-r--r--data/resnametable.txt2
-rwxr-xr-xdb/item_db.txt3
-rw-r--r--db/mob_db.txt1
-rw-r--r--npc/south-woodland/passages.txt2
-rw-r--r--npc/western-desert/nomads.txt13
-rw-r--r--npc/western-desert/passages.txt3
-rw-r--r--npc/woodland-desert/monsters.txt2
-rw-r--r--npc/woodland-desert/passages.txt2
-rw-r--r--npc/woodland/passages.txt26
16 files changed, 16 insertions, 38 deletions
diff --git a/data/new_1-1.wlk b/data/new_1-1.wlk
index f6faa2a5..519edb1f 100644
--- a/data/new_1-1.wlk
+++ b/data/new_1-1.wlk
Binary files differ
diff --git a/data/new_14-1.wlk b/data/new_14-1.wlk
index fb2574f8..b7914ba9 100644
--- a/data/new_14-1.wlk
+++ b/data/new_14-1.wlk
Binary files differ
diff --git a/data/new_15-1.wlk b/data/new_15-1.wlk
new file mode 100644
index 00000000..db8ec4b5
--- /dev/null
+++ b/data/new_15-1.wlk
Binary files differ
diff --git a/data/new_16-1.wlk b/data/new_16-1.wlk
new file mode 100644
index 00000000..a1f4d970
--- /dev/null
+++ b/data/new_16-1.wlk
Binary files differ
diff --git a/data/new_2-1.wlk b/data/new_2-1.wlk
index 961e6e47..a3b8d53d 100644
--- a/data/new_2-1.wlk
+++ b/data/new_2-1.wlk
Binary files differ
diff --git a/data/new_7-1.wlk b/data/new_7-1.wlk
index ddcfbe4a..699a1b44 100644
--- a/data/new_7-1.wlk
+++ b/data/new_7-1.wlk
Binary files differ
diff --git a/data/new_9-1.wlk b/data/new_9-1.wlk
index be730a02..acd84712 100644
--- a/data/new_9-1.wlk
+++ b/data/new_9-1.wlk
Binary files differ
diff --git a/data/resnametable.txt b/data/resnametable.txt
index 842e4718..8145e6a5 100644
--- a/data/resnametable.txt
+++ b/data/resnametable.txt
@@ -68,6 +68,8 @@ new_11-1.gat#new_11-1.wlk#
new_12-1.gat#new_12-1.wlk#
new_13-1.gat#new_13-1.wlk#
new_14-1.gat#new_14-1.wlk#
+new_15-1.gat#new_15-1.wlk#
+new_16-1.gat#new_16-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 b3b670e9..2c82b4b3 100755
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -89,7 +89,8 @@
583,staffofamun,staffofamun,4,8000,4000,100,100,,1,0,10477567,2,2,1,1,1,{},{}
584,jackal,jackal,4,8000,4000,100,100,,1,0,10477567,2,2,1,1,1,{},{}
585,scarabarmelt,scarabarmlet,5,8000,4000,100,,0,,0,10477567,2,32,,1,1,{},{}
-586,Cotton_shorts,Cotton shorts,5,1000,500,10,,0,,0,10477567,2,1,,1,4,{},{}
+586,Cotton_shorts,Cotton shorts,5,1000,500,10,,2,,0,10477567,2,1,,1,4,{},{}
+610,Jeans_shorts,Jeans shorts,5,2000,1000,10,,4,,0,10477567,2,1,,0,5,{},{}
1199,Arrow,Arrow,10,2,1,1,25,,,,10477567,2,32768,,,,{},{}
1200,Bow,Bow,4,1000,500,200,15,,5,0,10477567,2,34,1,4,11,{},{}
1201,Knife,Knife,4,50,25,100,5,,1,0,10477567,2,2,1,1,1,{},{}
diff --git a/db/mob_db.txt b/db/mob_db.txt
index d192b7da..92019b71 100644
--- a/db/mob_db.txt
+++ b/db/mob_db.txt
@@ -18,3 +18,4 @@
1017,Bat,Bat,30,250,0,45,2,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
1018,Violet,Violet,30,500,0,55,3,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
1019,Shroom,Shroom,30,250,0,45,2,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
+1020,Fluffy,Fluffy,30,250,0,45,2,1,7,10,0,5,1,1,1,0,20,25,1,1,1,3,21,129,800,1872,672,480,505,800,501,150,518,400,533,150,521,70,522,1,909,0,0,0,0,0,0,0,,,,,,
diff --git a/npc/south-woodland/passages.txt b/npc/south-woodland/passages.txt
new file mode 100644
index 00000000..e6b31011
--- /dev/null
+++ b/npc/south-woodland/passages.txt
@@ -0,0 +1,2 @@
+new_14-1.gat,131,53 warp tofield 2,2,new_16-1.gat,25,53
+new_14-1.gat,48,23 warp tofield 1,1,new_9-1.gat,46,99
diff --git a/npc/western-desert/nomads.txt b/npc/western-desert/nomads.txt
index 1c747c5f..391411fe 100644
--- a/npc/western-desert/nomads.txt
+++ b/npc/western-desert/nomads.txt
@@ -8,16 +8,7 @@ new_1-1.gat,15,67,0 script Nomad1 132,{
new_1-1.gat,18,68,0 script Nomad2 128,{
mes "[Nomad]";
- mes "I found a passage to a green land through the mountains west of here";
+ mes "If I only had a tent...";
- mes "Do you want me to show you the way?";
- next;
- menu
- "Sure",sure,
- "No thank you",no;
-sure:
- warp "new_9-1.gat",38,95; mes "I'll be awaiting you here."; mes "Tell me when you want to go back.";
close;
-no:
- close;
-} \ No newline at end of file
+}
diff --git a/npc/western-desert/passages.txt b/npc/western-desert/passages.txt
index ec363db0..a4d7c3af 100644
--- a/npc/western-desert/passages.txt
+++ b/npc/western-desert/passages.txt
@@ -1,4 +1,5 @@
new_2-1.gat,36,30 warp caveexit 3,0,new_1-1.gat,25,95
new_1-1.gat,19,94 warp caveentrance 1,1,new_2-1.gat,37,31
new_1-1.gat,111,79 warp eastdesert 2,2,new_7-1.gat,23,40
-new_7-1.gat,18,39 warp westdesert 3,4,new_1-1.gat,106,78 \ No newline at end of file
+new_7-1.gat,18,39 warp westdesert 3,4,new_1-1.gat,106,78
+new_1-1.gat,11,66 warp woodland 1,2,new_15-1.gat,164,66
diff --git a/npc/woodland-desert/monsters.txt b/npc/woodland-desert/monsters.txt
new file mode 100644
index 00000000..fb557255
--- /dev/null
+++ b/npc/woodland-desert/monsters.txt
@@ -0,0 +1,2 @@
+new_15-1.gat,0,0,0,0 monster Scorpion 1009,20,0,0,0
+new_15-1.gat,0,0,0,0 monster Scorpion 1010,10,0,0,0
diff --git a/npc/woodland-desert/passages.txt b/npc/woodland-desert/passages.txt
new file mode 100644
index 00000000..a964484a
--- /dev/null
+++ b/npc/woodland-desert/passages.txt
@@ -0,0 +1,2 @@
+new_15-1.gat,172,66 warp todesert 3,3,new_1-1.gat,15,66
+new_15-1.gat,20,13 warp towoodland 1,0,new_16-1.gat,120,112
diff --git a/npc/woodland/passages.txt b/npc/woodland/passages.txt
index ae94482f..39622d71 100644
--- a/npc/woodland/passages.txt
+++ b/npc/woodland/passages.txt
@@ -1,29 +1,5 @@
new_9-1.gat,58,91 warp tofield 1,1,new_4-1.gat,15,15
-new_9-1.gat,41,92,0 script Nomad3 131,{
-
- mes "[Nomad]";
-
- mes "Do you want to go back?";
-
- next;
-
- menu
-
- "Yes please",yes,
-
- "Not yet",notyet;
-
-yes:
-
- warp "new_1-1.gat",18,70;
-
- close;
-
-notyet:
-
- close;
-
-}
+new_9-1.gat,47,102 warp tosouth 2,2,new_14-1.gat,50,25
new_9-1.gat,73,29,0 script Child 114,{