diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-12-05 21:46:23 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-12-05 21:46:23 -0700 |
| commit | 57b63bbd208b13a41fc441281f04b99ccf9eda01 (patch) | |
| tree | 288651e9d869b251df4eb1d419e2d784e1a82559 | |
| parent | 864e75f983a52a2e9afb3dd877c316fc0af91ae8 (diff) | |
| parent | c94b0ba8224669ccce43dd76ee80a389c00f3848 (diff) | |
| download | serverdata-57b63bbd208b13a41fc441281f04b99ccf9eda01.tar.gz serverdata-57b63bbd208b13a41fc441281f04b99ccf9eda01.tar.bz2 serverdata-57b63bbd208b13a41fc441281f04b99ccf9eda01.tar.xz serverdata-57b63bbd208b13a41fc441281f04b99ccf9eda01.zip | |
Merge branch 'master' into exp
| -rw-r--r-- | conf/map_athena.conf | 2 | ||||
| -rw-r--r-- | npc/013-3_Cave/_mobs.txt | 2 | ||||
| -rw-r--r-- | npc/018-1_Woodland_mining_camp/_mobs.txt | 2 | ||||
| -rw-r--r-- | npc/018-3_Cave/bookcase.txt | 2 | ||||
| -rw-r--r-- | npc/_import.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/conf/map_athena.conf b/conf/map_athena.conf index 82e8c08b..f03c0123 100644 --- a/conf/map_athena.conf +++ b/conf/map_athena.conf @@ -13,5 +13,7 @@ mapreg_txt: save/mapreg.txt import: npc/scripts.conf +gm_log: gm.log + // local settings for this server in this file import: conf/map_local.conf diff --git a/npc/013-3_Cave/_mobs.txt b/npc/013-3_Cave/_mobs.txt index c0de99b6..c8ca6c38 100644 --- a/npc/013-3_Cave/_mobs.txt +++ b/npc/013-3_Cave/_mobs.txt @@ -3,7 +3,7 @@ 013-3.gat,28,89,16,52 monster Cave Snake 1021,10,120000,60000,Mob013-3::On1021 013-3.gat,61,22,2,2 monster Fire Skull 1023,3,120000,60000,Mob013-3::On1023 013-3.gat,81,22,2,2 monster Poison Skull 1024,3,120000,60000,Mob013-3::On1024 -013-3.gat,109,31,6,22 monster Black Scorpion 1009,20,80000,40000,Mob013-3::On1009 +013-3.gat,109,31,6,22 monster Black Scorpion 1009,20,50000,25000,Mob013-3::On1009 013-3.gat,119,84,27,38 monster Spider 1012,20,120000,40000,Mob013-3::On1012 013-3.gat,176,23,5,6 monster Spider 1012,10,100000,40000,Mob013-3::On1012 013-3.gat,82,75,2,2 monster Fire skull 1023,1,180000,60000,Mob013-3::On1023 diff --git a/npc/018-1_Woodland_mining_camp/_mobs.txt b/npc/018-1_Woodland_mining_camp/_mobs.txt index 7e06eed1..0a7c1c47 100644 --- a/npc/018-1_Woodland_mining_camp/_mobs.txt +++ b/npc/018-1_Woodland_mining_camp/_mobs.txt @@ -22,7 +22,7 @@ 018-1.gat,106,52,15,6 monster Cobalt Plant 1030,1,240000,120000,Mob018-1::On1030 018-1.gat,78,55,37,6 monster Red Slime 1008,7,100000,50000,Mob018-1::On1008 018-1.gat,145,24,10,9 monster Red Slime 1008,3,100000,50000,Mob018-1::On1008 -018-1.gat,68,89,14,17 monster Grass Snake 1034,3,100000,50000,Mob018-1::On1034 +018-1.gat,68,89,14,17 monster Bat 1017,3,100000,50000,Mob018-1::On1017 018-1.gat,160,31,11,18 monster Red Slime 1008,5,100000,50000,Mob018-1::On1008 diff --git a/npc/018-3_Cave/bookcase.txt b/npc/018-3_Cave/bookcase.txt index b2e14e41..d56b3fca 100644 --- a/npc/018-3_Cave/bookcase.txt +++ b/npc/018-3_Cave/bookcase.txt @@ -12,7 +12,7 @@ close; L_Search: - mes "After searching the bookcase, you were able to find a few pasages that you can read."; + mes "After searching the bookcase, you were able to find a few passages that you can read."; next; mes "One of the describes an ancient barrier that guards a great treasure."; diff --git a/npc/_import.txt b/npc/_import.txt index 77e9a46b..df218035 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -38,5 +38,3 @@ import: npc/020-1/_import.txt import: npc/020-2/_import.txt import: npc/020-3_Ice_cave/_import.txt import: npc/020-4_Ice_cave/_import.txt -import: npc/021-1_Tulimshar/_import.txt -import: npc/022-1_Beach_Cliffs/_import.txt |