thefish/alchemyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix GetEntitiesWuthComponent, pickup logic fixed accordingly

Browse Source
This commit is contained in:
thefish 2020-09-25 01:13:26 +03:00
parent 9f3eaafa3f
commit 76780d7936
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
engine/ecs/controller.go
View File

@ -138,15 +138,20 @@ func (c *Controller) GetEntities() map[Entity]map[string]Component {
}
// GetEntitiesWithComponent returns a list of all entities with a given component attached
// TODO: Allow for passing a list of components
func (c *Controller) GetEntitiesWithComponent(componentType string) []Entity {
func (c *Controller) GetEntitiesWithComponent(componentTypes... string) []Entity {
entitiesWithComponent := make([]Entity, 0)
for entity := range c.entities {
if c.HasComponent(entity, componentType) {
mustAddThis := true
for _, componentType := range componentTypes {
if !c.HasComponent(entity, componentType) {
mustAddThis = false
break
}
}
if mustAddThis {
entitiesWithComponent = append(entitiesWithComponent, entity)
}
}
return entitiesWithComponent
}

16
engine/items/carried.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
"lab.zaar.be/thefish/alchemyst-go/engine/ecs"
"lab.zaar.be/thefish/alchemyst-go/engine/types"
"lab.zaar.be/thefish/alchemyst-go/util/appctx"
)
type CarriedFace interface {
@ -95,18 +94,11 @@ func (c *Carried) GetBulk(what ecs.Entity) int {
func FindCarriedUnder(who ecs.Entity) []ecs.Entity {
pickerCoords := Controller.GetComponent(who, ecs.CoordsComponent).(types.Coords)
carrieds := Controller.GetEntitiesWithComponent(ecs.CarriedComponent)
// _И_ носимые _И_ имеющие координаты, т.е. где-то лежащие
carrieds := Controller.GetEntitiesWithComponent(ecs.CarriedComponent, ecs.CoordsComponent)
result := make([]ecs.Entity, 0)
for idx, carried := range carrieds {
appctx.Logger().Info().Msgf("%d - %s", idx, carried)
maybeCoords := Controller.GetComponent(carried, ecs.CoordsComponent)
//if maybeCoords == nil {
// continue
//}
// убедились что что-то есть? тогда кастуем в тип
carriedCoords := maybeCoords.(types.Coords)
for _, carried := range carrieds {
carriedCoords := Controller.GetComponent(carried, ecs.CoordsComponent).(types.Coords)
if pickerCoords.IsAdjacentTo(&carriedCoords) {
result = append(result, carried)
}