From 54f08808646a5f138fe87c9f9defa6cdd0b0fda5 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 13 Jan 2023 14:52:47 -0500 Subject: [PATCH] add falling block --- graphics/falling_block/falling_block_cave.png | Bin 0 -> 180 bytes .../falling_block_cave.png.import | 35 +++++++++++++ maps/cave.tscn | 46 ++++++++++++++---- maps/map01.tscn | 8 +-- maps/test_room.tscn | 17 +++++-- objects/enemy/rolling_fiend.tscn | 4 +- objects/{ => environment}/barrier/barrier.gd | 0 .../{ => environment}/barrier/barrier.tscn | 2 +- .../death tile/death_tile.gd | 0 .../death tile/death_tile.tscn | 2 +- objects/{ => environment}/exit/exit.gd | 0 objects/{ => environment}/exit/exit.tscn | 2 +- .../falling_block/falling_block.gd | 18 +++++++ .../falling_block/falling_block.tscn | 38 +++++++++++++++ objects/{ => environment}/ladder/ladder.gd | 0 objects/{ => environment}/ladder/ladder.tscn | 2 +- objects/{ => environment}/rock/rock.gd | 0 objects/{ => environment}/rock/rock.tscn | 3 +- .../{ => environment}/turniwood/turniwood.gd | 0 .../turniwood/turniwood.tscn | 2 +- 20 files changed, 153 insertions(+), 26 deletions(-) create mode 100644 graphics/falling_block/falling_block_cave.png create mode 100644 graphics/falling_block/falling_block_cave.png.import rename objects/{ => environment}/barrier/barrier.gd (100%) rename objects/{ => environment}/barrier/barrier.tscn (97%) rename objects/{ => environment}/death tile/death_tile.gd (100%) rename objects/{ => environment}/death tile/death_tile.tscn (80%) rename objects/{ => environment}/exit/exit.gd (100%) rename objects/{ => environment}/exit/exit.tscn (97%) create mode 100644 objects/environment/falling_block/falling_block.gd create mode 100644 objects/environment/falling_block/falling_block.tscn rename objects/{ => environment}/ladder/ladder.gd (100%) rename objects/{ => environment}/ladder/ladder.tscn (87%) rename objects/{ => environment}/rock/rock.gd (100%) rename objects/{ => environment}/rock/rock.tscn (93%) rename objects/{ => environment}/turniwood/turniwood.gd (100%) rename objects/{ => environment}/turniwood/turniwood.tscn (97%) diff --git a/graphics/falling_block/falling_block_cave.png b/graphics/falling_block/falling_block_cave.png new file mode 100644 index 0000000000000000000000000000000000000000..a74c260b03dd874557598cee15c8de9da8c9bf69 GIT binary patch literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`0h2Ka=yc6#b;k2V7GQcEn311aW`Aiv=M{~4~I;svT@;4JWnEM{QfI{?Cr zS=Tx_fr6@@E{-7*;ks>{OhEe%-uN#+cT%>>?U$c|TOu-~n=S8rbE!{Y;M8IWVOac4 Q45)#@)78&qol`;+09qO`SO5S3 literal 0 HcmV?d00001 diff --git a/graphics/falling_block/falling_block_cave.png.import b/graphics/falling_block/falling_block_cave.png.import new file mode 100644 index 0000000..799e17d --- /dev/null +++ b/graphics/falling_block/falling_block_cave.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/falling_block_cave.png-e73188b4fa53340991d27a7ae323ec86.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/falling_block/falling_block_cave.png" +dest_files=[ "res://.import/falling_block_cave.png-e73188b4fa53340991d27a7ae323ec86.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/maps/cave.tscn b/maps/cave.tscn index 87fd09d..3319bc4 100644 --- a/maps/cave.tscn +++ b/maps/cave.tscn @@ -1,14 +1,14 @@ -[gd_scene load_steps=17 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] -[ext_resource path="res://objects/rock/rock.tscn" type="PackedScene" id=3] +[ext_resource path="res://objects/environment/rock/rock.tscn" type="PackedScene" id=3] [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] [ext_resource path="res://objects/enemy/snail.tscn" type="PackedScene" id=7] [ext_resource path="res://graphics/backgrounds/cave.png" type="Texture" id=8] -[ext_resource path="res://objects/ladder/ladder.tscn" type="PackedScene" id=9] +[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=10] [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://audio/music/smokestack.mp3" type="AudioStream" id=12] @@ -16,6 +16,10 @@ [ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=14] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=15] [ext_resource path="res://objects/enemy/tentacle.tscn" type="PackedScene" id=16] +[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=17] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 4, 96 ) [node name="Map" type="Node2D" groups=["map"]] script = ExtResource( 11 ) @@ -35,7 +39,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 720905, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 65537, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1179648, 0, 65537, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1179658, 0, 65537, 1179659, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1310727, 0, 65537, 1310728, 0, 65537, 1310729, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 ) +tile_data = PoolIntArray( 720896, 0, 65537, 720897, 0, 65537, 720898, 0, 65537, 720899, 0, 65537, 720900, 0, 65537, 720901, 0, 65537, 720902, 0, 65537, 720903, 0, 65537, 720904, 0, 65537, 720905, 0, 65537, 720906, 0, 65537, 786455, 0, 65537, 786456, 0, 65537, 786457, 0, 65537, 786458, 0, 0, 851983, 0, 65537, 851984, 0, 65537, 851985, 0, 65537, 851986, 0, 65537, 851987, 0, 65537, 851988, 0, 65537, 851989, 0, 65537, 851994, 0, 0, 917530, 0, 0, 983040, 0, 65537, 983041, 0, 65537, 983042, 0, 65537, 983045, 0, 65537, 983046, 0, 65537, 983047, 0, 65537, 983048, 0, 65537, 983049, 0, 65537, 983050, 0, 65537, 983051, 0, 65537, 983066, 0, 0, 1048591, 0, 65537, 1048592, 0, 65537, 1048593, 0, 65537, 1048594, 0, 65537, 1048595, 0, 65537, 1048596, 0, 65537, 1048597, 0, 65537, 1048598, 0, 65537, 1048599, 0, 65537, 1048600, 0, 65537, 1048601, 0, 65537, 1048602, 0, 65537, 1179648, 0, 65537, 1179649, 0, 65537, 1179650, 0, 65537, 1179651, 0, 65537, 1179652, 0, 65537, 1245192, 0, 65537, 1245193, 0, 65537, 1245194, 0, 65537, 1245195, 0, 65537, 1245200, 0, 65537, 1245201, 0, 65537, 1245202, 0, 65537, 1245203, 0, 65537, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1441824, 0, 0, 1441825, 0, 0, 1441826, 0, 0, 1441827, 0, 0, 1441828, 0, 0, 1441829, 0, 0, 1441830, 0, 0, 1441831, 0, 0, 1441832, 0, 0, 1441833, 0, 0, 1441834, 0, 0, 1441835, 0, 0, 1441836, 0, 0, 1441837, 0, 0, 1441838, 0, 0, 1441839, 0, 0, 1441840, 0, 0, 1441841, 0, 0, 1441842, 0, 0, 1441843, 0, 0, 1441844, 0, 0, 1441845, 0, 0, 1441846, 0, 0, 1441847, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0, 1507360, 0, 0, 1507361, 0, 0, 1507362, 0, 0, 1507363, 0, 0, 1507364, 0, 0, 1507365, 0, 0, 1507366, 0, 0, 1507367, 0, 0, 1507368, 0, 0, 1507369, 0, 0, 1507370, 0, 0, 1507371, 0, 0, 1507372, 0, 0, 1507373, 0, 0, 1507374, 0, 0, 1507375, 0, 0, 1507376, 0, 0, 1507377, 0, 0, 1507378, 0, 0, 1507379, 0, 0, 1507380, 0, 0, 1507381, 0, 0, 1507382, 0, 0, 1507383, 0, 0 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 32, 166 ) @@ -74,13 +78,16 @@ right_down_boundry = 10.0 [node name="Bat2" parent="Enemies" instance=ExtResource( 10 )] position = Vector2( 32, 120 ) -left_up_boundry = 4.0 -right_down_boundry = 2.0 +left_up_boundry = 3.0 +right_down_boundry = 3.0 speed = 80 [node name="RollingFiend" parent="Enemies" instance=ExtResource( 13 )] position = Vector2( 144, 96 ) +[node name="RollingFiend2" parent="Enemies" instance=ExtResource( 13 )] +position = Vector2( 80, 144 ) + [node name="Tentacle" parent="Enemies" instance=ExtResource( 16 )] position = Vector2( 160, 152 ) @@ -90,13 +97,25 @@ position = Vector2( 176, 104 ) [node name="Collectibles" type="Node2D" parent="."] [node name="Gold" parent="Collectibles" instance=ExtResource( 14 )] -position = Vector2( 64, 152 ) +position = Vector2( 48, 168 ) + +[node name="Gold12" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 80, 168 ) [node name="Gold2" parent="Collectibles" instance=ExtResource( 14 )] -position = Vector2( 80, 136 ) +position = Vector2( 64, 144 ) [node name="Gold3" parent="Collectibles" instance=ExtResource( 14 )] -position = Vector2( 88, 136 ) +position = Vector2( 88, 144 ) + +[node name="Gold9" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 160, 120 ) + +[node name="Gold10" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 144, 120 ) + +[node name="Gold11" parent="Collectibles" instance=ExtResource( 14 )] +position = Vector2( 128, 120 ) [node name="Gold4" parent="Collectibles" instance=ExtResource( 14 )] position = Vector2( 80, 112 ) @@ -116,7 +135,16 @@ position = Vector2( 64, 112 ) [node name="Star" parent="Collectibles" instance=ExtResource( 15 )] position = Vector2( 8, 136 ) +[node name="Shard" parent="Collectibles" instance=ExtResource( 17 )] +position = Vector2( 192, 120 ) + [node name="Death" type="TileMap" parent="."] tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) format = 1 + +[node name="StaticBody2D" type="StaticBody2D" parent="."] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="StaticBody2D"] +position = Vector2( -4, 96 ) +shape = SubResource( 1 ) diff --git a/maps/map01.tscn b/maps/map01.tscn index 755c319..39162fb 100644 --- a/maps/map01.tscn +++ b/maps/map01.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=22 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] -[ext_resource path="res://objects/ladder/ladder.tscn" type="PackedScene" id=2] +[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=2] [ext_resource path="res://graphics/backgrounds/blue_sky.png" type="Texture" id=3] [ext_resource path="res://objects/collectibles/star.tscn" type="PackedScene" id=4] [ext_resource path="res://objects/collectibles/gold.tscn" type="PackedScene" id=5] @@ -14,12 +14,12 @@ [ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=12] [ext_resource path="res://objects/enemy/bat.tscn" type="PackedScene" id=13] [ext_resource path="res://objects/enemy/snake.tscn" type="PackedScene" id=14] -[ext_resource path="res://objects/barrier/barrier.tscn" type="PackedScene" id=15] -[ext_resource path="res://objects/turniwood/turniwood.tscn" type="PackedScene" id=16] +[ext_resource path="res://objects/environment/barrier/barrier.tscn" type="PackedScene" id=15] +[ext_resource path="res://objects/environment/turniwood/turniwood.tscn" type="PackedScene" id=16] [ext_resource path="res://objects/collectibles/arrow.tscn" type="PackedScene" id=17] [ext_resource path="res://maps/map.gd" type="Script" id=18] [ext_resource path="res://audio/music/rumble_loop.mp3" type="AudioStream" id=19] -[ext_resource path="res://objects/exit/exit.tscn" type="PackedScene" id=20] +[ext_resource path="res://objects/environment/exit/exit.tscn" type="PackedScene" id=20] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 128 ) diff --git a/maps/test_room.tscn b/maps/test_room.tscn index fe8fd41..dc9bcac 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=2] +[gd_scene load_steps=12 format=2] [ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=1] [ext_resource path="res://tilesets/t_cave.tres" type="TileSet" id=2] @@ -6,8 +6,9 @@ [ext_resource path="res://objects/hud/hud.tscn" type="PackedScene" id=4] [ext_resource path="res://tilesets/t_death.tres" type="TileSet" id=5] [ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=6] +[ext_resource path="res://objects/environment/falling_block/falling_block.tscn" type="PackedScene" id=7] [ext_resource path="res://graphics/backgrounds/cave.png" type="Texture" id=8] -[ext_resource path="res://objects/ladder/ladder.tscn" type="PackedScene" id=9] +[ext_resource path="res://objects/environment/ladder/ladder.tscn" type="PackedScene" id=9] [ext_resource path="res://maps/map.gd" type="Script" id=11] [ext_resource path="res://audio/music/smokestack.mp3" type="AudioStream" id=12] @@ -26,7 +27,13 @@ texture = ExtResource( 8 ) [node name="CanvasLayer" parent="." instance=ExtResource( 4 )] [node name="Tentacle" parent="." instance=ExtResource( 3 )] -position = Vector2( 88, 152 ) +position = Vector2( 184, 152 ) + +[node name="FallingBlock" parent="." instance=ExtResource( 7 )] +position = Vector2( 56, 152 ) + +[node name="FallingBlock2" parent="." instance=ExtResource( 7 )] +position = Vector2( 72, 136 ) [node name="Ground" type="TileMap" parent="."] tile_set = ExtResource( 2 ) @@ -39,7 +46,7 @@ tile_data = PoolIntArray( 1310725, 0, 0, 1376261, 0, 0, 1376268, 0, 262144, 1376 position = Vector2( 32, 166 ) [node name="Ladder2" parent="." instance=ExtResource( 9 )] -position = Vector2( 64, 128 ) +position = Vector2( 136, 128 ) scale = Vector2( 1, 3 ) [node name="Ladder" type="TileMap" parent="."] @@ -47,7 +54,7 @@ tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 1048584, 0, 196608, 1114120, 0, 196608, 1179656, 0, 196608, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) +tile_data = PoolIntArray( 1048593, 0, 196608, 1114129, 0, 196608, 1179665, 0, 196608, 1376268, 0, 262144, 1376274, 0, 262144, 1376284, 0, 262144, 1441792, 0, 0, 1441793, 0, 0, 1441794, 0, 0, 1441795, 0, 0, 1441796, 0, 0, 1441797, 0, 0, 1441798, 0, 0, 1441799, 0, 0, 1441800, 0, 0, 1441801, 0, 0, 1441802, 0, 0, 1441803, 0, 0, 1441804, 0, 0, 1441805, 0, 0, 1441806, 0, 0, 1441807, 0, 0, 1441808, 0, 0, 1441809, 0, 0, 1441810, 0, 0, 1441811, 0, 0, 1441812, 0, 0, 1441813, 0, 0, 1441814, 0, 0, 1441815, 0, 0, 1441816, 0, 0, 1441817, 0, 0, 1441818, 0, 0, 1441819, 0, 0, 1441820, 0, 0, 1441821, 0, 0, 1441822, 0, 0, 1441823, 0, 0, 1507328, 0, 0, 1507329, 0, 0, 1507330, 0, 0, 1507331, 0, 0, 1507332, 0, 0, 1507333, 0, 0, 1507334, 0, 0, 1507335, 0, 0, 1507336, 0, 0, 1507337, 0, 0, 1507338, 0, 0, 1507339, 0, 0, 1507340, 0, 0, 1507341, 0, 0, 1507342, 0, 0, 1507343, 0, 0, 1507344, 0, 0, 1507345, 0, 0, 1507346, 0, 0, 1507347, 0, 0, 1507348, 0, 0, 1507349, 0, 0, 1507350, 0, 0, 1507351, 0, 0, 1507352, 0, 0, 1507353, 0, 0, 1507354, 0, 0, 1507355, 0, 0, 1507356, 0, 0, 1507357, 0, 0, 1507358, 0, 0, 1507359, 0, 0 ) [node name="Death" type="TileMap" parent="."] tile_set = ExtResource( 5 ) diff --git a/objects/enemy/rolling_fiend.tscn b/objects/enemy/rolling_fiend.tscn index ab223de..73044aa 100644 --- a/objects/enemy/rolling_fiend.tscn +++ b/objects/enemy/rolling_fiend.tscn @@ -54,11 +54,11 @@ position = Vector2( 0, 1 ) [node name="WallCast" type="RayCast2D" parent="Raycasts" index="0"] position = Vector2( -7, 7 ) enabled = true -cast_to = Vector2( 0, -11 ) +cast_to = Vector2( 0, -10 ) [node name="FloorCast" type="RayCast2D" parent="Raycasts" index="1"] position = Vector2( -7, 8 ) enabled = true -cast_to = Vector2( 11, 0 ) +cast_to = Vector2( 10, 0 ) [connection signal="area_entered" from="Hitbox" to="." method="_on_Area2D_area_entered"] diff --git a/objects/barrier/barrier.gd b/objects/environment/barrier/barrier.gd similarity index 100% rename from objects/barrier/barrier.gd rename to objects/environment/barrier/barrier.gd diff --git a/objects/barrier/barrier.tscn b/objects/environment/barrier/barrier.tscn similarity index 97% rename from objects/barrier/barrier.tscn rename to objects/environment/barrier/barrier.tscn index 57f3e98..d7d480e 100644 --- a/objects/barrier/barrier.tscn +++ b/objects/environment/barrier/barrier.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://objects/barrier/barrier.gd" type="Script" id=1] +[ext_resource path="res://objects/environment/barrier/barrier.gd" type="Script" id=1] [ext_resource path="res://graphics/barrier/barrier_2px.png" type="Texture" id=2] [ext_resource path="res://fonts/2ndpuberty..fnt" type="BitmapFont" id=3] diff --git a/objects/death tile/death_tile.gd b/objects/environment/death tile/death_tile.gd similarity index 100% rename from objects/death tile/death_tile.gd rename to objects/environment/death tile/death_tile.gd diff --git a/objects/death tile/death_tile.tscn b/objects/environment/death tile/death_tile.tscn similarity index 80% rename from objects/death tile/death_tile.tscn rename to objects/environment/death tile/death_tile.tscn index c069e95..25c1e86 100644 --- a/objects/death tile/death_tile.tscn +++ b/objects/environment/death tile/death_tile.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://objects/death tile/death_tile.gd" type="Script" id=1] +[ext_resource path="res://objects/environment/death tile/death_tile.gd" type="Script" id=1] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 4, 4 ) diff --git a/objects/exit/exit.gd b/objects/environment/exit/exit.gd similarity index 100% rename from objects/exit/exit.gd rename to objects/environment/exit/exit.gd diff --git a/objects/exit/exit.tscn b/objects/environment/exit/exit.tscn similarity index 97% rename from objects/exit/exit.tscn rename to objects/environment/exit/exit.tscn index 69a555f..eb4a8ed 100644 --- a/objects/exit/exit.tscn +++ b/objects/environment/exit/exit.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=9 format=2] [ext_resource path="res://scripts/theme.tres" type="Theme" id=1] -[ext_resource path="res://objects/exit/exit.gd" type="Script" id=2] +[ext_resource path="res://objects/environment/exit/exit.gd" type="Script" id=2] [ext_resource path="res://graphics/exit/exit.png" type="Texture" id=3] [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=4] diff --git a/objects/environment/falling_block/falling_block.gd b/objects/environment/falling_block/falling_block.gd new file mode 100644 index 0000000..09d1671 --- /dev/null +++ b/objects/environment/falling_block/falling_block.gd @@ -0,0 +1,18 @@ +extends KinematicBody2D + +var fall = false +export var fall_speed = 0.5 +onready var startpos = position + +func _physics_process(delta): + if fall: + position.y += fall_speed + +func _on_Area2D_area_entered(area): + if area.is_in_group("player"): + fall = true + + +func _on_VisibilityNotifier2D_screen_exited(): + position = startpos + fall = false diff --git a/objects/environment/falling_block/falling_block.tscn b/objects/environment/falling_block/falling_block.tscn new file mode 100644 index 0000000..e1a5f87 --- /dev/null +++ b/objects/environment/falling_block/falling_block.tscn @@ -0,0 +1,38 @@ +[gd_scene load_steps=5 format=2] + +[ext_resource path="res://graphics/falling_block/falling_block_cave.png" type="Texture" id=1] +[ext_resource path="res://objects/environment/falling_block/falling_block.gd" type="Script" id=2] + +[sub_resource type="RectangleShape2D" id=1] +extents = Vector2( 4, 3.5 ) + +[sub_resource type="RectangleShape2D" id=2] +extents = Vector2( 4, 0.5 ) + +[node name="FallingBlock" type="KinematicBody2D"] +script = ExtResource( 2 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +visible = false +position = Vector2( 4, 4.5 ) +shape = SubResource( 1 ) + +[node name="Sprite" type="Sprite" parent="."] +texture = ExtResource( 1 ) +centered = false + +[node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="."] +visible = false +position = Vector2( 4, 4 ) +scale = Vector2( 0.4, 0.4 ) + +[node name="Area2D" type="Area2D" parent="."] +visible = false +collision_mask = 2 + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] +position = Vector2( 4, -0.5 ) +shape = SubResource( 2 ) + +[connection signal="screen_exited" from="VisibilityNotifier2D" to="." method="_on_VisibilityNotifier2D_screen_exited"] +[connection signal="area_entered" from="Area2D" to="." method="_on_Area2D_area_entered"] diff --git a/objects/ladder/ladder.gd b/objects/environment/ladder/ladder.gd similarity index 100% rename from objects/ladder/ladder.gd rename to objects/environment/ladder/ladder.gd diff --git a/objects/ladder/ladder.tscn b/objects/environment/ladder/ladder.tscn similarity index 87% rename from objects/ladder/ladder.tscn rename to objects/environment/ladder/ladder.tscn index ee64464..ee3afff 100644 --- a/objects/ladder/ladder.tscn +++ b/objects/environment/ladder/ladder.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://objects/ladder/ladder.gd" type="Script" id=1] +[ext_resource path="res://objects/environment/ladder/ladder.gd" type="Script" id=1] [sub_resource type="RectangleShape2D" id=1] extents = Vector2( 8, 4 ) diff --git a/objects/rock/rock.gd b/objects/environment/rock/rock.gd similarity index 100% rename from objects/rock/rock.gd rename to objects/environment/rock/rock.gd diff --git a/objects/rock/rock.tscn b/objects/environment/rock/rock.tscn similarity index 93% rename from objects/rock/rock.tscn rename to objects/environment/rock/rock.tscn index 5888bbf..1d1d15e 100644 --- a/objects/rock/rock.tscn +++ b/objects/environment/rock/rock.tscn @@ -2,7 +2,8 @@ [ext_resource path="res://graphics/rock/rock.png" type="Texture" id=1] [ext_resource path="res://scripts/1px_border.gdshader" type="Shader" id=2] -[ext_resource path="res://objects/rock/rock.gd" type="Script" id=3] +[ext_resource path="res://objects/environment/rock/rock.gd" type="Script" id=3] + [sub_resource type="ShaderMaterial" id=1] shader = ExtResource( 2 ) diff --git a/objects/turniwood/turniwood.gd b/objects/environment/turniwood/turniwood.gd similarity index 100% rename from objects/turniwood/turniwood.gd rename to objects/environment/turniwood/turniwood.gd diff --git a/objects/turniwood/turniwood.tscn b/objects/environment/turniwood/turniwood.tscn similarity index 97% rename from objects/turniwood/turniwood.tscn rename to objects/environment/turniwood/turniwood.tscn index f2cb73e..c253414 100644 --- a/objects/turniwood/turniwood.tscn +++ b/objects/environment/turniwood/turniwood.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://objects/turniwood/turniwood.gd" type="Script" id=1] +[ext_resource path="res://objects/environment/turniwood/turniwood.gd" type="Script" id=1] [ext_resource path="res://graphics/turniwood/turniwood_yellow.png" type="Texture" id=2] [sub_resource type="RectangleShape2D" id=1]