dkforest

commit 459be8b2c0c74c7d0aae8d71bc881c6f7810c064
parent b5ed9b712faaa0f4ca48a417dc205bce062d3894
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Mon,  4 Dec 2023 18:49:26 -0500

cleanup

Diffstat:
M
pkg/web/handlers/poker.go
 | 
62
++++++++++++++++++++++++++++++++------------------------------

1 file changed, 32 insertions(+), 30 deletions(-)
diff --git a/pkg/web/handlers/poker.go b/pkg/web/handlers/poker.go
@@ -85,11 +85,13 @@ func (g *PokerGame) Deal(roomID string) {
 			Top   int
 			Left  int
 			Angle string
+			Top2  int
+			Left2 int
 		}
 		seats := []Seat{
-			{Top: 50, Left: 600, Angle: "-90deg"},
-			{Top: 150, Left: 574, Angle: "-80deg"},
-			{Top: 250, Left: 530, Angle: "-70deg"},
+			{Top: 50, Left: 600, Top2: 50 + 5, Left2: 600 + 5, Angle: "-90deg"},
+			{Top: 150, Left: 574, Top2: 150 + 5, Left2: 574 + 3, Angle: "-80deg"},
+			{Top: 250, Left: 530, Top2: 250 + 5, Left2: 530 + 1, Angle: "-70deg"},
 			//{Top: 150, Left: 550},
 			//{Top: 150, Left: 550},
 			//{Top: 150, Left: 550},
@@ -106,37 +108,37 @@ func (g *PokerGame) Deal(roomID string) {
 			Reveal bool
 		}
 
-		data := []Data{
-			{seats[0].Top, seats[0].Left, seats[0].Angle, false},
-			{seats[1].Top, seats[1].Left, seats[1].Angle, false},
-			{seats[2].Top, seats[2].Left, seats[2].Angle, false},
-			{seats[0].Top + 5, seats[0].Left + 3, seats[0].Angle, false},
-			{seats[1].Top + 5, seats[1].Left + 2, seats[1].Angle, false},
-			{seats[2].Top + 5, seats[2].Left + 1, seats[2].Angle, false},
-		}
-
 		var card string
 		idx := 0
 
-		for _, d := range data {
-			time.Sleep(time.Second)
-			idx++
-			card, g.Ongoing.Deck = g.Ongoing.Deck[0], g.Ongoing.Deck[1:]
-			name := ""
-			if d.Reveal {
-				name = card
+		for j := 1; j <= 2; j++ {
+			for i, p := range g.Ongoing.Players {
+				if p == "" {
+					continue
+				}
+				d := seats[i]
+				time.Sleep(time.Second)
+				idx++
+				card, g.Ongoing.Deck = g.Ongoing.Deck[0], g.Ongoing.Deck[1:]
+				name := ""
+				left := d.Left
+				top := d.Top
+				if j == 2 {
+					left = d.Left2
+					top = d.Top2
+				}
+				evt := PokerEvent{
+					ID:    "card" + strconv.Itoa(idx),
+					Name:  name,
+					Idx:   idx,
+					Top:   top,
+					Left:  left,
+					Angle: d.Angle,
+					Burn:  true,
+				}
+				PokerPubSub.Pub(myTopic, evt)
+				g.Ongoing.Events = append(g.Ongoing.Events, evt)
 			}
-			evt := PokerEvent{
-				ID:    "card" + strconv.Itoa(idx),
-				Name:  name,
-				Idx:   idx,
-				Top:   d.Top,
-				Left:  d.Left,
-				Angle: d.Angle,
-				Burn:  !d.Reveal,
-			}
-			PokerPubSub.Pub(myTopic, evt)
-			g.Ongoing.Events = append(g.Ongoing.Events, evt)
 		}
 
 		// Burn