diff --git a/Player.gd b/Player.gd index 3f7da1f..563a193 100644 --- a/Player.gd +++ b/Player.gd @@ -5,6 +5,8 @@ const MAX_SPEED = 120 const FRICTION = 1000 var velocity: Vector2 = Vector2.ZERO +var isDash = false +var counter = 0 func _physics_process(delta) -> void: @@ -19,6 +21,21 @@ func _physics_process(delta) -> void: velocity = velocity.move_toward(input_vector * MAX_SPEED, ACCELERATION * delta) else: velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) + + # if dashing, increase velocity by 4 for one frame + if Input.is_action_just_pressed("player_dash") and input_vector != Vector2.ZERO and isDash == false: + velocity = velocity * 4 + isDash = true + + # If the dash was previously pressed, start a counter + if isDash: + counter += 1 + + # wait time before you can dash again + if counter > 60: + counter = 0 + isDash = false + velocity = move_and_slide(velocity) return diff --git a/Tilesets/Forest/forestTreeBig.png b/Tilesets/Forest/forestTreeBig.png new file mode 100644 index 0000000..7cf487f Binary files /dev/null and b/Tilesets/Forest/forestTreeBig.png differ diff --git a/Tilesets/Forest/forestTreeBig.png.import b/Tilesets/Forest/forestTreeBig.png.import new file mode 100644 index 0000000..b8c99ea --- /dev/null +++ b/Tilesets/Forest/forestTreeBig.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/forestTreeBig.png-5316235b4ff51d1dfac133e14da4cf6f.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tilesets/Forest/forestTreeBig.png" +dest_files=[ "res://.import/forestTreeBig.png-5316235b4ff51d1dfac133e14da4cf6f.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=true +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/Tilesets/Forest/tileSet.png b/Tilesets/Forest/tileSet.png new file mode 100644 index 0000000..a73f570 Binary files /dev/null and b/Tilesets/Forest/tileSet.png differ diff --git a/Tilesets/Forest/tileSet.png.import b/Tilesets/Forest/tileSet.png.import new file mode 100644 index 0000000..a11c5e2 --- /dev/null +++ b/Tilesets/Forest/tileSet.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/tileSet.png-93e0a2dace30fafd685daf0f2fd79e63.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tilesets/Forest/tileSet.png" +dest_files=[ "res://.import/tileSet.png-93e0a2dace30fafd685daf0f2fd79e63.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=true +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/Tilesets/Forest/tileSet.tres b/Tilesets/Forest/tileSet.tres new file mode 100644 index 0000000..f5439b5 --- /dev/null +++ b/Tilesets/Forest/tileSet.tres @@ -0,0 +1,28 @@ +[gd_resource type="TileSet" load_steps=2 format=2] + +[ext_resource path="res://Tilesets/Forest/tileSet.png" type="Texture" id=1] + +[resource] +0/name = "tileSet.png 0" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 208, 96 ) +0/tile_mode = 1 +0/autotile/bitmask_mode = 1 +0/autotile/bitmask_flags = [ Vector2( 1, 1 ), 432, Vector2( 1, 2 ), 438, Vector2( 1, 3 ), 54, Vector2( 1, 4 ), 48, Vector2( 2, 1 ), 504, Vector2( 2, 2 ), 511, Vector2( 2, 3 ), 63, Vector2( 2, 4 ), 56, Vector2( 3, 1 ), 216, Vector2( 3, 2 ), 219, Vector2( 3, 3 ), 27, Vector2( 3, 4 ), 24, Vector2( 4, 1 ), 144, Vector2( 4, 2 ), 146, Vector2( 4, 3 ), 18, Vector2( 4, 4 ), 16, Vector2( 5, 1 ), 176, Vector2( 5, 2 ), 182, Vector2( 5, 3 ), 434, Vector2( 5, 4 ), 50, Vector2( 5, 5 ), 178, Vector2( 6, 1 ), 248, Vector2( 6, 2 ), 255, Vector2( 6, 3 ), 507, Vector2( 6, 4 ), 59, Vector2( 6, 5 ), 251, Vector2( 7, 1 ), 440, Vector2( 7, 2 ), 447, Vector2( 7, 3 ), 510, Vector2( 7, 4 ), 62, Vector2( 7, 5 ), 446, Vector2( 8, 1 ), 152, Vector2( 8, 2 ), 155, Vector2( 8, 3 ), 218, Vector2( 8, 4 ), 26, Vector2( 8, 5 ), 154, Vector2( 9, 1 ), 184, Vector2( 9, 2 ), 191, Vector2( 9, 3 ), 506, Vector2( 9, 4 ), 58, Vector2( 9, 5 ), 186, Vector2( 10, 1 ), 443, Vector2( 10, 2 ), 254, Vector2( 10, 3 ), 442, Vector2( 10, 4 ), 190, Vector2( 11, 3 ), 250, Vector2( 11, 4 ), 187 ] +0/autotile/icon_coordinate = Vector2( 2, 2 ) +0/autotile/tile_size = Vector2( 16, 16 ) +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_one_way = false +0/shape_one_way_margin = 0.0 +0/shapes = [ ] +0/z_index = 0 diff --git a/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png b/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png new file mode 100644 index 0000000..a1d4cee Binary files /dev/null and b/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png differ diff --git a/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png.import b/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png.import new file mode 100644 index 0000000..3d54dcb --- /dev/null +++ b/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/tileset_mk_16_16_nature_tileset_godot.png-6c0fc33746e3be05314fa73b9ffb5148.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.png" +dest_files=[ "res://.import/tileset_mk_16_16_nature_tileset_godot.png-6c0fc33746e3be05314fa73b9ffb5148.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/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.tres b/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.tres new file mode 100644 index 0000000..583d92c --- /dev/null +++ b/Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.tres @@ -0,0 +1,233 @@ +[gd_resource type="TileSet" load_steps=2 format=2] + +[ext_resource path="tileset_mk_16_16_nature_tileset_godot.png" type="Texture" id=1] + +[resource] +0/name = "tileset_mk_16_16_nature_tileset_godot.png 0" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 960, 400 ) +0/tile_mode = 1 +0/autotile/bitmask_mode = 1 +0/autotile/bitmask_flags = [ Vector2( 1, 0 ), 432, Vector2( 1, 1 ), 438, Vector2( 1, 2 ), 54, Vector2( 1, 3 ), 48, Vector2( 2, 0 ), 504, Vector2( 2, 1 ), 511, Vector2( 2, 2 ), 63, Vector2( 2, 3 ), 56, Vector2( 3, 0 ), 216, Vector2( 3, 1 ), 219, Vector2( 3, 2 ), 27, Vector2( 3, 3 ), 24, Vector2( 4, 0 ), 144, Vector2( 4, 1 ), 146, Vector2( 4, 2 ), 18, Vector2( 4, 3 ), 16, Vector2( 5, 0 ), 176, Vector2( 5, 1 ), 182, Vector2( 5, 2 ), 434, Vector2( 5, 3 ), 50, Vector2( 5, 4 ), 178, Vector2( 6, 0 ), 248, Vector2( 6, 1 ), 255, Vector2( 6, 2 ), 507, Vector2( 6, 3 ), 59, Vector2( 6, 4 ), 251, Vector2( 7, 0 ), 440, Vector2( 7, 1 ), 447, Vector2( 7, 2 ), 510, Vector2( 7, 3 ), 62, Vector2( 7, 4 ), 446, Vector2( 8, 0 ), 152, Vector2( 8, 1 ), 155, Vector2( 8, 2 ), 218, Vector2( 8, 3 ), 26, Vector2( 8, 4 ), 154, Vector2( 9, 0 ), 184, Vector2( 9, 1 ), 191, Vector2( 9, 2 ), 506, Vector2( 9, 3 ), 58, Vector2( 9, 4 ), 186, Vector2( 10, 0 ), 443, Vector2( 10, 1 ), 254, Vector2( 10, 2 ), 442, Vector2( 10, 3 ), 190, Vector2( 11, 2 ), 250, Vector2( 11, 3 ), 187 ] +0/autotile/icon_coordinate = Vector2( 2, 1 ) +0/autotile/tile_size = Vector2( 16, 16 ) +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/shapes = [ ] +0/z_index = 0 +1/name = "tileset_mk_16_16_nature_tileset_godot.png 1" +1/texture = ExtResource( 1 ) +1/tex_offset = Vector2( 0, 0 ) +1/modulate = Color( 1, 1, 1, 1 ) +1/region = Rect2( 0, 0, 960, 400 ) +1/tile_mode = 1 +1/autotile/bitmask_mode = 1 +1/autotile/bitmask_flags = [ Vector2( 1, 6 ), 432, Vector2( 1, 7 ), 438, Vector2( 1, 8 ), 54, Vector2( 1, 9 ), 48, Vector2( 2, 6 ), 504, Vector2( 2, 7 ), 511, Vector2( 2, 8 ), 63, Vector2( 2, 9 ), 56, Vector2( 3, 6 ), 216, Vector2( 3, 7 ), 219, Vector2( 3, 8 ), 27, Vector2( 3, 9 ), 24, Vector2( 4, 6 ), 144, Vector2( 4, 7 ), 146, Vector2( 4, 8 ), 18, Vector2( 4, 9 ), 16, Vector2( 5, 6 ), 176, Vector2( 5, 7 ), 182, Vector2( 5, 8 ), 434, Vector2( 5, 9 ), 50, Vector2( 5, 10 ), 178, Vector2( 6, 6 ), 248, Vector2( 6, 7 ), 255, Vector2( 6, 8 ), 507, Vector2( 6, 9 ), 59, Vector2( 6, 10 ), 251, Vector2( 7, 6 ), 440, Vector2( 7, 7 ), 447, Vector2( 7, 8 ), 510, Vector2( 7, 9 ), 62, Vector2( 7, 10 ), 446, Vector2( 8, 6 ), 152, Vector2( 8, 7 ), 155, Vector2( 8, 8 ), 218, Vector2( 8, 9 ), 26, Vector2( 8, 10 ), 154, Vector2( 9, 6 ), 184, Vector2( 9, 7 ), 191, Vector2( 9, 8 ), 506, Vector2( 9, 9 ), 58, Vector2( 9, 10 ), 186, Vector2( 10, 6 ), 443, Vector2( 10, 7 ), 254, Vector2( 10, 8 ), 442, Vector2( 10, 9 ), 190, Vector2( 11, 8 ), 250, Vector2( 11, 9 ), 187 ] +1/autotile/icon_coordinate = Vector2( 2, 7 ) +1/autotile/tile_size = Vector2( 16, 16 ) +1/autotile/spacing = 0 +1/autotile/occluder_map = [ ] +1/autotile/navpoly_map = [ ] +1/autotile/priority_map = [ ] +1/autotile/z_index_map = [ ] +1/occluder_offset = Vector2( 0, 0 ) +1/navigation_offset = Vector2( 0, 0 ) +1/shapes = [ ] +1/z_index = 0 +2/name = "tileset_mk_16_16_nature_tileset_godot.png 2" +2/texture = ExtResource( 1 ) +2/tex_offset = Vector2( 0, 0 ) +2/modulate = Color( 1, 1, 1, 1 ) +2/region = Rect2( 0, 0, 960, 400 ) +2/tile_mode = 1 +2/autotile/bitmask_mode = 1 +2/autotile/bitmask_flags = [ Vector2( 13, 0 ), 432, Vector2( 13, 1 ), 438, Vector2( 13, 2 ), 54, Vector2( 13, 3 ), 48, Vector2( 14, 0 ), 504, Vector2( 14, 1 ), 511, Vector2( 14, 2 ), 63, Vector2( 14, 3 ), 56, Vector2( 15, 0 ), 216, Vector2( 15, 1 ), 219, Vector2( 15, 2 ), 27, Vector2( 15, 3 ), 24, Vector2( 16, 0 ), 144, Vector2( 16, 1 ), 146, Vector2( 16, 2 ), 18, Vector2( 16, 3 ), 16, Vector2( 17, 0 ), 176, Vector2( 17, 1 ), 182, Vector2( 17, 2 ), 434, Vector2( 17, 3 ), 50, Vector2( 17, 4 ), 178, Vector2( 18, 0 ), 248, Vector2( 18, 1 ), 255, Vector2( 18, 2 ), 507, Vector2( 18, 3 ), 59, Vector2( 18, 4 ), 251, Vector2( 19, 0 ), 440, Vector2( 19, 1 ), 447, Vector2( 19, 2 ), 510, Vector2( 19, 3 ), 62, Vector2( 19, 4 ), 446, Vector2( 20, 0 ), 152, Vector2( 20, 1 ), 155, Vector2( 20, 2 ), 218, Vector2( 20, 3 ), 26, Vector2( 20, 4 ), 154, Vector2( 21, 0 ), 184, Vector2( 21, 1 ), 191, Vector2( 21, 2 ), 506, Vector2( 21, 3 ), 58, Vector2( 21, 4 ), 186, Vector2( 22, 0 ), 443, Vector2( 22, 1 ), 254, Vector2( 22, 2 ), 442, Vector2( 22, 3 ), 190, Vector2( 23, 2 ), 250, Vector2( 23, 3 ), 187 ] +2/autotile/icon_coordinate = Vector2( 14, 1 ) +2/autotile/tile_size = Vector2( 16, 16 ) +2/autotile/spacing = 0 +2/autotile/occluder_map = [ ] +2/autotile/navpoly_map = [ ] +2/autotile/priority_map = [ ] +2/autotile/z_index_map = [ ] +2/occluder_offset = Vector2( 0, 0 ) +2/navigation_offset = Vector2( 0, 0 ) +2/shapes = [ ] +2/z_index = 0 +3/name = "tileset_mk_16_16_nature_tileset_godot.png 3" +3/texture = ExtResource( 1 ) +3/tex_offset = Vector2( 0, 0 ) +3/modulate = Color( 1, 1, 1, 1 ) +3/region = Rect2( 0, 0, 960, 400 ) +3/tile_mode = 1 +3/autotile/bitmask_mode = 1 +3/autotile/bitmask_flags = [ Vector2( 13, 6 ), 432, Vector2( 13, 7 ), 438, Vector2( 13, 8 ), 54, Vector2( 13, 9 ), 48, Vector2( 14, 6 ), 504, Vector2( 14, 7 ), 511, Vector2( 14, 8 ), 63, Vector2( 14, 9 ), 56, Vector2( 15, 6 ), 216, Vector2( 15, 7 ), 219, Vector2( 15, 8 ), 27, Vector2( 15, 9 ), 24, Vector2( 16, 6 ), 144, Vector2( 16, 7 ), 146, Vector2( 16, 8 ), 18, Vector2( 16, 9 ), 16, Vector2( 17, 6 ), 176, Vector2( 17, 7 ), 182, Vector2( 17, 8 ), 434, Vector2( 17, 9 ), 50, Vector2( 17, 10 ), 178, Vector2( 18, 6 ), 248, Vector2( 18, 7 ), 255, Vector2( 18, 8 ), 507, Vector2( 18, 9 ), 59, Vector2( 18, 10 ), 251, Vector2( 19, 6 ), 440, Vector2( 19, 7 ), 447, Vector2( 19, 8 ), 510, Vector2( 19, 9 ), 62, Vector2( 19, 10 ), 446, Vector2( 20, 6 ), 152, Vector2( 20, 7 ), 155, Vector2( 20, 8 ), 218, Vector2( 20, 9 ), 26, Vector2( 20, 10 ), 154, Vector2( 21, 6 ), 184, Vector2( 21, 7 ), 191, Vector2( 21, 8 ), 506, Vector2( 21, 9 ), 58, Vector2( 21, 10 ), 186, Vector2( 22, 6 ), 443, Vector2( 22, 7 ), 254, Vector2( 22, 8 ), 442, Vector2( 22, 9 ), 190, Vector2( 23, 8 ), 250, Vector2( 23, 9 ), 187 ] +3/autotile/icon_coordinate = Vector2( 14, 7 ) +3/autotile/tile_size = Vector2( 16, 16 ) +3/autotile/spacing = 0 +3/autotile/occluder_map = [ ] +3/autotile/navpoly_map = [ ] +3/autotile/priority_map = [ ] +3/autotile/z_index_map = [ ] +3/occluder_offset = Vector2( 0, 0 ) +3/navigation_offset = Vector2( 0, 0 ) +3/shapes = [ ] +3/z_index = 0 +4/name = "tileset_mk_16_16_nature_tileset_godot.png 4" +4/texture = ExtResource( 1 ) +4/tex_offset = Vector2( 0, 0 ) +4/modulate = Color( 1, 1, 1, 1 ) +4/region = Rect2( 0, 0, 960, 400 ) +4/tile_mode = 1 +4/autotile/bitmask_mode = 1 +4/autotile/bitmask_flags = [ Vector2( 0, 14 ), 432, Vector2( 0, 15 ), 438, Vector2( 0, 16 ), 54, Vector2( 0, 17 ), 48, Vector2( 1, 14 ), 504, Vector2( 1, 15 ), 511, Vector2( 1, 16 ), 63, Vector2( 1, 17 ), 56, Vector2( 2, 14 ), 216, Vector2( 2, 15 ), 219, Vector2( 2, 16 ), 27, Vector2( 2, 17 ), 24, Vector2( 3, 14 ), 144, Vector2( 3, 15 ), 146, Vector2( 3, 16 ), 18, Vector2( 3, 17 ), 16, Vector2( 4, 14 ), 176, Vector2( 4, 15 ), 182, Vector2( 4, 16 ), 434, Vector2( 4, 17 ), 50, Vector2( 4, 18 ), 178, Vector2( 5, 14 ), 248, Vector2( 5, 15 ), 255, Vector2( 5, 16 ), 507, Vector2( 5, 17 ), 59, Vector2( 5, 18 ), 251, Vector2( 6, 14 ), 440, Vector2( 6, 15 ), 447, Vector2( 6, 16 ), 510, Vector2( 6, 17 ), 62, Vector2( 6, 18 ), 446, Vector2( 7, 14 ), 152, Vector2( 7, 15 ), 155, Vector2( 7, 16 ), 218, Vector2( 7, 17 ), 26, Vector2( 7, 18 ), 154, Vector2( 8, 14 ), 184, Vector2( 8, 15 ), 191, Vector2( 8, 16 ), 506, Vector2( 8, 17 ), 58, Vector2( 8, 18 ), 186, Vector2( 9, 14 ), 443, Vector2( 9, 15 ), 254, Vector2( 9, 16 ), 442, Vector2( 9, 17 ), 190, Vector2( 10, 16 ), 250, Vector2( 10, 17 ), 187 ] +4/autotile/icon_coordinate = Vector2( 1, 15 ) +4/autotile/tile_size = Vector2( 16, 16 ) +4/autotile/spacing = 0 +4/autotile/occluder_map = [ ] +4/autotile/navpoly_map = [ ] +4/autotile/priority_map = [ ] +4/autotile/z_index_map = [ ] +4/occluder_offset = Vector2( 0, 0 ) +4/navigation_offset = Vector2( 0, 0 ) +4/shapes = [ ] +4/z_index = 0 +5/name = "tileset_mk_16_16_nature_tileset_godot.png 5" +5/texture = ExtResource( 1 ) +5/tex_offset = Vector2( 0, 0 ) +5/modulate = Color( 1, 1, 1, 1 ) +5/region = Rect2( 0, 0, 960, 400 ) +5/tile_mode = 1 +5/autotile/bitmask_mode = 1 +5/autotile/bitmask_flags = [ Vector2( 0, 20 ), 432, Vector2( 0, 21 ), 438, Vector2( 0, 22 ), 54, Vector2( 0, 23 ), 48, Vector2( 1, 20 ), 504, Vector2( 1, 21 ), 511, Vector2( 1, 22 ), 63, Vector2( 1, 23 ), 56, Vector2( 2, 20 ), 216, Vector2( 2, 21 ), 219, Vector2( 2, 22 ), 27, Vector2( 2, 23 ), 24, Vector2( 3, 20 ), 144, Vector2( 3, 21 ), 146, Vector2( 3, 22 ), 18, Vector2( 3, 23 ), 16, Vector2( 4, 20 ), 176, Vector2( 4, 21 ), 182, Vector2( 4, 22 ), 434, Vector2( 4, 23 ), 50, Vector2( 4, 24 ), 178, Vector2( 5, 20 ), 248, Vector2( 5, 21 ), 255, Vector2( 5, 22 ), 507, Vector2( 5, 23 ), 59, Vector2( 5, 24 ), 251, Vector2( 6, 20 ), 440, Vector2( 6, 21 ), 447, Vector2( 6, 22 ), 510, Vector2( 6, 23 ), 62, Vector2( 6, 24 ), 446, Vector2( 7, 20 ), 152, Vector2( 7, 21 ), 155, Vector2( 7, 22 ), 218, Vector2( 7, 23 ), 26, Vector2( 7, 24 ), 154, Vector2( 8, 20 ), 184, Vector2( 8, 21 ), 191, Vector2( 8, 22 ), 506, Vector2( 8, 23 ), 58, Vector2( 8, 24 ), 186, Vector2( 9, 20 ), 443, Vector2( 9, 21 ), 254, Vector2( 9, 22 ), 442, Vector2( 9, 23 ), 190, Vector2( 10, 22 ), 250, Vector2( 10, 23 ), 187 ] +5/autotile/icon_coordinate = Vector2( 1, 21 ) +5/autotile/tile_size = Vector2( 16, 16 ) +5/autotile/spacing = 0 +5/autotile/occluder_map = [ ] +5/autotile/navpoly_map = [ ] +5/autotile/priority_map = [ ] +5/autotile/z_index_map = [ ] +5/occluder_offset = Vector2( 0, 0 ) +5/navigation_offset = Vector2( 0, 0 ) +5/shapes = [ ] +5/z_index = 0 +6/name = "tileset_mk_16_16_nature_tileset_godot.png 6" +6/texture = ExtResource( 1 ) +6/tex_offset = Vector2( 0, 0 ) +6/modulate = Color( 1, 1, 1, 1 ) +6/region = Rect2( 0, 0, 960, 400 ) +6/tile_mode = 1 +6/autotile/bitmask_mode = 1 +6/autotile/bitmask_flags = [ Vector2( 25, 0 ), 432, Vector2( 25, 1 ), 438, Vector2( 25, 2 ), 54, Vector2( 25, 3 ), 48, Vector2( 26, 0 ), 504, Vector2( 26, 1 ), 511, Vector2( 26, 2 ), 63, Vector2( 26, 3 ), 56, Vector2( 27, 0 ), 216, Vector2( 27, 1 ), 219, Vector2( 27, 2 ), 27, Vector2( 27, 3 ), 24, Vector2( 28, 0 ), 144, Vector2( 28, 1 ), 146, Vector2( 28, 2 ), 18, Vector2( 28, 3 ), 16, Vector2( 29, 0 ), 176, Vector2( 29, 1 ), 182, Vector2( 29, 2 ), 434, Vector2( 29, 3 ), 50, Vector2( 29, 4 ), 178, Vector2( 30, 0 ), 248, Vector2( 30, 1 ), 255, Vector2( 30, 2 ), 507, Vector2( 30, 3 ), 59, Vector2( 30, 4 ), 251, Vector2( 31, 0 ), 440, Vector2( 31, 1 ), 447, Vector2( 31, 2 ), 510, Vector2( 31, 3 ), 62, Vector2( 31, 4 ), 446, Vector2( 32, 0 ), 152, Vector2( 32, 1 ), 155, Vector2( 32, 2 ), 218, Vector2( 32, 3 ), 26, Vector2( 32, 4 ), 154, Vector2( 33, 0 ), 184, Vector2( 33, 1 ), 191, Vector2( 33, 2 ), 506, Vector2( 33, 3 ), 58, Vector2( 33, 4 ), 186, Vector2( 34, 0 ), 443, Vector2( 34, 1 ), 254, Vector2( 34, 2 ), 442, Vector2( 34, 3 ), 190, Vector2( 35, 2 ), 250, Vector2( 35, 3 ), 187 ] +6/autotile/icon_coordinate = Vector2( 26, 1 ) +6/autotile/tile_size = Vector2( 16, 16 ) +6/autotile/spacing = 0 +6/autotile/occluder_map = [ ] +6/autotile/navpoly_map = [ ] +6/autotile/priority_map = [ ] +6/autotile/z_index_map = [ ] +6/occluder_offset = Vector2( 0, 0 ) +6/navigation_offset = Vector2( 0, 0 ) +6/shapes = [ ] +6/z_index = 0 +7/name = "tileset_mk_16_16_nature_tileset_godot.png 7" +7/texture = ExtResource( 1 ) +7/tex_offset = Vector2( 0, 0 ) +7/modulate = Color( 1, 1, 1, 1 ) +7/region = Rect2( 0, 0, 960, 400 ) +7/tile_mode = 1 +7/autotile/bitmask_mode = 1 +7/autotile/bitmask_flags = [ Vector2( 25, 6 ), 432, Vector2( 25, 7 ), 438, Vector2( 25, 8 ), 54, Vector2( 25, 9 ), 48, Vector2( 26, 6 ), 504, Vector2( 26, 7 ), 511, Vector2( 26, 8 ), 63, Vector2( 26, 9 ), 56, Vector2( 27, 6 ), 216, Vector2( 27, 7 ), 219, Vector2( 27, 8 ), 27, Vector2( 27, 9 ), 24, Vector2( 28, 6 ), 144, Vector2( 28, 7 ), 146, Vector2( 28, 8 ), 18, Vector2( 28, 9 ), 16, Vector2( 29, 6 ), 176, Vector2( 29, 7 ), 182, Vector2( 29, 8 ), 434, Vector2( 29, 9 ), 50, Vector2( 29, 10 ), 178, Vector2( 30, 6 ), 248, Vector2( 30, 7 ), 255, Vector2( 30, 8 ), 507, Vector2( 30, 9 ), 59, Vector2( 30, 10 ), 251, Vector2( 31, 6 ), 440, Vector2( 31, 7 ), 447, Vector2( 31, 8 ), 510, Vector2( 31, 9 ), 62, Vector2( 31, 10 ), 446, Vector2( 32, 6 ), 152, Vector2( 32, 7 ), 155, Vector2( 32, 8 ), 218, Vector2( 32, 9 ), 26, Vector2( 32, 10 ), 154, Vector2( 33, 6 ), 184, Vector2( 33, 7 ), 191, Vector2( 33, 8 ), 506, Vector2( 33, 9 ), 58, Vector2( 33, 10 ), 186, Vector2( 34, 6 ), 443, Vector2( 34, 7 ), 254, Vector2( 34, 8 ), 442, Vector2( 34, 9 ), 190, Vector2( 35, 8 ), 250, Vector2( 35, 9 ), 187 ] +7/autotile/icon_coordinate = Vector2( 26, 7 ) +7/autotile/tile_size = Vector2( 16, 16 ) +7/autotile/spacing = 0 +7/autotile/occluder_map = [ ] +7/autotile/navpoly_map = [ ] +7/autotile/priority_map = [ ] +7/autotile/z_index_map = [ ] +7/occluder_offset = Vector2( 0, 0 ) +7/navigation_offset = Vector2( 0, 0 ) +7/shapes = [ ] +7/z_index = 0 +8/name = "tileset_mk_16_16_nature_tileset_godot.png 8" +8/texture = ExtResource( 1 ) +8/tex_offset = Vector2( 0, 0 ) +8/modulate = Color( 1, 1, 1, 1 ) +8/region = Rect2( 0, 0, 960, 400 ) +8/tile_mode = 1 +8/autotile/bitmask_mode = 1 +8/autotile/bitmask_flags = [ Vector2( 37, 0 ), 432, Vector2( 37, 1 ), 438, Vector2( 37, 2 ), 54, Vector2( 37, 3 ), 48, Vector2( 38, 0 ), 504, Vector2( 38, 1 ), 511, Vector2( 38, 2 ), 63, Vector2( 38, 3 ), 56, Vector2( 39, 0 ), 216, Vector2( 39, 1 ), 219, Vector2( 39, 2 ), 27, Vector2( 39, 3 ), 24, Vector2( 40, 0 ), 144, Vector2( 40, 1 ), 146, Vector2( 40, 2 ), 18, Vector2( 40, 3 ), 16, Vector2( 41, 0 ), 176, Vector2( 41, 1 ), 182, Vector2( 41, 2 ), 434, Vector2( 41, 3 ), 50, Vector2( 41, 4 ), 178, Vector2( 42, 0 ), 248, Vector2( 42, 1 ), 255, Vector2( 42, 2 ), 507, Vector2( 42, 3 ), 59, Vector2( 42, 4 ), 251, Vector2( 43, 0 ), 440, Vector2( 43, 1 ), 447, Vector2( 43, 2 ), 510, Vector2( 43, 3 ), 62, Vector2( 43, 4 ), 446, Vector2( 44, 0 ), 152, Vector2( 44, 1 ), 155, Vector2( 44, 2 ), 218, Vector2( 44, 3 ), 26, Vector2( 44, 4 ), 154, Vector2( 45, 0 ), 184, Vector2( 45, 1 ), 191, Vector2( 45, 2 ), 506, Vector2( 45, 3 ), 58, Vector2( 45, 4 ), 186, Vector2( 46, 0 ), 443, Vector2( 46, 1 ), 254, Vector2( 46, 2 ), 442, Vector2( 46, 3 ), 190, Vector2( 47, 2 ), 250, Vector2( 47, 3 ), 187 ] +8/autotile/icon_coordinate = Vector2( 38, 1 ) +8/autotile/tile_size = Vector2( 16, 16 ) +8/autotile/spacing = 0 +8/autotile/occluder_map = [ ] +8/autotile/navpoly_map = [ ] +8/autotile/priority_map = [ ] +8/autotile/z_index_map = [ ] +8/occluder_offset = Vector2( 0, 0 ) +8/navigation_offset = Vector2( 0, 0 ) +8/shapes = [ ] +8/z_index = 0 +9/name = "tileset_mk_16_16_nature_tileset_godot.png 9" +9/texture = ExtResource( 1 ) +9/tex_offset = Vector2( 0, 0 ) +9/modulate = Color( 1, 1, 1, 1 ) +9/region = Rect2( 0, 0, 960, 400 ) +9/tile_mode = 1 +9/autotile/bitmask_mode = 1 +9/autotile/bitmask_flags = [ Vector2( 37, 6 ), 432, Vector2( 37, 7 ), 438, Vector2( 37, 8 ), 54, Vector2( 37, 9 ), 48, Vector2( 38, 6 ), 504, Vector2( 38, 7 ), 511, Vector2( 38, 8 ), 63, Vector2( 38, 9 ), 56, Vector2( 39, 6 ), 216, Vector2( 39, 7 ), 219, Vector2( 39, 8 ), 27, Vector2( 39, 9 ), 24, Vector2( 40, 6 ), 144, Vector2( 40, 7 ), 146, Vector2( 40, 8 ), 18, Vector2( 40, 9 ), 16, Vector2( 41, 6 ), 176, Vector2( 41, 7 ), 182, Vector2( 41, 8 ), 434, Vector2( 41, 9 ), 50, Vector2( 41, 10 ), 178, Vector2( 42, 6 ), 248, Vector2( 42, 7 ), 255, Vector2( 42, 8 ), 507, Vector2( 42, 9 ), 59, Vector2( 42, 10 ), 251, Vector2( 43, 6 ), 440, Vector2( 43, 7 ), 447, Vector2( 43, 8 ), 510, Vector2( 43, 9 ), 62, Vector2( 43, 10 ), 446, Vector2( 44, 6 ), 152, Vector2( 44, 7 ), 155, Vector2( 44, 8 ), 218, Vector2( 44, 9 ), 26, Vector2( 44, 10 ), 154, Vector2( 45, 6 ), 184, Vector2( 45, 7 ), 191, Vector2( 45, 8 ), 506, Vector2( 45, 9 ), 58, Vector2( 45, 10 ), 186, Vector2( 46, 6 ), 443, Vector2( 46, 7 ), 254, Vector2( 46, 8 ), 442, Vector2( 46, 9 ), 190, Vector2( 47, 8 ), 250, Vector2( 47, 9 ), 187 ] +9/autotile/icon_coordinate = Vector2( 38, 7 ) +9/autotile/tile_size = Vector2( 16, 16 ) +9/autotile/spacing = 0 +9/autotile/occluder_map = [ ] +9/autotile/navpoly_map = [ ] +9/autotile/priority_map = [ ] +9/autotile/z_index_map = [ ] +9/occluder_offset = Vector2( 0, 0 ) +9/navigation_offset = Vector2( 0, 0 ) +9/shapes = [ ] +9/z_index = 0 +10/name = "tileset_mk_16_16_nature_tileset_godot.png 10" +10/texture = ExtResource( 1 ) +10/tex_offset = Vector2( 0, 0 ) +10/modulate = Color( 1, 1, 1, 1 ) +10/region = Rect2( 0, 0, 960, 400 ) +10/tile_mode = 1 +10/autotile/bitmask_mode = 1 +10/autotile/bitmask_flags = [ Vector2( 49, 0 ), 432, Vector2( 49, 1 ), 438, Vector2( 49, 2 ), 54, Vector2( 49, 3 ), 48, Vector2( 50, 0 ), 504, Vector2( 50, 1 ), 511, Vector2( 50, 2 ), 63, Vector2( 50, 3 ), 56, Vector2( 51, 0 ), 216, Vector2( 51, 1 ), 219, Vector2( 51, 2 ), 27, Vector2( 51, 3 ), 24, Vector2( 52, 0 ), 144, Vector2( 52, 1 ), 146, Vector2( 52, 2 ), 18, Vector2( 52, 3 ), 16, Vector2( 53, 0 ), 176, Vector2( 53, 1 ), 182, Vector2( 53, 2 ), 434, Vector2( 53, 3 ), 50, Vector2( 53, 4 ), 178, Vector2( 54, 0 ), 248, Vector2( 54, 1 ), 255, Vector2( 54, 2 ), 507, Vector2( 54, 3 ), 59, Vector2( 54, 4 ), 251, Vector2( 55, 0 ), 440, Vector2( 55, 1 ), 447, Vector2( 55, 2 ), 510, Vector2( 55, 3 ), 62, Vector2( 55, 4 ), 446, Vector2( 56, 0 ), 152, Vector2( 56, 1 ), 155, Vector2( 56, 2 ), 218, Vector2( 56, 3 ), 26, Vector2( 56, 4 ), 154, Vector2( 57, 0 ), 184, Vector2( 57, 1 ), 191, Vector2( 57, 2 ), 506, Vector2( 57, 3 ), 58, Vector2( 57, 4 ), 186, Vector2( 58, 0 ), 443, Vector2( 58, 1 ), 254, Vector2( 58, 2 ), 442, Vector2( 58, 3 ), 190, Vector2( 59, 2 ), 250, Vector2( 59, 3 ), 187 ] +10/autotile/icon_coordinate = Vector2( 50, 1 ) +10/autotile/tile_size = Vector2( 16, 16 ) +10/autotile/spacing = 0 +10/autotile/occluder_map = [ ] +10/autotile/navpoly_map = [ ] +10/autotile/priority_map = [ ] +10/autotile/z_index_map = [ ] +10/occluder_offset = Vector2( 0, 0 ) +10/navigation_offset = Vector2( 0, 0 ) +10/shapes = [ ] +10/z_index = 0 +11/name = "tileset_mk_16_16_nature_tileset_godot.png 11" +11/texture = ExtResource( 1 ) +11/tex_offset = Vector2( 0, 0 ) +11/modulate = Color( 1, 1, 1, 1 ) +11/region = Rect2( 0, 0, 960, 400 ) +11/tile_mode = 1 +11/autotile/bitmask_mode = 1 +11/autotile/bitmask_flags = [ Vector2( 49, 6 ), 432, Vector2( 49, 7 ), 438, Vector2( 49, 8 ), 54, Vector2( 49, 9 ), 48, Vector2( 50, 6 ), 504, Vector2( 50, 7 ), 511, Vector2( 50, 8 ), 63, Vector2( 50, 9 ), 56, Vector2( 51, 6 ), 216, Vector2( 51, 7 ), 219, Vector2( 51, 8 ), 27, Vector2( 51, 9 ), 24, Vector2( 52, 6 ), 144, Vector2( 52, 7 ), 146, Vector2( 52, 8 ), 18, Vector2( 52, 9 ), 16, Vector2( 53, 6 ), 176, Vector2( 53, 7 ), 182, Vector2( 53, 8 ), 434, Vector2( 53, 9 ), 50, Vector2( 54, 6 ), 248, Vector2( 54, 7 ), 255, Vector2( 54, 8 ), 507, Vector2( 54, 9 ), 59, Vector2( 55, 6 ), 440, Vector2( 55, 7 ), 447, Vector2( 55, 8 ), 510, Vector2( 55, 9 ), 62, Vector2( 56, 6 ), 152, Vector2( 56, 7 ), 155, Vector2( 56, 8 ), 218, Vector2( 56, 9 ), 26, Vector2( 57, 6 ), 184, Vector2( 57, 7 ), 191, Vector2( 57, 8 ), 506, Vector2( 57, 9 ), 58, Vector2( 58, 6 ), 443, Vector2( 58, 7 ), 254, Vector2( 58, 8 ), 442, Vector2( 58, 9 ), 190, Vector2( 59, 8 ), 250, Vector2( 59, 9 ), 187, Vector2( 53, 10 ), 178, Vector2( 54, 10 ), 251, Vector2( 55, 10 ), 446, Vector2( 56, 10 ), 154, Vector2( 57, 10 ), 186 ] +11/autotile/icon_coordinate = Vector2( 50, 7 ) +11/autotile/tile_size = Vector2( 16, 16 ) +11/autotile/spacing = 0 +11/autotile/occluder_map = [ ] +11/autotile/navpoly_map = [ ] +11/autotile/priority_map = [ ] +11/autotile/z_index_map = [ ] +11/occluder_offset = Vector2( 0, 0 ) +11/navigation_offset = Vector2( 0, 0 ) +11/shapes = [ ] +11/z_index = 0 diff --git a/World.gd b/World.gd index f349435..faaf7c8 100644 --- a/World.gd +++ b/World.gd @@ -1,5 +1,5 @@ extends Node2D func _ready() -> void: - $YSort/Player.position = get_viewport_rect().size / 2 - return + $YSort/Player.position = get_viewport_rect().size / 2 + return diff --git a/World.tscn b/World.tscn index ced7c73..3b248c4 100644 --- a/World.tscn +++ b/World.tscn @@ -1,12 +1,23 @@ -[gd_scene load_steps=3 format=2] +[gd_scene load_steps=4 format=2] [ext_resource path="res://Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" id=2] +[ext_resource path="res://Tilesets/Hell/tileset_mk_16_16_nature_tileset_godot.tres" type="TileSet" id=3] [node name="World" type="Node2D"] script = ExtResource( 2 ) +[node name="TileMap" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 16, 16 ) +cell_custom_transform = Transform2D( 16, 0, 0, 16, 0, 0 ) +format = 1 +tile_data = PoolIntArray( 0, 8, 37, 1, 8, 38, 2, 8, 38, 3, 8, 38, 4, 8, 38, 5, 8, 38, 6, 8, 38, 7, 8, 38, 8, 8, 38, 9, 8, 38, 10, 8, 39, 65536, 8, 65573, 65537, 8, 65574, 65538, 8, 65574, 65539, 8, 65574, 65540, 8, 65574, 65541, 8, 65574, 65542, 8, 65574, 65543, 8, 65574, 65544, 8, 65574, 65545, 8, 65574, 65546, 8, 65575, 131072, 8, 65573, 131073, 8, 65578, 131074, 8, 131110, 131075, 8, 131110, 131076, 8, 131110, 131077, 8, 131110, 131078, 8, 131110, 131079, 8, 131110, 131080, 8, 131110, 131081, 8, 65579, 131082, 8, 65575, 196608, 8, 65573, 196609, 8, 65575, 196617, 8, 65573, 196618, 8, 65575, 262144, 8, 65573, 262145, 8, 131114, 262146, 8, 38, 262147, 8, 38, 262148, 8, 38, 262149, 8, 38, 262150, 8, 38, 262151, 8, 38, 262152, 8, 38, 262153, 8, 131115, 262154, 8, 65575, 327680, 8, 65573, 327681, 8, 65574, 327682, 8, 65574, 327683, 8, 65574, 327684, 8, 65574, 327685, 8, 65574, 327686, 8, 65574, 327687, 8, 65574, 327688, 8, 65574, 327689, 8, 65574, 327690, 8, 65575, 393216, 8, 131109, 393217, 8, 131110, 393218, 8, 131110, 393219, 8, 131110, 393220, 8, 131110, 393221, 8, 131110, 393222, 8, 131110, 393223, 8, 131110, 393224, 8, 131110, 393225, 8, 131110, 393226, 8, 131111 ) + [node name="YSort" type="YSort" parent="."] [node name="Player" parent="YSort" instance=ExtResource( 1 )] collision_mask = 2 + +[node name="Camera2D" type="Camera2D" parent="YSort/Player"] +current = true diff --git a/project.godot b/project.godot index c88bda6..3637c40 100644 --- a/project.godot +++ b/project.godot @@ -30,22 +30,27 @@ window/stretch/aspect="keep" player_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_up={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) ] } player_down={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":83,"physical_scancode":0,"unicode":0,"echo":false,"script":null) + ] +} +player_dash={ +"deadzone": 0.5, +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":0,"physical_scancode":16777237,"unicode":0,"echo":false,"script":null) ] }