diff --git a/project.godot b/project.godot index e4031f9..c28169d 100644 --- a/project.godot +++ b/project.godot @@ -12,7 +12,7 @@ config_version=5 config/name="Texpand" config/description="Submission for the GMTK Game jam 2024. Tetris with special Blocks that expands" -config/version="0.1.1" +config/version="0.1.2" config/tags=PackedStringArray("game_jam") run/main_scene="res://scenes/Main/main.tscn" config/features=PackedStringArray("4.3", "GL Compatibility") @@ -30,7 +30,6 @@ window/size/viewport_width=1080 window/size/viewport_height=1280 window/stretch/mode="viewport" window/stretch/aspect="expand" -window/stretch/scale=0.5 window/handheld/orientation=1 [editor] diff --git a/scenes/Grid/grid.gd b/scenes/Grid/grid.gd index be21a52..39954ed 100644 --- a/scenes/Grid/grid.gd +++ b/scenes/Grid/grid.gd @@ -185,7 +185,8 @@ func getNewPatterns(): newPatterns[0].type = GLOBAL.BLOCKTYPES.HEAVY newPatterns.shuffle() newPatterns[0].expand = true - + #for i in newPatterns: + #i.expand = true newPatterns.shuffle() patternsArray.append_array(newPatterns) @@ -249,8 +250,7 @@ func test(): if i.turningPoint: currentPattern.set_scale(Vector2(2,2)) currentPattern.moveToPosition(i.global_position-spawnpoint.position) - #currentPattern.position.x - 64 - #if i.is_in_group("Block"): + for j in await currentPattern.getCollidingBorder(): if j.is_in_group("Floor"): @@ -275,6 +275,10 @@ func test(): for i in await currentPattern.getCollidingBlocks(): i.queue_free() + testRows() + PlacePattern() + +func testRows(): for i in $RowTests.get_children(): if i.isCompleted(): for j in i.getRow(): @@ -289,6 +293,3 @@ func test(): for j in getBlockGroupsList(): if j != GLOBAL.currentUID: moveUidGroup(GLOBAL.Direction.BOTTOM, j) - - - PlacePattern()