diff --git a/control.tscn b/control.tscn index e28ed77..29c5df1 100644 --- a/control.tscn +++ b/control.tscn @@ -49,7 +49,6 @@ handle_input_locally = false render_target_update_mode = 3 [node name="Map" parent="ViewportContainer/Viewport" instance=ExtResource( 3 )] -pause_mode = 1 [node name="CheatLayer" type="CanvasLayer" parent="ViewportContainer/Viewport"] layer = 127 diff --git a/graphics/backgrounds/copper.png b/graphics/backgrounds/copper.png new file mode 100644 index 0000000..6d5e292 Binary files /dev/null and b/graphics/backgrounds/copper.png differ diff --git a/graphics/backgrounds/copper.png.import b/graphics/backgrounds/copper.png.import new file mode 100644 index 0000000..184cce1 --- /dev/null +++ b/graphics/backgrounds/copper.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/copper.png-0e0c64750364433a7cc623ac388f9fc7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/backgrounds/copper.png" +dest_files=[ "res://.import/copper.png-0e0c64750364433a7cc623ac388f9fc7.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/graphics/tiles/copper.png b/graphics/tiles/copper.png new file mode 100644 index 0000000..2cdfa44 Binary files /dev/null and b/graphics/tiles/copper.png differ diff --git a/graphics/tiles/copper.png.import b/graphics/tiles/copper.png.import new file mode 100644 index 0000000..b18577e --- /dev/null +++ b/graphics/tiles/copper.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/copper.png-58f74dd0386650bae89eb268902007d7.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/tiles/copper.png" +dest_files=[ "res://.import/copper.png-58f74dd0386650bae89eb268902007d7.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/copper.tscn b/maps/copper.tscn new file mode 100644 index 0000000..962580d --- /dev/null +++ b/maps/copper.tscn @@ -0,0 +1,28 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://graphics/backgrounds/copper.png" type="Texture" id=1] +[ext_resource path="res://objects/player/player.tscn" type="PackedScene" id=2] +[ext_resource path="res://objects/Camera2D.tscn" type="PackedScene" id=3] +[ext_resource path="res://maps/map.gd" type="Script" id=4] +[ext_resource path="res://tilesets/t_copper.tres" type="TileSet" id=5] + +[node name="Map" type="Node2D" groups=["map"]] +pause_mode = 1 +script = ExtResource( 4 ) +save_location = 3 + +[node name="Camera2D" parent="." instance=ExtResource( 3 )] + +[node name="Sprite" type="Sprite" parent="Camera2D"] +position = Vector2( 128, 96 ) +z_index = -2 +texture = ExtResource( 1 ) + +[node name="Player" parent="." instance=ExtResource( 2 )] +position = Vector2( 32, 152 ) + +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource( 5 ) +cell_size = Vector2( 8, 8 ) +format = 1 +tile_data = PoolIntArray( 1310731, 0, 65536, 1310732, 0, 65537, 1310733, 0, 65537, 1310734, 0, 65538, 1441792, 0, 65539, 1441793, 0, 65539, 1441794, 0, 65539, 1441795, 0, 65539, 1441796, 0, 65539, 1441797, 0, 65539, 1441798, 0, 65539, 1441799, 0, 65539, 1441800, 0, 65539, 1441801, 0, 65539, 1441802, 0, 65539, 1441803, 0, 65539, 1441804, 0, 65539, 1441805, 0, 65539, 1441806, 0, 65539, 1441807, 0, 65539, 1441808, 0, 65539, 1441809, 0, 65539, 1441810, 0, 65539, 1441811, 0, 65539, 1441812, 0, 65539, 1441813, 0, 65539, 1441814, 0, 65539, 1441815, 0, 65539, 1441816, 0, 65539, 1441817, 0, 65539, 1441818, 0, 65539, 1441819, 0, 65539, 1441820, 0, 65539, 1441821, 0, 65539, 1441822, 0, 65539, 1441823, 0, 65539, 1507328, 0, 65539, 1507329, 0, 65539, 1507330, 0, 65539, 1507331, 0, 65539, 1507332, 0, 65539, 1507333, 0, 65539, 1507334, 0, 65539, 1507335, 0, 65539, 1507336, 0, 65539, 1507337, 0, 65539, 1507338, 0, 65539, 1507339, 0, 65539, 1507340, 0, 65539, 1507341, 0, 65539, 1507342, 0, 65539, 1507343, 0, 65539, 1507344, 0, 65539, 1507345, 0, 65539, 1507346, 0, 65539, 1507347, 0, 65539, 1507348, 0, 65539, 1507349, 0, 65539, 1507350, 0, 65539, 1507351, 0, 65539, 1507352, 0, 65539, 1507353, 0, 65539, 1507354, 0, 65539, 1507355, 0, 65539, 1507356, 0, 65539, 1507357, 0, 65539, 1507358, 0, 65539, 1507359, 0, 65539 ) diff --git a/maps/test_room.tscn b/maps/test_room.tscn index cb1f8ff..7ef6344 100644 --- a/maps/test_room.tscn +++ b/maps/test_room.tscn @@ -1,14 +1,12 @@ -[gd_scene load_steps=14 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] -[ext_resource path="res://objects/enemy/tentacle.tscn" type="PackedScene" id=3] +[ext_resource path="res://tilesets/t_copper.tres" type="TileSet" 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/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/environment/ladder/ladder.tscn" type="PackedScene" id=9] [ext_resource path="res://objects/enemy/slime.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] @@ -22,6 +20,7 @@ music = ExtResource( 12 ) [node name="Camera2D" parent="." instance=ExtResource( 6 )] [node name="Sprite" type="Sprite" parent="Camera2D"] +modulate = Color( 0.862745, 0.054902, 0.054902, 1 ) position = Vector2( 128, 96 ) z_index = -2 texture = ExtResource( 8 ) @@ -31,15 +30,12 @@ __meta__ = { [node name="CanvasLayer" parent="." instance=ExtResource( 4 )] -[node name="Tentacle" parent="." instance=ExtResource( 3 )] -position = Vector2( 184, 152 ) - [node name="Ground" type="TileMap" parent="."] -tile_set = ExtResource( 2 ) +tile_set = ExtResource( 3 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 196618, 0, 65537, 196619, 0, 65537, 196620, 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, 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( 1245195, 0, 65536, 1245196, 0, 65537, 1245197, 0, 65537, 1245198, 0, 65538, 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="Slime" parent="." instance=ExtResource( 10 )] position = Vector2( 84, -7 ) @@ -50,25 +46,14 @@ position = Vector2( 77, 164 ) [node name="Player" parent="." instance=ExtResource( 1 )] position = Vector2( 64, 162 ) -[node name="Ladder2" parent="." instance=ExtResource( 9 )] -position = Vector2( 56, 104 ) -scale = Vector2( 1, 5 ) - -[node name="Ladder3" parent="." instance=ExtResource( 9 )] -position = Vector2( 80, 104 ) -scale = Vector2( 1, 4 ) - [node name="Ladder" type="TileMap" parent="."] tile_set = ExtResource( 2 ) cell_size = Vector2( 8, 8 ) collision_layer = 9 format = 1 -tile_data = PoolIntArray( 851975, 0, 196608, 851978, 0, 196608, 917511, 0, 196608, 917514, 0, 196608, 983047, 0, 196608, 983050, 0, 196608, 1048583, 0, 196608, 1048586, 0, 196608, 1048593, 0, 196608, 1114119, 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="."] +visible = false tile_set = ExtResource( 5 ) cell_size = Vector2( 8, 8 ) format = 1 - -[node name="FallingBlock" parent="." instance=ExtResource( 7 )] -position = Vector2( 40, 160 ) diff --git a/objects/hud/pause_screen.gd b/objects/hud/pause_screen.gd index fb3c44d..4790214 100644 --- a/objects/hud/pause_screen.gd +++ b/objects/hud/pause_screen.gd @@ -6,7 +6,6 @@ func _ready(): $Body/Resume.grab_focus() func _physics_process(delta): - print(get_tree().paused) #Resume with pause button if Input.is_action_just_pressed("pause"): get_tree().paused = false diff --git a/tilesets/t_copper.tres b/tilesets/t_copper.tres new file mode 100644 index 0000000..cc8b651 --- /dev/null +++ b/tilesets/t_copper.tres @@ -0,0 +1,72 @@ +[gd_resource type="TileSet" load_steps=7 format=2] + +[ext_resource path="res://graphics/tiles/copper.png" type="Texture" id=1] + +[sub_resource type="ConvexPolygonShape2D" id=1] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=2] +points = PoolVector2Array( 8, 6, 0, 6, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=3] +points = PoolVector2Array( 8, 6, 0, 6, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=4] +points = PoolVector2Array( 8, 6, 0, 6, 0, 0, 8, 0 ) + +[sub_resource type="ConvexPolygonShape2D" id=5] +points = PoolVector2Array( 8, 8, 0, 8, 0, 0, 8, 0 ) + +[resource] +0/name = "copper.png 0" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 32, 40 ) +0/tile_mode = 2 +0/autotile/icon_coordinate = Vector2( 0, 0 ) +0/autotile/tile_size = Vector2( 8, 8 ) +0/autotile/spacing = 0 +0/autotile/occluder_map = [ ] +0/autotile/navpoly_map = [ ] +0/autotile/priority_map = [ ] +0/autotile/z_index_map = [ ] +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape = SubResource( 1 ) +0/shape_one_way = false +0/shape_one_way_margin = 1.0 +0/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 2 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 3 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 4 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 5 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +0/z_index = 0