diff options
author | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
---|---|---|
committer | Fate <fate-tmw@googlemail.com> | 2009-05-30 20:03:41 +0000 |
commit | 8b70df06b9454fe76765dd3044b378d4b3002002 (patch) | |
tree | 8518b9c58642ae85d17bc62ae87d0501858b7bdd /npc/018-1_Woodland_mining_camp | |
parent | 96c8a2957d499b4dd7c867455bdff51920eb31ea (diff) | |
parent | f17c823d6f91ae535ebcadd8b5b369efea09b772 (diff) | |
download | serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.gz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.bz2 serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.tar.xz serverdata-8b70df06b9454fe76765dd3044b378d4b3002002.zip |
Merge branch 'master' of the testing branch
Conflicts:
conf/magic.conf
db/item_db.txt
npc/013-3_Cave/barrier.txt
Eliminated conf/magic.conf. Re-build this file using conf/build-magic.sh;
otherwise marriage will be disabled and spells won't work.
Diffstat (limited to 'npc/018-1_Woodland_mining_camp')
-rw-r--r-- | npc/018-1_Woodland_mining_camp/_import.txt | 1 | ||||
-rw-r--r-- | npc/018-1_Woodland_mining_camp/sword.txt | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/npc/018-1_Woodland_mining_camp/_import.txt b/npc/018-1_Woodland_mining_camp/_import.txt index 9be2065c..06c8a307 100644 --- a/npc/018-1_Woodland_mining_camp/_import.txt +++ b/npc/018-1_Woodland_mining_camp/_import.txt @@ -2,3 +2,4 @@ map: 018-1.gat npc: npc/018-1_Woodland_mining_camp/_mobs.txt npc: npc/018-1_Woodland_mining_camp/_warps.txt npc: npc/018-1_Woodland_mining_camp/miners.txt +npc: npc/018-1_Woodland_mining_camp/sword.txt diff --git a/npc/018-1_Woodland_mining_camp/sword.txt b/npc/018-1_Woodland_mining_camp/sword.txt new file mode 100644 index 00000000..7352384d --- /dev/null +++ b/npc/018-1_Woodland_mining_camp/sword.txt @@ -0,0 +1,12 @@ +018-1.gat,110,43,0 script #IceSword#_M 127,{ + if (getskilllv(SKILL_MAGIC)) + goto L_message; + + close; + +L_message: + mes "[Sword in Pond]"; + mes "\"Zzzzzz.....\""; + next; + close; +} |