Feat/raft

cardinal/component/building.go

@@ -30,6 +30,7 @@ func GetAllBuildingTypes() []BuildingType {
 }
 
 type Building struct {
+	TileID          int          `json:"tileID"`
 	Level           int          `json:"level"`
 	Type            BuildingType `json:"type"`
 	Farming         *Farming     `json:"farming,omitempty"`
@@ -43,6 +44,7 @@ func (Building) Name() string {
 }
 
 type BuildingConstants struct {
+	TileID          int
 	UnitLimit       int
 	StorageCapacity int
 	Resources       []Resource
@@ -53,6 +55,7 @@ type BuildingConstants struct {
 
 var BuildingConfigs = map[BuildingType]BuildingConstants{
 	Main: {
+		TileID:          constants.MainTileID,
 		Resources:       []Resource{},
 		UnitLimit:       constants.MainUnitLimit,
 		StorageCapacity: constants.MainStorageCapacity,
@@ -100,6 +103,7 @@ var BuildingConfigs = map[BuildingType]BuildingConstants{
 				{Type: Wood, Amount: constants.ShipyardEffectRaftResourceWood},
 				{Type: Fish, Amount: constants.ShipyardEffectRaftResourceFish},
 			},
+			BuildingTimeSeconds: constants.ShipyardEffectRaftBuildSeconds,
 		},
 		TileType: CoastlineTile,
 	},
@@ -128,6 +132,7 @@ func GetBuilding(buildingType BuildingType) (Building, error) {
 	switch buildingType {
 	case Main:
 		return Building{
+			TileID:          config.TileID,
 			Level:           1,
 			Type:            buildingType,
 			UnitLimit:       config.UnitLimit,
@@ -153,14 +158,9 @@ func GetBuilding(buildingType BuildingType) (Building, error) {
 		}, nil
 	case Shipyard:
 		return Building{
-			Level: 1,
-			Type:  buildingType,
-			Effect: &Effect{
-				Type:      config.Effect.Type,
-				Amount:    0,
-				Capacity:  config.Effect.Capacity,
-				Resources: config.Effect.Resources,
-			},
+			Level:  1,
+			Type:   buildingType,
+			Effect: config.Effect,
 		}, nil
 	case Warehouse:
 		return Building{

cardinal/component/effect.go

@@ -1,5 +1,7 @@
 package component
 
+import "oceanus-shard/constants"
+
 type EffectType string
 
 const (
@@ -12,11 +14,22 @@ func GetAllEffectTypes() []EffectType {
 	}
 }
 
+func GetCapacityByEffectType(effectType EffectType) int {
+	switch effectType {
+	case Raft:
+		return constants.ShipyardEffectRaftCapacity
+	default:
+		return 0
+	}
+}
+
 type Effect struct {
-	Type      EffectType `json:"type"`
-	Amount    int        `json:"amount"`
-	Capacity  int        `json:"capacity"`
-	Resources []Resource `json:"resources,omitempty"`
+	Type                  EffectType `json:"type"`
+	Amount                int        `json:"amount"`
+	Capacity              int        `json:"capacity"`
+	Resources             []Resource `json:"resources,omitempty"`
+	BuildingTimeSeconds   int        `json:"buildingTimeSeconds,omitempty"`
+	BuildingTimeStartedAt uint64     `json:"buildingTimeStartedAt,omitempty"`
 }
 
 func (Effect) Name() string {

cardinal/constants/buildings.go

@@ -1,6 +1,7 @@
 package constants
 
 const (
+	MainTileID    = 22
 	MainUnitLimit = 5
 	// MainStorageCapacity = 10
 	MainStorageCapacity = 100
@@ -31,6 +32,7 @@ const (
 	ShipyardEffectRaftCapacity     = 1
 	ShipyardEffectRaftResourceWood = 10
 	ShipyardEffectRaftResourceFish = 20
+	ShipyardEffectRaftBuildSeconds = 60
 )
 
 const (

cardinal/go.mod

@@ -4,7 +4,6 @@ go 1.22.1
 
 require (
 	github.com/rs/zerolog v1.32.0
-	gotest.tools/v3 v3.5.1
 	pkg.world.dev/world-engine/cardinal v1.5.1
 )
 
@@ -113,6 +112,7 @@ require (
 	gopkg.in/DataDog/dd-trace-go.v1 v1.63.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
+	gotest.tools/v3 v3.5.1 // indirect
 	pkg.world.dev/world-engine/rift v1.1.0-beta.0.20240402214846-de1fc179818a // indirect
 	pkg.world.dev/world-engine/sign v1.0.1-beta // indirect
 )

cardinal/main.go

@@ -47,18 +47,14 @@ func MustInitWorld(w *cardinal.World) {
 	// NOTE: You must register your transactions here for it to be executed.
 	Must(
 		cardinal.RegisterMessage[msg.CreatePlayerMsg, msg.CreatePlayerResult](w, "create-player"),
-		cardinal.RegisterMessage[msg.AttackPlayerMsg, msg.AttackPlayerMsgReply](w, "attack-player"),
 		cardinal.RegisterMessage[msg.CreateBuildingMsg, msg.CreateBuildingResult](w, "create-building"),
 		cardinal.RegisterMessage[msg.DeleteBuildingMsg, msg.DeleteBuildingResult](w, "delete-building"),
+		cardinal.RegisterMessage[msg.CreateEffectMsg, msg.CreateEffectResult](w, "create-effect"),
 	)
 
 	// Register queries
 	// NOTE: You must register your queries here for it to be accessible.
 	Must(
-		cardinal.RegisterQuery[
-			query.PlayerHealthRequest,
-			query.PlayerHealthResponse,
-		](w, "player-health", query.PlayerHealth),
 		cardinal.RegisterQuery[
 			query.MapStateRequest,
 			query.MapStateResponse,
@@ -78,11 +74,12 @@ func MustInitWorld(w *cardinal.World) {
 	// For example, you may want to run the attack system before the regen system
 	// so that the player's HP is subtracted (and player killed if it reaches 0) before HP is regenerated.
 	Must(cardinal.RegisterSystems(w,
-		system.AttackSystem,
 		system.FarmingSystem,
 		system.PlayerSpawnerSystem,
 		system.CreateBuildingSystem,
 		system.DeleteBuildingSystem,
+		system.CreateEffectSystem,
+		system.EffectsSpawnerSystem,
 	))
 }
 

cardinal/msg/create_effect.go

@@ -0,0 +1,10 @@
+package msg
+
+type CreateEffectMsg struct {
+	EffectType string `json:"effectType"`
+	TileIndex  int    `json:"tileIndex"`
+}
+
+type CreateEffectResult struct {
+	Success bool `json:"success"`
+}

cardinal/system/create_building.go

@@ -35,18 +35,20 @@ func CreateBuildingSystem(world cardinal.WorldContext) error {
 					fmt.Errorf("failed to create building, this building doesn't fit this tiletype")
 			}
 
-			if err := SubtractResourcesToBuild(world, building, request.Tx.PersonaTag); err != nil {
-				return msg.CreateBuildingResult{Success: false}, err
-			}
-
 			tile := &(*playerMap.Tiles)[request.Msg.TileIndex]
 			if tile.Building == nil {
+				building.TileID = request.Msg.TileIndex
 				tile.Building = &building
 			} else {
 				return msg.CreateBuildingResult{Success: false},
 					fmt.Errorf("failed to create building, this tile already have another building")
 			}
 
+			resourcesForBuild := comp.BuildingConfigs[building.Type].Resources
+			if err := SubtractResources(world, resourcesForBuild, request.Tx.PersonaTag); err != nil {
+				return msg.CreateBuildingResult{Success: false}, err
+			}
+
 			player, _ := cardinal.GetComponent[comp.Player](world, mapEntityID)
 
 			if err := cardinal.SetComponent(world, mapEntityID, playerMap); err != nil {
@@ -55,14 +57,7 @@ func CreateBuildingSystem(world cardinal.WorldContext) error {
 
 			buildingEntityID, _ := cardinal.Create(world,
 				player,
-				comp.Building{
-					Level:           building.Level,
-					Type:            building.Type,
-					Farming:         building.Farming,
-					Effect:          building.Effect,
-					UnitLimit:       building.UnitLimit,
-					StorageCapacity: building.StorageCapacity,
-				},
+				building,
 			)
 
 			if building.Farming != nil {
@@ -83,16 +78,15 @@ func CreateBuildingSystem(world cardinal.WorldContext) error {
 		})
 }
 
-func SubtractResourcesToBuild(world cardinal.WorldContext, building comp.Building, personaTag string) error {
+func SubtractResources(world cardinal.WorldContext, resources []comp.Resource, personaTag string) error {
 	playerResourcesEntityID, playerResources, _ := QueryComponent[comp.PlayerResources](
 		world,
 		personaTag,
 		filter.Component[comp.Player](),
 		filter.Component[comp.PlayerResources](),
 	)
 
-	resourcesToBuild := comp.BuildingConfigs[building.Type].Resources
-	for _, resource := range resourcesToBuild {
+	for _, resource := range resources {
 		var playerResource *comp.Resource
 		var err error
 		if playerResource, err = GetResourceByType(playerResources, resource.Type); err != nil {