YourWishes/Dawn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a couple more discussion points.

Browse Source
This commit is contained in:
Dominic Masters
2021-08-29 16:46:03 -07:00
parent 5f2b4848db
commit 6a81c28c7c
4 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/dawn/game/poker/pokerdiscussion.h
View File

@ -21,6 +21,8 @@
#define POKER_DISCUSSION_REASON_PLAYER_CHECKING 0x05
#define POKER_DISCUSSION_REASON_PLAYER_CALLING 0x06
#define POKER_DISCUSSION_REASON_PLAYER_RAISING 0x07
#define POKER_DISCUSSION_REASON_FLOP 0x08
#define POKER_DISCUSSION_REASON_DEAL 0x09
typedef struct {
pokergame_t *poker;

7
src/game/poker/actions/bet.c
View File

@ -81,8 +81,9 @@ void _pokerGameActionBetOnEnd(
uint8_t j;
pokerplayer_t *player;
queueaction_t *next;
pokergame_t *game = (pokergame_t *)action->data;
pokerdiscussiondata_t discussion;
bool playersPending;
pokergame_t *game = (pokergame_t *)action->data;
// Go to the next better
game->poker.bet.better = (game->poker.bet.better + 1) % POKER_PLAYER_COUNT;
@ -110,6 +111,10 @@ void _pokerGameActionBetOnEnd(
// No! Begin the next flop.
next = pokerActionNextFlopAdd(queue, &game->poker);
if(next != NULL) {
discussion.reason = POKER_DISCUSSION_REASON_FLOP;
discussion.poker = game;
pokerDiscussionQueue(&discussion);
pokerBetResetBetter(&game->poker);
pokerGameActionRestackAdd(game);
pokerGameActionBetAdd(game);

4
src/game/poker/actions/round.c
View File

@ -34,6 +34,10 @@ void _pokerGameActionRoundOnEnd(queue_t *queue,queueaction_t *action,uint8_t i){
// Deal
pokerActionDealAdd(queue, &game->poker);
// Speak
data.reason = POKER_DISCUSSION_REASON_DEAL;
pokerDiscussionQueue(&data);
// Begin Betting Round. This will queue for one player only and then the round
// will take over.

16
src/game/poker/discussion/pokerdiscussion.c
View File

@ -39,6 +39,14 @@ void pokerDiscussionGet(
discussion->players[0] = POKER_DEALER_INDEX;
discussion->emotions[0] = VN_CHARACTER_EMOTION_BORED;
break;
// Deal
case POKER_DISCUSSION_REASON_DEAL:
discussion->count++;
discussion->messages[0] = "Cards dealt.";
discussion->players[0] = POKER_DEALER_INDEX;
discussion->emotions[0] = VN_CHARACTER_EMOTION_BORED;
break;
// Betting conversations
case POKER_DISCUSSION_REASON_PLAYER_FOLDING:
@ -68,6 +76,14 @@ void pokerDiscussionGet(
discussion->players[0] = data->playerCause;
discussion->emotions[0] = VN_CHARACTER_EMOTION_BOASTFUL;
break;
// Flops
case POKER_DISCUSSION_REASON_FLOP:
discussion->count++;
discussion->messages[0] = "Doing the flop.";
discussion->players[0] = POKER_DEALER_INDEX;
discussion->emotions[0] = VN_CHARACTER_EMOTION_ANIME_MOM;
break;
// Fallback
default: