Skip to content

Fix join message not displayed in private games #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fix join message not displayed in private games #17

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07fffe7
Fix join message not displayed in private games
renyhp Feb 13, 2017
822898c
Don't tell Coup chosen if player has 10+ coins
renyhp Feb 14, 2017
58b6512
Show cards when player goes out of the game
renyhp Feb 14, 2017
9b6e3ef
Prevent duplicated messages when player loses a card
renyhp Feb 14, 2017
e8cb703
Hide blocking menu when assassin is not blocked
renyhp Feb 14, 2017
531fb46
Fix /leave not removing users
renyhp Feb 14, 2017
643e4b0
Attempt to fix the Exchange bug
renyhp Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 76 additions & 89 deletions CoupForTelegram/CoupForTelegram/Game.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public int RemovePlayer(User u)
{
if (State == GameState.Joining)
{
Players.RemoveAll(x => x.Id == u.Id);
Players.RemoveAll(x => x.TeleUser.Id == u.Id);
if (Players.Count() == 0)
{
State = GameState.Ended;
Expand Down Expand Up @@ -282,8 +282,9 @@ public void StartGame()
}
break;
case Action.Coup:
if (p.Coins < 10) //else, we have already sent the message "...must Coup someone."
Send($"{p.Name.ToBold()} has chosen to Coup.");
p.Coins -= 7;
Send($"{p.Name.ToBold()} has chosen to Coup.");
choices = Players.Where(x => x.Id != p.Id && x.Cards.Count() > 0);
if (choices.Count() == 1)
target = choices.First();
Expand All @@ -299,21 +300,22 @@ public void StartGame()
{
LastMenu = null;
Send($"{p.Name.ToBold()} did not choose in time, and has lost 7 coins");
Send("Times up!", p.Id, menuTo: p.Id);
Send("Time's up!", p.Id, menuTo: p.Id);
break;
}

if (target.Cards.Count() == 1)
{
PlayerLoseCard(target, target.Cards.First());
Send($"{p.Name.ToBold()} has chosen to Coup {target.Name.ToBold()}!");
PlayerLoseCard(target);
//Graveyard.Add(target.Cards.First());
target.Cards.Clear();
LastMenu = null;
Send($"{target.Name.ToBold()}, you have been couped. You are out of cards, and therefore out of the game!");
Send($"{target.Name.ToBold()}, you have been couped. You are out of cards, and therefore out of the game!");
}
else
{
Send($"{p.Name.ToBold()} has chosen to Coup {target.Name.ToBold()}! {target.Name.ToBold()} please choose a card to lose.");
Send($"{p.Name.ToBold()} has chosen to Coup {target.Name.ToBold()}! {target.Name.ToBold()} please choose a card to lose.");
PlayerLoseCard(target);
}
break;
Expand Down Expand Up @@ -344,25 +346,25 @@ public void StartGame()
if (target == null)
{
LastMenu = null;
Send("Times up!", p.Id, menuTo: p.Id);
Send("Time's up!", p.Id, menuTo: p.Id);
Send($"{p.Name.ToBold()} did not choose in time, and has lost 3 coins!");
break;

}
if (PlayerMadeBlockableAction(p, choice, target, "Assassin"))
{
DBAddValue(p, Models.ValueType.PlayersAssassinated);
//unblocked!
if (target.Cards.Count() == 1)
{
Send($"{target.Name.ToBold()}, you have been assassinated. You are out of cards, and therefore out of the game!");
PlayerLoseCard(target, target.Cards.First());
PlayerLoseCard(target);
Send($"{target.Name.ToBold()}, you have been assassinated. You are out of cards, and therefore out of the game!");
//Graveyard.Add(target.Cards.First());
target.Cards.Clear();
}
else
{
Send($"{p.Name.ToBold()} was not blocked! {target.Name.ToBold()} please choose a card to lose.");
LastMenu = null;
Send($"{p.Name.ToBold()} was not blocked! {target.Name.ToBold()} please choose a card to lose.");
PlayerLoseCard(target);
}
}
Expand Down Expand Up @@ -394,11 +396,13 @@ public void StartGame()
TellCards(p);
break;
}
var card2 = "";

newCards.Remove(newCards.First(x => x.Name == CardToLose));
var card1 = CardToLose;
newCards.Remove(newCards.First(x => x.Name == card1));
var newCard = Cards.First(x => x.Name == card1);
Cards.Remove(newCard);
p.Cards.Add(newCard);
CardToLose = null;

if (count == 2)
{
menu = new InlineKeyboardMarkup(new[]
Expand All @@ -415,18 +419,12 @@ public void StartGame()
TellCards(p);
break;
}
card2 = CardToLose;
CardToLose = null;
var card2 = CardToLose;
newCards.Remove(newCards.First(x => x.Name == card2));
}
var newCard = Cards.First(x => x.Name == card1);
Cards.Remove(newCard);
p.Cards.Add(newCard);
if (count == 2)
{
newCard = Cards.First(x => x.Name == card2);
Cards.Remove(newCard);
p.Cards.Add(newCard);
CardToLose = null;
}
Cards.Shuffle();
TellCards(p);
Expand All @@ -447,7 +445,7 @@ public void StartGame()
if (target == null)
{
LastMenu = null;
Send("Times up!", p.Id, menuTo: p.Id);
Send("Time's up!", p.Id, menuTo: p.Id);
Send($"{p.Name.ToBold()} did not choose in time");
break;
}
Expand All @@ -463,10 +461,14 @@ public void StartGame()
}
break;
case Action.Concede:
LastMenu = null;
Send($"{p.Name} has chosen to concede the game, and is out!\n");
if (p.Cards.Count() == 1)
Send($"{p.Name}'s card was {p.Cards.First().Name}. It is now in the graveyard.");
else
Send($"{p.Name}'s cards were {p.Cards.First().Name} and {p.Cards.Last().Name}. They are now in the graveyard.");
Graveyard.AddRange(p.Cards);
p.Cards.Clear();
LastMenu = null;
Send($"{p.Name} has chosen to concede the game, and is out!");
break;
default:
LastMenu = null;
Expand All @@ -475,9 +477,13 @@ public void StartGame()
if (p.AfkCount >= 2)
{
//out!
Send($"{p.Name} is AFK, and is out!");
if (p.Cards.Count() == 1)
Send($"{p.Name}'s card was {p.Cards.First().Name}. It is now in the graveyard.");
else
Send($"{p.Name}'s cards were {p.Cards.First().Name} and {p.Cards.Last().Name}. They are now in the graveyard.");
Graveyard.AddRange(p.Cards);
p.Cards.Clear();
Send($"{p.Name} is AFK, and is out!");
}
break;
}
Expand Down Expand Up @@ -709,7 +715,7 @@ private bool PlayerMadeBlockableAction(CPlayer p, Action a, CPlayer t = null, st
var menu = new InlineKeyboardMarkup(new[] { "🛡 Captain", "👳 Ambassador" }.Select(x => new InlineKeyboardButton(x, $"card|{GameId}|{x}")).ToArray());
ActualTurn = Turn;
Turn = blocker.Id;
Send($"{blocker.Name.ToBold()} has chosen to block. Please choose which card you are blocking with", menu: menu);
Send($"{blocker.Name.ToBold()} has chosen to block. Please choose which card you are blocking with", menu: menu);
WaitForChoice(ChoiceType.Card);
Turn = ActualTurn;
cardUsed = CardToLose;
Expand All @@ -736,19 +742,11 @@ private bool PlayerMadeBlockableAction(CPlayer p, Action a, CPlayer t = null, st
if (!isBluff)
{
//player has a card!
if (bluffer.Cards.Count() == 1)
{
Send($"{bluffer.Name.ToBold()}, {p.Name.ToBold()} had {cardUsed.ToBold()}. You are out of cards, and therefore out of the game!");
PlayerLoseCard(bluffer, bluffer.Cards.First());
//Graveyard.Add(bluffer.Cards.First());
bluffer.Cards.Clear();
}
else
{
Send(msg + $"{bluffer.Name.ToBold()}, {p.Name.ToBold()} had {cardUsed.ToBold()}. You must pick a card to lose!");
//TODO pick card to lose
PlayerLoseCard(bluffer);
}
Send($"{bluffer.Name.ToBold()}, {p.Name.ToBold()} had {cardUsed.ToBold()}!" + ((bluffer.Cards.Count() > 1) ? " You must pick a card to lose." : ""));
PlayerLoseCard(bluffer);
if (bluffer.Cards.Count() == 0)
Send($"{bluffer.Name.ToBold()} is out of cards, so out of the game!");

//players card goes back in deck, given new card
try
{
Expand All @@ -757,6 +755,7 @@ private bool PlayerMadeBlockableAction(CPlayer p, Action a, CPlayer t = null, st
p.Cards.Remove(card);
Cards.Shuffle();
Cards.Shuffle();
Cards.Shuffle();
card = Cards.First();
Cards.Remove(card);
p.Cards.Add(card);
Expand All @@ -772,19 +771,10 @@ private bool PlayerMadeBlockableAction(CPlayer p, Action a, CPlayer t = null, st
}
else
{
if (p.Cards.Count() == 1)
{

Send(msg + $"{p.Name.ToBold()}, your bluff was called. You are out of cards, and therefore out of the game!");
PlayerLoseCard(p, p.Cards.First());
//Graveyard.Add(p.Cards.First());
p.Cards.Clear();
}
else
{
Send(msg + $"{p.Name.ToBold()}, you did not have {cardUsed.ToBold()}! You must pick a card to lose.");
PlayerLoseCard(p);
}
Send($"{p.Name.ToBold()}, you did not have {cardUsed.ToBold()}!" + ((p.Cards.Count() > 1) ? " You must pick a card to lose." : ""));
PlayerLoseCard(p);
if (p.Cards.Count() == 0)
Send($"{p.Name.ToBold()} is out of cards, so out of the game!");
//successful bluff called
DBAddBluff(p, cardUsed, true, bluffer);
return false;
Expand All @@ -803,47 +793,42 @@ private bool PlayerMadeBlockableAction(CPlayer p, Action a, CPlayer t = null, st



private void PlayerLoseCard(CPlayer p, Card card = null)
private void PlayerLoseCard(CPlayer p)
{
Card card = null;
//send menu
if (card == null)
if (p.Cards.Count() == 0)
{
if (p.Cards.Count() == 0)
{
Send($"{p.Name.ToBold()} is out of cards, so out of the game!");
return;
}
else if (p.Cards.Count() == 1)
Send($"{p.Name.ToBold()} is out of cards, so out of the game!");
return;
}
else if (p.Cards.Count() == 1)
card = p.Cards.First();
else
{
var menu = new InlineKeyboardMarkup(new[]
{
p.Cards.Select(x => new InlineKeyboardButton(x.Name, $"card|{GameId}|{x.Name}")).ToArray()
});
ActualTurn = Turn;
Turn = p.Id;
Send($"Please choose a card to lose", p.Id, menu: menu, newMsg: true, menuTo: p.Id);

WaitForChoice(ChoiceType.Card);
Turn = ActualTurn;
if (CardToLose == null)
{
card = p.Cards.First();
Send($"{p.Name.ToBold()} is out of cards, so out of the game!");
Send($"I chose for you, you lost {card.Name.ToBold()}", p.Id);
}
else
{
var menu = new InlineKeyboardMarkup(new[]
{
p.Cards.Select(x => new InlineKeyboardButton(x.Name, $"card|{GameId}|{x.Name}")).ToArray()
});
ActualTurn = Turn;
Turn = p.Id;
Send($"Please choose a card to lose", p.Id, menu: menu, newMsg: true, menuTo: p.Id);

WaitForChoice(ChoiceType.Card);
Turn = ActualTurn;
if (CardToLose == null)
{
card = p.Cards.First();
Send($"I chose for you, you lost {card.Name.ToBold()}", p.Id);
}
else
card = p.Cards.FirstOrDefault(x => x.Name == CardToLose);
}
card = p.Cards.FirstOrDefault(x => x.Name == CardToLose);
}
p.Cards.Remove(card);
Graveyard.Add(card);
TellCards(p);
LastMenu = null;
Send($"{p.Name.ToBold()} has lost {card.Name.ToBold()}. It is now in the graveyard.");
Send($"{p.Name.ToBold()} has lost {card.Name.ToBold()}. It is now in the graveyard.");
}

private bool PlayerCanDoAction(Action a, CPlayer p)
Expand Down Expand Up @@ -983,37 +968,39 @@ private List<Message> Send(string message, long id = 0, bool clearKeyboard = fal
Message r = null;
try
{

var p = Players.FirstOrDefault(x => x.Id == id);
var last = p?.LastMessageId ?? LastMessageId;
var lastStr = p?.LastMessageSent ?? LastMessageSent;
if (last != 0 & !newMsg & !joinMessage)
if (last != 0 && !newMsg && !joinMessage)
{
message = lastStr + Environment.NewLine + message;
r = Bot.Edit(id, last, message, menu ?? LastMenu).Result;
}
else if ((IsGroup || last == 0) && joinMessage)
else if (joinMessage)
{
message = Players.Aggregate(message, (c, v) => c + v.GetName() + " has joined\n");
if (IsGroup)
{
LastMessageSent = "";
message = Players.Aggregate(message, (c, v) => c + v.GetName() + " has joined\n");
r = Bot.Edit(ChatId, last, message, LastMenu).Result;
}
else
else if (last == 0)
{
p.LastMessageSent = "";
message = Players.Aggregate(message, (c, v) => c + v.GetName() + " has joined\n");
r = Bot.SendAsync(message, id, customMenu: menu ?? LastMenu).Result;
}
else if (last != 0)
{
r = Bot.Edit(id, last, message, customMenu: menu ?? LastMenu).Result;
}
}
else
{
r = Bot.SendAsync(message, id, clearKeyboard, menu, game: this).Result;
if (!specialMenu)
LastMenu = menu;
}
if (p != null & !specialMenu)
if (p != null && !specialMenu)
{
p.LastMessageId = r.MessageId;
p.LastMessageSent = message;
Expand Down