From 2c7c17e727ebc367c41949f6dd863d9da87de6bf Mon Sep 17 00:00:00 2001
From: Sacha Ligthert <sacha@ligthert.net>
Date: Wed, 6 Dec 2023 19:23:47 +0100
Subject: [PATCH] Change game-logic a bit. Reduces trash. Addresses #3 and #11.

---
 robots.go | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/robots.go b/robots.go
index c0905b9..699ac64 100644
--- a/robots.go
+++ b/robots.go
@@ -43,21 +43,28 @@ func (game *Game) moveRobots() {
 	// After all the moves, lets check if any of the rowboz collided with anything
 	for i, r := range game.robots {
 
-		// Check if it collides with anything.
+		// Hit a player? Game over
 		if game.onPlayer(r) {
 			game.gameover = 1
 			return
 		}
 
-		if game.onRobot(i, r) || game.onTrash(r) {
+		// Robots mingling? Trash
+		if game.onRobot(i, r) {
 
-			trash := r
-
-			// delete robot
+			// Delete robot
 			game.deleteRobot(i)
 
-			// create trash
-			game.addTrash(trash)
+			// Create trash
+			game.addTrash(r)
+
+		}
+
+		// Colided with Trash
+		if game.onTrash(r) {
+
+			// Delete robot
+			game.deleteRobot(i)
 
 		}