action: Changed the 'MoveUnit' to 'TPS'

So it's more coherent to what it actually is and changed how the off camera
cursor moves the camera around so it does not longer require a movement
but just the positon of the Cursor

action/action.go

@@ -70,9 +70,9 @@ func NewSummonUnit(t, pid string, plid, clid int) *Action {
 	}
 }
 
-func NewMoveUnit() *Action {
+func NewTPS() *Action {
 	return &Action{
-		Type: MoveUnit,
+		Type: TPS,
 	}
 }
 

action/type.go

@@ -8,7 +8,7 @@ const (
 	CursorMove Type = iota
 	CameraZoom
 	SummonUnit
-	MoveUnit
+	TPS
 	RemoveUnit
 	StealLive
 	PlaceTower

client/action.go

@@ -40,10 +40,10 @@ func (ac *ActionDispatcher) SummonUnit(unit, pid string, plid, clid int) {
 	//ac.dispatcher.Dispatch(sua)
 }
 
-// MoveUnit moves all the units
-func (ac *ActionDispatcher) MoveUnit() {
-	mua := action.NewMoveUnit()
-	ac.dispatcher.Dispatch(mua)
+// TPS is the call for every TPS event
+func (ac *ActionDispatcher) TPS() {
+	tpsa := action.NewTPS()
+	ac.dispatcher.Dispatch(tpsa)
 }
 
 // RemoveUnit removes the unit with the id 'uid'

client/camera.go

@@ -22,7 +22,8 @@ type CameraStore struct {
 // CameraState is the store data on the Camera
 type CameraState struct {
 	utils.Object
-	Zoom float64
+	Zoom               float64
+	LastCursorPosition utils.Object
 }
 
 const (
@@ -80,19 +81,23 @@ func (cs *CameraStore) Reduce(state, a interface{}) interface{} {
 
 	switch act.Type {
 	case action.CursorMove:
+		// We update the last seen cursor position to not resend unnecessary events
+		cstate.LastCursorPosition.X = float64(act.CursorMove.X)
+		cstate.LastCursorPosition.Y = float64(act.CursorMove.Y)
+	case action.TPS:
 		// If the X or Y exceed the current Height or Width then
 		// it means the cursor is moving out of boundaries so we
 		// increase the camera X/Y at a ratio of the cameraSpeed
 		// so we move it around on the map
-		if float64(act.CursorMove.Y) >= (cstate.H - leeway) {
+		if float64(cstate.LastCursorPosition.Y) >= (cstate.H - leeway) {
 			cstate.Y += cs.cameraSpeed
-		} else if act.CursorMove.Y <= (0 + leeway) {
+		} else if cstate.LastCursorPosition.Y <= (0 + leeway) {
 			cstate.Y -= cs.cameraSpeed
 		}
 
-		if float64(act.CursorMove.X) >= (cstate.W - leeway) {
+		if float64(cstate.LastCursorPosition.X) >= (cstate.W - leeway) {
 			cstate.X += cs.cameraSpeed
-		} else if act.CursorMove.X <= (0 + leeway) {
+		} else if cstate.LastCursorPosition.X <= (0 + leeway) {
 			cstate.X -= cs.cameraSpeed
 		}
 

client/game.go

@@ -28,6 +28,8 @@ func (g *Game) Update() error {
 	g.Units.Update()
 	g.Towers.Update()
 
+	actionDispatcher.TPS()
+
 	return nil
 }
 

client/logger.go

@@ -25,9 +25,9 @@ func (ss *LoggerStore) Reduce(cstate, a interface{}) interface{} {
 		return cstate
 	}
 
-	// As the MoveUnit is called on every TPS we can
+	// As the TPS is called on every TPS we can
 	// ignore it
-	if act.Type == action.MoveUnit {
+	if act.Type == action.TPS {
 		return cstate
 	}
 	// Prints all the action types

client/units.go

@@ -49,7 +49,6 @@ func NewUnits(g *Game) (*Units, error) {
 }
 
 func (us *Units) Update() error {
-	actionDispatcher.MoveUnit()
 	cp := us.game.Store.Players.FindCurrent()
 
 	for _, u := range us.game.Store.Units.List() {

integration/main_test.go

@@ -54,7 +54,7 @@ func TestRun(t *testing.T) {
 	// Start the Server
 	go func() {
 		err := server.New(sad, rooms, server.Options{
-			Port: ":5555",
+			Port: "5555",
 		})
 		require.NoError(t, err)
 	}()

server/action.go

@@ -47,9 +47,9 @@ func (ac *ActionDispatcher) IncomeTick(rooms *RoomsStore) {
 	ac.dispatcher.Dispatch(ita)
 }
 
-func (ac *ActionDispatcher) MoveUnit(rooms *RoomsStore) {
-	mua := action.NewMoveUnit()
-	ac.dispatcher.Dispatch(mua)
+func (ac *ActionDispatcher) TPS(rooms *RoomsStore) {
+	tpsa := action.NewTPS()
+	ac.dispatcher.Dispatch(tpsa)
 }
 
 func (ac *ActionDispatcher) UpdateState(rooms *RoomsStore) {

server/new.go

@@ -145,7 +145,7 @@ func startRoomsLoop(ctx context.Context, rooms *RoomsStore) {
 		case <-incomeTicker.C:
 			actionDispatcher.IncomeTick(rooms)
 		case <-moveTicker.C:
-			actionDispatcher.MoveUnit(rooms)
+			actionDispatcher.TPS(rooms)
 		case <-ctx.Done():
 			stateTicker.Stop()
 			incomeTicker.Stop()

store/reduce_test.go

@@ -131,13 +131,13 @@ func TestSummonUnit(t *testing.T) {
 	})
 }
 
-func TestMoveUnit(t *testing.T) {
+func TestTPS(t *testing.T) {
 	t.Run("Success", func(t *testing.T) {
 		s := initStore()
 		p := addPlayer(s)
 		p, u := summonUnit(s, p)
 
-		s.Dispatch(action.NewMoveUnit())
+		s.Dispatch(action.NewTPS())
 
 		ps := playersInitialState()
 		ps.Players[p.ID] = &p

store/units.go

@@ -124,7 +124,7 @@ func (us *Units) Reduce(state, a interface{}) interface{} {
 		u.Path = us.Astar(us.store.Map, u.CurrentLineID, u.MovingObject, tws)
 		u.HashPath = utils.HashSteps(u.Path)
 		ustate.Units[uid.String()] = u
-	case action.MoveUnit:
+	case action.TPS:
 		us.mxUnits.Lock()
 		defer us.mxUnits.Unlock()