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-2_Hurnscald/alan.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-2_Hurnscald/alan.txt')
| -rw-r--r-- | npc/009-2_Hurnscald/alan.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/npc/009-2_Hurnscald/alan.txt b/npc/009-2_Hurnscald/alan.txt index 6d8a1770..6dc9da67 100644 --- a/npc/009-2_Hurnscald/alan.txt +++ b/npc/009-2_Hurnscald/alan.txt @@ -134,7 +134,7 @@ L_State_3_try: mes "\"Hmmm... looks ok, but is it strong enough?\""; mes "Alan bends the log over his knee."; next; - delitem 569, 1; + delitem "RawLog", 1; set @Temp1, rand(20); if (@Temp1 == 0) goto L_State_3_success; mes "The log breaks with a loud crack"; @@ -177,7 +177,7 @@ L_State_4_pay: getinventorylist; if (@inventorylist_count == 100) goto L_State_4_TooMany; set zeny, zeny - 10000; - getitem 545, 1; + getitem "ForestBow", 1; set @Q_status, 5; callsub S_Update_Var; mes "[Alan]"; |