all: Refactored the game interface to use 'ebitenui'

action/action.go

@@ -22,11 +22,11 @@ type Action struct {
 	TowerAttack          *TowerAttackPayload          `json:"tower_attack,omitempty"`
 	UnitKilled           *UnitKilledPayload           `json:"unit_killed,omitempty"`
 	WindowResizing       *WindowResizingPayload       `json:"window_resizing,omitempty"`
-	PlayerReady          *PlayerReadyPayload          `json:"player_ready, omitempty"`
 	NavigateTo           *NavigateToPayload           `json:"navigate_to, omitempty"`
 	StartGame            *StartGamePayload            `json:"start_game, omitempty"`
 	GoHome               *GoHomePayload               `json:"go_home, omitempty"`
 	CheckedPath          *CheckedPathPayload          `json:"checked_path,omitempty"`
+	ToggleStats          *ToggleStatsPayload          `json:"toggle_stats,omitempty"`
 
 	OpenTowerMenu  *OpenTowerMenuPayload  `json:"open_tower_menu, omitempty"`
 	CloseTowerMenu *CloseTowerMenuPayload `json:"close_tower_menu, omitempty"`
@@ -284,28 +284,13 @@ func NewAddPlayer(id, name string, lid int) *Action {
 }
 
 type RemovePlayerPayload struct {
-	ID   string
-	Room string
+	ID string
 }
 
-func NewRemovePlayer(r, id string) *Action {
+func NewRemovePlayer(id string) *Action {
 	return &Action{
 		Type: RemovePlayer,
 		RemovePlayer: &RemovePlayerPayload{
-			ID:   id,
-			Room: r,
-		},
-	}
-}
-
-type PlayerReadyPayload struct {
-	ID string
-}
-
-func NewPlayerReady(id string) *Action {
-	return &Action{
-		Type: PlayerReady,
-		PlayerReady: &PlayerReadyPayload{
 			ID: id,
 		},
 	}
@@ -325,15 +310,12 @@ func NewNavigateTo(route string) *Action {
 }
 
 type StartGamePayload struct {
-	Room string
 }
 
-func NewStartGame(r string) *Action {
+func NewStartGame() *Action {
 	return &Action{
-		Type: StartGame,
-		StartGame: &StartGamePayload{
-			Room: r,
-		},
+		Type:      StartGame,
+		StartGame: &StartGamePayload{},
 	}
 }
 
@@ -381,6 +363,16 @@ func NewCheckedPath(cp bool) *Action {
 	}
 }
 
+type ToggleStatsPayload struct {
+}
+
+func NewToggleStats() *Action {
+	return &Action{
+		Type:        ToggleStats,
+		ToggleStats: &ToggleStatsPayload{},
+	}
+}
+
 type SignUpErrorPayload struct {
 	Error string
 }
@@ -500,7 +492,6 @@ type UpdateStatePlayerPayload struct {
 	Gold    int
 	Current bool
 	Winner  bool
-	Ready   bool
 }
 
 type UpdateStateTowersPayload struct {

action/type.go

@@ -35,6 +35,7 @@ const (
 	UserSignOut
 	JoinWaitingRoom
 	ExitWaitingRoom
+	ToggleStats
 
 	// Specific to WS
 	AddPlayer

assets/assets.go

@@ -75,9 +75,6 @@ var TilesetHouse_png []byte
 //go:embed TilesetLogic.png
 var TilesetLogic_png []byte
 
-//go:embed TilesetElement.png
-var TilesetElement_png []byte
-
 //go:embed maps/2.png
 var Map_2_png []byte
 

client/action.go

@@ -130,11 +130,11 @@ func (ac *ActionDispatcher) UnitKilled(pid, ut string) {
 	ac.dispatcher.Dispatch(uk)
 }
 
-// PlayerReady marks the player as ready to start the game
-func (ac *ActionDispatcher) PlayerReady(pid string) {
-	pr := action.NewPlayerReady(pid)
-	wsSend(pr)
-	ac.dispatcher.Dispatch(pr)
+func (ac *ActionDispatcher) RemovePlayer(pid string) {
+	rpa := action.NewRemovePlayer(pid)
+	wsSend(rpa)
+	ac.dispatcher.Dispatch(rpa)
+	ac.dispatcher.Dispatch(action.NewNavigateTo(LobbyRoute))
 }
 
 // WindowResizing new sizes of the window
@@ -149,14 +149,6 @@ func (ac *ActionDispatcher) NavigateTo(route string) {
 	ac.dispatcher.Dispatch(nt)
 }
 
-// StartGame notifies that the game will start,
-// used to update any store before that
-func (ac *ActionDispatcher) StartGame(r string) {
-	sg := action.NewStartGame(r)
-	wsSend(sg)
-	ac.dispatcher.Dispatch(sg)
-}
-
 // OpenTowerMenu when a tower is clicked and the menu of
 // the tower is displayed
 func (ac *ActionDispatcher) OpenTowerMenu(tid string) {
@@ -256,3 +248,9 @@ func (ac *ActionDispatcher) ExitWaitingRoom(un string) {
 
 	ac.dispatcher.Dispatch(action.NewNavigateTo(LobbyRoute))
 }
+
+func (ac *ActionDispatcher) ToggleStats() {
+	tsa := action.NewToggleStats()
+
+	ac.dispatcher.Dispatch(tsa)
+}

client/game.go

@@ -1,9 +1,8 @@
 package client
 
 import (
-	"image"
-
 	"github.com/hajimehoshi/ebiten/v2"
+	"github.com/xescugc/maze-wars/action"
 	"github.com/xescugc/maze-wars/store"
 )
 
@@ -19,35 +18,31 @@ type Game struct {
 	Units  *Units
 	Towers *Towers
 
-	SessionID string
+	Map *Map
 }
 
 func (g *Game) Update() error {
+	g.Map.Update()
 	g.Camera.Update()
 	g.HUD.Update()
 	g.Units.Update()
 	g.Towers.Update()
 
+	if len(g.Store.Players.List()) == 0 {
+		actionDispatcher.Dispatch(action.NewAddPlayer("1", "test1", 0))
+		actionDispatcher.Dispatch(action.NewAddPlayer("2", "test2", 1))
+		actionDispatcher.Dispatch(action.NewAddPlayer("3", "test3", 2))
+		actionDispatcher.Dispatch(action.NewAddPlayer("4", "test4", 3))
+		actionDispatcher.Dispatch(action.NewAddPlayer("5", "test5", 4))
+		actionDispatcher.Dispatch(action.NewAddPlayer("6", "test6", 5))
+	}
 	actionDispatcher.TPS()
 
 	return nil
 }
 
 func (g *Game) Draw(screen *ebiten.Image) {
-
-	// Draw will draw just a partial image of the map based on the viewport, so it does not render everything but just the
-	// part that it's seen by the user
-	// If we want to render everything and just move the viewport around we need o render the full image and change the
-	// opt.GeoM.Transport to the Map.X/Y and change the Update function to do the opposite in terms of -+
-	//
-	// TODO: Maybe create a self Map entity with Update/Draw
-	op := &ebiten.DrawImageOptions{}
-	s := g.Camera.GetState().(CameraState)
-	op.GeoM.Scale(s.Zoom, s.Zoom)
-	inverseZoom := maxZoom - s.Zoom + zoomScale
-	mi := ebiten.NewImageFromImage(g.Store.Map.GetState().(store.MapState).Image)
-	screen.DrawImage(mi.SubImage(image.Rect(int(s.X), int(s.Y), int((s.X+s.W)*inverseZoom), int((s.Y+s.H)*inverseZoom))).(*ebiten.Image), op)
-
+	g.Map.Draw(screen)
 	g.Camera.Draw(screen)
 	g.HUD.Draw(screen)
 	g.Units.Draw(screen)