Fix stuff broken by merge

scenes/demo/demo.tscn

@@ -4,11 +4,10 @@
 [ext_resource type="PackedScene" uid="uid://br315evr8x2gt" path="res://scenes/hazy_env.tscn" id="2_le85m"]
 [ext_resource type="LightmapGIData" uid="uid://bp05p4yab2ukx" path="res://scenes/demo/demo.lmbake" id="2_thfwf"]
 [ext_resource type="PackedScene" uid="uid://bqts60gpnb82d" path="res://scenes/demo/demo_map.tscn" id="4_0ojvw"]
+[ext_resource type="PackedScene" uid="uid://b5asfx4vribls" path="res://scenes/interface/hud.tscn" id="7_g7tfv"]
 [ext_resource type="PackedScene" uid="uid://wjbuh7jk50nm" path="res://scenes/player.tscn" id="10_3xiy2"]
 [ext_resource type="PackedScene" uid="uid://d02cqylu3xwos" path="res://scenes/table.tscn" id="11_7trvw"]
 [ext_resource type="PackedScene" uid="uid://c670g1qg5gaug" path="res://scenes/interface/pause_menu.tscn" id="11_lav3p"]
-[ext_resource type="Material" uid="uid://bq5oqyuwekryv" path="res://materials/building_block.tres" id="12_i3ahj"]
-[ext_resource type="PackedScene" uid="uid://b5asfx4vribls" path="res://scenes/interface/hud.tscn" id="7_g7tfv"]
 
 [node name="Demo" type="Node3D"]
 
@@ -57,7 +56,6 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -0.332064, 1.5426, 3.65156)
 [node name="table" parent="." node_paths=PackedStringArray("TrenchbroomMap") instance=ExtResource("11_7trvw")]
 transform = Transform3D(-0.0123217, 0, 0.999924, 0, 1, 0, -0.999924, 0, -0.0123217, 2.83695, 0, -4.36558)
 TrenchbroomMap = NodePath("../DemoMap")
-RelativeScale = 0.005
 
 [node name="HUD" parent="." node_paths=PackedStringArray("Player") instance=ExtResource("7_g7tfv")]
 Player = NodePath("../Player")

scenes/stairs/stairs.tscn

@@ -5,9 +5,9 @@
 [ext_resource type="PackedScene" uid="uid://br315evr8x2gt" path="res://scenes/hazy_env.tscn" id="3_gdvn0"]
 [ext_resource type="PackedScene" uid="uid://mgs2yc1fcem7" path="res://scenes/stairs/stairs_map.tscn" id="4_87fvr"]
 [ext_resource type="PackedScene" uid="uid://wjbuh7jk50nm" path="res://scenes/player.tscn" id="8_6btor"]
+[ext_resource type="PackedScene" uid="uid://b5asfx4vribls" path="res://scenes/interface/hud.tscn" id="8_i25qr"]
 [ext_resource type="PackedScene" uid="uid://c670g1qg5gaug" path="res://scenes/interface/pause_menu.tscn" id="9_cfhxe"]
 [ext_resource type="PackedScene" uid="uid://d02cqylu3xwos" path="res://scenes/table.tscn" id="10_hcwch"]
-[ext_resource type="Material" uid="uid://bq5oqyuwekryv" path="res://materials/building_block.tres" id="11_gpc6i"]
 
 [node name="Stairs" type="Node3D"]
 
@@ -24,16 +24,14 @@ light_data = ExtResource("2_36ysp")
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -58.6119, 24, 3.65156)
 MaxVolumeWindHeight = 60.0
 
-[node name="PauseMenu" parent="." instance=ExtResource("9_cfhxe")]
+[node name="table" parent="." node_paths=PackedStringArray("TrenchbroomMap") instance=ExtResource("10_hcwch")]
-
-[node name="table" parent="." instance=ExtResource("10_hcwch")]
 transform = Transform3D(-0.0123217, 0, 0.999924, 0, 1, 0, -0.999924, 0, -0.0123217, -58.2601, 24.0011, 0)
-
+TrenchbroomMap = NodePath("../StairsMap")
-[node name="Node3D" parent="table" index="2" node_paths=PackedStringArray("TrenchbroomMap")]
+RelativeScale = 0.002
-TrenchbroomMap = NodePath("../../StairsMap")
-BuildingBlockMaterial = ExtResource("11_gpc6i")
-BuildingBlockScale = 0.005
 
 [node name="StairsMap" parent="." instance=ExtResource("4_87fvr")]
 
-[editable path="table"]
+[node name="HUD" parent="." node_paths=PackedStringArray("Player") instance=ExtResource("8_i25qr")]
+Player = NodePath("../Player")
+
+[node name="PauseMenu" parent="." instance=ExtResource("9_cfhxe")]

scripts/BuildingBlock.cs

@@ -60,6 +60,7 @@ namespace Gmtk24 {
                     HoverMaterialArr[i] = newHoverMat;
                 } else {
                     NormalMaterialArr[i] = Material;
+                    HoverMaterialArr[i] = HoverMaterial;
                 }
                 MeshInstance.SetSurfaceOverrideMaterial(i, NormalMaterialArr[i]);
             }

scripts/Table.cs

@@ -5,7 +5,7 @@ namespace Gmtk24 {
     public partial class Table : Interactible {
         [Export(PropertyHint.NodeType, "FuncGodotMap")]
         public Node3D TrenchbroomMap;
-        [Export(PropertyHint.Range, "0.005,0.1,0.005,or_greater")]
+        [Export]
         public float RelativeScale = 0.05f;
         [Export]
         public ShaderMaterial BlockMaterial;