diff --git a/exec/ircbots/poker/poker_commands.js b/exec/ircbots/poker/poker_commands.js
index 40bad2dce5fd448ef0e78b725a4e0be3d602e098..974893b58be5198da7fcfea06ea34caeaa4d01e6 100644
--- a/exec/ircbots/poker/poker_commands.js
+++ b/exec/ircbots/poker/poker_commands.js
@@ -36,7 +36,7 @@ Bot_Commands["GO"].command = function (target,onick,ouh,srv,lvl,cmd) {
return;
}
poker_games[target].round = 0;
- poker_init_hand(target);
+ poker_init_hand(target,srv);
poker_deal_hole_cards(target,srv);
poker_prompt_player(target,srv);
return;
@@ -56,6 +56,13 @@ Bot_Commands["FOLD"].command = function (target,onick,ouh,srv,lvl,cmd) {
Bot_Commands["CHECK"] = new Bot_Command(0,false,false);
Bot_Commands["CHECK"].command = function (target,onick,ouh,srv,lvl,cmd) {
if(!poker_verify_game_status(target,srv,onick)) return;
+ var poker=poker_games[target];
+ var current_player=poker.users[onick.toUpperCase()];
+ if(poker.current_bet>current_player.bet) {
+ srv.o(onick,"You have not met the current bet: $" + poker.current_bet,"NOTICE");
+ srv.o(onick,"Your current bet: $" + current_player.bet,"NOTICE");
+ return;
+ }
srv.o(target,onick + " checks.");
poker_next_turn(target,srv);
return;
@@ -92,15 +99,20 @@ Bot_Commands["CALL"] = new Bot_Command(0,false,false);
Bot_Commands["CALL"].command = function (target,onick,ouh,srv,lvl,cmd) {
if(!poker_verify_game_status(target,srv,onick)) return;
var poker=poker_games[target];
- if(poker.current_bet>poker.users[onick.toUpperCase()].money) {
- srv.writeout("NOTICE " + onick + " :" + "You don't have enough to call!");
- srv.writeout("NOTICE " + onick + " :" + "Balance: $" + poker.users[onick.toUpperCase()].money);
+ var current_player=poker.users[onick.toUpperCase()];
+
+ if(poker.current_bet==current_player.bet) {
+ srv.o(target,onick + " checks.");
+ } else if(poker.current_bet>current_player.money+current_player.bet) {
+ srv.o(onick,"You don't have enough to call!","NOTICE");
+ srv.o(onick,"Balance: $" + current_player.money,"NOTICE");
return;
+ } else {
+ srv.o(target,onick + " calls the bet: $" + poker.current_bet);
+ current_player.money-=poker.current_bet;
+ current_player.bet+=poker.current_bet;
+ srv.o(onick,"Balance: $" + current_player.money,"NOTICE");
}
- srv.o(target,onick + " calls the bet: $" + poker.current_bet);
- poker.users[onick.toUpperCase()].money-=poker.current_bet;
- poker.users[onick.toUpperCase()].bet+=poker.current_bet;
- srv.writeout("NOTICE " + onick + " :" + "Balance: $" + poker.users[onick.toUpperCase()].money);
poker_next_turn(target,srv);
return;
}
diff --git a/exec/ircbots/poker/poker_functions.js b/exec/ircbots/poker/poker_functions.js
index d0a2c8beb0c9378fcf397ef825ecf48818bd50aa..92f02272ff735e7260a395b23327c7ae28f6e295 100644
--- a/exec/ircbots/poker/poker_functions.js
+++ b/exec/ircbots/poker/poker_functions.js
@@ -1,38 +1,3 @@
-/* IRC Bot Module - Server Commands
- You would place all of your module functions in this file. */
-
-function Server_command(srv,cmdline,onick,ouh)
-{
- var cmd=IRC_parsecommand(cmdline);
- switch (cmd[0]) {
- case "JOIN":
- if (onick == srv.curnick) break;
-
- // Someone else joining? Let's send them a private welcome message!
- srv.o(onick,"Welcome to Poker!");
- srv.o(onick,"This is a module for IRCBot - by Cyan");
- break;
- case "PRIVMSG":
- if ((cmd[1][0] == "#") || (cmd[1][0] == "&")) {
- var chan = srv.channel[cmd[1].toUpperCase()];
- if (!chan)
- break;
- if (!chan.is_joined)
- break;
- if(srv.users[onick.toUpperCase()]) {
- /* You can do special command processing here, if you like.
- This is currently set up to parse public room messages
- for things like trivia answers, or other responses that
- are inconvenient for users to submit with a command
- prefix */
- }
- }
- break;
- default:
- break;
- }
-}
-
//////////////////// Non-object Functions ////////////////////
function poker_deal_hole_cards(target,srv) {
var poker_game=poker_games[target];
@@ -50,9 +15,7 @@ function poker_deal_hole_cards(target,srv) {
function poker_next_turn(target,srv) {
var poker=poker_games[target];
- poker.turn++;
- if(poker.turn==poker.users_map.length) poker.turn=0;
-
+ poker.turn=get_next_player(poker.users_map,poker.turn);
if(poker.deal_next) {
poker_load_pot(target,srv);
@@ -78,6 +41,12 @@ function poker_next_turn(target,srv) {
if(poker.round<4) poker_prompt_player(target,srv);
}
+function get_next_player(map,turn) {
+ turn++;
+ if(turn==map.length) turn=0;
+ return turn;
+}
+
function poker_compare_hands(target,srv) {
var poker=poker_games[target];
var winning_hand=-1;
@@ -147,7 +116,8 @@ function poker_load_pot(target,srv) {
function poker_prompt_player(target,srv) {
var poker=poker_games[target];
var turn=poker.users_map[poker.turn];
- srv.o(turn,"It is your turn. Minimum bet: $" + poker.current_bet,"NOTICE");
+ var min_bet=poker.current_bet-poker.users[turn].bet;
+ srv.o(turn,"It is your turn. Minimum bet to call: $" + min_bet,"NOTICE");
}
function poker_verify_game_status(target,srv,onick) {
@@ -173,11 +143,22 @@ function poker_verify_game_status(target,srv,onick) {
return true;
}
-function poker_init_hand(target) {
- poker_games[target].deck.shuffle();
- for(var u in poker_games[target].users) {
- poker_games[target].users_map.push(u);
+function poker_init_hand(target,srv) {
+ var poker=poker_games[target];
+ poker.deck.shuffle();
+ for(var u in poker.users) {
+ poker.users_map.push(u);
}
+ var small_blind=get_next_player(poker.users_map,poker.dealer);
+ var large_blind=get_next_player(poker.users_map,small_blind);
+
+ srv.o(target,poker.users_map[poker.dealer] + " is the dealer for this hand.");
+ poker.users[poker.users_map[small_blind]].bet+=poker.sm_blind;
+ srv.o(target,"Small blind: " + poker.users_map[small_blind] + " $" + poker.sm_blind);
+ poker.users[poker.users_map[large_blind]].bet+=poker.lg_blind;
+ srv.o(target,"Large blind: " + poker.users_map[large_blind] + " $" + poker.lg_blind);
+
+ poker.min_bet=poker.lg_blind;
}
function load_scores()
diff --git a/exec/ircbots/poker/pokerbot.js b/exec/ircbots/poker/pokerbot.js
index d68fd00586a521fbbb38e6422666a9c13c5376d3..33c6acd4accbf37de49665606fabc29087c06338 100644
--- a/exec/ircbots/poker/pokerbot.js
+++ b/exec/ircbots/poker/pokerbot.js
@@ -46,6 +46,7 @@ function Poker_Game()
this.pot=0;
this.lg_blind=10;
this.sm_blind=5;
+ this.dealer=0;
this.min_bet=this.sm_blind;
this.current_bet=this.min_bet;
this.round=-1;