Merge remote-tracking branch 'origin/main'

5 files changed, 32 insertions, 24 deletions

diff --git a/Scenes/Builder.gd b/Scenes/Builder.gd
index b0d4166..8413e6e 100644
--- a/Scenes/Builder.gd
+++ b/Scenes/Builder.gd
@@ -1,5 +1,6 @@
 extends Node
 
+const Ground = preload("res://Scenes/Ground.tscn")
 const Obstacle = preload("res://Scenes/Obstacle.tscn")
 const Crystal = preload("res://Scenes/Crystal.tscn")
 
@@ -92,6 +93,10 @@ func build(player : Entity, dungeon):
 		var length = room_size + 1
 		var corner = key * length
 
+		var ground = Ground.instance()
+		dungeon.add_child(ground)
+		ground.translation = dungeon.tile_to_pos(corner + Vector2.ONE / 2)
+
 		for i in range(0, length):
 			if not rooms.has(key + Vector2(-1, 0)):
 				build_obstacle(corner + Vector2(0, i), dungeon)
diff --git a/Scenes/Dungeon.tscn b/Scenes/Dungeon.tscn
index 4bbacd1..072dc0f 100644
--- a/Scenes/Dungeon.tscn
+++ b/Scenes/Dungeon.tscn
@@ -1,26 +1,18 @@
-[gd_scene load_steps=16 format=2]
+[gd_scene load_steps=13 format=2]
 
 [ext_resource path="res://Scenes/Dungeon.gd" type="Script" id=1]
 [ext_resource path="res://Scenes/CameraControl.gd" type="Script" id=2]
-[ext_resource path="res://Assets/Environment/Floor_tile.png" type="Texture" id=3]
 [ext_resource path="res://Scenes/UIController.gd" type="Script" id=4]
 [ext_resource path="res://Assets/AlegreyaSansSC-ExtraBold.ttf" type="DynamicFontData" id=5]
 [ext_resource path="res://Scenes/ScoreParticle.tscn" type="PackedScene" id=6]
 [ext_resource path="res://Assets/arm.png" type="Texture" id=7]
 
-[sub_resource type="PlaneMesh" id=1]
-
-[sub_resource type="SpatialMaterial" id=4]
-albedo_color = Color( 0.694118, 0.505882, 0.666667, 1 )
-albedo_texture = ExtResource( 3 )
-uv1_scale = Vector3( 12, 12, 1 )
-uv1_offset = Vector3( 0.25, 0.25, 1 )
-
 [sub_resource type="ProceduralSky" id=2]
 
 [sub_resource type="Environment" id=3]
-background_mode = 2
+background_mode = 1
 background_sky = SubResource( 2 )
+background_color = Color( 0.1, 0.1, 0.1, 1 )
 ambient_light_color = Color( 1, 1, 1, 1 )
 dof_blur_far_amount = 0.06
 
@@ -70,11 +62,6 @@ tracks/0/keys = {
 [node name="Dungeon" type="Spatial"]
 script = ExtResource( 1 )
 
-[node name="Floor" type="MeshInstance" parent="."]
-transform = Transform( 12, 0, 0, 0, 1, 0, 0, 0, 12, 0, 0, 0 )
-mesh = SubResource( 1 )
-material/0 = SubResource( 4 )
-
 [node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( 3 )
 
diff --git a/Scenes/Ground.tscn b/Scenes/Ground.tscn
new file mode 100644
index 0000000..60c9e11
--- /dev/null
+++ b/Scenes/Ground.tscn
@@ -0,0 +1,19 @@
+[gd_scene load_steps=4 format=2]
+
+[ext_resource path="res://Assets/Environment/Floor_tile.png" type="Texture" id=1]
+
+[sub_resource type="PlaneMesh" id=1]
+size = Vector2( 1, 1 )
+
+[sub_resource type="SpatialMaterial" id=4]
+albedo_color = Color( 0.694118, 0.505882, 0.666667, 1 )
+albedo_texture = ExtResource( 1 )
+uv1_scale = Vector3( 3.5, 3.5, 1 )
+uv1_offset = Vector3( 0, 0, 1 )
+
+[node name="Spatial" type="Spatial"]
+
+[node name="Ground" type="MeshInstance" parent="."]
+transform = Transform( 7, 0, 0, 0, 1, 0, 0, 0, 7, 3.5, 0, -3.5 )
+mesh = SubResource( 1 )
+material/0 = SubResource( 4 )
diff --git a/Scenes/MonsterSquare.gd b/Scenes/MonsterSquare.gd
index 89ae2e3..443d3ec 100644
--- a/Scenes/MonsterSquare.gd
+++ b/Scenes/MonsterSquare.gd
@@ -1,22 +1,20 @@
 extends Monster
 
-onready var cardinal = Vector2.UP
-
 const directions = [Vector2(1,0), Vector2(0,1), Vector2(-1,0), Vector2(0,-1)]
+
 var dir_i = 0
+var dir = 1
 
 func _ready():
 	._ready()
-	dir_i = 0
+	dir_i = randi() % 4
 	if randf() < 0.5:
-		cardinal = Vector2.RIGHT
+		dir = -1
 
 func try_moving(player_pos : Vector2, monster_pos : Vector2) -> MonsterAction:
 	var action = MonsterAction.new()
 
-	var next_tile = monster_pos
 	var next_movement = directions[dir_i]
-	
 	var next_pos = monster_pos + next_movement
 
 	if next_pos == player_pos:
@@ -24,7 +22,7 @@ func try_moving(player_pos : Vector2, monster_pos : Vector2) -> MonsterAction:
 	else:
 		action.type = MonsterActionType.MOVE
 		action.dir = next_movement
-		dir_i = (dir_i + 1) % 4
+		dir_i = (dir_i + dir) % 4
 
 	return action
 
diff --git a/Scenes/MonsterSquare.tscn b/Scenes/MonsterSquare.tscn
index 3627cae..95a8b79 100644
--- a/Scenes/MonsterSquare.tscn
+++ b/Scenes/MonsterSquare.tscn
@@ -6,7 +6,6 @@
 
 [node name="MonsterSquare" instance=ExtResource( 1 )]
 script = ExtResource( 2 )
-actionable = false
 
 [node name="Sprite3D" parent="." index="0"]
 texture = ExtResource( 3 )