diff options
Diffstat (limited to 'npc/custom/etc')
| -rw-r--r-- | npc/custom/etc/blackjack.txt | 21 | ||||
| -rw-r--r-- | npc/custom/etc/penal_servitude.txt | 4 | ||||
| -rw-r--r-- | npc/custom/etc/quest_warper.txt | 2 |
3 files changed, 18 insertions, 9 deletions
diff --git a/npc/custom/etc/blackjack.txt b/npc/custom/etc/blackjack.txt index ee1e7904b..5baba717e 100644 --- a/npc/custom/etc/blackjack.txt +++ b/npc/custom/etc/blackjack.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Description: ========================================= //= Black Jack card game. Gameplay based off standard casino //= black jack rules. Dealer must have at least 17 to stay and will @@ -12,7 +12,8 @@ //= Currently does not allow for "insurance", or "splitting" //= of pairs. //===== Additional Comments: ================================= -//= +// 1.0 Release +// 1.1 Prevent player logout from zeny deletion (AnnieRuru) //============================================================ cmd_in02,188,89,1 script Black Jack Dealer 1_M_LIBRARYMASTER,{ @@ -71,7 +72,7 @@ sM_0b: mes "3.) If you have a point total of 21 with the first 2 cards, you"; mes "will automatically win the round. This is called a ^5533FF'Black Jack'^000000"; mes "and happens when you get an 'Ace' and a '10 valued' card. If the"; - mes "dealer gets a Black Jack he/she will automatically win the round."; + mes "dealer gets a Black Jack the player will automatically lose the round."; next; mes "[Dealer]"; mes "4.) Besides winning and loosing, you can tie with the dealer. If"; @@ -133,18 +134,22 @@ L_Play: M_1a: if(Zeny < 2) goto sL_NotEnuf; set @bet, 2; + Zeny -= @bet; goto L_Cont0; M_1b: if(Zeny < 10) goto sL_NotEnuf; set @bet, 10; + Zeny -= @bet; goto L_Cont0; M_1c: if(Zeny < 20) goto sL_NotEnuf; set @bet, 20; + Zeny -= @bet; goto L_Cont0; M_1d: if(Zeny < 100) goto sL_NotEnuf; set @bet, 100; + Zeny -= @bet; goto L_Cont0; sL_NotEnuf: @@ -157,6 +162,7 @@ L_Cont0: next; deletearray $@card[0],13; set @dealerTurn, 0; + set @doubledown, 0; set @numP, 0; set @numD, 0; set @pAce, 0; @@ -219,7 +225,7 @@ M_Double: mes "doubled, and you will only be able to pull 1 extra card."; next; set @dealerTurn, 1; - set @bet, @bet*2; + set @doubledown, 1; callsub sF_GetCards, @numP, @playCard[@numP], @playCard$[@numP], @pAce; goto L_Start; @@ -232,18 +238,21 @@ L_Check: sL_Win: mes "[Dealer]"; mes "Congratulations, you've won!"; + if ( @doubledown ) + Zeny += @bet *3; + else + Zeny += @bet *2; next; - Zeny += @bet; goto L_Play; sL_Lose: mes "[Dealer]"; mes "I'm sorry but you've lost."; - Zeny -= @bet; next; goto L_Play; sL_Push: mes "[Dealer]"; mes "Its a push. You tied with the Dealer."; + Zeny += @bet; next; goto L_Play; diff --git a/npc/custom/etc/penal_servitude.txt b/npc/custom/etc/penal_servitude.txt index e78833b66..b83bf3f83 100644 --- a/npc/custom/etc/penal_servitude.txt +++ b/npc/custom/etc/penal_servitude.txt @@ -84,9 +84,9 @@ M_Q1: menu "OK, I'll work off!",-, "I love this prison!",M_NO_THANKS; mes "[Saddeus]"; - if(checkcart() || checkfalcon() || checkriding()){ + if(checkcart() || checkfalcon() || checkmount()){ emotion e_hmm; - mes "I'm sorry, you should release your Cart, PecoPeco or Falcon!"; + mes "I'm sorry, you should release your Cart, Mount or Falcon!"; close; } mes "Talk to our overseer, Oliver."; diff --git a/npc/custom/etc/quest_warper.txt b/npc/custom/etc/quest_warper.txt index b9bfcf74f..3526cde5c 100644 --- a/npc/custom/etc/quest_warper.txt +++ b/npc/custom/etc/quest_warper.txt @@ -55,7 +55,7 @@ // - when all towns and dungeons are collected a new option on the main menu will show // - it will only show when you setup the mapname of the warp ! //= 2.0a - Dungeon Level Limit & Split dungeon fees -// - Limits dungeon based on Depth, access special setup menu thru GM-Menu +// - Limits dungeon based on Depth, access to special setup menu through the GM-Menu // - Dungeon fees split up based on Basic , Advanced & Overseas // - Old Dungeon fee system removed, all dungeon fees now set to 0 //= 2.0b - Special warpname menu option name bug fixed |