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/013-3_Cave/barrier.txt | |
| 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/013-3_Cave/barrier.txt')
| -rw-r--r-- | npc/013-3_Cave/barrier.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/013-3_Cave/barrier.txt b/npc/013-3_Cave/barrier.txt index b597541f..0ec3f86a 100644 --- a/npc/013-3_Cave/barrier.txt +++ b/npc/013-3_Cave/barrier.txt @@ -1,7 +1,7 @@ // -//013-3.gat,71,21,0 script #DemonMineBarrier1 0,1,1,{ -013-3.gat,71,21,0 script #DemonMineBarrier1 127,1,1,{ +//013-3.gat,71,21,0 script #DemonMineBarrier1#_M 0,1,1,{ +013-3.gat,71,21,0 script #DemonMineBarrier1#_M 127,1,1,{ if (QUEST_demon_mines >= 2) close; if (QUEST_demon_mines == 1 && countitem(1198) >= 1) goto L_Has_Jack_O_Soul; @@ -14,6 +14,6 @@ L_Has_Jack_O_Soul: mes "The barrier around the opening allows you passage."; set QUEST_demon_mines, 2; - delitem 1198, 1; + delitem "JackOSoul", 1; close; } |