Merge branch 'master' of https://github.com/adrienmalin/TETRIS3000

This reverts commit 8435997cc4.

.gitignore

@@ -9,4 +9,5 @@ export_presets.cfg
 
 midi/FluidR3 GM.sf2
 release/
-*.import
+*.import
+*.tmp

README.md

@@ -2,5 +2,5 @@
 
 [Downloads](https://github.com/adrienmalin/TETRIS3000/releases)
 
-[Play in browser (experimental)](https://adrienmalin.github.io/TETRIS3000/web/TETRIS3000.html)
+[Play in browser](https://adrienmalin.github.io/TETRIS3000/web/TETRIS3000.html) (Firefox recommanded)
 

source/Environment.tres

@@ -0,0 +1,87 @@
+[gd_resource type="Environment" load_steps=2 format=2]
+
+[sub_resource type="PanoramaSky" id=1]
+
+radiance_size = 0
+
+[resource]
+
+resource_local_to_scene = true
+background_mode = 0
+background_sky = SubResource( 1 )
+background_sky_custom_fov = 0.0
+background_color = Color( 0, 0, 0, 1 )
+background_energy = 0.0
+background_canvas_max_layer = 0
+ambient_light_color = Color( 0.86908, 0.949502, 0.958984, 1 )
+ambient_light_energy = 2.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 )
+fog_sun_amount = 0.0
+fog_depth_enabled = true
+fog_depth_begin = 10.0
+fog_depth_curve = 1.0
+fog_transmit_enabled = false
+fog_transmit_curve = 1.0
+fog_height_enabled = false
+fog_height_min = 0.0
+fog_height_max = 100.0
+fog_height_curve = 1.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 = 0.26
+auto_exposure_speed = 0.5
+ss_reflections_enabled = false
+ss_reflections_max_steps = 64
+ss_reflections_fade_in = 0.15
+ss_reflections_fade_out = 2.0
+ss_reflections_depth_tolerance = 0.2
+ss_reflections_roughness = true
+ssao_enabled = false
+ssao_radius = 1.0
+ssao_intensity = 1.0
+ssao_radius2 = 0.0
+ssao_intensity2 = 1.0
+ssao_bias = 0.01
+ssao_light_affect = 0.0
+ssao_color = Color( 0, 0, 0, 1 )
+ssao_quality = 0
+ssao_blur = 3
+ssao_edge_sharpness = 4.0
+dof_blur_far_enabled = false
+dof_blur_far_distance = 10.0
+dof_blur_far_transition = 5.0
+dof_blur_far_amount = 0.1
+dof_blur_far_quality = 1
+dof_blur_near_enabled = false
+dof_blur_near_distance = 2.0
+dof_blur_near_transition = 1.0
+dof_blur_near_amount = 0.1
+dof_blur_near_quality = 1
+glow_enabled = false
+glow_levels/1 = false
+glow_levels/2 = false
+glow_levels/3 = true
+glow_levels/4 = false
+glow_levels/5 = true
+glow_levels/6 = false
+glow_levels/7 = false
+glow_intensity = 6.17
+glow_strength = 1.0
+glow_bloom = 0.0
+glow_blend_mode = 2
+glow_hdr_threshold = 1.0
+glow_hdr_scale = 2.0
+glow_bicubic_upscale = false
+adjustment_enabled = false
+adjustment_brightness = 0.27
+adjustment_contrast = 1.0
+adjustment_saturation = 0.34
+_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Resource" ]
+

source/FlashText.gd

@@ -10,7 +10,7 @@ func print(text):
 	$AnimationPlayer.play("Flash")
 
 func _on_AnimationPlayer_animation_finished(anim_name):
-	texts.resize(0)
+	texts = PoolStringArray()
 
 func _on_Stats_flash_text(text):
 	self.print(text)

source/GridMap.gd

@@ -1,12 +1,12 @@
 extends GridMap
 
 const Tetromino = preload("res://Tetrominos/Tetromino.gd")
-const ExplodingLine = preload("res://ExplodingLine.tscn")
+const ExplodingMino = preload("res://Tetrominos/Mino/ExplodingMino.tscn")
 
 const EMPTY_CELL = -1
 const MINO = 0
 
-var exploding_lines = []
+var exploding_minoes = []
 var nb_collumns
 var nb_lines
 
@@ -14,9 +14,11 @@ func _ready():
 	nb_collumns = int(get_parent().scale.x)
 	nb_lines = int(get_parent().scale.y)
 	for y in range(nb_lines):
-		exploding_lines.append(ExplodingLine.instance())
-		add_child(exploding_lines[y])
-		exploding_lines[y].translation = Vector3(nb_collumns/2, y, 1)
+		exploding_minoes.append([])
+		for x in range(nb_collumns):
+			exploding_minoes[y].append(ExplodingMino.instance())
+			add_child(exploding_minoes[y][x])
+			exploding_minoes[y][x].translation = Vector3(x, y, 0)
 
 func clear():
 	for used_cell in get_used_cells():
@@ -52,10 +54,9 @@ func lock(piece):
 	return minoes_over_grid < Tetromino.NB_MINOES
 
 func clear_lines():
-	var line_cleared
 	var lines_cleared = 0
 	for y in range(nb_lines-1, -1, -1):
-		line_cleared = true
+		var line_cleared = true
 		for x in range(nb_collumns):
 			if not get_cell_item(x, y, 0) == MINO:
 				line_cleared = false
@@ -63,8 +64,10 @@ func clear_lines():
 		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))
+					var above_cell = get_cell_item(x, y2+1, 0)
+					set_cell_item(x, y2, 0, above_cell)
 			lines_cleared += 1
-			exploding_lines[y].emitting = true
-			exploding_lines[y].restart()
+			for x in range(nb_collumns):
+				exploding_minoes[y][x].emitting = true
+				exploding_minoes[y][x].restart()
 	return lines_cleared

source/Main.gd

@@ -27,6 +27,9 @@ var autoshift_action
 
 var playing = false
 
+func _ready():
+	randomize()
+
 func new_game(level):
 	$Start.visible = false
 	next_piece = random_piece()
@@ -71,7 +74,7 @@ func _unhandled_input(event):
 	if event.is_action_pressed("pause"):
 		if playing:
 			pause($controls_ui)
-		elif $controls_ui.enable_resume:
+		else:
 			resume()
 	if event.is_action_pressed("toggle_fullscreen"):
 		OS.window_fullscreen = not OS.window_fullscreen
@@ -80,28 +83,26 @@ func _unhandled_input(event):
 			$AutoShiftDelay.stop()
 			$AutoShiftTimer.stop()
 			autoshift_action = ""
-			for action in movements:
-				if Input.is_action_pressed(action):
-					autoshift_action = action
-					process_autoshift()
-					$AutoShiftDelay.start()
-					break
-		for action in movements:
-			if action != autoshift_action:
-				if event.is_action_pressed(action):
-					$AutoShiftTimer.stop()
-					autoshift_action = action
-					process_autoshift()
-					$AutoShiftDelay.start()
-					break
+			process_new_action(Input)
+		else:
+			process_new_action(event)
 		if event.is_action_pressed("hard_drop"):
 			hard_drop()
 		if event.is_action_pressed("rotate_clockwise"):
-			current_piece.rotate(Tetromino.CLOCKWISE)
+			current_piece.turn(Tetromino.CLOCKWISE)
 		if event.is_action_pressed("rotate_counterclockwise"):
-			current_piece.rotate(Tetromino.COUNTERCLOCKWISE)
+			current_piece.turn(Tetromino.COUNTERCLOCKWISE)
 		if event.is_action_pressed("hold"):
 			hold()
+			
+func process_new_action(event):
+	for action in movements:
+		if action != autoshift_action and event.is_action_pressed(action):
+			$AutoShiftTimer.stop()
+			autoshift_action = action
+			process_autoshift()
+			$AutoShiftDelay.start()
+			break
 
 func _on_AutoShiftDelay_timeout():
 	if autoshift_action:
@@ -122,9 +123,17 @@ func hard_drop():
 	while current_piece.move(movements["soft_drop"]):
 		score += 2
 	$Stats.piece_dropped(score)
+	var translations = current_piece.get_translations()
+	for i in range(Tetromino.NB_MINOES):
+		get_node("DropTrail/"+str(i)).translation = translations[i]
+	$DropTrail.visible = true
+	$DropTrail/Delay.start()
 	$LockDelay.stop()
 	lock()
 
+func _on_DropTrailDelay_timeout():
+	$DropTrail.visible = false
+
 func _on_DropTimer_timeout():
 	if not current_piece.move(movements["soft_drop"]):
 		if $LockDelay.is_stopped():
@@ -132,9 +141,10 @@ func _on_DropTimer_timeout():
 		
 func lock():
 	if $Matrix/GridMap.lock(current_piece):
+		var t_spin = current_piece.t_spin()
 		var lines_cleared = $Matrix/GridMap.clear_lines()
-		$Stats.piece_locked(lines_cleared, current_piece.t_spin)
-		if lines_cleared or current_piece.t_spin:
+		$Stats.piece_locked(lines_cleared, t_spin)
+		if lines_cleared or t_spin:
 			$MidiPlayer.piece_locked(lines_cleared)
 		remove_child(current_piece)
 		new_piece()

source/Main.tscn

@@ -1,104 +1,21 @@
 [gd_scene load_steps=21 format=2]
 
-[ext_resource path="res://Main.gd" type="Script" id=1]
-[ext_resource path="res://aperture-vintage-472251-unsplash.jpg" 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]
-[ext_resource path="res://MidiPlayer.gd" type="Script" id=6]
-[ext_resource path="res://FlashText.gd" type="Script" id=7]
-[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=8]
-[ext_resource path="res://Stats.tscn" type="PackedScene" id=9]
-[ext_resource path="res://controls.tscn" type="PackedScene" id=10]
-[ext_resource path="res://Start.tscn" type="PackedScene" id=11]
-[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=12]
+[ext_resource path="res://Environment.tres" type="Environment" id=1]
+[ext_resource path="res://Main.gd" type="Script" id=2]
+[ext_resource path="res://aperture-vintage-472251-unsplash.jpg" type="Texture" id=3]
+[ext_resource path="res://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=4]
+[ext_resource path="res://GridMap.gd" type="Script" id=5]
+[ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=6]
+[ext_resource path="res://MidiPlayer.gd" type="Script" id=7]
+[ext_resource path="res://FlashText.gd" type="Script" id=8]
+[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=9]
+[ext_resource path="res://Stats.tscn" type="PackedScene" id=10]
+[ext_resource path="res://controls.tscn" type="PackedScene" id=11]
+[ext_resource path="res://Start.tscn" type="PackedScene" id=12]
+[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=13]
+[ext_resource path="res://Tetrominos/drop_trail.png" type="Texture" id=14]
 
-[sub_resource type="PanoramaSky" id=1]
-
-radiance_size = 0
-
-[sub_resource type="Environment" id=2]
-
-resource_local_to_scene = true
-background_mode = 0
-background_sky = SubResource( 1 )
-background_sky_custom_fov = 0.0
-background_color = Color( 0, 0, 0, 1 )
-background_energy = 0.0
-background_canvas_max_layer = 0
-ambient_light_color = Color( 0.86908, 0.949502, 0.958984, 1 )
-ambient_light_energy = 2.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 )
-fog_sun_amount = 0.0
-fog_depth_enabled = true
-fog_depth_begin = 10.0
-fog_depth_curve = 1.0
-fog_transmit_enabled = false
-fog_transmit_curve = 1.0
-fog_height_enabled = false
-fog_height_min = 0.0
-fog_height_max = 100.0
-fog_height_curve = 1.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 = 0.26
-auto_exposure_speed = 0.5
-ss_reflections_enabled = false
-ss_reflections_max_steps = 64
-ss_reflections_fade_in = 0.15
-ss_reflections_fade_out = 2.0
-ss_reflections_depth_tolerance = 0.2
-ss_reflections_roughness = true
-ssao_enabled = false
-ssao_radius = 1.0
-ssao_intensity = 1.0
-ssao_radius2 = 0.0
-ssao_intensity2 = 1.0
-ssao_bias = 0.01
-ssao_light_affect = 0.0
-ssao_color = Color( 0, 0, 0, 1 )
-ssao_quality = 0
-ssao_blur = 3
-ssao_edge_sharpness = 4.0
-dof_blur_far_enabled = false
-dof_blur_far_distance = 10.0
-dof_blur_far_transition = 5.0
-dof_blur_far_amount = 0.1
-dof_blur_far_quality = 1
-dof_blur_near_enabled = false
-dof_blur_near_distance = 2.0
-dof_blur_near_transition = 1.0
-dof_blur_near_amount = 0.1
-dof_blur_near_quality = 1
-glow_enabled = false
-glow_levels/1 = false
-glow_levels/2 = false
-glow_levels/3 = true
-glow_levels/4 = false
-glow_levels/5 = true
-glow_levels/6 = false
-glow_levels/7 = false
-glow_intensity = 6.17
-glow_strength = 1.0
-glow_bloom = 0.0
-glow_blend_mode = 2
-glow_hdr_threshold = 1.0
-glow_hdr_scale = 2.0
-glow_bicubic_upscale = false
-adjustment_enabled = false
-adjustment_brightness = 0.27
-adjustment_contrast = 1.0
-adjustment_saturation = 0.34
-_sections_unfolded = [ "Adjustments", "Ambient Light", "Background", "Resource" ]
-
-[sub_resource type="SpatialMaterial" id=3]
+[sub_resource type="SpatialMaterial" id=1]
 
 render_priority = 0
 flags_transparent = true
@@ -149,35 +66,35 @@ 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" ]
+_sections_unfolded = [ "Albedo", "Emission", "Flags", "Metallic", "NormalMap", "Proximity Fade" ]
 
-[sub_resource type="CubeMesh" id=4]
+[sub_resource type="CubeMesh" id=2]
 
-material = SubResource( 3 )
+material = SubResource( 1 )
 custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
 size = Vector3( 1, 1, 1 )
 subdivide_width = 0
 subdivide_height = 0
 subdivide_depth = 0
 
-[sub_resource type="CubeMesh" id=5]
+[sub_resource type="CubeMesh" id=3]
 
-material = SubResource( 3 )
+material = SubResource( 1 )
 custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
 size = Vector3( 1, 1, 1 )
 subdivide_width = 0
 subdivide_height = 0
 subdivide_depth = 0
 
-[sub_resource type="DynamicFont" id=6]
+[sub_resource type="DynamicFont" id=4]
 
 size = 30
 use_mipmaps = true
 use_filter = false
-font_data = ExtResource( 8 )
+font_data = ExtResource( 9 )
 _sections_unfolded = [ "Font", "Settings" ]
 
-[sub_resource type="Animation" id=7]
+[sub_resource type="Animation" id=5]
 
 resource_name = "Flash"
 length = 1.0
@@ -220,23 +137,23 @@ tracks/2/keys = {
 "values": [ Vector2( 0, 110 ), Vector2( 0, -50 ), Vector2( 0, -60 ), Vector2( 0, -100 ) ]
 }
 
-[sub_resource type="DynamicFont" id=8]
+[sub_resource type="DynamicFont" id=6]
 
 size = 20
 use_mipmaps = false
 use_filter = false
 extra_spacing_bottom = 5
-font_data = ExtResource( 12 )
+font_data = ExtResource( 13 )
 _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
 
-[node name="Main" type="WorldEnvironment"]
+[node name="Main" type="WorldEnvironment" index="0"]
 
-environment = SubResource( 2 )
-script = ExtResource( 1 )
+environment = ExtResource( 1 )
+script = ExtResource( 2 )
 
 [node name="Background" type="Sprite3D" parent="." index="0"]
 
-transform = Transform( 12.8, 0, 0, 0, 8.53, 0, 0, 0, 1, 5, 10, -32 )
+transform = Transform( 12.8, 0, 0, 0, 8.53, 0, 0, 0, 1, 4.5, 25, -32 )
 layers = 1
 material_override = null
 cast_shadow = 1
@@ -255,10 +172,10 @@ opacity = 1.0
 pixel_size = 0.01
 axis = 2
 transparent = false
-shaded = true
+shaded = false
 double_sided = false
 alpha_cut = 0
-texture = ExtResource( 2 )
+texture = ExtResource( 3 )
 vframes = 1
 hframes = 1
 frame = 0
@@ -268,7 +185,7 @@ _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 )
+transform = Transform( 1, 0, 0, 0, 0.939693, -0.34202, 0, 0.34202, 0.939693, 4.5, 2, 17 )
 keep_aspect = 1
 cull_mask = 1048575
 environment = null
@@ -277,7 +194,7 @@ v_offset = 0.0
 doppler_tracking = 0
 projection = 0
 current = true
-fov = 70.0
+fov = 60.3
 size = 1.0
 near = 0.05
 far = 500.0
@@ -324,15 +241,15 @@ lod_min_distance = 0.0
 lod_min_hysteresis = 0.0
 lod_max_distance = 0.0
 lod_max_hysteresis = 0.0
-mesh = SubResource( 4 )
+mesh = SubResource( 2 )
 skeleton = NodePath("..")
 material/0 = null
-_sections_unfolded = [ "Transform" ]
+_sections_unfolded = [ "Transform", "material" ]
 
 [node name="GridMap" type="GridMap" parent="Matrix" index="0"]
 
 transform = Transform( 0.1, 0, 0, 0, 0.05, 0, 0, 0, 1, -0.45, -0.475, 0 )
-theme = ExtResource( 3 )
+theme = ExtResource( 4 )
 cell_size = Vector3( 1, 1, 1 )
 cell_octant_size = 8
 cell_center_x = false
@@ -344,11 +261,11 @@ collision_mask = 1
 data = {
 "cells": PoolIntArray(  )
 }
-script = ExtResource( 4 )
+script = ExtResource( 5 )
 _sections_unfolded = [ "Cell", "Transform" ]
 __meta__ = {
 "_editor_clip_": 1,
-"_editor_floor_": Vector3( 0, -1, 0 )
+"_editor_floor_": Vector3( 0, -2, 0 )
 }
 
 [node name="Position3D" type="Position3D" parent="Matrix" index="1"]
@@ -369,7 +286,7 @@ lod_min_distance = 0.0
 lod_min_hysteresis = 0.0
 lod_max_distance = 0.0
 lod_max_hysteresis = 0.0
-mesh = SubResource( 5 )
+mesh = SubResource( 3 )
 skeleton = NodePath("..")
 material/0 = null
 _sections_unfolded = [ "Transform" ]
@@ -392,7 +309,7 @@ lod_min_distance = 0.0
 lod_min_hysteresis = 0.0
 lod_max_distance = 0.0
 lod_max_hysteresis = 0.0
-mesh = SubResource( 5 )
+mesh = SubResource( 3 )
 skeleton = NodePath("..")
 material/0 = null
 _sections_unfolded = [ "Transform" ]
@@ -430,11 +347,12 @@ wait_time = 0.03
 one_shot = false
 autostart = false
 
-[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 5 )]
+[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 6 )]
 
 editor/display_folded = true
-script = ExtResource( 6 )
-file = "res://midi/Tetris - Song A.mid"
+script = ExtResource( 7 )
+_sections_unfolded = [ "Pause" ]
+file = "res://midi/Korobeiniki.mid"
 volume_db = -24
 loop = true
 loop_start = 1.81
@@ -463,7 +381,7 @@ mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
-script = ExtResource( 7 )
+script = ExtResource( 8 )
 _sections_unfolded = [ "Material", "Size Flags", "Theme" ]
 
 [node name="Label" type="Label" parent="FlashText" index="0"]
@@ -481,7 +399,7 @@ mouse_filter = 2
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 4
-custom_fonts/font = SubResource( 6 )
+custom_fonts/font = SubResource( 4 )
 custom_colors/font_color = Color( 0.445404, 0.710476, 0.820313, 0 )
 align = 1
 valign = 1
@@ -497,27 +415,27 @@ autoplay = ""
 playback_process_mode = 1
 playback_default_blend_time = 0.0
 playback_speed = 1.0
-anims/Flash = SubResource( 7 )
+anims/Flash = SubResource( 5 )
 blend_times = [  ]
 _sections_unfolded = [ "Playback Options" ]
 
-[node name="Stats" parent="." index="12" instance=ExtResource( 9 )]
+[node name="Stats" parent="." index="12" instance=ExtResource( 10 )]
 
 visible = false
 anchor_left = 0.0
 anchor_top = 1.0
 anchor_right = 0.0
 anchor_bottom = 1.0
-margin_left = 20.0
-margin_top = -260.0
-margin_right = 130.0
-margin_bottom = -50.0
+margin_left = 30.0
+margin_top = -220.0
+margin_right = 140.0
+margin_bottom = -25.0
 
-[node name="controls_ui" parent="." index="13" instance=ExtResource( 10 )]
+[node name="controls_ui" parent="." index="13" instance=ExtResource( 11 )]
 
 visible = false
 
-[node name="Start" parent="." index="14" instance=ExtResource( 11 )]
+[node name="Start" parent="." index="14" instance=ExtResource( 12 )]
 
 [node name="ReplayButton" type="Button" parent="." index="15"]
 
@@ -526,10 +444,10 @@ anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-margin_left = -335.0
-margin_top = -55.0
-margin_right = -165.0
-margin_bottom = -15.0
+margin_left = -170.0
+margin_top = -90.0
+margin_right = -45.0
+margin_bottom = -50.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 focus_mode = 2
@@ -537,20 +455,176 @@ mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 6 )
 custom_colors/font_color = Color( 1, 1, 1, 1 )
 toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
-text = "REPLAY"
+text = "play again"
 flat = false
 align = 1
 _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ]
 
-[connection signal="timeout" from="DropTimer" to="." method="_on_DropTimer_timeout"]
+[node name="DropTrail" type="Spatial" parent="." index="16"]
 
-[connection signal="timeout" from="LockDelay" to="." method="_on_LockDelay_timeout"]
+_sections_unfolded = [ "Transform" ]
+
+[node name="0" type="Spatial" parent="DropTrail" index="0"]
+
+_sections_unfolded = [ "Transform" ]
+
+[node name="Sprite" type="Sprite3D" parent="DropTrail/0" index="0"]
+
+transform = Transform( 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 6, 0 )
+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( 1, 1, 1, 1 )
+opacity = 0.3
+pixel_size = 0.01
+axis = 2
+transparent = true
+shaded = false
+double_sided = true
+alpha_cut = 0
+texture = ExtResource( 14 )
+vframes = 1
+hframes = 1
+frame = 0
+region_enabled = false
+region_rect = Rect2( 0, 0, 0, 0 )
+_sections_unfolded = [ "Flags", "Transform" ]
+
+[node name="1" type="Spatial" parent="DropTrail" index="1"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 0, 0 )
+_sections_unfolded = [ "Transform" ]
+
+[node name="Sprite" type="Sprite3D" parent="DropTrail/1" index="0"]
+
+transform = Transform( 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 6, 0 )
+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( 1, 1, 1, 1 )
+opacity = 0.3
+pixel_size = 0.01
+axis = 2
+transparent = true
+shaded = false
+double_sided = true
+alpha_cut = 0
+texture = ExtResource( 14 )
+vframes = 1
+hframes = 1
+frame = 0
+region_enabled = false
+region_rect = Rect2( 0, 0, 0, 0 )
+_sections_unfolded = [ "Flags", "Transform" ]
+
+[node name="2" type="Spatial" parent="DropTrail" index="2"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0 )
+_sections_unfolded = [ "Transform" ]
+
+[node name="Sprite" type="Sprite3D" parent="DropTrail/2" index="0"]
+
+transform = Transform( 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 6, 0 )
+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( 1, 1, 1, 1 )
+opacity = 0.3
+pixel_size = 0.01
+axis = 2
+transparent = true
+shaded = false
+double_sided = true
+alpha_cut = 0
+texture = ExtResource( 14 )
+vframes = 1
+hframes = 1
+frame = 0
+region_enabled = false
+region_rect = Rect2( 0, 0, 0, 0 )
+_sections_unfolded = [ "Flags", "Transform" ]
+
+[node name="3" type="Spatial" parent="DropTrail" index="3"]
+
+transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0 )
+_sections_unfolded = [ "Transform" ]
+
+[node name="Sprite" type="Sprite3D" parent="DropTrail/3" index="0"]
+
+transform = Transform( 3, 0, 0, 0, 5, 0, 0, 0, 1, 0, 6, 0 )
+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( 1, 1, 1, 1 )
+opacity = 0.3
+pixel_size = 0.01
+axis = 2
+transparent = true
+shaded = false
+double_sided = true
+alpha_cut = 0
+texture = ExtResource( 14 )
+vframes = 1
+hframes = 1
+frame = 0
+region_enabled = false
+region_rect = Rect2( 0, 0, 0, 0 )
+_sections_unfolded = [ "Flags", "Transform" ]
+
+[node name="Delay" type="Timer" parent="DropTrail" index="4"]
+
+process_mode = 1
+wait_time = 0.06
+one_shot = true
+autostart = false
+
+[connection signal="timeout" from="DropTimer" to="." method="_on_DropTimer_timeout"]
 
 [connection signal="timeout" from="AutoShiftDelay" to="." method="_on_AutoShiftDelay_timeout"]
 
@@ -568,4 +642,6 @@ _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ]
 
 [connection signal="pressed" from="ReplayButton" to="." method="_on_ReplayButton_pressed"]
 
+[connection signal="timeout" from="DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"]
+
 

source/MidiPlayer.gd

@@ -2,7 +2,7 @@ extends "midi/MidiPlayer.gd"
 
 const Tetromino = preload("res://Tetrominos/Tetromino.gd")
 
-const LINE_CLEAR_CHANNELS = [2, 6]
+const LINE_CLEAR_CHANNELS = [2]
 
 var muted_events = []
 

source/Start.tscn

@@ -1,21 +1,30 @@
-[gd_scene load_steps=7 format=2]
+[gd_scene load_steps=9 format=2]
 
 [ext_resource path="res://Start.gd" type="Script" id=1]
 [ext_resource path="res://fonts/TitleFont.tres" type="DynamicFont" id=2]
-[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=3]
-[ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=4]
+[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=3]
+[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=4]
+[ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=5]
 
-[sub_resource type="DynamicFont" id=1]
+[sub_resource type="DynamicFont" id=4]
+
+size = 50
+use_mipmaps = false
+use_filter = false
+font_data = ExtResource( 3 )
+_sections_unfolded = [ "Font", "Settings" ]
+
+[sub_resource type="DynamicFont" id=2]
 
 size = 20
 use_mipmaps = false
 use_filter = false
-font_data = ExtResource( 3 )
+font_data = ExtResource( 4 )
 _sections_unfolded = [ "Extra Spacing", "Font", "Font/fallback", "Settings" ]
 
-[sub_resource type="Theme" id=2]
+[sub_resource type="Theme" id=3]
 
-default_font = SubResource( 1 )
+default_font = SubResource( 2 )
 
 [node name="Start" type="Control" index="0"]
 
@@ -42,9 +51,9 @@ anchor_top = 0.0
 anchor_right = 0.5
 anchor_bottom = 0.0
 margin_left = -250.0
-margin_top = -100.0
+margin_top = -109.0
 margin_right = 250.0
-margin_bottom = -26.0
+margin_bottom = -69.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -54,15 +63,40 @@ size_flags_vertical = 4
 custom_fonts/font = ExtResource( 2 )
 custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 )
 custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 )
-text = "TETRIS
-3000"
+text = "TETRIS"
+align = 1
+percent_visible = 1.0
+lines_skipped = 0
+max_lines_visible = -1
+_sections_unfolded = [ "Theme", "custom_colors", "custom_fonts" ]
+
+[node name="Label2" type="Label" parent="." index="1"]
+
+anchor_left = 0.5
+anchor_top = 0.0
+anchor_right = 0.5
+anchor_bottom = 0.0
+margin_left = -250.0
+margin_top = -75.0
+margin_right = 250.0
+margin_bottom = -19.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 2
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 4
+custom_fonts/font = SubResource( 4 )
+custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 )
+custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 )
+text = "3000"
 align = 1
 percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
 _sections_unfolded = [ "custom_colors", "custom_fonts" ]
 
-[node name="SpinBox" type="SpinBox" parent="." index="1"]
+[node name="SpinBox" type="SpinBox" parent="." index="2"]
 
 anchor_left = 0.5
 anchor_top = 0.5
@@ -78,7 +112,7 @@ mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
-theme = SubResource( 2 )
+theme = SubResource( 3 )
 min_value = 1.0
 max_value = 15.0
 step = 1.0
@@ -91,7 +125,7 @@ prefix = "Level "
 suffix = ""
 _sections_unfolded = [ "Margin", "Theme" ]
 
-[node name="PlayButton" type="Button" parent="." index="2"]
+[node name="PlayButton" type="Button" parent="." index="3"]
 
 anchor_left = 0.5
 anchor_top = 0.5
@@ -108,7 +142,7 @@ mouse_filter = 0
 mouse_default_cursor_shape = 0
 size_flags_horizontal = 1
 size_flags_vertical = 1
-custom_fonts/font = ExtResource( 4 )
+custom_fonts/font = ExtResource( 5 )
 toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null

source/Stats.gd

@@ -1,14 +1,13 @@
 extends MarginContainer
 
 const SCORES = [
-	[0, 4, 1],
-	[1, 8, 2],
-	[3, 12],
-	[5, 16],
-	[8]
+	{"": 0, "MINI T-SPIN": 1, "T-SPIN": 4},
+	{"": 1, "MINI T-SPIN": 2, "T-SPIN": 8},
+	{"": 3, "T-SPIN": 12},
+	{"": 5, "T-SPIN": 16},
+	{"": 8}
 ]
 const LINES_CLEARED_NAMES = ["", "SINGLE", "DOUBLE", "TRIPLE", "TETRIS"]
-const T_SPIN_NAMES = ["", "T-SPIN", "MINI T-SPIN"]
 const password = "TETRIS 3000"
 
 var level
@@ -18,8 +17,8 @@ var high_score
 var time
 var combos
 
-signal flash_text(text)
 signal level_up(level)
+signal flash_text(text)
 
 func _ready():
 	load_user_data()
@@ -69,15 +68,15 @@ func piece_dropped(ds):
 func piece_locked(lines, t_spin):
 	var ds
 	if lines or t_spin:
-		var text = T_SPIN_NAMES[t_spin]
 		if lines and t_spin:
-			text += " "
-		text += LINES_CLEARED_NAMES[lines]
-		emit_signal("flash_text", text)
-		ds = SCORES[lines][t_spin]
-		goal -= ds
+			emit_signal("flash_text", t_spin + " " + LINES_CLEARED_NAMES[lines])
+		elif lines:
+			emit_signal("flash_text", LINES_CLEARED_NAMES[lines])
+		elif t_spin:
+			emit_signal("flash_text", t_spin)
+		goal -= SCORES[lines][""]
 		$VBC/Goal.text = str(goal)
-		ds *= 100 * level
+		ds = 100 * level * SCORES[lines][t_spin]
 		emit_signal("flash_text", str(ds))
 		score += ds
 		$VBC/Score.text = str(score)

source/Stats.tscn

@@ -267,9 +267,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_top = 153.0
-margin_right = 78.0
-margin_bottom = 170.0
+margin_left = -116.0
+margin_top = 205.0
+margin_right = -38.0
+margin_bottom = 222.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2

source/Tetrominos/Mino/ExplodingMino.tscn

@@ -30,16 +30,16 @@ render_priority = 0
 trail_divisor = 2
 trail_color_modifier = SubResource( 4 )
 emission_shape = 2
-emission_box_extents = Vector3( 10, 1, 1 )
+emission_box_extents = Vector3( 1, 1, 1 )
 flag_align_y = false
 flag_rotate_y = true
 flag_disable_z = false
 spread = 0.0
 flatness = 0.0
-gravity = Vector3( 0, -10, 30 )
-initial_velocity = 20.0
+gravity = Vector3( 0, -40, 0 )
+initial_velocity = 100.0
 initial_velocity_random = 1.0
-angular_velocity = 97.14
+angular_velocity = 210.0
 angular_velocity_random = 1.0
 linear_accel = 100.0
 linear_accel_random = 1.0
@@ -61,9 +61,9 @@ anim_speed_random = 0.0
 anim_offset = 0.0
 anim_offset_random = 0.0
 anim_loop = false
-_sections_unfolded = [ "Angular Velocity", "Color", "Gravity", "Initial Velocity", "Linear Accel", "Scale", "Spread" ]
+_sections_unfolded = [ "Angular Velocity", "Color", "Emission Shape", "Gravity", "Initial Velocity", "Linear Accel", "Scale", "Spread" ]
 
-[node name="ExplodingLine" type="Particles" index="0"]
+[node name="ExplodingMino" type="Particles"]
 
 layers = 1
 material_override = null
@@ -75,7 +75,7 @@ lod_min_hysteresis = 0.0
 lod_max_distance = 0.0
 lod_max_hysteresis = 0.0
 emitting = false
-amount = 40
+amount = 1
 lifetime = 2.0
 one_shot = true
 preprocess = 0.0
@@ -84,7 +84,7 @@ explosiveness = 1.0
 randomness = 0.0
 fixed_fps = 0
 fract_delta = true
-visibility_aabb = AABB( -5, -0.5, -1, 10, 1, 2 )
+visibility_aabb = AABB( -0.5, -0.5, -0.5, 1, 1, 1 )
 local_coords = false
 draw_order = 0
 process_material = SubResource( 5 )

source/Tetrominos/Mino/Mino.tscn

@@ -162,7 +162,7 @@ subdivide_width = 0
 subdivide_height = 0
 subdivide_depth = 0
 
-[node name="Mino" type="Spatial"]
+[node name="Mino" type="Spatial" index="0"]
 
 transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
 _sections_unfolded = [ "Pause", "Transform", "Visibility" ]
@@ -204,13 +204,13 @@ _sections_unfolded = [ "Draw Passes", "Drawing", "Geometry", "LOD", "Process Mat
 
 [node name="SpotLight" type="SpotLight" parent="." index="2"]
 
-transform = Transform( 1, 0, 0, 0, -4.37114e-008, 1, 0, -1, -4.37114e-008, 0, 0, 0.5 )
+transform = Transform( 1, 0, 0, 0, 0.0174524, 0.999848, 0, -0.999848, 0.0174524, 0, 4, 1 )
 layers = 1
 light_color = Color( 1, 1, 1, 1 )
 light_energy = 16.0
 light_indirect_energy = 1.0
 light_negative = false
-light_specular = 0.5
+light_specular = 0.86
 light_bake_mode = 1
 light_cull_mask = -1
 shadow_enabled = false
@@ -219,10 +219,10 @@ shadow_bias = 0.15
 shadow_contact = 0.0
 shadow_reverse_cull_face = false
 editor_only = false
-spot_range = 20.0
+spot_range = 30.0
 spot_attenuation = 0.5
 spot_angle = 5.0
 spot_angle_attenuation = 2.0
-_sections_unfolded = [ "Light", "Spot", "Transform" ]
+_sections_unfolded = [ "Editor", "Light", "Spot", "Transform" ]
 
 

source/Tetrominos/Mino/MinoMaterial.tres

@@ -23,7 +23,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.486471 )
+albedo_color = Color( 0.601563, 0.775878, 1, 0.259529 )
 metallic = 1.0
 metallic_specular = 0.63
 metallic_texture_channel = 4
@@ -31,7 +31,7 @@ roughness = 0.46
 roughness_texture_channel = 0
 emission_enabled = true
 emission = Color( 0.755859, 1, 0.914169, 1 )
-emission_energy = 0.2
+emission_energy = 0.1
 emission_operator = 0
 emission_on_uv2 = false
 normal_enabled = false

source/Tetrominos/Mino/MinoMesh.tscn

@@ -2,8 +2,6 @@
 
 [ext_resource path="res://Tetrominos/Mino/MinoMaterial.tres" type="Material" id=1]
 
-
-
 [sub_resource type="CubeMesh" id=1]
 
 custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
@@ -12,7 +10,7 @@ subdivide_width = 0
 subdivide_height = 0
 subdivide_depth = 0
 
-[node name="Mino" type="MeshInstance" index="0"]
+[node name="Mino" type="MeshInstance"]
 
 layers = 1
 material_override = null

source/Tetrominos/TetroI.gd

@@ -1,70 +1,69 @@
 extends "Tetromino.gd"
 
-const CLOCKWISE = -1
-const COUNTERCLOCKWISE = 1
-const SUPER_ROTATION_SYSTEM = [
-    {
-        COUNTERCLOCKWISE: [
-			Vector3(0, -1, 0),
-			Vector3(-1, -1, 0),
-			Vector3(2, -1, 0),
-			Vector3(-1, 1, 0),
-			Vector3(2, -2, 0)
-		],
-        CLOCKWISE: [
-			Vector3(1, 0, 0),
-			Vector3(-1, 0, 0),
-			Vector3(2, 0, 0),
-			Vector3(-1, -1, 0),
-			Vector3(2, 2, 0)
-		],
-    },
-    {
-        COUNTERCLOCKWISE: [
-			Vector3(-1, 0, 0),
-			Vector3(1, 0, 0),
-			Vector3(-2, 0, 0),
-			Vector3(1, 1, 0),
-			Vector3(-2, -2, 0)
-		],
-        CLOCKWISE: [
-			Vector3(0, -1, 0),
-			Vector3(-1, -1, 0),
-			Vector3(2, -1, 0),
-			Vector3(-1, 1, 0),
-			Vector3(2, -2, 0)
-		],
-    },
-    {
-        COUNTERCLOCKWISE: [
-			Vector3(0, 1, 0),
-			Vector3(1, 1, 0),
-			Vector3(-2, 1, 0),
-			Vector3(1, -1, 0),
-			Vector3(-2, 2, 0)
-		],
-        CLOCKWISE: [
-			Vector3(-1, 0, 0),
-			Vector3(1, 0, 0),
-			Vector3(-2, 0, 0),
-			Vector3(1, 1, 0),
-			Vector3(-2, -2, 0)
-		],
-    },
-    {
-        COUNTERCLOCKWISE: [
-			Vector3(1, 0, 0),
-			Vector3(-1, 0, 0),
-			Vector3(2, 0, 0),
-			Vector3(-1, -1, 0),
-			Vector3(2, 2, 0)
-		],
-        CLOCKWISE: [
-			Vector3(0, 1, 0),
-			Vector3(1, 1, 0),
-			Vector3(-2, 1, 0),
-			Vector3(1, -1, 0),
-			Vector3(-2, 2, 0)
-		],
-    },
-]
+func _init():
+	super_rotation_system = [
+	    {
+	        COUNTERCLOCKWISE: [
+				Vector3(0, -1, 0),
+				Vector3(-1, -1, 0),
+				Vector3(2, -1, 0),
+				Vector3(-1, 1, 0),
+				Vector3(2, -2, 0)
+			],
+	        CLOCKWISE: [
+				Vector3(1, 0, 0),
+				Vector3(-1, 0, 0),
+				Vector3(2, 0, 0),
+				Vector3(-1, -1, 0),
+				Vector3(2, 2, 0)
+			],
+	    },
+	    {
+	        COUNTERCLOCKWISE: [
+				Vector3(-1, 0, 0),
+				Vector3(1, 0, 0),
+				Vector3(-2, 0, 0),
+				Vector3(1, 1, 0),
+				Vector3(-2, -2, 0)
+			],
+	        CLOCKWISE: [
+				Vector3(0, -1, 0),
+				Vector3(-1, -1, 0),
+				Vector3(2, -1, 0),
+				Vector3(-1, 1, 0),
+				Vector3(2, -2, 0)
+			],
+	    },
+	    {
+	        COUNTERCLOCKWISE: [
+				Vector3(0, 1, 0),
+				Vector3(1, 1, 0),
+				Vector3(-2, 1, 0),
+				Vector3(1, -1, 0),
+				Vector3(-2, 2, 0)
+			],
+	        CLOCKWISE: [
+				Vector3(-1, 0, 0),
+				Vector3(1, 0, 0),
+				Vector3(-2, 0, 0),
+				Vector3(1, 1, 0),
+				Vector3(-2, -2, 0)
+			],
+	    },
+	    {
+	        COUNTERCLOCKWISE: [
+				Vector3(1, 0, 0),
+				Vector3(-1, 0, 0),
+				Vector3(2, 0, 0),
+				Vector3(-1, -1, 0),
+				Vector3(2, 2, 0)
+			],
+	        CLOCKWISE: [
+				Vector3(0, 1, 0),
+				Vector3(1, 1, 0),
+				Vector3(-2, 1, 0),
+				Vector3(1, -1, 0),
+				Vector3(-2, 2, 0)
+			],
+	    },
+	]

source/Tetrominos/TetroJ.tscn

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

source/Tetrominos/TetroO.gd

@@ -1,4 +1,5 @@
 extends "Tetromino.gd"
 
-func rotate(direction):
-	return 0
+func turn(direction):
+	return false
+	

source/Tetrominos/TetroO.tscn

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

source/Tetrominos/TetroT.gd

@@ -6,20 +6,16 @@ const T_SLOT = [
 	Vector3(1, -1, 0),
 	Vector3(-1, -1, 0)
 ]
-
-func rotate(direction):
-	var rotation_point = .rotate(direction)
-	if rotation_point and t_spin != T_SPIN:
+	
+func t_spin():
+	if rotated_last:
 		var center = to_global(minoes[0].translation)
 		var a = not grid_map.is_free_cell(center + T_SLOT[orientation])
 		var b = not grid_map.is_free_cell(center + T_SLOT[(1+orientation)%4])
-		var c = not grid_map.is_free_cell(center + T_SLOT[(2+orientation)%4])
-		var d = not grid_map.is_free_cell(center + T_SLOT[(3+orientation)%4])
-		if a and b and (c or d):
-			t_spin = T_SPIN
+		var c = not grid_map.is_free_cell(center + T_SLOT[(3+orientation)%4])
+		var d = not grid_map.is_free_cell(center + T_SLOT[(2+orientation)%4])
+		if rotation_point_5_used or (a and b and (c or d)):
+			return "T-SPIN"
 		elif c and d and (a or b):
-			if rotation_point == 5:
-				t_spin = T_SPIN
-			else:
-				t_spin = MINI_T_SPIN
-	return rotation_point
+			return "MINI T-SPIN"
+	return ""

source/Tetrominos/TetroT.tscn

@@ -6,6 +6,7 @@
 [node name="TetroT" type="Spatial"]
 
 script = ExtResource( 1 )
+_sections_unfolded = [ "Transform" ]
 
 [node name="Mino0" parent="." index="0" instance=ExtResource( 2 )]
 

source/Tetrominos/Tetromino.gd

@@ -3,10 +3,8 @@ extends Spatial
 const NB_MINOES = 4
 const CLOCKWISE = -1
 const COUNTERCLOCKWISE = 1
-const NO_T_SPIN = 0
-const T_SPIN = 1
-const MINI_T_SPIN = 2
-const SUPER_ROTATION_SYSTEM = [
+
+var super_rotation_system = [
     {
         COUNTERCLOCKWISE: [
 			Vector3(0, 0, 0),
@@ -77,10 +75,10 @@ var minoes = []
 var grid_map
 var lock_delay
 var orientation = 0
-var t_spin = NO_T_SPIN
+var rotation_point_5_used = false
+var rotated_last = false
 
 func _ready():
-	randomize()
 	for i in range(NB_MINOES):
 		minoes.append(get_node("Mino"+str(i)))
 	grid_map = get_node("../Matrix/GridMap")
@@ -100,28 +98,34 @@ func move(movement):
 	if grid_map.possible_positions(get_translations(), movement):
 		translate(movement)
 		lock_delay.start()
+		rotated_last = false
 		return true
 	return false
 	
-func rotate(direction):
-	var t = get_translations()
-	var rotated_translations = [t[0]]
+func turn(direction):
+	var translations = get_translations()
+	var rotated_translations = [translations[0]]
+	var center = translations[0]
 	for i in range(1, NB_MINOES):
-		var v = t[i]
-		v -= t[0]
-		v = Vector3(-1*direction*v.y, direction*v.x, 0)
-		v += t[0]
-		rotated_translations.append(v)
-	var movements = SUPER_ROTATION_SYSTEM[orientation][direction]
+		var rt = translations[i] - center
+		rt = Vector3(-1*direction*rt.y, direction*rt.x, 0)
+		rt += center
+		rotated_translations.append(rt)
+	var movements = super_rotation_system[orientation][direction]
 	for i in range(movements.size()):
 		if grid_map.possible_positions(rotated_translations, movements[i]):
-			orientation -= direction
-			orientation %= NB_MINOES
+			orientation = (orientation - direction) % NB_MINOES
 			set_translations(rotated_translations)
 			translate(movements[i])
 			lock_delay.start()
-			return i+1
-	return 0
+			rotated_last = true
+			if i == 4:
+				rotation_point_5_used = true
+			return true
+	return false
+	
+func t_spin():
+	return ""
 	
 func emit_trail(visible):
 	var trail

source/controls.gd

@@ -1,17 +1,5 @@
 extends Control
 
-# Note for the reader:
-#
-# This demo conveniently uses the same names for actions and for the container nodes
-# that hold each remapping button. This allow to get back to the button based simply
-# on the name of the corresponding action, but it might not be so simple in your project.
-#
-# A better approach for large-scale input remapping might be to do the connections between
-# buttons and wait_for_input through the code, passing as arguments both the name of the
-# action and the node, e.g.:
-# button.connect("pressed", self, "wait_for_input", [ button, action ])
-
-# Constants
 const INPUT_ACTIONS = [
 	"move_left",
 	"move_right",
@@ -24,11 +12,8 @@ const INPUT_ACTIONS = [
 ]
 const CONFIG_FILE = "user://input.cfg"
 
-# Member variables
 var action # To register the action the UI is currently handling
 var button # Button node corresponding to the above action
-var enable_resume = true
-
 
 # Load/save input mapping to a config file
 # Changes done while testing the demo will be persistent, saved to CONFIG_FILE
@@ -74,8 +59,7 @@ func wait_for_input(action_bind):
 	action = action_bind
 	# See note at the beginning of the script
 	button = get_node("bindings").get_node(action).get_node("Button")
-	#get_node("contextual_help").text = "Press a key to assign to the '" + action + "' action."
-	enable_resume = false
+	button.text = "Press key"
 	set_process_input(true)
 
 
@@ -85,9 +69,7 @@ func _input(event):
 		# Register the event as handled and stop polling
 		get_tree().set_input_as_handled()
 		set_process_input(false)
-		# Reinitialise the contextual help label
-		#get_node("contextual_help").text = "Click a key binding to reassign it, or press the Cancel action."
-
+		
 		# Display the string corresponding to the pressed key
 		var scancode = OS.get_scancode_string(event.scancode)
 		button.text = scancode
@@ -97,9 +79,8 @@ func _input(event):
 		# Add the new key binding
 		InputMap.action_add_event(action, event)
 		save_to_config("input", action, scancode)
-		enable_resume = true
-
-
+		hint_text()
+	
 func _ready():
 	# Load config if existing, if not it will be generated with default values
 	load_config()
@@ -111,6 +92,13 @@ func _ready():
 		var button = get_node("bindings").get_node(action).get_node("Button")
 		button.text = OS.get_scancode_string(input_event.scancode)
 		button.connect("pressed", self, "wait_for_input", [action])
+		
+	hint_text()
+
+func hint_text():
+	var input_event = InputMap.get_action_list("pause")[0]
+	var scancode = OS.get_scancode_string(input_event.scancode)
+	$hint.text = "Press ["+ scancode + "] to resume\nor click on a button to change key assignment"
 	
 	# Do not start processing input until a button is pressed
 	set_process_input(false)

source/controls.tscn

@@ -19,9 +19,9 @@ anchor_top = 0.5
 anchor_right = 0.5
 anchor_bottom = 0.5
 margin_left = -30.0
-margin_top = 10.0
+margin_top = 20.0
 margin_right = 10.0
-margin_bottom = 50.0
+margin_bottom = 60.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -39,10 +39,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = -40.0
-margin_top = -150.0
-margin_right = 110.0
-margin_bottom = -111.0
+margin_left = -220.0
+margin_top = -190.0
+margin_right = 280.0
+margin_bottom = -151.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 2
@@ -53,6 +53,8 @@ custom_fonts/font = ExtResource( 2 )
 custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 )
 custom_colors/font_color_shadow = Color( 1, 1, 1, 0.0968627 )
 text = "PAUSE"
+align = 1
+valign = 1
 percent_visible = 1.0
 lines_skipped = 0
 max_lines_visible = -1
@@ -81,10 +83,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 50.0
-margin_top = 50.0
-margin_right = 90.0
-margin_bottom = 90.0
+margin_left = 20.0
+margin_top = 65.0
+margin_right = 60.0
+margin_bottom = 105.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -99,7 +101,7 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 80.0
-margin_right = 155.0
+margin_right = 174.0
 margin_bottom = 37.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -113,6 +115,7 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
 _sections_unfolded = [ "Rect" ]
@@ -120,7 +123,7 @@ _sections_unfolded = [ "Rect" ]
 [node name="arrowLeft" type="Sprite" parent="bindings/move_left" index="1"]
 
 position = Vector2( 30, 20 )
-scale = Vector2( 0.9, 0.9 )
+scale = Vector2( 0.75, 0.75 )
 texture = ExtResource( 4 )
 
 [node name="move_right" type="Control" parent="bindings" index="1"]
@@ -129,10 +132,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 226.0
-margin_top = 51.0
-margin_right = 266.0
-margin_bottom = 91.0
+margin_left = 220.0
+margin_top = 65.0
+margin_right = 260.0
+margin_bottom = 105.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -148,7 +151,7 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 84.0
 margin_top = -1.0
-margin_right = 159.0
+margin_right = 178.0
 margin_bottom = 36.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -162,12 +165,15 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
+_sections_unfolded = [ "custom_fonts" ]
 
 [node name="arrowRight" type="Sprite" parent="bindings/move_right" index="1"]
 
 position = Vector2( 34, 19 )
+scale = Vector2( 0.8, 0.8 )
 texture = ExtResource( 5 )
 _sections_unfolded = [ "Transform" ]
 
@@ -177,10 +183,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 230.0
-margin_top = 100.0
-margin_right = 270.0
-margin_bottom = 140.0
+margin_left = 224.0
+margin_top = 114.0
+margin_right = 264.0
+margin_bottom = 154.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -195,7 +201,7 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 80.0
-margin_right = 155.0
+margin_right = 174.0
 margin_bottom = 37.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -209,13 +215,15 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
-_sections_unfolded = [ "custom_fonts" ]
+_sections_unfolded = [ "Rect", "custom_fonts" ]
 
 [node name="clockwise" type="Sprite" parent="bindings/rotate_clockwise" index="1"]
 
 position = Vector2( 30, 15 )
+scale = Vector2( 0.8, 0.8 )
 texture = ExtResource( 6 )
 
 [node name="rotate_counterclockwise" type="Control" parent="bindings" index="3"]
@@ -224,10 +232,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 45.0
-margin_top = 100.0
-margin_right = 85.0
-margin_bottom = 140.0
+margin_left = 15.0
+margin_top = 115.0
+margin_right = 55.0
+margin_bottom = 155.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -243,7 +251,7 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 84.0
 margin_top = -1.0
-margin_right = 159.0
+margin_right = 178.0
 margin_bottom = 36.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -257,13 +265,15 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
 _sections_unfolded = [ "Rect" ]
 
 [node name="counterclockwise" type="Sprite" parent="bindings/rotate_counterclockwise" index="1"]
 
-position = Vector2( 34, 14 )
+position = Vector2( 35, 15 )
+scale = Vector2( 0.82, 0.82 )
 texture = ExtResource( 7 )
 
 [node name="soft_drop" type="Control" parent="bindings" index="4"]
@@ -272,10 +282,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 50.0
-margin_top = 150.0
-margin_right = 90.0
-margin_bottom = 190.0
+margin_left = 20.0
+margin_top = 165.0
+margin_right = 60.0
+margin_bottom = 205.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -290,7 +300,7 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 80.0
-margin_right = 155.0
+margin_right = 174.0
 margin_bottom = 37.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -304,12 +314,14 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
 
 [node name="arrowDown" type="Sprite" parent="bindings/soft_drop" index="1"]
 
 position = Vector2( 30, 20 )
+scale = Vector2( 0.8, 0.8 )
 texture = ExtResource( 8 )
 _sections_unfolded = [ "Transform" ]
 
@@ -319,10 +331,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 226.0
-margin_top = 151.0
-margin_right = 266.0
-margin_bottom = 191.0
+margin_left = 220.0
+margin_top = 165.0
+margin_right = 260.0
+margin_bottom = 205.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -338,7 +350,7 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 84.0
 margin_top = -1.0
-margin_right = 159.0
+margin_right = 178.0
 margin_bottom = 36.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -352,13 +364,16 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
 
 [node name="harddrop" type="Sprite" parent="bindings/hard_drop" index="1"]
 
 position = Vector2( 34, 19 )
+scale = Vector2( 0.75, 0.75 )
 texture = ExtResource( 9 )
+_sections_unfolded = [ "Transform", "Z Index" ]
 
 [node name="hold" type="Control" parent="bindings" index="6"]
 
@@ -366,10 +381,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 50.0
-margin_top = 200.0
-margin_right = 90.0
-margin_bottom = 240.0
+margin_left = 20.0
+margin_top = 215.0
+margin_right = 60.0
+margin_bottom = 255.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -384,7 +399,7 @@ anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 80.0
-margin_right = 155.0
+margin_right = 174.0
 margin_bottom = 37.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -398,12 +413,14 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
 
 [node name="hold" type="Sprite" parent="bindings/hold" index="1"]
 
 position = Vector2( 30, 20 )
+scale = Vector2( 0.8, 0.8 )
 texture = ExtResource( 10 )
 
 [node name="pause" type="Control" parent="bindings" index="7"]
@@ -412,10 +429,10 @@ anchor_left = 0.0
 anchor_top = 0.0
 anchor_right = 0.0
 anchor_bottom = 0.0
-margin_left = 226.0
-margin_top = 201.0
-margin_right = 266.0
-margin_bottom = 241.0
+margin_left = 220.0
+margin_top = 215.0
+margin_right = 260.0
+margin_bottom = 255.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
 mouse_filter = 0
@@ -431,7 +448,7 @@ anchor_right = 0.0
 anchor_bottom = 0.0
 margin_left = 84.0
 margin_top = -1.0
-margin_right = 159.0
+margin_right = 178.0
 margin_bottom = 36.0
 rect_pivot_offset = Vector2( 0, 0 )
 rect_clip_content = false
@@ -445,12 +462,41 @@ toggle_mode = false
 enabled_focus_mode = 2
 shortcut = null
 group = null
+text = "Press key"
 flat = false
 align = 1
 
 [node name="pause" type="Sprite" parent="bindings/pause" index="1"]
 
 position = Vector2( 34, 19 )
+scale = Vector2( 0.8, 0.8 )
 texture = ExtResource( 11 )
+_sections_unfolded = [ "Transform" ]
+
+[node name="hint" type="Label" parent="." index="2"]
+
+anchor_left = 0.0
+anchor_top = 0.0
+anchor_right = 0.0
+anchor_bottom = 0.0
+margin_left = -220.0
+margin_top = -135.0
+margin_right = 280.0
+margin_bottom = -84.0
+rect_pivot_offset = Vector2( 0, 0 )
+rect_clip_content = false
+mouse_filter = 2
+mouse_default_cursor_shape = 0
+size_flags_horizontal = 1
+size_flags_vertical = 4
+custom_fonts/font = ExtResource( 3 )
+text = "Press [pause key] to resume
+or click on a button to change key assignment"
+align = 1
+valign = 1
+percent_visible = 1.0
+lines_skipped = 0
+max_lines_visible = -1
+_sections_unfolded = [ "custom_fonts" ]
 
 

source/midi/ADSR.gd

@@ -36,13 +36,13 @@ func set_instrument( instrument ):
 	self.ads_state = instrument.ads_state
 	self.release_state = instrument.release_state
 
-func play( ):
+func play( from_position=0.0 ):
 	self.releasing = false
 	self.timer = 0.0
 	self.using_timer = 0.0
 	self.current_volume = self.ads_state[0].volume
 	self.stream.mix_rate = round( self.mix_rate * ( 1.0 + self.pitch_bend * 0.5 ) )
-	.play( 0.0 )
+	.play( from_position )
 	self._update_volume( )
 
 func start_release( ):

source/project.godot

@@ -17,8 +17,8 @@ config/icon="res://icons/48.png"
 
 [display]
 
-window/size/width=500
-window/size/height=500
+window/size/width=640
+window/size/height=480
 window/vsync/use_vsync=false
 window/stretch/aspect="expand"
 
@@ -50,4 +50,5 @@ toggle_fullscreen=[ Object(InputEventKey,"resource_local_to_scene":false,"resour
 [rendering]
 
 environment/default_clear_color=Color( 0, 0, 0, 1 )
+environment/default_environment="res://Environment.tres"
 quality/main_loop_type=""

web/TETRIS3000.html

@@ -10,7 +10,7 @@
 			border: 0 none;
 			padding: 0;
 			text-align: center;
-			background-color: #222226;
+			background-color: #000000;
 			font-family: 'Noto Sans', Arial, sans-serif;
 		}
 
@@ -20,7 +20,7 @@
 
 		.godot {
 			color: #e0e0e0;
-			background-color: #3b3943;
+			background-color: #000000;
 			background-image: linear-gradient(to bottom, #403e48, #35333c);
 			border: 1px solid #45434e;
 			box-shadow: 0 0 1px 1px #2f2d35;
@@ -65,6 +65,8 @@
 		 * ================ */
 
 		#container {
+			background-image: url("TETRIS3000.png");
+			background-size: 100% 100%;
 			display: inline-block; /* scale with canvas */
 			vertical-align: top; /* prevent extra height */
 			position: relative; /* root for absolutely positioned overlay */