WIP change for bugfix help

shantanu-argus · Nov 14, 2024 · 7aab0b3 · 7aab0b3
1 parent 7244207
commit 7aab0b3
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 16 deletions.
diff --git a/cardinal/system/default_spawner.go b/cardinal/system/default_spawner.go
@@ -13,9 +13,18 @@ import (
 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

diff --git a/cardinal/system/movement_system.go b/cardinal/system/movement_system.go
@@ -12,44 +12,69 @@ import (
 
 // 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]())).
 		Each(world, func(id types.EntityID) bool {
 			movement, err := cardinal.GetComponent[comp.Movement](world, id)
 			if err != nil {
+				fmt.Println("Error in movement system", err)
 				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)
-
+			fmt.Println(movement)
 			if err := cardinal.SetComponent[comp.Movement](world, id, movement); err != nil {
 				return true
 			}
 			return true
 		})
+	//return cardinal.NewSearch().Entity(
+	//	filter.Exact(filter.Component[comp.Movement]())).
+	//	Each(world, func(id types.EntityID) bool {
+	//		fmt.Println("Hello from movement system")
+	//		movement, err := cardinal.GetComponent[comp.Movement](world, id)
+	//		if err != nil {
+	//			fmt.Println("Error in movement system")
+	//			return true
+	//		}
+	//		velocity := 5.0
+	//		movement.CurrentLocation.X += velocity * float64(movement.CurrentDirection.X) * 0.2
+	//		movement.CurrentLocation.Y += velocity * float64(movement.CurrentDirection.Y) * 0.2
+	//
+	//		if err := cardinal.SetComponent[comp.Movement](world, id, movement); err != nil {
+	//			return true
+	//		}
+	//		return true
+	//	})
 }
 
 func MovementValidationSystem(world cardinal.WorldContext) error {
 	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 = 0.2
 			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
+				return msg.MovementPlayerMsgReply{IsValid: false,
+						LocationX: playerMovementData.CurrentLocation.X,
+						LocationY: playerMovementData.CurrentLocation.Y},
+					nil
+			}
+			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
 		})
 }
diff --git a/cardinal/system/regen.go b/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 @@ func RegenSystem(world cardinal.WorldContext) error {
 			if err != nil {
 				return true
 			}
+			fmt.Println(id)
 			health.HP++
 			if err := cardinal.SetComponent[comp.Health](world, id, health); err != nil {
 				return true

diff --git a/cardinal/system/utils.go b/cardinal/system/utils.go
@@ -55,14 +55,14 @@ func queryTargetPlayerMovementData(world cardinal.WorldContext, targetNickname s
 	var playerMovementComponent *comp.Movement
 	var err error
 	searchErr := cardinal.NewSearch().Entity(
-		filter.Exact(filter.Component[comp.Player](), filter.Component[comp.Movement]())).Each(world,
+		filter.Exact(filter.Component[comp.Player]())).Each(world,
 		func(id types.EntityID) bool {
 			var player *comp.Player
 			player, err = cardinal.GetComponent[comp.Player](world, id)
 			if err != nil {
 				return false
 			}
-
+			fmt.Println(player)
 			// Terminates the search if the player is found
 			if player.Nickname == targetNickname {
 				playerID = id
@@ -76,6 +76,7 @@ func queryTargetPlayerMovementData(world cardinal.WorldContext, targetNickname s
 			// Continue searching if the player is not the target player
 			return true
 		})
+	fmt.Println("finding ", targetNickname)
 	if searchErr != nil {
 		return 0, nil, err
 	}