test using hololive logo as pieces

godot/assets/hololive.svg.import

@@ -0,0 +1,37 @@
+[remap]
+
+importer="texture"
+type="CompressedTexture2D"
+uid="uid://dqwdbqw3mt2uo"
+path="res://.godot/imported/hololive.svg-5d8999462ad73316360d50386c031c6d.ctex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://assets/hololive.svg"
+dest_files=["res://.godot/imported/hololive.svg-5d8999462ad73316360d50386c031c6d.ctex"]
+
+[params]
+
+compress/mode=0
+compress/high_quality=false
+compress/lossy_quality=0.7
+compress/hdr_compression=1
+compress/normal_map=0
+compress/channel_pack=0
+mipmaps/generate=false
+mipmaps/limit=-1
+roughness/mode=0
+roughness/src_normal=""
+process/fix_alpha_border=true
+process/premult_alpha=false
+process/normal_map_invert_y=false
+process/hdr_as_srgb=false
+process/hdr_clamp_exposure=false
+process/size_limit=0
+detect_3d/compress_to=1
+svg/scale=1.0
+editor/scale_with_editor_scale=false
+editor/convert_colors_with_editor_theme=false

godot/project.godot

@@ -12,7 +12,7 @@ config_version=5
 
 config/name="holo-crush"
 run/main_scene="res://src/start.tscn"
-config/features=PackedStringArray("4.1")
+config/features=PackedStringArray("4.2")
 boot_splash/bg_color=Color(0.101961, 0.101961, 0.101961, 1)
 config/icon="res://icon.svg"
 

godot/src/game.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=22 format=3 uid="uid://di8g8e6s34cik"]
+[gd_scene load_steps=24 format=3 uid="uid://di8g8e6s34cik"]
 
 [ext_resource type="Theme" uid="uid://cvvavdkxk7llv" path="res://theme/theme.tres" id="1_f8tal"]
 [ext_resource type="Script" path="res://src/game.gd" id="1_vav6y"]
@@ -9,6 +9,7 @@
 [ext_resource type="Script" path="res://src/grid/match_grid.gd" id="4_egjxx"]
 [ext_resource type="PackedScene" uid="uid://dqw32jg4upbcp" path="res://src/menu/score.tscn" id="4_gaq27"]
 [ext_resource type="Resource" uid="uid://cmiuj3tuuvo5b" path="res://src/grid/SimpleGridLevel.tres" id="5_gomi5"]
+[ext_resource type="Shader" path="res://src/circle.gdshader" id="6_2i5it"]
 [ext_resource type="Shader" path="res://src/grid/shockwave.gdshader" id="6_2vgwy"]
 [ext_resource type="StyleBox" uid="uid://bd0c76q5d7ocf" path="res://theme/dialog.tres" id="9_qa60b"]
 [ext_resource type="AudioStream" uid="uid://b7ilfb8f6t6wg" path="res://assets/sound/Shiny Smily Story_Inst_hololive_202308151841.mp3" id="10_chsc8"]
@@ -24,6 +25,9 @@ shader_parameter/mouse = null
 shader_parameter/time = null
 shader_parameter/speed2 = 0.2
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_j7fqh"]
+shader = ExtResource("6_2i5it")
+
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_s84n1"]
 shader = ExtResource("6_2vgwy")
 shader_parameter/strength = 0.08
@@ -107,18 +111,30 @@ theme_override_constants/margin_bottom = 10
 layout_mode = 2
 size_flags_vertical = 0
 
-[node name="Label2" type="Label" parent="Top/MarginContainer/HBoxContainer"]
+[node name="HBoxContainer" type="HBoxContainer" parent="Top/MarginContainer/HBoxContainer"]
+modulate = Color(0.819608, 0.247059, 0.247059, 1)
 layout_mode = 2
-size_flags_vertical = 0
-text = "Turns"
+theme_override_constants/separation = 15
+
+[node name="ColorRect" type="ColorRect" parent="Top/MarginContainer/HBoxContainer/HBoxContainer"]
+material = SubResource("ShaderMaterial_j7fqh")
+custom_minimum_size = Vector2(25, 25)
+layout_mode = 2
+size_flags_horizontal = 4
+size_flags_vertical = 4
+
+[node name="Label" type="Label" parent="Top/MarginContainer/HBoxContainer/HBoxContainer"]
+layout_mode = 2
+text = "Live"
 
 [node name="Control" type="Control" parent="Top/MarginContainer/HBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 3
 
-[node name="Label3" type="Label" parent="Top/MarginContainer/HBoxContainer"]
+[node name="Label2" type="Label" parent="Top/MarginContainer/HBoxContainer"]
 layout_mode = 2
 size_flags_vertical = 0
+text = "Turns"
 
 [node name="Score" parent="." instance=ExtResource("4_gaq27")]
 layout_mode = 1

godot/src/grid/SimpleGridLevel.tres

@@ -6,5 +6,5 @@
 script = ExtResource("1_1pc7e")
 width = 9
 height = 8
-blocked = Array[Vector2i]([Vector2i(0, 0), Vector2i(0, 7), Vector2i(8, 0), Vector2i(8, 7), Vector2i(0, 6), Vector2i(1, 7), Vector2i(7, 7), Vector2i(8, 6), Vector2i(4, 0)])
+blocked = Array[Vector2i]([])
 icings = {}

godot/src/piece/basic_blue.tscn

@@ -1,4 +1,4 @@
-[gd_scene load_steps=22 format=3 uid="uid://cmwklckfgwegu"]
+[gd_scene load_steps=23 format=3 uid="uid://cmwklckfgwegu"]
 
 [ext_resource type="PackedScene" uid="uid://c0o3d7dki4axs" path="res://src/piece/ina.tscn" id="1_hiotm"]
 [ext_resource type="Script" path="res://src/piece/basic.gd" id="2_1hvhb"]
@@ -8,16 +8,10 @@
 [ext_resource type="Texture2D" uid="uid://c6vm2u4qhfw8b" path="res://assets/Piece__Basic_Bomb.png" id="6_2wluf"]
 [ext_resource type="Shader" path="res://src/piece/rainbow.gdshader" id="7_wjrow"]
 [ext_resource type="Shader" path="res://src/piece/pop_circle.gdshader" id="8_kn5mu"]
+[ext_resource type="Texture2D" uid="uid://dqwdbqw3mt2uo" path="res://assets/hololive.svg" id="8_qotk5"]
 [ext_resource type="Texture2D" uid="uid://3gxx3fuvygy5" path="res://assets/circle.png" id="9_hp3tc"]
 [ext_resource type="Texture2D" uid="uid://dwofmghe1u30e" path="res://assets/star_08.png" id="11_w00wj"]
 
-[sub_resource type="ShaderMaterial" id="ShaderMaterial_tnkub"]
-shader = ExtResource("8_kn5mu")
-shader_parameter/ring_radius = 0.4
-shader_parameter/thickness_scalar = 0.7
-shader_parameter/color = Color(1, 1, 1, 1)
-shader_parameter/progress = 1.0
-
 [sub_resource type="ShaderMaterial" id="ShaderMaterial_yj06x"]
 shader = ExtResource("7_wjrow")
 shader_parameter/speed = 2.5
@@ -26,6 +20,13 @@ shader_parameter/strength = 0.8
 shader_parameter/smoothing = 1.5
 shader_parameter/size = 0.5
 
+[sub_resource type="ShaderMaterial" id="ShaderMaterial_tnkub"]
+shader = ExtResource("8_kn5mu")
+shader_parameter/ring_radius = 0.4
+shader_parameter/thickness_scalar = 0.7
+shader_parameter/color = Color(1, 1, 1, 1)
+shader_parameter/progress = 1.0
+
 [sub_resource type="Animation" id="Animation_yytgt"]
 length = 0.001
 tracks/0/type = "value"
@@ -203,18 +204,16 @@ point_count = 3
 curve = SubResource("Curve_7rocm")
 
 [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_31y3t"]
+particle_flag_disable_z = true
 emission_shape = 3
 emission_box_extents = Vector3(40, 40, 40)
-particle_flag_disable_z = true
 direction = Vector3(0, 0, 0)
 spread = 180.0
-gravity = Vector3(0, 50, 0)
 initial_velocity_min = 20.0
 initial_velocity_max = 50.0
 angular_velocity_min = 150.0
 angular_velocity_max = 200.0
-orbit_velocity_min = 0.0
-orbit_velocity_max = 0.0
+gravity = Vector3(0, 50, 0)
 scale_min = 0.3
 scale_max = 0.3
 scale_curve = SubResource("CurveTexture_xe8ul")
@@ -227,19 +226,19 @@ row_texture = ExtResource("3_6fepw")
 col_texture = ExtResource("4_k8n1j")
 bomb_texture = ExtResource("6_2wluf")
 
-[node name="Sprite2D" parent="." index="0"]
-modulate = Color(0.176471, 0.603922, 0.701961, 1)
-material = SubResource("ShaderMaterial_tnkub")
-texture = ExtResource("2_la2jm")
-
-[node name="BackColor" type="ColorRect" parent="." index="1"]
+[node name="BackColor" type="ColorRect" parent="." index="0"]
 material = SubResource("ShaderMaterial_yj06x")
 offset_left = -80.0
 offset_top = -80.0
 offset_right = 80.0
 offset_bottom = 80.0
 mouse_filter = 2
 
+[node name="Sprite2D" parent="." index="1"]
+modulate = Color(0.176471, 0.603922, 0.701961, 1)
+material = SubResource("ShaderMaterial_tnkub")
+texture = ExtResource("8_qotk5")
+
 [node name="Sprite2D3" type="Sprite2D" parent="." index="2"]
 visible = false
 scale = Vector2(0.4, 0.4)

godot/src/start.tscn

@@ -63,8 +63,6 @@ curve = SubResource("Curve_u5k7a")
 particle_flag_disable_z = true
 direction = Vector3(0, 0, 0)
 gravity = Vector3(0, 0, 0)
-orbit_velocity_min = 0.0
-orbit_velocity_max = 0.0
 scale_curve = SubResource("CurveTexture_sc0vi")
 color_ramp = SubResource("GradientTexture1D_0xr3d")