14 Commits

Author SHA1 Message Date
59da630c7c fix orientation 2019-02-10 15:03:02 +01:00
bdbeb399d5 v1.11.1 release 2019-01-27 14:32:00 +01:00
976bc01c20 Update .gitignore 2019-01-27 14:18:50 +01:00
4424107f16 Update Start.tscn 2019-01-27 14:18:46 +01:00
bdba103417 fix flash text (again) 2019-01-27 14:18:42 +01:00
9e42789e1e v1.11 release 2019-01-27 12:43:06 +01:00
667cde38a1 Change music 2019-01-26 18:53:22 +01:00
f2655a075e update splashscreen 2019-01-26 18:01:10 +01:00
92b97dbfb3 GHOST PIECE 2019-01-26 14:03:27 +01:00
ac6e561c3d tweaks 2019-01-26 13:38:04 +01:00
6e75bcf968 move background 2019-01-26 12:59:04 +01:00
a9118f0563 Update Main.tscn 2019-01-26 12:57:35 +01:00
33f7994997 move start GUI 2019-01-26 12:40:15 +01:00
c4ce4af524 Update Main.gd 2019-01-26 00:08:21 +01:00
17 changed files with 471 additions and 236 deletions

2
.gitignore vendored
View File

@ -11,3 +11,5 @@ midi/FluidR3 GM.sf2
release/ release/
*.import *.import
*.tmp *.tmp
desktop.ini

View File

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

View File

@ -43,7 +43,7 @@ func new_game(level):
func new_piece(): func new_piece():
current_piece = next_piece current_piece = next_piece
current_piece.translation = $Matrix/Position3D.translation current_piece.translation = $Matrix/Position3D.translation
current_piece.turn_light(true) current_piece.move_ghost()
next_piece = random_piece() next_piece = random_piece()
next_piece.translation = $Next/Position3D.translation next_piece.translation = $Next/Position3D.translation
if $Matrix/GridMap.possible_positions(current_piece.get_translations(), THERE): if $Matrix/GridMap.possible_positions(current_piece.get_translations(), THERE):
@ -66,7 +66,7 @@ func random_piece():
func new_level(level): func new_level(level):
if level <= 15: if level <= 15:
$DropTimer.wait_time = pow(0.8 - ((level - 1) * 0.007), level - 1) $DropTimer.wait_time = pow(0.8 - ((level-1)*0.007), level-1)
else: else:
$LockDelay.wait_time = 0.5 * pow(0.9, level-15) $LockDelay.wait_time = 0.5 * pow(0.9, level-15)
@ -125,14 +125,14 @@ func hard_drop():
$Stats.piece_dropped(score) $Stats.piece_dropped(score)
var translations = current_piece.get_translations() var translations = current_piece.get_translations()
for i in range(Tetromino.NB_MINOES): for i in range(Tetromino.NB_MINOES):
get_node("DropTrail/"+str(i)).translation = translations[i] get_node("Matrix/DropTrail/"+str(i)).translation = translations[i]
$DropTrail.visible = true $Matrix/DropTrail.visible = true
$DropTrail/Delay.start() $Matrix/DropTrail/Delay.start()
$LockDelay.stop() $LockDelay.stop()
lock() lock()
func _on_DropTrailDelay_timeout(): func _on_DropTrailDelay_timeout():
$DropTrail.visible = false $Matrix/DropTrail.visible = false
func _on_DropTimer_timeout(): func _on_DropTimer_timeout():
current_piece.move(movements["soft_drop"]) current_piece.move(movements["soft_drop"])
@ -159,13 +159,12 @@ func hold():
var swap = current_piece var swap = current_piece
current_piece = held_piece current_piece = held_piece
held_piece = swap held_piece = swap
held_piece.turn_light(false)
for mino in held_piece.minoes: for mino in held_piece.minoes:
mino.get_node("LockingMesh").visible = false mino.get_node("LockingMesh").visible = false
held_piece.translation = $Hold/Position3D.translation held_piece.translation = $Hold/Position3D.translation
if current_piece: if current_piece:
current_piece.translation = $Matrix/Position3D.translation current_piece.translation = $Matrix/Position3D.translation
current_piece.turn_light(true) current_piece.move_ghost()
else: else:
new_piece() new_piece()
@ -182,6 +181,7 @@ func resume():
$Hold.visible = true $Hold.visible = true
$Next.visible = true $Next.visible = true
current_piece.visible = true current_piece.visible = true
$Ghost.visible = true
if held_piece: if held_piece:
held_piece.visible = true held_piece.visible = true
next_piece.visible = true next_piece.visible = true
@ -203,6 +203,7 @@ func pause(gui=null):
$Hold.visible = false $Hold.visible = false
$Next.visible = false $Next.visible = false
current_piece.visible = false current_piece.visible = false
$Ghost.visible = false
if held_piece: if held_piece:
held_piece.visible = false held_piece.visible = false
next_piece.visible = false next_piece.visible = false

View File

@ -1,19 +1,20 @@
[gd_scene load_steps=21 format=2] [gd_scene load_steps=22 format=2]
[ext_resource path="res://Environment.tres" type="Environment" id=1] [ext_resource path="res://Environment.tres" type="Environment" id=1]
[ext_resource path="res://Main.gd" type="Script" id=2] [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://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://Tetrominos/Mino/MinoLibrary.tres" type="MeshLibrary" id=4]
[ext_resource path="res://GridMap.gd" type="Script" id=5] [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://Tetrominos/Mino/drop_trail.png" type="Texture" id=6]
[ext_resource path="res://MidiPlayer.gd" type="Script" id=7] [ext_resource path="res://midi/MidiPlayer.tscn" type="PackedScene" id=7]
[ext_resource path="res://FlashText.gd" type="Script" id=8] [ext_resource path="res://MidiPlayer.gd" type="Script" id=8]
[ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=9] [ext_resource path="res://FlashText.gd" type="Script" id=9]
[ext_resource path="res://Stats.tscn" type="PackedScene" id=10] [ext_resource path="res://fonts/525-ROUN.TTF" type="DynamicFontData" id=10]
[ext_resource path="res://controls.tscn" type="PackedScene" id=11] [ext_resource path="res://Stats.tscn" type="PackedScene" id=11]
[ext_resource path="res://Start.tscn" type="PackedScene" id=12] [ext_resource path="res://controls.tscn" type="PackedScene" id=12]
[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=13] [ext_resource path="res://Start.tscn" type="PackedScene" id=13]
[ext_resource path="res://Tetrominos/Mino/drop_trail.png" type="Texture" id=14] [ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=14]
[ext_resource path="res://Tetrominos/Ghost.tscn" type="PackedScene" id=15]
[sub_resource type="SpatialMaterial" id=1] [sub_resource type="SpatialMaterial" id=1]
@ -66,7 +67,7 @@ uv2_triplanar_sharpness = 1.0
proximity_fade_enable = true proximity_fade_enable = true
proximity_fade_distance = 1.0 proximity_fade_distance = 1.0
distance_fade_enable = false distance_fade_enable = false
_sections_unfolded = [ "Albedo", "Emission", "Flags", "Metallic", "NormalMap", "Proximity Fade" ] _sections_unfolded = [ "Albedo", "Anisotropy", "Clearcoat", "Detail", "Distance Fade", "Emission", "Flags", "Metallic", "NormalMap", "Parameters", "Proximity Fade", "Rim", "Roughness" ]
[sub_resource type="CubeMesh" id=2] [sub_resource type="CubeMesh" id=2]
@ -91,7 +92,7 @@ subdivide_depth = 0
size = 50 size = 50
use_mipmaps = true use_mipmaps = true
use_filter = false use_filter = false
font_data = ExtResource( 9 ) font_data = ExtResource( 10 )
_sections_unfolded = [ "Font", "Settings" ] _sections_unfolded = [ "Font", "Settings" ]
[sub_resource type="Animation" id=5] [sub_resource type="Animation" id=5]
@ -143,7 +144,7 @@ size = 20
use_mipmaps = false use_mipmaps = false
use_filter = false use_filter = false
extra_spacing_bottom = 5 extra_spacing_bottom = 5
font_data = ExtResource( 13 ) font_data = ExtResource( 14 )
_sections_unfolded = [ "Extra Spacing", "Font", "Settings" ] _sections_unfolded = [ "Extra Spacing", "Font", "Settings" ]
[node name="Main" type="WorldEnvironment" index="0"] [node name="Main" type="WorldEnvironment" index="0"]
@ -153,7 +154,7 @@ script = ExtResource( 2 )
[node name="Background" type="Sprite3D" parent="." index="0"] [node name="Background" type="Sprite3D" parent="." index="0"]
transform = Transform( 12.8, 0, 0, 0, 8.53, 0, 0, 0, 1, 4.5, 25, -32 ) transform = Transform( 12.8, 0, 0, 0, 8.53, 0, 0, 0, 1, 4.5, 28.8, -34 )
layers = 1 layers = 1
material_override = null material_override = null
cast_shadow = 1 cast_shadow = 1
@ -185,7 +186,7 @@ _sections_unfolded = [ "Animation", "Flags", "Geometry", "Transform" ]
[node name="Camera" type="Camera" parent="." index="1"] [node name="Camera" type="Camera" parent="." index="1"]
transform = Transform( 1, 0, 0, 0, 0.939693, -0.34202, 0, 0.34202, 0.939693, 4.5, 2, 17 ) transform = Transform( 1, 0, 0, 0, 0.939693, -0.34202, 0, 0.34202, 0.939693, 4.5, 2, 19 )
keep_aspect = 1 keep_aspect = 1
cull_mask = 1048575 cull_mask = 1048575
environment = null environment = null
@ -273,6 +274,167 @@ __meta__ = {
transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 20, 0 ) transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 5, 20, 0 )
_sections_unfolded = [ "Transform" ] _sections_unfolded = [ "Transform" ]
[node name="DropTrail" type="Spatial" parent="Matrix" index="2"]
editor/display_folded = true
transform = Transform( 0.1, 0, 0, 0, 0.05, 0, 0, 0, 1, -0.45, -0.475, 0 )
visible = false
_sections_unfolded = [ "Transform" ]
[node name="0" type="Spatial" parent="Matrix/DropTrail" index="0"]
_sections_unfolded = [ "Transform" ]
[node name="Sprite" type="Sprite3D" parent="Matrix/DropTrail/0" index="0"]
transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
pixel_size = 0.01
axis = 2
transparent = true
shaded = false
double_sided = true
alpha_cut = 0
texture = ExtResource( 6 )
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="Matrix/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="Matrix/DropTrail/1" index="0"]
transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
pixel_size = 0.01
axis = 2
transparent = true
shaded = false
double_sided = true
alpha_cut = 0
texture = ExtResource( 6 )
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="Matrix/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="Matrix/DropTrail/2" index="0"]
transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
pixel_size = 0.01
axis = 2
transparent = true
shaded = false
double_sided = true
alpha_cut = 0
texture = ExtResource( 6 )
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="Matrix/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="Matrix/DropTrail/3" index="0"]
transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
pixel_size = 0.01
axis = 2
transparent = true
shaded = false
double_sided = true
alpha_cut = 0
texture = ExtResource( 6 )
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="Matrix/DropTrail" index="4"]
process_mode = 1
wait_time = 0.06
one_shot = true
autostart = false
[node name="Hold" type="MeshInstance" parent="." index="4"] [node name="Hold" type="MeshInstance" parent="." index="4"]
transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, -5, 16, 0 ) transform = Transform( 7, 0, 0, 0, 7, 0, 0, 0, 1, -5, 16, 0 )
@ -347,15 +509,14 @@ wait_time = 0.03
one_shot = false one_shot = false
autostart = false autostart = false
[node name="MidiPlayer" parent="." index="10" instance=ExtResource( 6 )] [node name="MidiPlayer" parent="." index="10" instance=ExtResource( 7 )]
editor/display_folded = true editor/display_folded = true
script = ExtResource( 7 ) script = ExtResource( 8 )
_sections_unfolded = [ "Pause" ] _sections_unfolded = [ "Pause" ]
file = "res://midi/Korobeiniki.mid" file = "res://midi/music-a-dance-remix-.mid"
volume_db = -24 volume_db = -24
loop = true loop = true
loop_start = 1.81
soundfont = "res://midi/TimGM6mb.sf2" soundfont = "res://midi/TimGM6mb.sf2"
[node name="LineCLearTimer" type="Timer" parent="MidiPlayer" index="1"] [node name="LineCLearTimer" type="Timer" parent="MidiPlayer" index="1"]
@ -381,7 +542,7 @@ mouse_filter = 0
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 1 size_flags_vertical = 1
script = ExtResource( 8 ) script = ExtResource( 9 )
_sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme" ] _sections_unfolded = [ "Material", "Rect", "Size Flags", "Theme" ]
[node name="Label" type="Label" parent="FlashText" index="0"] [node name="Label" type="Label" parent="FlashText" index="0"]
@ -419,7 +580,7 @@ anims/Flash = SubResource( 5 )
blend_times = [ ] blend_times = [ ]
_sections_unfolded = [ "Playback Options" ] _sections_unfolded = [ "Playback Options" ]
[node name="Stats" parent="." index="12" instance=ExtResource( 10 )] [node name="Stats" parent="." index="12" instance=ExtResource( 11 )]
visible = false visible = false
anchor_left = 0.0 anchor_left = 0.0
@ -431,11 +592,11 @@ margin_top = -220.0
margin_right = 140.0 margin_right = 140.0
margin_bottom = -25.0 margin_bottom = -25.0
[node name="controls_ui" parent="." index="13" instance=ExtResource( 11 )] [node name="controls_ui" parent="." index="13" instance=ExtResource( 12 )]
visible = false visible = false
[node name="Start" parent="." index="14" instance=ExtResource( 12 )] [node name="Start" parent="." index="14" instance=ExtResource( 13 )]
[node name="ReplayButton" type="Button" parent="." index="15"] [node name="ReplayButton" type="Button" parent="." index="15"]
@ -466,165 +627,11 @@ flat = false
align = 1 align = 1
_sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ] _sections_unfolded = [ "Margin", "custom_colors", "custom_fonts" ]
[node name="DropTrail" type="Spatial" parent="." index="16"] [node name="Ghost" parent="." index="16" instance=ExtResource( 15 )]
editor/display_folded = true
visible = false visible = false
_sections_unfolded = [ "Transform" ]
[node name="0" type="Spatial" parent="DropTrail" index="0"] [connection signal="timeout" from="Matrix/DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"]
_sections_unfolded = [ "Transform" ]
[node name="Sprite" type="Sprite3D" parent="DropTrail/0" index="0"]
transform = Transform( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
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( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
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( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
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( 1.5, 0, 0, 0, 5, 0, 0, 0, 1, 0, 8, 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.1
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="DropTimer" to="." method="_on_DropTimer_timeout"]
@ -646,6 +653,4 @@ autostart = false
[connection signal="pressed" from="ReplayButton" to="." method="_on_ReplayButton_pressed"] [connection signal="pressed" from="ReplayButton" to="." method="_on_ReplayButton_pressed"]
[connection signal="timeout" from="DropTrail/Delay" to="." method="_on_DropTrailDelay_timeout"]

View File

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

View File

@ -6,7 +6,7 @@
[ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=4] [ext_resource path="res://fonts/Gamer.ttf" type="DynamicFontData" id=4]
[ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=5] [ext_resource path="res://fonts/ButtonFont.tres" type="DynamicFont" id=5]
[sub_resource type="DynamicFont" id=4] [sub_resource type="DynamicFont" id=1]
size = 50 size = 50
use_mipmaps = false use_mipmaps = false
@ -26,7 +26,7 @@ _sections_unfolded = [ "Extra Spacing", "Font", "Font/fallback", "Settings" ]
default_font = SubResource( 2 ) default_font = SubResource( 2 )
[node name="Start" type="Control" index="0"] [node name="Start" type="Control"]
anchor_left = 0.5 anchor_left = 0.5
anchor_top = 0.5 anchor_top = 0.5
@ -86,7 +86,7 @@ mouse_filter = 2
mouse_default_cursor_shape = 0 mouse_default_cursor_shape = 0
size_flags_horizontal = 1 size_flags_horizontal = 1
size_flags_vertical = 4 size_flags_vertical = 4
custom_fonts/font = SubResource( 4 ) custom_fonts/font = SubResource( 1 )
custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 ) custom_colors/font_color = Color( 0.443137, 0.709804, 0.819608, 0.533333 )
custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 ) custom_colors/font_color_shadow = Color( 1, 1, 1, 0.101333 )
text = "3000" text = "3000"
@ -103,9 +103,9 @@ anchor_top = 0.5
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 0.5 anchor_bottom = 0.5
margin_left = -83.0 margin_left = -83.0
margin_top = -20.0 margin_top = 40.0
margin_right = 113.0 margin_right = 113.0
margin_bottom = 17.0 margin_bottom = 77.0
rect_pivot_offset = Vector2( 0, 0 ) rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false rect_clip_content = false
mouse_filter = 0 mouse_filter = 0
@ -132,9 +132,9 @@ anchor_top = 0.5
anchor_right = 0.5 anchor_right = 0.5
anchor_bottom = 0.5 anchor_bottom = 0.5
margin_left = -85.0 margin_left = -85.0
margin_top = 29.0 margin_top = 89.0
margin_right = 85.0 margin_right = 85.0
margin_bottom = 69.0 margin_bottom = 129.0
rect_pivot_offset = Vector2( 0, 0 ) rect_pivot_offset = Vector2( 0, 0 )
rect_clip_content = false rect_clip_content = false
focus_mode = 2 focus_mode = 2

View File

@ -0,0 +1,247 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Tetrominos/TetroI.gd" type="Script" id=1]
[sub_resource type="SpatialMaterial" id=1]
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.259529 )
metallic = 1.0
metallic_specular = 0.63
metallic_texture_channel = 4
roughness = 0.46
roughness_texture_channel = 0
emission_enabled = true
emission = Color( 0.446159, 0.591797, 0.540939, 1 )
emission_energy = 0.15
emission_operator = 0
emission_on_uv2 = 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" ]
[sub_resource type="CubeMesh" id=2]
material = SubResource( 1 )
custom_aabb = AABB( 0, 0, 0, 0, 0, 0 )
size = Vector3( 0.9, 0.9, 0.9 )
subdivide_width = 0
subdivide_height = 0
subdivide_depth = 0
[node name="Ghost" type="Spatial"]
script = ExtResource( 1 )
[node name="Mino0" type="Spatial" parent="." index="0"]
transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
_sections_unfolded = [ "Pause", "Transform", "Visibility" ]
[node name="MinoMesh" type="MeshInstance" parent="Mino0" index="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
mesh = SubResource( 2 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="OmniLight" type="OmniLight" parent="Mino0" index="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_bake_mode = 1
light_cull_mask = -1
shadow_enabled = false
shadow_color = Color( 0, 0, 0, 1 )
shadow_bias = 0.15
shadow_contact = 0.0
shadow_reverse_cull_face = false
editor_only = false
omni_range = 5.0
omni_attenuation = 1.0
omni_shadow_mode = 1
omni_shadow_detail = 1
_sections_unfolded = [ "Light" ]
[node name="Mino1" type="Spatial" parent="." index="1"]
transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
_sections_unfolded = [ "Pause", "Transform", "Visibility" ]
[node name="MinoMesh" type="MeshInstance" parent="Mino1" index="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
mesh = SubResource( 2 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="OmniLight" type="OmniLight" parent="Mino1" index="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_bake_mode = 1
light_cull_mask = -1
shadow_enabled = false
shadow_color = Color( 0, 0, 0, 1 )
shadow_bias = 0.15
shadow_contact = 0.0
shadow_reverse_cull_face = false
editor_only = false
omni_range = 5.0
omni_attenuation = 1.0
omni_shadow_mode = 1
omni_shadow_detail = 1
_sections_unfolded = [ "Light" ]
[node name="Mino2" type="Spatial" parent="." index="2"]
transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
_sections_unfolded = [ "Pause", "Transform", "Visibility" ]
[node name="MinoMesh" type="MeshInstance" parent="Mino2" index="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
mesh = SubResource( 2 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="OmniLight" type="OmniLight" parent="Mino2" index="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_bake_mode = 1
light_cull_mask = -1
shadow_enabled = false
shadow_color = Color( 0, 0, 0, 1 )
shadow_bias = 0.15
shadow_contact = 0.0
shadow_reverse_cull_face = false
editor_only = false
omni_range = 5.0
omni_attenuation = 1.0
omni_shadow_mode = 1
omni_shadow_detail = 1
_sections_unfolded = [ "Light" ]
[node name="Mino3" type="Spatial" parent="." index="3"]
transform = Transform( 0.997027, 0, 0, 0, 0.997027, 0, 0, 0, 0.997027, 0, 0, 0 )
_sections_unfolded = [ "Pause", "Transform", "Visibility" ]
[node name="MinoMesh" type="MeshInstance" parent="Mino3" index="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
mesh = SubResource( 2 )
skeleton = NodePath("..")
material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="OmniLight" type="OmniLight" parent="Mino3" index="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_bake_mode = 1
light_cull_mask = -1
shadow_enabled = false
shadow_color = Color( 0, 0, 0, 1 )
shadow_bias = 0.15
shadow_contact = 0.0
shadow_reverse_cull_face = false
editor_only = false
omni_range = 5.0
omni_attenuation = 1.0
omni_shadow_mode = 1
omni_shadow_detail = 1
_sections_unfolded = [ "Light" ]

View File

@ -79,30 +79,7 @@ mesh = ExtResource( 2 )
material/0 = null material/0 = null
_sections_unfolded = [ "Geometry", "Transform", "material" ] _sections_unfolded = [ "Geometry", "Transform", "material" ]
[node name="SpotLight" type="SpotLight" parent="." index="1"] [node name="LockingMesh" type="MeshInstance" parent="." index="1"]
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.86
light_bake_mode = 1
light_cull_mask = -1
shadow_enabled = false
shadow_color = Color( 0, 0, 0, 1 )
shadow_bias = 0.15
shadow_contact = 0.0
shadow_reverse_cull_face = false
editor_only = false
spot_range = 30.0
spot_attenuation = 0.5
spot_angle = 5.0
spot_angle_attenuation = 2.0
_sections_unfolded = [ "Editor", "Light", "Spot", "Transform" ]
[node name="LockingMesh" type="MeshInstance" parent="." index="2"]
visible = false visible = false
layers = 1 layers = 1

View File

@ -73,17 +73,19 @@ var super_rotation_system = [
] ]
var minoes = [] var minoes = []
var grid_map
var lock_delay
var orientation = 0 var orientation = 0
var rotation_point_5_used = false var rotation_point_5_used = false
var rotated_last = false var rotated_last = false
var grid_map
var lock_delay
var ghost
func _ready(): func _ready():
for i in range(NB_MINOES): for i in range(NB_MINOES):
minoes.append(get_node("Mino"+str(i))) minoes.append(get_node("Mino"+str(i)))
grid_map = get_node("../Matrix/GridMap") grid_map = get_node("../Matrix/GridMap")
lock_delay = get_node("../LockDelay") lock_delay = get_node("../LockDelay")
ghost = get_node("../Ghost")
func set_translations(translations): func set_translations(translations):
for i in range(NB_MINOES): for i in range(NB_MINOES):
@ -98,9 +100,9 @@ func get_translations():
func move(movement): func move(movement):
if grid_map.possible_positions(get_translations(), movement): if grid_map.possible_positions(get_translations(), movement):
translate(movement) translate(movement)
if movement == DROP_MOVEMENT: unlocking()
unlocking()
rotated_last = false rotated_last = false
move_ghost()
return true return true
else: else:
if movement == DROP_MOVEMENT: if movement == DROP_MOVEMENT:
@ -119,23 +121,25 @@ func turn(direction):
var movements = super_rotation_system[orientation][direction] var movements = super_rotation_system[orientation][direction]
for i in range(movements.size()): for i in range(movements.size()):
if grid_map.possible_positions(rotated_translations, movements[i]): if grid_map.possible_positions(rotated_translations, movements[i]):
orientation = (orientation - direction) % NB_MINOES orientation = (orientation - direction) % 4
set_translations(rotated_translations) set_translations(rotated_translations)
translate(movements[i]) translate(movements[i])
unlocking() unlocking()
rotated_last = true rotated_last = true
if i == 4: if i == 4:
rotation_point_5_used = true rotation_point_5_used = true
move_ghost()
return true return true
return false return false
func move_ghost():
ghost.set_translations(get_translations())
while grid_map.possible_positions(ghost.get_translations(), DROP_MOVEMENT):
ghost.translate(DROP_MOVEMENT)
func t_spin(): func t_spin():
return "" return ""
func turn_light(on):
for mino in minoes:
mino.get_node("SpotLight").visible = on
func locking(): func locking():
if lock_delay.is_stopped(): if lock_delay.is_stopped():
lock_delay.start() lock_delay.start()

Binary file not shown.

View File

@ -19,7 +19,7 @@ export var play_speed = 1.0
export var volume_db = -30 export var volume_db = -30
export var key_shift = 0 export var key_shift = 0
export var loop = false export var loop = false
export var loop_start = 1.81 export var loop_start = 0
export var soundfont = "" export var soundfont = ""
export var mix_target = AudioStreamPlayer.MIX_TARGET_STEREO export var mix_target = AudioStreamPlayer.MIX_TARGET_STEREO
export var bus = "Master" export var bus = "Master"

Binary file not shown.

Binary file not shown.

View File

@ -49,6 +49,7 @@ toggle_fullscreen=[ Object(InputEventKey,"resource_local_to_scene":false,"resour
[rendering] [rendering]
quality/filters/use_nearest_mipmap_filter=true
environment/default_clear_color=Color( 0, 0, 0, 1 ) environment/default_clear_color=Color( 0, 0, 0, 1 )
environment/default_environment="res://Environment.tres" environment/default_environment="res://Environment.tres"
quality/main_loop_type="" quality/main_loop_type=""

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 KiB

After

Width:  |  Height:  |  Size: 396 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 396 KiB

After

Width:  |  Height:  |  Size: 396 KiB