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/009-1_Hurnscald/jack.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/009-1_Hurnscald/jack.txt')
| -rw-r--r-- | npc/009-1_Hurnscald/jack.txt | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/npc/009-1_Hurnscald/jack.txt b/npc/009-1_Hurnscald/jack.txt index 02381aa7..de78e37a 100644 --- a/npc/009-1_Hurnscald/jack.txt +++ b/npc/009-1_Hurnscald/jack.txt @@ -15,9 +15,7 @@ // Lumberjack 009-1.gat,40,45,0 script Jack 141, { - set @RAWLOG, 569; set @RAWLOGS_AMOUNT, 40; - set @WOODENSHIELD, 602; set @SHIELD_COST, 5000; set @QUEST_SHIELD_EXP, 2500; @@ -181,15 +179,15 @@ L_Shield_state_2: mes "\"Let's see if you have enough of everything.\""; next; - if (countitem(@RAWLOG) < @RAWLOGS_AMOUNT) goto L_Not_enough_logs; + if (countitem("RawLog") < @RAWLOGS_AMOUNT) goto L_Not_enough_logs; if (zeny < @SHIELD_COST) goto L_Not_enough_money; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; - delitem @RAWLOG, @RAWLOGS_AMOUNT; + delitem "RawLog", @RAWLOGS_AMOUNT; set zeny, zeny - @SHIELD_COST; getexp @QUEST_SHIELD_EXP, 0; - getitem @WOODENSHIELD, 1; + getitem "WoodenShield", 1; set @Q_Woodenshield, 3; callsub S_Update_Mask; |