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/scripts.conf | |
| 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/scripts.conf')
| -rw-r--r-- | npc/scripts.conf | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/npc/scripts.conf b/npc/scripts.conf index 3f8967b9..dda7d1ff 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -6,11 +6,15 @@ npc: npc/functions/barber.txt npc: npc/functions/clear_vars.txt npc: npc/functions/game_rules.txt npc: npc/functions/inn.txt +npc: npc/functions/magic.txt npc: npc/functions/mob_points.txt npc: npc/functions/process_equip.txt npc: npc/functions/slot_machine.txt npc: npc/functions/soul_menhir.txt +// Item Functions +npc: npc/items/purification_potion.txt + import: npc/_import.txt // Christmas 2006 |