diff --git a/src/controllers/duelController.go b/src/controllers/duelController.go index fcd9873..1c460d0 100644 --- a/src/controllers/duelController.go +++ b/src/controllers/duelController.go @@ -150,30 +150,21 @@ func (s *DuelController) CheckWin(r tele.Recipient) { userOne := s.DC.GetUser(s.PlayerOne.ID) userTwo := s.DC.GetUser(s.PlayerTwo.ID) time.Sleep(time.Second * 3) - var winner int = 0 if s.PlayerOne.Counter > s.PlayerTwo.Counter { - winner = 1 - } else { - winner = 2 - } - - if winner == 1 { - s.Bot.Send(r, fmt.Sprintf("Игрок %s победил!", s.PlayerOne.FName)) + s.Bot.Send(r, fmt.Sprintf("%s победил!", s.PlayerOne.FName)) s.DC.UpdateDick(userOne.ID, userOne.DickSize+(s.Summ/2)) s.DC.UpdateDick(userTwo.ID, userTwo.DickSize-(s.Summ/2)) - s.Inited = false - } else if winner == 2 { - s.Bot.Send(r, fmt.Sprintf("Игрок %s победил!", s.PlayerTwo.FName)) + } else if s.PlayerOne.Counter < s.PlayerTwo.Counter { + s.Bot.Send(r, fmt.Sprintf("%s победил!", s.PlayerTwo.FName)) s.DC.UpdateDick(userOne.ID, userOne.DickSize-(s.Summ/2)) s.DC.UpdateDick(userTwo.ID, userTwo.DickSize+(s.Summ/2)) - s.Inited = false - } else { + } else if s.PlayerOne.Counter == s.PlayerTwo.Counter { s.Bot.Send(r, "Ничья!") - s.Inited = false } s.PlayerOne.Counter = 0 s.PlayerTwo.Counter = 0 s.Summ = 0 + s.Inited = false }