Explode entire minoes

README.md

@@ -1 +1,6 @@
-![screenshot](https://github.com/adrienmalin/TETRIS3000/raw/master/screenshot.png "Screenshot")
+![screenshot](https://raw.githubusercontent.com/adrienmalin/TETRIS3000/master/web/screenshot.png "Screenshot")
+
+[Downloads](https://github.com/adrienmalin/TETRIS3000/releases)
+
+[Play in browser (experimental)](https://adrienmalin.github.io/TETRIS3000/web/TETRIS3000.html)
+

Tetrominos/Mino/BackMaterial.tres

@@ -1,55 +0,0 @@
-[gd_resource type="SpatialMaterial" format=2]
-
-[resource]
-
-render_priority = 0
-flags_transparent = true
-flags_unshaded = false
-flags_vertex_lighting = false
-flags_no_depth_test = false
-flags_use_point_size = false
-flags_world_triplanar = false
-flags_fixed_size = false
-flags_albedo_tex_force_srgb = false
-vertex_color_use_as_albedo = false
-vertex_color_is_srgb = false
-params_diffuse_mode = 0
-params_specular_mode = 0
-params_blend_mode = 1
-params_cull_mode = 0
-params_depth_draw_mode = 0
-params_line_width = 1.0
-params_point_size = 1.0
-params_billboard_mode = 0
-params_grow = false
-params_use_alpha_scissor = false
-albedo_color = Color( 0.601563, 0.775878, 1, 0.0338039 )
-metallic = 0.18
-metallic_specular = 1.0
-metallic_texture_channel = 0
-roughness = 0.46
-roughness_texture_channel = 0
-emission_enabled = false
-normal_enabled = false
-rim_enabled = false
-clearcoat_enabled = false
-anisotropy_enabled = false
-ao_enabled = false
-depth_enabled = false
-subsurf_scatter_enabled = false
-transmission_enabled = false
-refraction_enabled = false
-detail_enabled = false
-uv1_scale = Vector3( 1, 1, 1 )
-uv1_offset = Vector3( 0, 0, 0 )
-uv1_triplanar = false
-uv1_triplanar_sharpness = 1.0
-uv2_scale = Vector3( 1, 1, 1 )
-uv2_offset = Vector3( 0, 0, 0 )
-uv2_triplanar = false
-uv2_triplanar_sharpness = 1.0
-proximity_fade_enable = true
-proximity_fade_distance = 1.0
-distance_fade_enable = false
-_sections_unfolded = [ "Albedo", "Emission", "Metallic", "NormalMap", "Proximity Fade" ]
-

_config.yml

@@ -1 +1,2 @@
 theme: jekyll-theme-slate
+show_downloads: true

icons/16.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/16.png-f3b4844aade9b270cbb38cff295ce33e.stex"
-
-[deps]
-
-source_file="res://icons/16.png"
-dest_files=[ "res://.import/16.png-f3b4844aade9b270cbb38cff295ce33e.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

icons/256.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/256.png-9a56a9319a91fa74ee7ddb5c0b84a228.stex"
-
-[deps]
-
-source_file="res://icons/256.png"
-dest_files=[ "res://.import/256.png-9a56a9319a91fa74ee7ddb5c0b84a228.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

icons/32.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/32.png-2c676109efa1e249139d639d1746eda5.stex"
-
-[deps]
-
-source_file="res://icons/32.png"
-dest_files=[ "res://.import/32.png-2c676109efa1e249139d639d1746eda5.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

icons/48.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/48.png-477be3215ba369c304be5535b6005c78.stex"
-
-[deps]
-
-source_file="res://icons/48.png"
-dest_files=[ "res://.import/48.png-477be3215ba369c304be5535b6005c78.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

icons/splash.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/splash.png-47c0e91fea9ce360c80365c194f47837.stex"
-
-[deps]
-
-source_file="res://icons/splash.png"
-dest_files=[ "res://.import/splash.png-47c0e91fea9ce360c80365c194f47837.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

screenshot.png.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/screenshot.png-024a21af5d37bf0f0dd0e2bccdd149d0.stex"
-
-[deps]
-
-source_file="res://screenshot.png"
-dest_files=[ "res://.import/screenshot.png-024a21af5d37bf0f0dd0e2bccdd149d0.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0

source/ExplodingLine.tscn

@@ -1,6 +1,6 @@
-[gd_scene load_steps=10 format=2]
+[gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1]
+[ext_resource path="res://Tetrominos/Mino/MinoMesh.tres" type="CubeMesh" id=1]
 
 [sub_resource type="Gradient" id=1]
 
@@ -30,19 +30,19 @@ render_priority = 0
 trail_divisor = 2
 trail_color_modifier = SubResource( 4 )
 emission_shape = 2
-emission_box_extents = Vector3( 8, 0.5, 0.5 )
+emission_box_extents = Vector3( 10, 1, 1 )
 flag_align_y = false
 flag_rotate_y = true
 flag_disable_z = false
-spread = 30.0
+spread = 0.0
 flatness = 0.0
-gravity = Vector3( 0, -30, 0 )
+gravity = Vector3( 0, -10, 30 )
-initial_velocity = 10.0
+initial_velocity = 20.0
-initial_velocity_random = 0.8
+initial_velocity_random = 1.0
 angular_velocity = 97.14
 angular_velocity_random = 1.0
 linear_accel = 100.0
-linear_accel_random = 0.84
+linear_accel_random = 1.0
 radial_accel = 8.48
 radial_accel_random = 0.85
 tangential_accel = 0.0
@@ -61,38 +61,9 @@ anim_speed_random = 0.0
 anim_offset = 0.0
 anim_offset_random = 0.0
 anim_loop = false
-_sections_unfolded = [ "Angular Velocity", "Color", "Emission Shape", "Gravity", "Scale", "Spread" ]
+_sections_unfolded = [ "Angular Velocity", "Color", "Gravity", "Initial Velocity", "Linear Accel", "Scale", "Spread" ]
 
-[sub_resource type="PrismMesh" id=6]
+[node name="ExplodingLine" type="Particles" index="0"]
-
-material = ExtResource( 1 )
-custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
-left_to_right = 2.98023e-008
-size = Vector3( 0.2, 0.2, 0.2 )
-subdivide_width = 2
-subdivide_height = 0
-subdivide_depth = 0
-
-[sub_resource type="PrismMesh" id=7]
-
-material = ExtResource( 1 )
-custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
-left_to_right = 0.5
-size = Vector3( 0.2, 0.2, 0.2 )
-subdivide_width = 2
-subdivide_height = 0
-subdivide_depth = 0
-
-[sub_resource type="CubeMesh" id=8]
-
-material = ExtResource( 1 )
-custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
-size = Vector3( 0.2, 0.2, 0.2 )
-subdivide_width = 0
-subdivide_height = 0
-subdivide_depth = 0
-
-[node name="ExplodingLine" type="Particles"]
 
 layers = 1
 material_override = null
@@ -104,23 +75,21 @@ lod_min_hysteresis = 0.0
 lod_max_distance = 0.0
 lod_max_hysteresis = 0.0
 emitting = false
-amount = 800
+amount = 40
 lifetime = 2.0
 one_shot = true
 preprocess = 0.0
 speed_scale = 2.18
-explosiveness = 0.9
+explosiveness = 1.0
-randomness = 0.69
+randomness = 0.0
 fixed_fps = 0
 fract_delta = true
 visibility_aabb = AABB( -5, -0.5, -1, 10, 1, 2 )
 local_coords = false
 draw_order = 0
 process_material = SubResource( 5 )
-draw_passes = 3
+draw_passes = 1
-draw_pass_1 = SubResource( 6 )
+draw_pass_1 = ExtResource( 1 )
-draw_pass_2 = SubResource( 7 )
-draw_pass_3 = SubResource( 8 )
 _sections_unfolded = [ "Draw Passes", "Drawing", "Process Material", "Time", "Transform" ]
 
 

source/GridMap.gd

@@ -45,17 +45,19 @@ func lock(piece):
 		set_cell_item(position.x, position.y, 0, MINO)
 
 func clear_lines():
-	var nb_minoes
+	var line_cleared
 	var lines_cleared = 0
 	for y in range(NB_LINES-1, -1, -1):
-		nb_minoes = 0
+		line_cleared = true
 		for x in range(NB_COLLUMNS):
-			if get_cell_item(x, y, 0) == MINO:
+			if not get_cell_item(x, y, 0) == MINO:
-				nb_minoes += 1
+				line_cleared = false
-		if nb_minoes == NB_COLLUMNS:
+				break
+		if line_cleared:
 			for y2 in range(y, NB_LINES+2):
 				for x in range(NB_COLLUMNS):
 					set_cell_item(x, y2, 0, get_cell_item(x, y2+1, 0))
 			lines_cleared += 1
+			exploding_lines[y].emitting = true
 			exploding_lines[y].restart()
 	return lines_cleared

source/Main.gd

@@ -14,6 +14,7 @@ const password = "TETRIS 3000"
 const NEXT_POSITION = Vector3(13, 16, 0)
 const START_POSITION = Vector3(5, 20, 0)
 const HOLD_POSITION = Vector3(-5, 16, 0)
+const THERE = Vector3(0, 0, 0)
 
 const movements = {
 	"move_right": Vector3(1, 0, 0),
@@ -26,7 +27,7 @@ var random_bag = []
 var next_piece
 var current_piece
 var held_piece
-var current_piece_held = false
+var current_piece_held
 
 var autoshift_action = ""
 
@@ -53,6 +54,7 @@ func _on_Start_start(level):
 	if held_piece:
 		remove_child(held_piece)
 		held_piece = null
+	current_piece_held = false
 	next_piece = random_piece()
 	new_piece()
 	$MidiPlayer.position = 0
@@ -69,7 +71,7 @@ func new_piece():
 	autoshift_action = ""
 	next_piece = random_piece()
 	next_piece.translation = NEXT_POSITION
-	if move(movements["soft_drop"]):
+	if move(THERE):
 		$DropTimer.start()
 		$LockDelay.start()
 		current_piece_held = false
@@ -100,6 +102,8 @@ func _process(delta):
 			$controls_ui.visible = true
 		elif $controls_ui.enable_resume:
 			resume()
+	if Input.is_action_just_pressed("toggle_fullscreen"):
+		OS.window_fullscreen = !OS.window_fullscreen
 	if playing:
 		for action in movements:
 			if action == autoshift_action:
@@ -116,11 +120,9 @@ func _process(delta):
 		if Input.is_action_just_pressed("hard_drop"):
 			hard_drop()
 		if Input.is_action_just_pressed("rotate_clockwise"):
-			if rotate(Tetromino.CLOCKWISE):
+			rotate(Tetromino.CLOCKWISE)
-				$MidiPlayer.move()
 		if Input.is_action_just_pressed("rotate_counterclockwise"):
-			if rotate(Tetromino.COUNTERCLOCKWISE):
+			rotate(Tetromino.COUNTERCLOCKWISE)
-				$MidiPlayer.move()
 		if Input.is_action_just_pressed("hold"):
 			hold()
 
@@ -135,12 +137,10 @@ func _on_AutoShiftTimer_timeout():
 
 func process_autoshift_action():
 	if move(movements[autoshift_action]):
-		$MidiPlayer.move()
 		if autoshift_action == "soft_drop":
 			emit_signal("piece_dropped", 1)
 
 func hard_drop():
-	$MidiPlayer.move()
 	var score = 0
 	while move(movements["soft_drop"]):
 		score += 2

source/Main.tscn

@@ -1,7 +1,7 @@
 [gd_scene load_steps=21 format=2]
 
-[ext_resource path="res://starmap_g8k.jpg" type="Texture" id=1]
+[ext_resource path="res://Main.gd" type="Script" id=1]
-[ext_resource path="res://Main.gd" type="Script" id=2]
+[ext_resource path="res://pexels-photo-1341279.jpeg" type="Texture" id=2]
 [ext_resource path="res://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=3]
 [ext_resource path="res://GridMap.gd" type="Script" id=4]
 [ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=5]
@@ -15,21 +15,20 @@
 
 [sub_resource type="PanoramaSky" id=1]
 
-radiance_size = 4
+radiance_size = 0
-panorama = ExtResource( 1 )
 
 [sub_resource type="Environment" id=2]
 
 resource_local_to_scene = true
-background_mode = 2
+background_mode = 0
 background_sky = SubResource( 1 )
 background_sky_custom_fov = 0.0
 background_color = Color( 0, 0, 0, 1 )
-background_energy = 3.0
+background_energy = 0.0
 background_canvas_max_layer = 0
-ambient_light_color = Color( 0.469971, 0.542197, 0.6875, 1 )
+ambient_light_color = Color( 0.86908, 0.949502, 0.958984, 1 )
-ambient_light_energy = 0.0
+ambient_light_energy = 2.0
-ambient_light_sky_contribution = 1.0
+ambient_light_sky_contribution = 0.92
 fog_enabled = false
 fog_color = Color( 0.5, 0.6, 0.7, 1 )
 fog_sun_color = Color( 1, 0.9, 0.7, 1 )
@@ -43,13 +42,13 @@ fog_height_enabled = false
 fog_height_min = 0.0
 fog_height_max = 100.0
 fog_height_curve = 1.0
-tonemap_mode = 0
+tonemap_mode = 3
 tonemap_exposure = 1.0
 tonemap_white = 1.0
 auto_exposure_enabled = false
 auto_exposure_scale = 0.4
 auto_exposure_min_luma = 0.05
-auto_exposure_max_luma = 8.0
+auto_exposure_max_luma = 0.26
 auto_exposure_speed = 0.5
 ss_reflections_enabled = false
 ss_reflections_max_steps = 64
@@ -86,7 +85,7 @@ glow_levels/4 = false
 glow_levels/5 = true
 glow_levels/6 = false
 glow_levels/7 = false
-glow_intensity = 2.26
+glow_intensity = 6.17
 glow_strength = 1.0
 glow_bloom = 0.0
 glow_blend_mode = 2
@@ -94,10 +93,10 @@ glow_hdr_threshold = 1.0
 glow_hdr_scale = 2.0
 glow_bicubic_upscale = false
 adjustment_enabled = false
-adjustment_brightness = 0.35
+adjustment_brightness = 0.27
 adjustment_contrast = 1.0
 adjustment_saturation = 0.34
-_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Fog", "Resource" ]
+_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Resource" ]
 
 [sub_resource type="SpatialMaterial" id=3]
 
@@ -230,14 +229,46 @@ extra_spacing_bottom = 5
 font_data = ExtResource( 11 )
 _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
 
-[node name="Main" type="WorldEnvironment" index="0"]
+[node name="Main" type="WorldEnvironment"]
 
 environment = SubResource( 2 )
-script = ExtResource( 2 )
+script = ExtResource( 1 )
 
-[node name="Camera" type="Camera" parent="." index="0"]
+[node name="Sprite3D" type="Sprite3D" parent="." index="0"]
 
-transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 10, 12 )
+transform = Transform( 12.8, 0, 0, 0, 8.53, 0, 0, 0, 1, 5, 10, -32 )
+layers = 1
+material_override = null
+cast_shadow = 1
+extra_cull_margin = 0.0
+use_in_baked_light = false
+lod_min_distance = 0.0
+lod_min_hysteresis = 0.0
+lod_max_distance = 0.0
+lod_max_hysteresis = 0.0
+centered = true
+offset = Vector2( 0, 0 )
+flip_h = false
+flip_v = false
+modulate = Color( 0.478431, 0.478431, 0.478431, 1 )
+opacity = 0.0
+pixel_size = 0.01
+axis = 2
+transparent = false
+shaded = false
+double_sided = false
+alpha_cut = 0
+texture = ExtResource( 2 )
+vframes = 1
+hframes = 1
+frame = 0
+region_enabled = false
+region_rect = Rect2( 0, 0, 0, 0 )
+_sections_unfolded = [ "Animation", "Flags", "Geometry", "Transform" ]
+
+[node name="Camera" type="Camera" parent="." index="1"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 4.5, 10, 20 )
 keep_aspect = 1
 cull_mask = 1048575
 environment = null
@@ -245,16 +276,16 @@ h_offset = 0.0
 v_offset = 0.0
 doppler_tracking = 0
 projection = 0
-current = false
+current = true
-fov = 100.0
+fov = 70.0
 size = 1.0
 near = 0.05
-far = -1.22275e+007
+far = 500.0
 _sections_unfolded = [ "Transform" ]
 
-[node name="DirectionalLight" type="DirectionalLight" parent="." index="1"]
+[node name="DirectionalLight" type="DirectionalLight" parent="." index="2"]
 
-transform = Transform( 0.376951, 0.677372, -0.631724, -0.295744, 0.734355, 0.610949, 0.877749, -0.0434695, 0.477145, -20, 30, 0 )
+transform = Transform( 0.332668, 0.771982, -0.541642, 0.579657, 0.285656, 0.763151, 0.743861, -0.567843, -0.352456, 5, 30, 0 )
 layers = 1
 light_color = Color( 1, 1, 1, 1 )
 light_energy = 3.0
@@ -280,7 +311,7 @@ directional_shadow_depth_range = 0
 directional_shadow_max_distance = 200.0
 _sections_unfolded = [ "Light", "Transform" ]
 
-[node name="GridMap" type="GridMap" parent="." index="2"]
+[node name="GridMap" type="GridMap" parent="." index="3"]
 
 theme = ExtResource( 3 )
 cell_size = Vector3( 1, 1, 1 )
@@ -303,9 +334,8 @@ __meta__ = {
 NB_LINES = 20
 NB_COLLUMNS = 10
 
-[node name="Backs" type="Spatial" parent="." index="3"]
+[node name="Backs" type="Spatial" parent="." index="4"]
 
-editor/display_folded = true
 visible = false
 
 [node name="GridBack" type="MeshInstance" parent="Backs" index="0"]
@@ -359,36 +389,37 @@ skeleton = NodePath("..")
 material/0 = null
 _sections_unfolded = [ "Transform" ]
 
-[node name="DropTimer" type="Timer" parent="." index="4"]
+[node name="DropTimer" type="Timer" parent="." index="5"]
 
 process_mode = 1
 wait_time = 1.0
 one_shot = false
 autostart = false
 
-[node name="LockDelay" type="Timer" parent="." index="5"]
+[node name="LockDelay" type="Timer" parent="." index="6"]
 
 process_mode = 1
 wait_time = 0.5
 one_shot = true
 autostart = false
 
-[node name="AutoShiftDelay" type="Timer" parent="." index="6"]
+[node name="AutoShiftDelay" type="Timer" parent="." index="7"]
 
 process_mode = 1
 wait_time = 0.17
 one_shot = true
 autostart = false
 
-[node name="AutoShiftTimer" type="Timer" parent="." index="7"]
+[node name="AutoShiftTimer" type="Timer" parent="." index="8"]
 
 process_mode = 1
 wait_time = 0.03
 one_shot = false
 autostart = false
 
-[node name="MidiPlayer" parent="." index="8" instance=ExtResource( 5 )]
+[node name="MidiPlayer" parent="." index="9" instance=ExtResource( 5 )]
 
+editor/display_folded = true
 script = ExtResource( 6 )
 file = "res://midi/Tetris - Song A.mid"
 volume_db = -12
@@ -403,7 +434,7 @@ wait_time = 1.41
 one_shot = true
 autostart = false
 
-[node name="FlashText" type="Control" parent="." index="9"]
+[node name="FlashText" type="Control" parent="." index="10"]
 
 anchor_left = 0.5
 anchor_top = 0.5
@@ -420,6 +451,7 @@ mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
 script = ExtResource( 7 )
+_sections_unfolded = [ "Material", "Size Flags", "Theme" ]
 
 [node name="Label" type="Label" parent="FlashText" index="0"]
 
@@ -456,15 +488,15 @@ anims/Flash = SubResource( 7 )
 blend_times = [  ]
 _sections_unfolded = [ "Playback Options" ]
 
-[node name="Stats" parent="." index="10" instance=ExtResource( 9 )]
+[node name="Stats" parent="." index="11" instance=ExtResource( 9 )]
 
 visible = false
 
-[node name="controls_ui" parent="." index="11" instance=ExtResource( 10 )]
+[node name="controls_ui" parent="." index="12" instance=ExtResource( 10 )]
 
 visible = false
 
-[node name="ReplayButton" type="Button" parent="." index="12"]
+[node name="ReplayButton" type="Button" parent="." index="13"]
 
 visible = false
 anchor_left = 1.0
@@ -493,14 +525,14 @@ flat = false
 align = 1
 _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ]
 
-[node name="Start" parent="." index="13" instance=ExtResource( 12 )]
+[node name="Start" parent="." index="14" instance=ExtResource( 12 )]
 
 [connection signal="piece_dropped" from="." to="Stats" method="_on_Main_piece_dropped"]
 
-[connection signal="piece_locked" from="." to="Stats" method="_on_Main_piece_locked"]
-
 [connection signal="piece_locked" from="." to="MidiPlayer" method="_on_Main_piece_locked"]
 
+[connection signal="piece_locked" from="." to="Stats" method="_on_Main_piece_locked"]
+
 [connection signal="timeout" from="DropTimer" to="." method="_on_DropTimer_timeout"]
 
 [connection signal="timeout" from="LockDelay" to="." method="_on_LockDelay_timeout"]

source/MidiPlayer.gd

@@ -3,12 +3,11 @@ extends "midi/MidiPlayer.gd"
 const Tetromino = preload("res://Tetrominos/Tetromino.gd")
 
 const LINE_CLEAR_CHANNELS = [2, 6]
-const MOVE_CHANNELS = []
 
 var muted_events = []
 
 func _ready():
-	mute_channels(MOVE_CHANNELS+LINE_CLEAR_CHANNELS)
+	mute_channels(LINE_CLEAR_CHANNELS)
 
 func _init_channel( ):
 	._init_channel()
@@ -37,10 +36,6 @@ func unmute_channels(channels):
 		for note in muted_events[channel_id]:
 			_process_track_event_note_on(channel_status[channel_id], muted_events[channel_id][note])
 
-func move():
-	unmute_channels(MOVE_CHANNELS)
-	mute_channels(MOVE_CHANNELS)
-
 func _on_Main_piece_locked(lines, t_spin):
 	if lines or t_spin:
 		if lines == Tetromino.NB_MINOES:

source/Start.tscn

@@ -17,7 +17,7 @@ _sections_unfolded = [ "Extra Spacing", "Font", "Font/fallback", "Settings" ]
 
 default_font = SubResource( 1 )
 
-[node name="Start" type="Control"]
+[node name="Start" type="Control" index="0"]
 
 anchor_left = 0.5
 anchor_top = 0.5
@@ -68,9 +68,9 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -78.0
+margin_left = -83.0
 margin_top = -20.0
-margin_right = 118.0
+margin_right = 113.0
 margin_bottom = 17.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -97,9 +97,9 @@ anchor_left = 0.5
 anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
-margin_left = -80.0
+margin_left = -85.0
 margin_top = 29.0
-margin_right = 90.0
+margin_right = 85.0
 margin_bottom = 69.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false

source/Tetrominos/Mino/Mino.tscn

@@ -123,7 +123,7 @@ params_point_size = 1.0
 params_billboard_mode = 0
 params_grow = false
 params_use_alpha_scissor = false
-albedo_color = Color( 0.601563, 0.775878, 1, 0.0196078 )
+albedo_color = Color( 0.601563, 0.775878, 1, 0.0045098 )
 metallic = 0.68
 metallic_specular = 1.0
 metallic_texture_channel = 0

source/Tetrominos/Mino/MinoMaterial.tres

@@ -23,15 +23,15 @@ params_point_size = 1.0
 params_billboard_mode = 0
 params_grow = false
 params_use_alpha_scissor = false
-albedo_color = Color( 0.601563, 0.775878, 1, 0.162157 )
+albedo_color = Color( 0.601563, 0.775878, 1, 0.486471 )
 metallic = 1.0
-metallic_specular = 1.0
+metallic_specular = 0.63
 metallic_texture_channel = 4
 roughness = 0.46
 roughness_texture_channel = 0
 emission_enabled = true
 emission = Color( 0.755859, 1, 0.914169, 1 )
-emission_energy = 1.0
+emission_energy = 0.2
 emission_operator = 0
 emission_on_uv2 = false
 normal_enabled = false

source/Tetrominos/TetroT.tscn

@@ -3,8 +3,7 @@
 [ext_resource path="res://Tetrominos/TetroT.gd" type="Script" id=1]
 [ext_resource path="res://Tetrominos/Mino/Mino.tscn" type="PackedScene" id=2]
 
-
+[node name="TetroT" type="Spatial"]
-[node name="TetroT" type="Spatial" index="0"]
 
 script = ExtResource( 1 )
 

source/Tetrominos/Tetromino.gd

@@ -122,10 +122,10 @@ func rotate(direction):
 			return i+1
 	return 0
 	
-func emit_trail(emit):
+func emit_trail(visible):
 	var trail
 	for mino in minoes:
 		trail = mino.get_node("Trail")
-		trail.emitting = emit
+		trail.emitting = visible
-		trail.restart()
+		trail.visible = visible
-		mino.get_node("SpotLight").visible = emit
+		mino.get_node("SpotLight").visible = visible

source/project.godot

@@ -12,15 +12,17 @@ config_version=3
 
 config/name="TETRIS 3000"
 run/main_scene="res://Main.tscn"
-boot_splash/image="res://icons/splash.png"
+boot_splash/image="res://splash.png"
 config/icon="res://icons/48.png"
 
 [display]
 
 window/size/width=500
 window/size/height=500
+window/vsync/use_vsync=false
 window/stretch/mode="2d"
 window/stretch/aspect="expand"
+window/stretch/shrink="1"
 
 [gui]
 
@@ -44,7 +46,9 @@ rotate_clockwise=[ Object(InputEventKey,"resource_local_to_scene":false,"resourc
  ]
 rotate_counterclockwise=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777238,"unicode":0,"echo":false,"script":null)
  ]
+toggle_fullscreen=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":true,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+ ]
 
 [rendering]
 
-threads/thread_model=2
+environment/default_clear_color=Color( 0, 0, 0, 1 )

starmap_g8k.jpg.import

@@ -1,29 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/starmap_g8k.jpg-617060714ab9f6908ea55c401bab327a.stex"
-
-[deps]
-
-source_file="res://starmap_g8k.jpg"
-dest_files=[ "res://.import/starmap_g8k.jpg-617060714ab9f6908ea55c401bab327a.stex" ]
-
-[params]
-
-compress/mode=0
-compress/lossy_quality=0.7
-compress/hdr_mode=0
-compress/normal_map=0
-flags/repeat=0
-flags/filter=true
-flags/mipmaps=false
-flags/anisotropic=false
-flags/srgb=2
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/HDR_as_SRGB=false
-stream=false
-size_limit=0
-detect_3d=true
-svg/scale=1.0