Merge remote-tracking branch 'origin/main'

15 files changed, 229 insertions, 26 deletions

diff --git a/Assets/1_dot_blue.png b/Assets/1_dot_blue.png
new file mode 100644
index 0000000..63a7ccc
--- /dev/null
+++ b/Assets/1_dot_blue.png
diff --git a/Assets/1_dot_blue.png.import b/Assets/1_dot_blue.png.import
new file mode 100644
index 0000000..2ee00fa
--- /dev/null
+++ b/Assets/1_dot_blue.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/1_dot_blue.png-883e97b4f587b16ce9a2d04d35905fd9.s3tc.stex"
+path.etc="res://.import/1_dot_blue.png-883e97b4f587b16ce9a2d04d35905fd9.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/1_dot_blue.png"
+dest_files=[ "res://.import/1_dot_blue.png-883e97b4f587b16ce9a2d04d35905fd9.s3tc.stex", "res://.import/1_dot_blue.png-883e97b4f587b16ce9a2d04d35905fd9.etc.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/Assets/2_dots_blue.png b/Assets/2_dots_blue.png
new file mode 100644
index 0000000..ec46c47
--- /dev/null
+++ b/Assets/2_dots_blue.png
diff --git a/Assets/2_dots_blue.png.import b/Assets/2_dots_blue.png.import
new file mode 100644
index 0000000..f61ce9f
--- /dev/null
+++ b/Assets/2_dots_blue.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/2_dots_blue.png-4374610b3285160a6b4db4f7792350a4.s3tc.stex"
+path.etc="res://.import/2_dots_blue.png-4374610b3285160a6b4db4f7792350a4.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/2_dots_blue.png"
+dest_files=[ "res://.import/2_dots_blue.png-4374610b3285160a6b4db4f7792350a4.s3tc.stex", "res://.import/2_dots_blue.png-4374610b3285160a6b4db4f7792350a4.etc.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/Assets/3_dots_blue.png b/Assets/3_dots_blue.png
new file mode 100644
index 0000000..76bed68
--- /dev/null
+++ b/Assets/3_dots_blue.png
diff --git a/Assets/3_dots_blue.png.import b/Assets/3_dots_blue.png.import
new file mode 100644
index 0000000..39e8e61
--- /dev/null
+++ b/Assets/3_dots_blue.png.import
@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path.s3tc="res://.import/3_dots_blue.png-8a2d52828e533b2895e7416f5de740d4.s3tc.stex"
+path.etc="res://.import/3_dots_blue.png-8a2d52828e533b2895e7416f5de740d4.etc.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://Assets/3_dots_blue.png"
+dest_files=[ "res://.import/3_dots_blue.png-8a2d52828e533b2895e7416f5de740d4.s3tc.stex", "res://.import/3_dots_blue.png-8a2d52828e533b2895e7416f5de740d4.etc.stex" ]
+
+[params]
+
+compress/mode=2
+compress/lossy_quality=0.7
+compress/hdr_mode=0
+compress/bptc_ldr=0
+compress/normal_map=0
+flags/repeat=true
+flags/filter=true
+flags/mipmaps=true
+flags/anisotropic=false
+flags/srgb=2
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/HDR_as_SRGB=false
+process/invert_color=false
+process/normal_map_invert_y=false
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0
diff --git a/Assets/DiceFaceMaterial.tres b/Assets/DiceFaceMaterial.tres
index c09595a..e47eb32 100644
--- a/Assets/DiceFaceMaterial.tres
+++ b/Assets/DiceFaceMaterial.tres
@@ -1,6 +1,6 @@
 [gd_resource type="SpatialMaterial" load_steps=2 format=2]
 
-[ext_resource path="res://Assets/1_dot.png" type="Texture" id=1]
+[ext_resource path="res://Assets/1_dot_blue.png" type="Texture" id=1]
 
 [resource]
 albedo_texture = ExtResource( 1 )
diff --git a/Scenes/Entity.gd b/Scenes/Entity.gd
index 63ab008..649d01b 100644
--- a/Scenes/Entity.gd
+++ b/Scenes/Entity.gd
@@ -50,7 +50,7 @@ func cor_shake(args : Array):
 	var time = 0
 
 	var zero = translation
-	var intensity = 0.02
+	var intensity = 0.03
 
 	while true:
 		time = min(time + get_process_delta_time(), duration)
diff --git a/Scenes/PlateBounce.tscn b/Scenes/PlateBounce.tscn
index da7395b..b323006 100644
--- a/Scenes/PlateBounce.tscn
+++ b/Scenes/PlateBounce.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://Scenes/PlateBounce.gd" type="Script" id=1]
 [ext_resource path="res://Assets/arrow.png" type="Texture" id=2]
@@ -10,12 +10,20 @@ size = Vector2( 1, 1 )
 flags_transparent = true
 albedo_texture = ExtResource( 2 )
 
+[sub_resource type="SpatialMaterial" id=3]
+albedo_color = Color( 0.341176, 0.27451, 0.529412, 1 )
+
 [node name="PlateBounce" type="Spatial"]
 script = ExtResource( 1 )
 valid_symbols = [ "2", "3", "4", "5", "6", "" ]
 cardinal = null
 
 [node name="Mesh" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, 0 )
 mesh = SubResource( 1 )
 material/0 = SubResource( 2 )
+
+[node name="Mesh2" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.01, 0 )
+mesh = SubResource( 1 )
+material/0 = SubResource( 3 )
diff --git a/Scenes/PlateDamage.gd b/Scenes/PlateDamage.gd
index 310ac39..d910f76 100644
--- a/Scenes/PlateDamage.gd
+++ b/Scenes/PlateDamage.gd
@@ -1,19 +1,17 @@
 extends Plate
 
-export(int) var damage
-
 func activate(entity : Entity, dungeon):
 	if entity is Player:
 		entity.add_action("cor_shake", [0.2])
-		Global.turns -= damage
+		Global.turns -= int(entity.get_top())
 		return
 
 	if entity is Monster:
-		if entity.health - damage <= 0:
+		if entity.health - 1 <= 0:
 			entity.alive = false
 			entity.add_action("cor_dies", [])
 			dungeon.kill_entity(entity)
 		else:
-			entity.health -= damage
+			entity.health -= 1
 			entity.add_action("cor_shake", [0.2])
 		return
diff --git a/Scenes/PlateDamage.tscn b/Scenes/PlateDamage.tscn
index ad83b80..f3a0ec9 100644
--- a/Scenes/PlateDamage.tscn
+++ b/Scenes/PlateDamage.tscn
@@ -1,19 +1,99 @@
-[gd_scene load_steps=4 format=2]
+[gd_scene load_steps=3 format=2]
 
 [ext_resource path="res://Scenes/PlateDamage.gd" type="Script" id=1]
 
-[sub_resource type="CubeMesh" id=1]
-size = Vector3( 0.9, 0.05, 1 )
-
-[sub_resource type="SpatialMaterial" id=2]
-albedo_color = Color( 1, 0.372549, 0.372549, 1 )
+[sub_resource type="PrismMesh" id=1]
+size = Vector3( 0.1, 0.1, 0.1 )
 
 [node name="PlateDamage" type="Spatial"]
 script = ExtResource( 1 )
-valid_symbols = [ "2", "3", "4", "5", "6", "" ]
-damage = 1
 
 [node name="Mesh" type="MeshInstance" parent="."]
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.025, 0 )
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.45, 0.05, 0.45 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh2" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1, 0.05, 0.45 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh3" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.05, 0.45 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh4" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.45, 0.05, 0.1 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh5" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1, 0.05, 0.1 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh6" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.05, 0.1 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh7" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.45, 0.05, -0.25 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh8" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.1, 0.05, -0.25 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh9" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.25, 0.05, -0.25 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh10" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.27615, 0.05, 0.27506 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh11" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0738502, 0.05, 0.27506 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh12" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.42385, 0.05, 0.27506 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh13" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.27615, 0.05, -0.0749402 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh14" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0738502, 0.05, -0.0749402 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh15" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.42385, 0.05, -0.0749402 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh16" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.27615, 0.05, -0.42494 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh17" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0738502, 0.05, -0.42494 )
+mesh = SubResource( 1 )
+material/0 = null
+
+[node name="Mesh18" type="MeshInstance" parent="."]
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.42385, 0.05, -0.42494 )
 mesh = SubResource( 1 )
-material/0 = SubResource( 2 )
+material/0 = null
diff --git a/Scenes/PlateKey.gd b/Scenes/PlateKey.gd
index 1342469..aa3bb8b 100644
--- a/Scenes/PlateKey.gd
+++ b/Scenes/PlateKey.gd
@@ -1,13 +1,18 @@
 extends Plate
 
 export(NodePath) var crystal_path
+export(Color) var active_color
 
 onready var crystal : Crystal = get_node(crystal_path) setget set_crystal
+onready var mesh : MeshInstance = $Mesh
 
 func activate(entity : Entity, dungeon):
 	if crystal == null or crystal.is_active:
 		return
 
+	var material = mesh.get_active_material(0)
+	material.albedo_color = active_color
+
 	crystal.add_action("cor_activate", [0.2])
 
 func set_crystal(value : Crystal):
diff --git a/Scenes/PlateKey.tscn b/Scenes/PlateKey.tscn
index f90a645..53b56c8 100644
--- a/Scenes/PlateKey.tscn
+++ b/Scenes/PlateKey.tscn
@@ -3,15 +3,16 @@
 [ext_resource path="res://Scenes/PlateKey.gd" type="Script" id=1]
 
 [sub_resource type="CubeMesh" id=1]
-size = Vector3( 0.9, 0.05, 1 )
+size = Vector3( 1, 0.05, 1 )
 
 [sub_resource type="SpatialMaterial" id=2]
-albedo_color = Color( 0.34902, 0.541176, 0.835294, 1 )
+resource_local_to_scene = true
+albedo_color = Color( 0.231373, 0.654902, 0.839216, 1 )
 
 [node name="PlateKey" type="Spatial"]
 script = ExtResource( 1 )
 valid_symbols = [ "1", "2", "3" ]
-door_path = null
+active_color = Color( 0.290196, 0.415686, 0.572549, 1 )
 
 [node name="Mesh" type="MeshInstance" parent="."]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.025, 0 )
diff --git a/Scenes/Player.gd b/Scenes/Player.gd
index 5af227b..21d182e 100644
--- a/Scenes/Player.gd
+++ b/Scenes/Player.gd
@@ -141,7 +141,7 @@ func cor_shake(args : Array):
 	var time = 0
 
 	var zero = Vector3(0, 0.5, 0)
-	var intensity = 0.02
+	var intensity = 0.03
 
 	while true:
 		time = min(time + get_process_delta_time(), duration)
diff --git a/Scenes/Player.tscn b/Scenes/Player.tscn
index 4d67f5e..0ec3d52 100644
--- a/Scenes/Player.tscn
+++ b/Scenes/Player.tscn
@@ -1,11 +1,11 @@
 [gd_scene load_steps=14 format=2]
 
 [ext_resource path="res://Scenes/Player.gd" type="Script" id=1]
+[ext_resource path="res://Assets/2_dots_blue.png" type="Texture" id=2]
 [ext_resource path="res://Assets/5_dots.png" type="Texture" id=3]
 [ext_resource path="res://Assets/DiceFaceMaterial.tres" type="Material" id=4]
-[ext_resource path="res://Assets/3_dots.png" type="Texture" id=5]
+[ext_resource path="res://Assets/3_dots_blue.png" type="Texture" id=5]
 [ext_resource path="res://Assets/4_dots.png" type="Texture" id=6]
-[ext_resource path="res://Assets/2_dots.png" type="Texture" id=7]
 [ext_resource path="res://Assets/6_dots.png" type="Texture" id=8]
 
 [sub_resource type="QuadMesh" id=5]
@@ -14,7 +14,7 @@
 albedo_texture = ExtResource( 8 )
 
 [sub_resource type="SpatialMaterial" id=7]
-albedo_texture = ExtResource( 7 )
+albedo_texture = ExtResource( 2 )
 
 [sub_resource type="SpatialMaterial" id=8]
 albedo_texture = ExtResource( 3 )