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/functions/slot_machine.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/functions/slot_machine.txt')
-rw-r--r-- | npc/functions/slot_machine.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/npc/functions/slot_machine.txt b/npc/functions/slot_machine.txt index 024a2e8a..8f4482cc 100644 --- a/npc/functions/slot_machine.txt +++ b/npc/functions/slot_machine.txt @@ -9,8 +9,8 @@ function script SlotMachine { close; L_Play: - if(countitem(503) < 1) goto L_NoCoin; - delitem 503, 1; + if(countitem("CasinoCoins") < 1) goto L_NoCoin; + delitem "CasinoCoins", 1; set @Temp1,rand(7); set @Temp2,rand(7); set @Temp3,rand(7); @@ -22,7 +22,7 @@ L_Play: if(@Temp1 != @Temp3) goto L_Lost; mes "Congratulations! You won!"; mes "You get 10 casino coins"; - getitem 503, 10; + getitem "CasinoCoins", 10; close; L_Lost: |