From 76780d793672385cce873aecde6e4b5a06b4f0c7 Mon Sep 17 00:00:00 2001
From: thefish <thefish@zaar.be>
Date: Fri, 25 Sep 2020 01:13:26 +0300
Subject: [PATCH] fix GetEntitiesWuthComponent, pickup logic fixed accordingly

---
 engine/ecs/controller.go | 13 +++++++++----
 engine/items/carried.go  | 16 ++++------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/engine/ecs/controller.go b/engine/ecs/controller.go
index 77d3f59..8383668 100644
--- a/engine/ecs/controller.go
+++ b/engine/ecs/controller.go
@@ -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
 }
 
diff --git a/engine/items/carried.go b/engine/items/carried.go
index 41e43be..a190823 100644
--- a/engine/items/carried.go
+++ b/engine/items/carried.go
@@ -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)
 		}