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-2_Magic_house/apprentice.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-2_Magic_house/apprentice.txt')
| -rw-r--r-- | npc/013-2_Magic_house/apprentice.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt index b0f32116..830b5171 100644 --- a/npc/013-2_Magic_house/apprentice.txt +++ b/npc/013-2_Magic_house/apprentice.txt @@ -41,9 +41,9 @@ L_Beer: L_Beer_yes: if (zeny < 175) goto L_Low_money; getinventorylist; - if (@inventorylist_count == 100 && countitem(539) == 0) goto L_TooMany; + if (@inventorylist_count == 100 && countitem("Beer") == 0) goto L_TooMany; - getitem 539, 1; + getitem "Beer", 1; set zeny, zeny - 175; goto L_Finish; @@ -64,8 +64,8 @@ L_Milk: L_Milk_yes: if (zeny < 300) goto L_Low_money; getinventorylist; - if (@inventorylist_count == 100 && countitem(527) == 0) goto L_TooMany; - getitem 527, 1; + if (@inventorylist_count == 100 && countitem("Milk") == 0) goto L_TooMany; + getitem "Milk", 1; set zeny, zeny - 300; goto L_Finish; |