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-2_Tulimshar/casino.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-2_Tulimshar/casino.txt')
| -rw-r--r-- | npc/001-2_Tulimshar/casino.txt | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/npc/001-2_Tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt index bc07cab8..d0d0c5f9 100644 --- a/npc/001-2_Tulimshar/casino.txt +++ b/npc/001-2_Tulimshar/casino.txt @@ -36,8 +36,8 @@ close; L_Begin: - if(countitem(503) < 15) goto L_NoCoin; - delitem 503, 15; + if(countitem("CasinoCoins") < 15) goto L_NoCoin; + delitem "CasinoCoins", 15; set @croupier, rand(0, 4); set @croupier, @croupier + 17; set @player, rand(4, 21); @@ -68,7 +68,7 @@ L_End: mes "\"Congratulations, you won!"; mes "I had " + @croupier + "."; mes "You get 45 casino coins.\""; - getitem 503, 45; + getitem "CasinoCoins", 45; close; L_NoCoin: @@ -132,8 +132,8 @@ L_b100: goto L_Check; L_Check: - if(countitem(503) < @bet) goto L_NoCoin; - delitem 503, @bet; + if(countitem("CasinoCoins") < @bet) goto L_NoCoin; + delitem "CasinoCoins", @bet; menu "Choose a color", -, "Choose a number", L_Number; @@ -143,7 +143,7 @@ L_Check: set @color,rand(2); if(@color == 1) goto L_Lost; mes "You won!"; - getitem 503, @bet * 2; + getitem "CasinoCoins", @bet * 2; close; L_Number: @@ -162,7 +162,7 @@ L_Number: if (@roulette < 37) mes "The ball stopped on " + @roulette; if (@number != @roulette) goto L_Lost; mes "\"You won!\""; - getitem 503, @bet * 10; + getitem "CasinoCoins", @bet * 10; close; L_NoCoin: |