dkforest

commit 8f05989d0c4442f140e9c1cc48ba3bf022df8f51
parent 40c619ad277ad54ffc8ec786ea92726b6c280d47
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed,  6 Dec 2023 04:24:12 -0500

UI

Diffstat:
M
pkg/web/handlers/poker/events.go
 | 
5
-----
M
pkg/web/handlers/poker/poker.go
 | 
19
+++++--------------

2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/pkg/web/handlers/poker/events.go b/pkg/web/handlers/poker/events.go
@@ -56,11 +56,6 @@ type YourCardEvent struct {
 	Name string
 }
 
-type ShowCardsEvent struct {
-	Top, Left int
-	Cards     []PlayerCard
-}
-
 type PokerSeatTakenEvent struct {
 }
 
diff --git a/pkg/web/handlers/poker/poker.go b/pkg/web/handlers/poker/poker.go
@@ -486,8 +486,11 @@ func dealerThread(g *PokerGame, roomID string) {
 	// Show cards
 	for idx, p := range g.Ongoing.Players {
 		if p != nil && !p.Folded {
-			fmt.Println(p.Username, p.Cards)
-			PokerPubSub.Pub(roomTopic, ShowCardsEvent{Cards: p.Cards, Top: seats[idx].Top, Left: seats[idx].Left})
+			evt1 := PokerEvent{ID: "card" + itoa(p.Cards[0].Idx), Name: p.Cards[0].Name, Idx: p.Cards[0].Idx, Top: seats[idx].Top, Left: seats[idx].Left, Reveal: true}
+			evt2 := PokerEvent{ID: "card" + itoa(p.Cards[1].Idx), Name: p.Cards[1].Name, Idx: p.Cards[1].Idx, Top: seats[idx].Top, Left: seats[idx].Left + 53, Reveal: true}
+			PokerPubSub.Pub(roomTopic, evt1)
+			PokerPubSub.Pub(roomTopic, evt2)
+			g.Ongoing.Events = append(g.Ongoing.Events, evt1, evt2)
 		}
 	}
 
@@ -871,16 +874,6 @@ func drawPlayerFoldEvent(evt PlayerFoldEvent) (html string) {
 	return
 }
 
-func drawShowCardsEvent(evt ShowCardsEvent) (html string) {
-	html += `<style>`
-	html += `#card` + itoa(evt.Cards[0].Idx) + ` { transition: 1s ease-in-out; transform: translateX(` + itoa(evt.Left) + `px) translateY(` + itoa(evt.Top) + `px) rotateY(0); }`
-	html += `#card` + itoa(evt.Cards[1].Idx) + ` { transition: 1s ease-in-out; transform: translateX(` + itoa(evt.Left+53) + `px) translateY(` + itoa(evt.Top) + `px) rotateY(0); }`
-	html += `#card` + itoa(evt.Cards[0].Idx) + ` .card .inner:before { content: "` + evt.Cards[0].Name + `"; color: ` + colorForCard(evt.Cards[0].Name) + `; }`
-	html += `#card` + itoa(evt.Cards[1].Idx) + ` .card .inner:before { content: "` + evt.Cards[1].Name + `"; color: ` + colorForCard(evt.Cards[1].Name) + `; }`
-	html += `</style>`
-	return
-}
-
 func drawResetCardsEvent() (html string) {
 	html += `<style>`
 	for i := 1; i <= 52; i++ {
@@ -1301,8 +1294,6 @@ Loop:
 			send(drawErrorMsgEvent(evt))
 		case PlayerFoldEvent:
 			send(drawPlayerFoldEvent(evt))
-		case ShowCardsEvent:
-			send(drawShowCardsEvent(evt))
 		case ResetCardsEvent:
 			send(drawResetCardsEvent())
 		case PokerSeatTakenEvent: