Merge branch 'master' of https://codeberg.org/metamuffin/undercooked

1 files changed, 15 insertions, 7 deletions

diff --git a/client/map/tiles/counter.gd b/client/map/tiles/counter.gd
index 62868087..d511e90d 100644
--- a/client/map/tiles/counter.gd
+++ b/client/map/tiles/counter.gd
@@ -1,28 +1,33 @@
 # Undercooked - a game about cooking
 # Copyright 2024 nokoe
-# 
+#
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
 # the Free Software Foundation, version 3 of the License only.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU Affero General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-# 
+#
 class_name Counter
 extends FullTile
 
-const counters: Array = [
+const COUNTERS: Array = [
 	"counter",
 	"pan",
 	"sink",
 	"oven",
 ]
 
+const FLOORS: Array = [
+	"floor",
+	"grass",
+]
+
 enum CounterKind {
 	OUTER_CORNER,
 	STRAIGHT,
@@ -43,7 +48,7 @@ func _init(rename: String, neighbors: Array):
 	for start in range(4):
 		var series = 0
 		for i in range(4):
-			if neighbors[(start + i) % 4] == "floor":
+			if Counter.is_floor(neighbors[(start + i) % 4]):
 				series += 1
 			else:
 				break
@@ -67,4 +72,7 @@ func _init(rename: String, neighbors: Array):
 static func is_counter(tile_name_t) -> bool:
 	if tile_name_t == null:
 		return false
-	return tile_name_t.ends_with("crate") or counters.has(tile_name_t)
+	return tile_name_t.ends_with("crate") or COUNTERS.has(tile_name_t)
+
+static func is_floor(floor_name) -> bool:
+	return FLOORS.has(floor_name)