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/001-1_Tulimshar/vincent.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/001-1_Tulimshar/vincent.txt')
| -rw-r--r-- | npc/001-1_Tulimshar/vincent.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt index e0572407..ec803827 100644 --- a/npc/001-1_Tulimshar/vincent.txt +++ b/npc/001-1_Tulimshar/vincent.txt @@ -80,13 +80,13 @@ L_Wait: close; L_Progress: - if(countitem(518) >= 30) goto L_Have; + if(countitem("BugLeg") >= 30) goto L_Have; mes "[Vincent]"; mes "\"Please help me collect 30 [Bug Leg]s!\""; close; L_Have: - delitem 518, 30; + delitem "BugLeg", 30; mes "[Vincent]"; mes "\"Excellent! Finally I can complete the model!!\""; next; |