Implement tile stacks in client; Upgrade to Godot 4.6

5 files changed, 12 insertions, 20 deletions

diff --git a/client/gui/menus/entry.tscn b/client/gui/menus/entry.tscn
index f4eced3e..a4e74f5e 100644
--- a/client/gui/menus/entry.tscn
+++ b/client/gui/menus/entry.tscn
@@ -1,8 +1,8 @@
-[gd_scene load_steps=2 format=3 uid="uid://cd52sr1cmo8oj"]
+[gd_scene format=3 uid="uid://cd52sr1cmo8oj"]
 
 [ext_resource type="Script" uid="uid://yxaynnimyxgr" path="res://gui/menus/entry.gd" id="1_kibw2"]
 
-[node name="Entry" type="Control"]
+[node name="Entry" type="Control" unique_id=1447244984]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
diff --git a/client/gui/menus/game.tscn b/client/gui/menus/game.tscn
index 44efef21..f0322454 100644
--- a/client/gui/menus/game.tscn
+++ b/client/gui/menus/game.tscn
@@ -1,10 +1,10 @@
-[gd_scene load_steps=4 format=3 uid="uid://bbjwoxs71fnsk"]
+[gd_scene format=3 uid="uid://bbjwoxs71fnsk"]
 
 [ext_resource type="Script" uid="uid://bmno0s2du3ie6" path="res://gui/menus/game.gd" id="1_cdpsh"]
 [ext_resource type="PackedScene" uid="uid://c6krh36hoqfg8" path="res://game.tscn" id="2_uojcy"]
 [ext_resource type="PackedScene" uid="uid://cr26jennm5c0c" path="res://gui/overlays/overlays.tscn" id="3_eaud4"]
 
-[node name="GameMenu" type="Control"]
+[node name="GameMenu" type="Control" unique_id=348091771]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -14,7 +14,7 @@ grow_vertical = 2
 script = ExtResource("1_cdpsh")
 auto_anim = false
 
-[node name="Game" parent="." instance=ExtResource("2_uojcy")]
+[node name="Game" parent="." unique_id=229241562 instance=ExtResource("2_uojcy")]
 
-[node name="Overlays" parent="." instance=ExtResource("3_eaud4")]
+[node name="Overlays" parent="." unique_id=553707754 instance=ExtResource("3_eaud4")]
 layout_mode = 1
diff --git a/client/gui/menus/main/background.gd b/client/gui/menus/main/background.gd
index e2a0d3be..6bf31ef9 100644
--- a/client/gui/menus/main/background.gd
+++ b/client/gui/menus/main/background.gd
@@ -26,7 +26,7 @@ func _ready():
 	if !Global.on_vulkan():
 		environment.environment.tonemap_exposure = 0.25
 
-	var tiles: Dictionary[Vector2i, Variant] = {} # : Dictionary[Vector2i, String?]
+	var tiles: Dictionary[Vector2i, Array] = {} # : Dictionary[Vector2i, Array[String]]
 	var item_counters := []
 	for x in range(-10, 11):
 		for y in range(-10, 11):
@@ -37,19 +37,11 @@ func _ready():
 			if k > 0.4: tile = choose(CRATES) if randf() > 0.7 else "counter"
 			if k > 0.6: tile = choose(TOOLS)
 			if tile != null:
-				tiles[Vector2i(x,y)] = tile
+				tiles[Vector2i(x,y)] = [tile]
 				if tile == "counter" and randf() > 0.5 and w > 0.45:
 					item_counters.push_back(Vector2i(x, y))
-	var get_tile := func (cs: Vector2i):
-		return tiles.get(cs)
-	for tile_pos: Vector2i in tiles.keys():
-		var x := tile_pos.x
-		var y := tile_pos.y
-		var tile = get_tile.call(tile_pos)
-		if tile != null:
-			map.set_tile(Vector2i(x,y), tile,
-				[Vector2i(x,y-1),Vector2i(x-1,y),Vector2i(x,y+1),Vector2i(x+1,y)].map(get_tile))
-
+	for pos: Vector2i in tiles:
+		map.set_tiles(Vector2i(pos.x, pos.y), tiles[pos], tiles)
 	map.flush()
 
 	for v: Vector2i in item_counters:
diff --git a/client/gui/resources/shaders/paper.tres b/client/gui/resources/shaders/paper.tres
index f99aec03..c2102a14 100644
--- a/client/gui/resources/shaders/paper.tres
+++ b/client/gui/resources/shaders/paper.tres
@@ -1,4 +1,4 @@
-[gd_resource type="NoiseTexture2D" load_steps=3 format=3 uid="uid://chxkwohi56cxx"]
+[gd_resource type="NoiseTexture2D" format=3 uid="uid://chxkwohi56cxx"]
 
 [sub_resource type="Gradient" id="Gradient_pkrjd"]
 colors = PackedColorArray(0.917969, 0.866454, 0.770122, 1, 0.832031, 0.781817, 0.666307, 1)
diff --git a/client/gui/resources/theme/theme.tres b/client/gui/resources/theme/theme.tres
index fba6ba2a..fdde8f70 100644
--- a/client/gui/resources/theme/theme.tres
+++ b/client/gui/resources/theme/theme.tres
@@ -1,4 +1,4 @@
-[gd_resource type="Theme" load_steps=12 format=3 uid="uid://b0qmvo504e457"]
+[gd_resource type="Theme" format=3 uid="uid://b0qmvo504e457"]
 
 [ext_resource type="FontFile" uid="uid://5ixo6b3bd3km" path="res://gui/resources/fonts/font-josefin-sans.woff2" id="1_f8qb0"]
 [ext_resource type="StyleBox" uid="uid://b86kbd3pfkd5w" path="res://gui/resources/style/focus_style.tres" id="1_x88rs"]