Movement validations flow setup

cardinal/msg/movement_player.go

@@ -2,7 +2,7 @@ package msg
 
 type MovementPlayerMsg struct {
 	TargetNickname string  `json:"target"`
-	Velocity       int     `json:"velocity"`
+	Velocity       float64 `json:"velocity"`
 	Direction      int     `json:"direction"`
 	LocationX      float64 `json:"locationX"`
 	LocationY      float64 `json:"locationY"`

cardinal/system/default_spawner.go

@@ -13,9 +13,18 @@
 func SpawnDefaultPlayersSystem(world cardinal.WorldContext) error {
 	for i := 0; i < 10; i++ {
 		name := fmt.Sprintf("default-%d", i)
+		fmt.Println("Creating entity for ", name)
 		_, err := cardinal.Create(world,
 			comp.Player{Nickname: name},
 			comp.Health{HP: InitialHP},
+			comp.Movement{
+				CurrentLocation: comp.Location{X: InitialXLocation, Y: InitialYLocation},
+				Velocity:        InitialVelocity,
+				CurrentDirection: comp.Direction{
+					comp.Directions[InitialDirection].X,
+					comp.Directions[InitialDirection].Y,
+				},
+			},
 		)
 		if err != nil {
 			return err

cardinal/system/movement_system.go

@@ -12,17 +12,19 @@
 
 // MovementSystem updates the player's location based on its velocity and direction.
 func MovementSystem(world cardinal.WorldContext) error {
+	fmt.Println("Hello from movement system")
+
 	return cardinal.NewSearch().Entity(
-		filter.Exact(filter.Component[comp.Player](), filter.Component[comp.Movement]())).
+		filter.Contains(filter.Component[comp.Movement]())).
 		Each(world, func(id types.EntityID) bool {
 			movement, err := cardinal.GetComponent[comp.Movement](world, id)
 			if err != nil {
+				fmt.Println("Error in movement system")
 				return true
 			}
-
-			// TODO: How to get delta time?
-			movement.CurrentLocation.X += movement.Velocity * float64(movement.CurrentDirection.X)
-			movement.CurrentLocation.Y += movement.Velocity * float64(movement.CurrentDirection.Y)
+			// Simulate the motion of the player
+			movement.CurrentLocation.X += movement.Velocity * float64(movement.CurrentDirection.X) * 0.2
+			movement.CurrentLocation.Y += movement.Velocity * float64(movement.CurrentDirection.Y) * 0.2
 
 			if err := cardinal.SetComponent[comp.Movement](world, id, movement); err != nil {
 				return true
@@ -35,21 +37,38 @@
 	return cardinal.EachMessage[msg.MovementPlayerMsg, msg.MovementPlayerMsgReply](
 		world,
 		func(movement cardinal.TxData[msg.MovementPlayerMsg]) (msg.MovementPlayerMsgReply, error) {
+			fmt.Println("Hello from movement validation system", movement)
 			playerID, playerMovementData, err := queryTargetPlayerMovementData(world, movement.Msg.TargetNickname)
 			if err != nil {
 				return msg.MovementPlayerMsgReply{}, fmt.Errorf("failed to update movement: %w", err)
 			}
-			const errorTolerance float64 = 0.001
+			const errorTolerance float64 = 5
 			if math.Abs(playerMovementData.CurrentLocation.X-movement.Msg.LocationX) > errorTolerance ||
 				math.Abs(playerMovementData.CurrentLocation.Y-movement.Msg.LocationY) > errorTolerance {
-				return msg.MovementPlayerMsgReply{IsValid: false, LocationX: playerMovementData.CurrentLocation.X, LocationY: playerMovementData.CurrentLocation.Y}, nil
-			} else {
-				playerMovementData.CurrentLocation.X = movement.Msg.LocationX
-				playerMovementData.CurrentLocation.Y = movement.Msg.LocationY
-				if err := cardinal.SetComponent[comp.Movement](world, playerID, playerMovementData); err != nil {
-					return msg.MovementPlayerMsgReply{IsValid: false, LocationX: playerMovementData.CurrentLocation.X, LocationY: playerMovementData.CurrentLocation.Y}, fmt.Errorf("failed to update movement: %w", err)
-				}
-				return msg.MovementPlayerMsgReply{IsValid: true, LocationX: playerMovementData.CurrentLocation.X, LocationY: playerMovementData.CurrentLocation.Y}, nil
+				fmt.Println(fmt.Errorf("player moved too far from server location"))
+				// force player to reset to servers location
+				return msg.MovementPlayerMsgReply{IsValid: false,
+						LocationX: playerMovementData.CurrentLocation.X,
+						LocationY: playerMovementData.CurrentLocation.Y},
+					nil
+			}
+
+			// update the movement if its error margin is within the tolerance
+			playerMovementData.Velocity = movement.Msg.Velocity
+			playerMovementData.CurrentDirection = comp.Directions[movement.Msg.Direction]
+			playerMovementData.CurrentLocation.X = movement.Msg.LocationX
+			playerMovementData.CurrentLocation.Y = movement.Msg.LocationY
+			fmt.Println(playerMovementData)
+			if err := cardinal.SetComponent[comp.Movement](world, playerID, playerMovementData); err != nil {
+				return msg.MovementPlayerMsgReply{IsValid: false,
+						LocationX: playerMovementData.CurrentLocation.X,
+						LocationY: playerMovementData.CurrentLocation.Y},
+					fmt.Errorf("failed to update movement: %w", err)
 			}
+			fmt.Println("Updated player movement ", err)
+			return msg.MovementPlayerMsgReply{IsValid: true,
+					LocationX: playerMovementData.CurrentLocation.X,
+					LocationY: playerMovementData.CurrentLocation.Y},
+				nil
 		})
 }

cardinal/system/regen.go

@@ -1,6 +1,7 @@
 package system
 
 import (
+	"fmt"
 	"pkg.world.dev/world-engine/cardinal"
 	"pkg.world.dev/world-engine/cardinal/search/filter"
 	"pkg.world.dev/world-engine/cardinal/types"
@@ -18,6 +19,7 @@
 			if err != nil {
 				return true
 			}
+			fmt.Println(id)
 			health.HP++
 			if err := cardinal.SetComponent[comp.Health](world, id, health); err != nil {
 				return true

cardinal/system/utils.go

@@ -50,19 +50,18 @@
 	return playerID, playerHealth, err
 }
 
 func queryTargetPlayerMovementData(world cardinal.WorldContext, targetNickname string) (types.EntityID, *comp.Movement, error) {
 	var playerID types.EntityID
 	var playerMovementComponent *comp.Movement
 	var err error
 	searchErr := cardinal.NewSearch().Entity(
-		filter.Exact(filter.Component[comp.Player](), filter.Component[comp.Movement]())).Each(world,
+		filter.Contains(filter.Component[comp.Movement]())).Each(world,
 		func(id types.EntityID) bool {
 			var player *comp.Player
 			player, err = cardinal.GetComponent[comp.Player](world, id)
 			if err != nil {
 				return false
 			}
-
 			// Terminates the search if the player is found
 			if player.Nickname == targetNickname {
 				playerID = id