diff --git a/src/Fass.gd b/src/Fass.gd new file mode 100644 index 0000000..dbdd835 --- /dev/null +++ b/src/Fass.gd @@ -0,0 +1,6 @@ +extends StaticBody2D + + + +func _on_Hurtbox_area_entered(area): + queue_free() diff --git a/src/HurtHit_Box/Hitbox.tscn b/src/HurtHit_Box/Hitbox.tscn new file mode 100644 index 0000000..c74ef33 --- /dev/null +++ b/src/HurtHit_Box/Hitbox.tscn @@ -0,0 +1,5 @@ +[gd_scene format=2] + +[node name="Hitbox" type="Area2D"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/src/HurtHit_Box/Hurtbox.tscn b/src/HurtHit_Box/Hurtbox.tscn new file mode 100644 index 0000000..7edbcb4 --- /dev/null +++ b/src/HurtHit_Box/Hurtbox.tscn @@ -0,0 +1,5 @@ +[gd_scene format=2] + +[node name="Hurtbox" type="Area2D"] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="."] diff --git a/src/Maps/Tilesets/Room/tileset_room.png b/src/Maps/Tilesets/Room/tileset_room.png index 90ee9c7..fc29df8 100644 Binary files a/src/Maps/Tilesets/Room/tileset_room.png and b/src/Maps/Tilesets/Room/tileset_room.png differ diff --git a/src/Maps/Tilesets/Room/tileset_room.tres b/src/Maps/Tilesets/Room/tileset_room.tres index 2986e97..c026a52 100644 --- a/src/Maps/Tilesets/Room/tileset_room.tres +++ b/src/Maps/Tilesets/Room/tileset_room.tres @@ -1,6 +1,171 @@ -[gd_resource type="TileSet" load_steps=2 format=2] +[gd_resource type="TileSet" load_steps=57 format=2] -[ext_resource path="tileset_room.png" type="Texture" id=1] +[ext_resource path="res://Maps/Tilesets/Room/tileset_room.png" type="Texture" id=1] + +[sub_resource type="ConvexPolygonShape2D" id=1] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=2] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=3] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=4] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=5] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=6] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=7] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=8] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=9] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=10] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=11] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=12] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=13] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=15] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=16] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=17] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=18] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=19] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=20] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=21] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=22] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=23] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=24] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=25] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=26] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=27] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=28] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=29] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=30] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=31] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=32] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=33] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=34] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=35] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=36] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=37] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=38] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=39] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=40] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=41] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=42] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=43] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=44] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=45] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=46] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=47] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=48] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=49] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=50] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=51] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=52] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=53] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=54] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=55] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) + +[sub_resource type="ConvexPolygonShape2D" id=56] +points = PoolVector2Array( 0, 0, 32, 0, 32, 32, 0, 32 ) [resource] 16/name = "tileset_room.png 16" @@ -20,7 +185,54 @@ 16/autotile/z_index_map = [ ] 16/occluder_offset = Vector2( 0, 0 ) 16/navigation_offset = Vector2( 0, 0 ) -16/shapes = [ ] +16/shape_offset = Vector2( 0, 0 ) +16/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +16/shape = SubResource( 1 ) +16/shape_one_way = false +16/shape_one_way_margin = 1.0 +16/shapes = [ { +"autotile_coord": Vector2( 1, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 2 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 3 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 4 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 5 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 6 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 7 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] 16/z_index = 0 17/name = "tileset_room.png 17" 17/texture = ExtResource( 1 ) @@ -39,5 +251,321 @@ 17/autotile/z_index_map = [ ] 17/occluder_offset = Vector2( 0, 0 ) 17/navigation_offset = Vector2( 0, 0 ) +17/shape_offset = Vector2( 0, 0 ) +17/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +17/shape_one_way = false +17/shape_one_way_margin = 0.0 17/shapes = [ ] 17/z_index = 0 +47/name = "tileset_room.png 47" +47/texture = ExtResource( 1 ) +47/tex_offset = Vector2( 0, 0 ) +47/modulate = Color( 1, 1, 1, 1 ) +47/region = Rect2( 0, 0, 352, 160 ) +47/tile_mode = 1 +47/autotile/bitmask_mode = 1 +47/autotile/bitmask_flags = [ Vector2( 0, 0 ), 432, Vector2( 0, 1 ), 438, Vector2( 0, 2 ), 54, Vector2( 0, 3 ), 48, Vector2( 1, 0 ), 504, Vector2( 1, 1 ), 511, Vector2( 1, 2 ), 63, Vector2( 1, 3 ), 56, Vector2( 2, 0 ), 216, Vector2( 2, 1 ), 219, Vector2( 2, 2 ), 27, Vector2( 2, 3 ), 24, Vector2( 3, 0 ), 144, Vector2( 3, 1 ), 146, Vector2( 3, 2 ), 18, Vector2( 3, 3 ), 16, Vector2( 4, 0 ), 176, Vector2( 4, 1 ), 182, Vector2( 4, 2 ), 434, Vector2( 4, 3 ), 50, Vector2( 4, 4 ), 178, Vector2( 5, 0 ), 248, Vector2( 5, 1 ), 255, Vector2( 5, 2 ), 507, Vector2( 5, 3 ), 59, Vector2( 5, 4 ), 251, Vector2( 6, 0 ), 440, Vector2( 6, 1 ), 447, Vector2( 6, 2 ), 510, Vector2( 6, 3 ), 62, Vector2( 6, 4 ), 446, Vector2( 7, 0 ), 152, Vector2( 7, 1 ), 155, Vector2( 7, 2 ), 218, Vector2( 7, 3 ), 26, Vector2( 7, 4 ), 154, Vector2( 8, 0 ), 184, Vector2( 8, 1 ), 191, Vector2( 8, 2 ), 506, Vector2( 8, 3 ), 58, Vector2( 8, 4 ), 186, Vector2( 9, 0 ), 443, Vector2( 9, 1 ), 254, Vector2( 9, 2 ), 442, Vector2( 9, 3 ), 190, Vector2( 10, 2 ), 250, Vector2( 10, 3 ), 187 ] +47/autotile/icon_coordinate = Vector2( 3, 3 ) +47/autotile/tile_size = Vector2( 32, 32 ) +47/autotile/spacing = 0 +47/autotile/occluder_map = [ ] +47/autotile/navpoly_map = [ ] +47/autotile/priority_map = [ ] +47/autotile/z_index_map = [ ] +47/occluder_offset = Vector2( 0, 0 ) +47/navigation_offset = Vector2( 0, 0 ) +47/shape_offset = Vector2( 0, 0 ) +47/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +47/shape = SubResource( 8 ) +47/shape_one_way = false +47/shape_one_way_margin = 1.0 +47/shapes = [ { +"autotile_coord": Vector2( 3, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 8 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 9 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 10 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 11 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 12 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 13 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 15 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 16 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 17 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 18 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 19 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 20 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 21 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 22 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 23 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 24 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 25 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 26 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 27 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 28 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 29 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 30 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 31 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 32 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 33 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 34 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 35 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 36 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 37 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 10, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 38 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 10, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 39 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 40 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 41 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 42 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 43 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 44 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 45 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 46 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 47 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 48 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 49 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 50 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 51 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 52 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 53 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 54 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 55 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 56 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +47/z_index = 0 diff --git a/src/Menus/TitleScreen/TitleScreen.tscn b/src/Menus/TitleScreen/TitleScreen.tscn index 51286fc..e1c661d 100644 --- a/src/Menus/TitleScreen/TitleScreen.tscn +++ b/src/Menus/TitleScreen/TitleScreen.tscn @@ -4,7 +4,7 @@ [ext_resource path="res://Menus/Startup/Startup.tscn" type="PackedScene" id=2] [ext_resource path="res://Menus/TitleScreen/TitleScreen.gd" type="Script" id=3] -[sub_resource type="Animation" id=2] +[sub_resource type="Animation" id=1] resource_name = "__INIT__" length = 0.1 tracks/0/type = "value" @@ -80,8 +80,7 @@ tracks/5/keys = { "values": [ 1.25 ] } -[sub_resource type="Animation" id=1] -resource_name = "show_buttons" +[sub_resource type="Animation" id=2] step = 0.3 tracks/0/type = "value" tracks/0/path = NodePath("VBoxContainer/NewGameButton:anchor_left") @@ -182,7 +181,7 @@ __meta__ = { } [node name="NewGameButton" parent="VBoxContainer" instance=ExtResource( 1 )] -margin_right = 111.0 +margin_right = 166.0 scene_to_load = "res://World.tscn" [node name="Label" parent="VBoxContainer/NewGameButton" index="0"] @@ -190,7 +189,7 @@ text = "New Game" [node name="CreditsButton" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 24.0 -margin_right = 111.0 +margin_right = 166.0 margin_bottom = 44.0 scene_to_load = "res://Menus/Credits/Credits.tscn" @@ -199,7 +198,7 @@ text = "Credits" [node name="QuitButton" parent="VBoxContainer" instance=ExtResource( 1 )] margin_top = 48.0 -margin_right = 111.0 +margin_right = 166.0 margin_bottom = 68.0 quit = true @@ -207,8 +206,8 @@ quit = true text = "Quit" [node name="AnimationPlayer" type="AnimationPlayer" parent="."] -anims/__INIT__ = SubResource( 2 ) -anims/show_buttons = SubResource( 1 ) +anims/__INIT__ = SubResource( 1 ) +anims/show_buttons = SubResource( 2 ) [connection signal="startup_finished" from="Startup" to="." method="_on_Startup_startup_finished"] [editable path="VBoxContainer/NewGameButton"] diff --git a/src/Objects/Barrel/Barrel.tscn b/src/Objects/Barrel/Barrel.tscn new file mode 100644 index 0000000..78665d9 --- /dev/null +++ b/src/Objects/Barrel/Barrel.tscn @@ -0,0 +1,36 @@ +[gd_scene load_steps=6 format=2] + +[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=1] +[ext_resource path="res://Fass.gd" type="Script" id=2] +[ext_resource path="res://testSprites/Fass.png" type="Texture" id=3] + +[sub_resource type="CapsuleShape2D" id=1] +radius = 10.7634 +height = 5.12255 + +[sub_resource type="CapsuleShape2D" id=2] +radius = 6.37219 +height = 8.78242 + +[node name="Barrel" type="StaticBody2D"] +script = ExtResource( 2 ) + +[node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0.244171, -10.0111 ) +texture = ExtResource( 3 ) + +[node name="Hurtbox" parent="." instance=ExtResource( 1 )] +collision_layer = 8 +collision_mask = 0 + +[node name="CollisionShape2D" parent="Hurtbox" index="0"] +position = Vector2( 0.322258, -10.0297 ) +shape = SubResource( 1 ) + +[node name="Body" type="CollisionShape2D" parent="."] +position = Vector2( 0.0780792, -0.0460815 ) +rotation = 1.5708 +shape = SubResource( 2 ) +[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] + +[editable path="Hurtbox"] diff --git a/src/Player/Player.gd b/src/Player/Player.gd index cc354dd..5638622 100644 --- a/src/Player/Player.gd +++ b/src/Player/Player.gd @@ -4,18 +4,44 @@ class_name Player This is an example player controller script created by Paul """ var velocity := Vector2.ZERO +var rollvector := Vector2.ZERO # This is how you export variables with ranges to the editor window export(int, 0, 500) var MAX_SPEED := 125 +export(int, 0, 500) var ROLL_SPEED := 150 export(int, 0, 500) var FRICTION := 200 # Speed at which the player deaccelarates export(int, 0, 500) var ACCELERATION := 450 +# Reference for the current player +onready var animation_player := $AnimationPlayer +onready var animation_tree := $AnimationTree +onready var animation_state = animation_tree.get("parameters/playback") + +enum moveState{ + MOVE, + ROLL, + HIT +} + +var movementState = moveState.MOVE func _physics_process(delta): - """ - Run approximately every 1/60th of a second by default. - @param delta, so the time since lastt frame, should be pretty constant at 1/60 by default. - """ - # If a constant is applicable, use it instead of creating the object yourself - var input_vector := Vector2.ZERO + match movementState: + moveState.MOVE: + movement_move(delta) + moveState.ROLL: + movement_roll() + moveState.HIT: + movement_hit() + + move() + +# IMPORTANT: If you are using move_and_slide don't multiply by delta +# Godots physics system does that internally +# In move_and_collide(...) you have to multiply by delta. +func move(): + move_and_slide(velocity) + +func movement_move(delta): + var input_vector = Vector2.ZERO # This is a clever way to handle directional input # Input.get_action_strength(...) returns a value between 0 and 1 depending # on how strong the controller direction is pressed @@ -26,11 +52,35 @@ func _physics_process(delta): input_vector = input_vector.normalized() if input_vector == Vector2.ZERO: - velocity = velocity.move_toward(Vector2.ZERO, FRICTION * delta) + animation_state.travel("idle") + velocity = Vector2.ZERO else: + rollvector = input_vector + animation_tree.set("parameters/idle/blend_position", input_vector) + animation_tree.set("parameters/hit/blend_position", input_vector) + animation_tree.set("parameters/roll/blend_position", input_vector) + animation_tree.set("parameters/run/blend_position", input_vector) + animation_state.travel("run") velocity = velocity.move_toward(MAX_SPEED * input_vector, ACCELERATION * delta) + if Input.is_action_just_pressed("roll"): + movementState = moveState.ROLL + elif Input.is_action_just_pressed("attack"): + movementState = moveState.HIT - # IMPORTANT: If you are using move_and_slide don't multiply by delta - # Godots physics system does that internally - # In move_and_collide(...) you have to multiply by delta. - move_and_slide(velocity) +func movement_hit(): + velocity = Vector2.ZERO + animation_state.travel("hit") + +func hit_finished(): + movementState = moveState.MOVE + +func movement_roll(): + velocity = rollvector * ROLL_SPEED + animation_state.travel("roll") + +func roll_finished(): + movementState = moveState.MOVE + + +func _on_Hurtbox_area_entered(area): + queue_free() diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index 120d7b4..9bd82b8 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -1,26 +1,681 @@ -[gd_scene load_steps=4 format=2] +[gd_scene load_steps=52 format=2] [ext_resource path="res://Player/Player.gd" type="Script" id=1] -[ext_resource path="res://Player/player.png" type="Texture" id=2] - - +[ext_resource path="res://Player/Player.png" type="Texture" id=2] +[ext_resource path="res://HurtHit_Box/Hurtbox.tscn" type="PackedScene" id=3] +[ext_resource path="res://HurtHit_Box/Hitbox.tscn" type="PackedScene" id=4] [sub_resource type="CapsuleShape2D" id=1] -radius = 6.0 -height = 5.0 +radius = 2.15976 +height = 3.85866 + +[sub_resource type="Animation" id=2] +resource_name = "HitDown" +length = 0.4 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ 36, 37, 38, 39 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.4 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "hit_finished" +} ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Pivot:rotation_degrees") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 90.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Pivot/SwordHitbox/CollisionShape2D:disabled") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0.1, 0.3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} + +[sub_resource type="Animation" id=3] +resource_name = "HitLeft" +length = 0.4 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ 32, 33, 34, 35 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.4 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "hit_finished" +} ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Pivot:rotation_degrees") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 180.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Pivot/SwordHitbox/CollisionShape2D:disabled") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0.1, 0.3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} + +[sub_resource type="Animation" id=4] +resource_name = "HitRight" +length = 0.4 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ 24, 25, 26, 27 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.4 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "hit_finished" +} ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Pivot:rotation_degrees") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 0.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Pivot/SwordHitbox/CollisionShape2D:disabled") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0.1, 0.3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} + +[sub_resource type="Animation" id=5] +resource_name = "HitTop" +length = 0.4 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3 ), +"transitions": PoolRealArray( 1, 1, 1, 1 ), +"update": 1, +"values": [ 28, 29, 30, 31 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.4 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "hit_finished" +} ] +} +tracks/2/type = "value" +tracks/2/path = NodePath("Pivot:rotation_degrees") +tracks/2/interp = 1 +tracks/2/loop_wrap = true +tracks/2/imported = false +tracks/2/enabled = true +tracks/2/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 0, +"values": [ 270.0 ] +} +tracks/3/type = "value" +tracks/3/path = NodePath("Pivot/SwordHitbox/CollisionShape2D:disabled") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/keys = { +"times": PoolRealArray( 0.1, 0.3 ), +"transitions": PoolRealArray( 1, 1 ), +"update": 1, +"values": [ false, true ] +} + +[sub_resource type="Animation" id=6] +resource_name = "IdleDown" +length = 0.1 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 18 ] +} + +[sub_resource type="Animation" id=7] +resource_name = "IdleLeft" +length = 0.1 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 12 ] +} + +[sub_resource type="Animation" id=8] +resource_name = "IdleRight" +length = 0.1 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 0 ] +} + +[sub_resource type="Animation" id=9] +resource_name = "IdleTop" +length = 0.1 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0 ), +"transitions": PoolRealArray( 1 ), +"update": 1, +"values": [ 6 ] +} + +[sub_resource type="Animation" id=10] +length = 0.5 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 55, 56, 57, 58, 59 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "roll_finished" +} ] +} + +[sub_resource type="Animation" id=11] +length = 0.5 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 50, 51, 52, 53, 54 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "roll_finished" +} ] +} + +[sub_resource type="Animation" id=12] +length = 0.5 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 40, 41, 42, 43, 44 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "roll_finished" +} ] +} + +[sub_resource type="Animation" id=13] +length = 0.5 +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 45, 46, 47, 48, 49 ] +} +tracks/1/type = "method" +tracks/1/path = NodePath(".") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/keys = { +"times": PoolRealArray( 0.5 ), +"transitions": PoolRealArray( 1 ), +"values": [ { +"args": [ ], +"method": "roll_finished" +} ] +} + +[sub_resource type="Animation" id=14] +length = 0.6 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4, 0.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 19, 20, 21, 22, 23, 18 ] +} + +[sub_resource type="Animation" id=15] +length = 0.6 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4, 0.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 13, 14, 15, 16, 17, 12 ] +} + +[sub_resource type="Animation" id=16] +length = 0.6 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4, 0.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 1, 2, 3, 4, 5, 0 ] +} + +[sub_resource type="Animation" id=17] +length = 0.6 +loop = true +tracks/0/type = "value" +tracks/0/path = NodePath("Sprite:frame") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/keys = { +"times": PoolRealArray( 0, 0.1, 0.2, 0.3, 0.4, 0.5 ), +"transitions": PoolRealArray( 1, 1, 1, 1, 1, 1 ), +"update": 1, +"values": [ 7, 8, 9, 10, 11, 6 ] +} + +[sub_resource type="AnimationNodeAnimation" id=18] +animation = "HitDown" + +[sub_resource type="AnimationNodeAnimation" id=19] +animation = "HitTop" + +[sub_resource type="AnimationNodeAnimation" id=20] +animation = "HitRight" + +[sub_resource type="AnimationNodeAnimation" id=21] +animation = "HitLeft" + +[sub_resource type="AnimationNodeBlendSpace2D" id=22] +blend_point_0/node = SubResource( 18 ) +blend_point_0/pos = Vector2( 0, 1 ) +blend_point_1/node = SubResource( 19 ) +blend_point_1/pos = Vector2( 0, -1 ) +blend_point_2/node = SubResource( 20 ) +blend_point_2/pos = Vector2( 1, 0 ) +blend_point_3/node = SubResource( 21 ) +blend_point_3/pos = Vector2( -1, 0 ) +blend_mode = 1 + +[sub_resource type="AnimationNodeAnimation" id=23] +animation = "IdleDown" + +[sub_resource type="AnimationNodeAnimation" id=24] +animation = "IdleRight" + +[sub_resource type="AnimationNodeAnimation" id=25] +animation = "IdleLeft" + +[sub_resource type="AnimationNodeAnimation" id=26] +animation = "IdleTop" + +[sub_resource type="AnimationNodeBlendSpace2D" id=27] +blend_point_0/node = SubResource( 23 ) +blend_point_0/pos = Vector2( 0, 1.1 ) +blend_point_1/node = SubResource( 24 ) +blend_point_1/pos = Vector2( 1, 0 ) +blend_point_2/node = SubResource( 25 ) +blend_point_2/pos = Vector2( -1, 0 ) +blend_point_3/node = SubResource( 26 ) +blend_point_3/pos = Vector2( 0, -1.1 ) +min_space = Vector2( -1, -1.1 ) +max_space = Vector2( 1, 1.1 ) +blend_mode = 1 + +[sub_resource type="AnimationNodeAnimation" id=28] +animation = "RollDown" + +[sub_resource type="AnimationNodeAnimation" id=29] +animation = "RollRight" + +[sub_resource type="AnimationNodeAnimation" id=30] +animation = "RollTop" + +[sub_resource type="AnimationNodeAnimation" id=31] +animation = "RollLeft" + +[sub_resource type="AnimationNodeBlendSpace2D" id=32] +resource_name = " " +blend_point_0/node = SubResource( 28 ) +blend_point_0/pos = Vector2( 0, 1.1 ) +blend_point_1/node = SubResource( 29 ) +blend_point_1/pos = Vector2( 1, 0 ) +blend_point_2/node = SubResource( 30 ) +blend_point_2/pos = Vector2( 0, -1.1 ) +blend_point_3/node = SubResource( 31 ) +blend_point_3/pos = Vector2( -1, 0 ) +min_space = Vector2( -1, -1.1 ) +max_space = Vector2( 1, 1.1 ) +blend_mode = 1 + +[sub_resource type="AnimationNodeAnimation" id=33] +animation = "RunDown" + +[sub_resource type="AnimationNodeAnimation" id=34] +animation = "RunUp" + +[sub_resource type="AnimationNodeAnimation" id=35] +animation = "RunRight" + +[sub_resource type="AnimationNodeAnimation" id=36] +animation = "RunLeft" + +[sub_resource type="AnimationNodeBlendSpace2D" id=37] +blend_point_0/node = SubResource( 33 ) +blend_point_0/pos = Vector2( 0, 1.1 ) +blend_point_1/node = SubResource( 34 ) +blend_point_1/pos = Vector2( 0, -1.1 ) +blend_point_2/node = SubResource( 35 ) +blend_point_2/pos = Vector2( 1, 0 ) +blend_point_3/node = SubResource( 36 ) +blend_point_3/pos = Vector2( -1, 0 ) +min_space = Vector2( -1, -1.1 ) +max_space = Vector2( 1, 1.1 ) +blend_mode = 1 + +[sub_resource type="AnimationNodeStateMachineTransition" id=38] + +[sub_resource type="AnimationNodeStateMachineTransition" id=39] + +[sub_resource type="AnimationNodeStateMachineTransition" id=40] + +[sub_resource type="AnimationNodeStateMachineTransition" id=41] + +[sub_resource type="AnimationNodeStateMachineTransition" id=42] + +[sub_resource type="AnimationNodeStateMachineTransition" id=43] + +[sub_resource type="AnimationNodeStateMachine" id=44] +states/hit/node = SubResource( 22 ) +states/hit/position = Vector2( 511, 196 ) +states/idle/node = SubResource( 27 ) +states/idle/position = Vector2( 203, 196 ) +states/roll/node = SubResource( 32 ) +states/roll/position = Vector2( 511, 90 ) +states/run/node = SubResource( 37 ) +states/run/position = Vector2( 511, 271 ) +transitions = [ "idle", "hit", SubResource( 38 ), "hit", "idle", SubResource( 39 ), "idle", "run", SubResource( 40 ), "run", "idle", SubResource( 41 ), "idle", "roll", SubResource( 42 ), "roll", "idle", SubResource( 43 ) ] +start_node = "idle" + +[sub_resource type="AnimationNodeStateMachinePlayback" id=45] + +[sub_resource type="CapsuleShape2D" id=46] +radius = 3.40253 +height = 6.72939 + +[sub_resource type="CapsuleShape2D" id=47] +radius = 4.03497 +height = 6.99104 [node name="Player" type="KinematicBody2D"] script = ExtResource( 1 ) -__meta__ = { -"_edit_group_": true -} FRICTION = 270 [node name="Sprite" type="Sprite" parent="."] +position = Vector2( 0.273621, 3.88423 ) scale = Vector2( 0.5, 0.5 ) texture = ExtResource( 2 ) offset = Vector2( 0, -18 ) +hframes = 60 +frame = 12 -[node name="CollisionShape2D" type="CollisionShape2D" parent="."] +[node name="Body" type="CollisionShape2D" parent="."] +position = Vector2( -0.0470657, -0.609329 ) rotation = 1.5708 shape = SubResource( 1 ) + +[node name="AnimationPlayer" type="AnimationPlayer" parent="."] +anims/HitDown = SubResource( 2 ) +anims/HitLeft = SubResource( 3 ) +anims/HitRight = SubResource( 4 ) +anims/HitTop = SubResource( 5 ) +anims/IdleDown = SubResource( 6 ) +anims/IdleLeft = SubResource( 7 ) +anims/IdleRight = SubResource( 8 ) +anims/IdleTop = SubResource( 9 ) +anims/RollDown = SubResource( 10 ) +anims/RollLeft = SubResource( 11 ) +anims/RollRight = SubResource( 12 ) +anims/RollTop = SubResource( 13 ) +anims/RunDown = SubResource( 14 ) +anims/RunLeft = SubResource( 15 ) +anims/RunRight = SubResource( 16 ) +anims/RunUp = SubResource( 17 ) + +[node name="AnimationTree" type="AnimationTree" parent="."] +tree_root = SubResource( 44 ) +anim_player = NodePath("../AnimationPlayer") +active = true +parameters/playback = SubResource( 45 ) +parameters/hit/blend_position = Vector2( 0.032258, -0.777778 ) +parameters/idle/blend_position = Vector2( -0.646202, 0.122222 ) +parameters/roll/blend_position = Vector2( 0.0166494, -0.387619 ) +parameters/run/blend_position = Vector2( 0.0697191, -0.967302 ) + +[node name="Hurtbox" parent="." instance=ExtResource( 3 )] +position = Vector2( 0, 0.0375252 ) +collision_mask = 0 + +[node name="CollisionShape2D" parent="Hurtbox" index="0"] +position = Vector2( -0.00503922, -4.92183 ) +shape = SubResource( 46 ) + +[node name="Pivot" type="Position2D" parent="."] +position = Vector2( 0, -4.16248 ) +rotation = 1.5708 +__meta__ = { +"_gizmo_extents_": 20.0 +} + +[node name="SwordHitbox" parent="Pivot" instance=ExtResource( 4 )] +collision_layer = 0 +collision_mask = 12 + +[node name="CollisionShape2D" parent="Pivot/SwordHitbox" index="0"] +position = Vector2( 8.43416, 0.0698299 ) +shape = SubResource( 47 ) +disabled = true +[connection signal="area_entered" from="Hurtbox" to="." method="_on_Hurtbox_area_entered"] + +[editable path="Hurtbox"] + +[editable path="Pivot/SwordHitbox"] diff --git a/src/Player/player.png b/src/Player/player.png index c98fbb6..6c7ff1b 100644 Binary files a/src/Player/player.png and b/src/Player/player.png differ diff --git a/src/World.tscn b/src/World.tscn index 1aed996..71e2c4d 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,13 +1,98 @@ -[gd_scene load_steps=2 format=2] +[gd_scene load_steps=6 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] +[ext_resource path="res://Menus/Startup/Startup.tscn" type="PackedScene" id=2] +[ext_resource path="res://Maps/Tilesets/Room/tileset_room.tres" type="TileSet" id=3] +[ext_resource path="res://testSprites/dark.png" type="Texture" id=4] +[ext_resource path="res://Objects/Barrel/Barrel.tscn" type="PackedScene" id=5] [node name="World" type="Node2D"] -[node name="Player" parent="." instance=ExtResource( 1 )] -position = Vector2( 164.844, 101.687 ) +[node name="WallSprite" type="Sprite" parent="."] +position = Vector2( 98.1828, 136.399 ) +texture = ExtResource( 4 ) +region_enabled = true +region_rect = Rect2( 0, 0, 1280, 720 ) -[node name="StaticBody2D" type="StaticBody2D" parent="."] +[node name="FloorTileMap" type="TileMap" parent="."] +tile_set = ExtResource( 3 ) +cell_size = Vector2( 32, 32 ) +format = 1 +tile_data = PoolIntArray( -131063, 47, 0, -131062, 47, 2, -65536, 47, 4, -65535, 47, 196609, -65534, 47, 196609, -65533, 47, 196609, -65532, 47, 196609, -65531, 47, 196609, -65530, 47, 196609, -65529, 47, 6, -65528, 47, 5, -65527, 47, 196614, -65526, 47, 196613, -65525, 47, 6, -65524, 47, 5, -65523, 47, 196609, -65522, 47, 7, 0, 47, 65539, 7, 47, 131072, 8, 47, 65543, 11, 47, 131072, 12, 47, 65543, 14, 47, 196612, 15, 47, 7, 65536, 47, 65539, 65544, 47, 196612, 65545, 47, 7, 65548, 47, 65539, 65551, 47, 65539, 131072, 47, 262148, 131073, 47, 196610, 131081, 47, 65539, 131084, 47, 65539, 131087, 47, 65539, 196608, 47, 65539, 196615, 47, 196611, 196617, 47, 131075, 196619, 47, 4, 196620, 47, 196615, 196622, 47, 4, 196623, 47, 196615, 262144, 47, 65539, 262146, 47, 3, 262155, 47, 65539, 262158, 47, 65539, 327680, 47, 262148, 327681, 47, 196609, 327682, 47, 196616, 327683, 47, 196609, 327684, 47, 196609, 327685, 47, 196609, 327686, 47, 196609, 327687, 47, 7, 327691, 47, 131075, 327694, 47, 65539, 393216, 47, 65539, 393223, 47, 196612, 393224, 47, 196610, 393230, 47, 65539, 458752, 47, 196612, 458753, 47, 196609, 458754, 47, 7, 458766, 47, 65539, 524290, 47, 196612, 524291, 47, 196609, 524292, 47, 196609, 524293, 47, 196609, 524294, 47, 196609, 524295, 47, 196609, 524296, 47, 196609, 524297, 47, 196609, 524298, 47, 196609, 524299, 47, 196609, 524300, 47, 196609, 524301, 47, 196609, 524302, 47, 196615 ) -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="StaticBody2D"] -polygon = PoolVector2Array( 192.287, 146.593, 265.375, 115.213, 228.831, 67.1505, 257.43, 37.3594, 218.9, 7.9655, 298.343, 3.59614, 310.26, 179.959, 11.9516, 168.837, 42.9343, 30.6067, 69.1505, 118.788, 86.628, 87.4084, 96.5583, 127.527 ) +[node name="Startup" parent="." instance=ExtResource( 2 )] +visible = false + +[node name="YSort" type="YSort" parent="."] +position = Vector2( 170.007, 112.118 ) + +[node name="Barrel" parent="YSort" instance=ExtResource( 5 )] +position = Vector2( -75.7991, -70.2346 ) + +[node name="Player" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -18.3394, -55.4925 ) +scale = Vector2( 2, 2 ) + +[node name="Player2" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -38.722, -70.0515 ) +ROLL_SPEED = 300 + +[node name="Player3" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -46.8102, -53.8748 ) +ROLL_SPEED = 300 + +[node name="Player4" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -51.3397, -35.4335 ) +ROLL_SPEED = 300 + +[node name="Player5" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -56.8398, -20.8745 ) +ROLL_SPEED = 300 + +[node name="Player6" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -60.7221, -6.96263 ) +ROLL_SPEED = 300 + +[node name="Player7" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -27.0748, 6.30219 ) +ROLL_SPEED = 300 + +[node name="Player8" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 10.7785, -23.1393 ) +ROLL_SPEED = 300 + +[node name="Player9" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 20.808, -10.5215 ) +ROLL_SPEED = 300 + +[node name="Player10" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -22.8689, -23.7863 ) +ROLL_SPEED = 300 + +[node name="Player11" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 9.80794, -43.1983 ) +ROLL_SPEED = 300 + +[node name="Player12" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 42.1612, -11.4921 ) +ROLL_SPEED = 300 + +[node name="Player13" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 58.9849, -37.3747 ) +ROLL_SPEED = 300 + +[node name="Player14" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 43.4553, -59.6984 ) +ROLL_SPEED = 300 + +[node name="Player15" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -6.69225, 23.4494 ) +ROLL_SPEED = 300 + +[node name="Player16" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( 19.1904, -66.4926 ) +ROLL_SPEED = 300 + +[node name="Player17" parent="YSort" instance=ExtResource( 1 )] +position = Vector2( -12.1923, -12.4627 ) +ROLL_SPEED = 300 diff --git a/src/project.godot b/src/project.godot index 8dba2e2..5b1eeb9 100644 --- a/src/project.godot +++ b/src/project.godot @@ -42,8 +42,8 @@ SoundControler="*res://Autoloads/SoundControler.gd" [display] -window/size/width=320 -window/size/height=180 +window/size/width=480 +window/size/height=270 window/size/test_width=1280 window/size/test_height=720 window/stretch/mode="2d" @@ -104,6 +104,16 @@ skip={ , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null) ] } +roll={ +"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":32,"unicode":0,"echo":false,"script":null) + ] +} +attack={ +"deadzone": 0.5, +"events": [ Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"button_mask":0,"position":Vector2( 0, 0 ),"global_position":Vector2( 0, 0 ),"factor":1.0,"button_index":1,"pressed":false,"doubleclick":false,"script":null) + ] +} [layer_names] diff --git a/src/testSprites/Fass.png b/src/testSprites/Fass.png new file mode 100644 index 0000000..3a95ee2 Binary files /dev/null and b/src/testSprites/Fass.png differ diff --git a/src/testSprites/Fass.png.import b/src/testSprites/Fass.png.import new file mode 100644 index 0000000..7b65a73 --- /dev/null +++ b/src/testSprites/Fass.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Fass.png-8b7a9a62cc4ca5f013bfec2b63e29313.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/Fass.png" +dest_files=[ "res://.import/Fass.png-8b7a9a62cc4ca5f013bfec2b63e29313.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/Feld.png b/src/testSprites/Feld.png new file mode 100644 index 0000000..f981dad Binary files /dev/null and b/src/testSprites/Feld.png differ diff --git a/src/testSprites/Feld.png.import b/src/testSprites/Feld.png.import new file mode 100644 index 0000000..451dbf0 --- /dev/null +++ b/src/testSprites/Feld.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Feld.png-c21f03c272e80c9c8e7a3328218f65d8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/Feld.png" +dest_files=[ "res://.import/Feld.png-c21f03c272e80c9c8e7a3328218f65d8.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/Herz.png b/src/testSprites/Herz.png new file mode 100644 index 0000000..1dd9040 Binary files /dev/null and b/src/testSprites/Herz.png differ diff --git a/src/testSprites/Herz.png.import b/src/testSprites/Herz.png.import new file mode 100644 index 0000000..dc131ea --- /dev/null +++ b/src/testSprites/Herz.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Herz.png-3bc4c258170ef18d93a634ef06d06196.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/Herz.png" +dest_files=[ "res://.import/Herz.png-3bc4c258170ef18d93a634ef06d06196.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/Spikes.png b/src/testSprites/Spikes.png new file mode 100644 index 0000000..e6b743b Binary files /dev/null and b/src/testSprites/Spikes.png differ diff --git a/src/testSprites/Spikes.png.import b/src/testSprites/Spikes.png.import new file mode 100644 index 0000000..aa1c113 --- /dev/null +++ b/src/testSprites/Spikes.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Spikes.png-258fd7509c119e5f872643f64387e2ab.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/Spikes.png" +dest_files=[ "res://.import/Spikes.png-258fd7509c119e5f872643f64387e2ab.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/Trapdoor.png b/src/testSprites/Trapdoor.png new file mode 100644 index 0000000..5dc9af2 Binary files /dev/null and b/src/testSprites/Trapdoor.png differ diff --git a/src/testSprites/Trapdoor.png.import b/src/testSprites/Trapdoor.png.import new file mode 100644 index 0000000..9a5ae71 --- /dev/null +++ b/src/testSprites/Trapdoor.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Trapdoor.png-c2738d9eef9c8010fb0124dcf9d0d7a2.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/Trapdoor.png" +dest_files=[ "res://.import/Trapdoor.png-c2738d9eef9c8010fb0124dcf9d0d7a2.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/bannane.png b/src/testSprites/bannane.png new file mode 100644 index 0000000..d2b3989 Binary files /dev/null and b/src/testSprites/bannane.png differ diff --git a/src/testSprites/bannane.png.import b/src/testSprites/bannane.png.import new file mode 100644 index 0000000..36bb5fa --- /dev/null +++ b/src/testSprites/bannane.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/bannane.png-52f1a956970a05bcc1055ac2236d86a9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/bannane.png" +dest_files=[ "res://.import/bannane.png-52f1a956970a05bcc1055ac2236d86a9.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/blue_Rubi.png b/src/testSprites/blue_Rubi.png new file mode 100644 index 0000000..df5901e Binary files /dev/null and b/src/testSprites/blue_Rubi.png differ diff --git a/src/testSprites/blue_Rubi.png.import b/src/testSprites/blue_Rubi.png.import new file mode 100644 index 0000000..35540a6 --- /dev/null +++ b/src/testSprites/blue_Rubi.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/blue_Rubi.png-9625c4b3c5ecaa7b4fc37f51c35c8e47.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/blue_Rubi.png" +dest_files=[ "res://.import/blue_Rubi.png-9625c4b3c5ecaa7b4fc37f51c35c8e47.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/boss.png b/src/testSprites/boss.png new file mode 100644 index 0000000..ee427fb Binary files /dev/null and b/src/testSprites/boss.png differ diff --git a/src/testSprites/boss.png.import b/src/testSprites/boss.png.import new file mode 100644 index 0000000..19aeba0 --- /dev/null +++ b/src/testSprites/boss.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/boss.png-6d73e25c3fd73041fcd6730f17d14bfc.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/boss.png" +dest_files=[ "res://.import/boss.png-6d73e25c3fd73041fcd6730f17d14bfc.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/dark.png b/src/testSprites/dark.png new file mode 100644 index 0000000..b8054dd Binary files /dev/null and b/src/testSprites/dark.png differ diff --git a/src/testSprites/dark.png.import b/src/testSprites/dark.png.import new file mode 100644 index 0000000..c7f90f0 --- /dev/null +++ b/src/testSprites/dark.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/dark.png-244965b9aa8a3636dc037fc3a79d9bb8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/dark.png" +dest_files=[ "res://.import/dark.png-244965b9aa8a3636dc037fc3a79d9bb8.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=1 +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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/fackel.png b/src/testSprites/fackel.png new file mode 100644 index 0000000..f3f1845 Binary files /dev/null and b/src/testSprites/fackel.png differ diff --git a/src/testSprites/fackel.png.import b/src/testSprites/fackel.png.import new file mode 100644 index 0000000..2e54123 --- /dev/null +++ b/src/testSprites/fackel.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/fackel.png-e9ccd3bef19ad0bbdb9bca3cb024b922.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/fackel.png" +dest_files=[ "res://.import/fackel.png-e9ccd3bef19ad0bbdb9bca3cb024b922.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/falle.png b/src/testSprites/falle.png new file mode 100644 index 0000000..f61ef6b Binary files /dev/null and b/src/testSprites/falle.png differ diff --git a/src/testSprites/falle.png.import b/src/testSprites/falle.png.import new file mode 100644 index 0000000..867d568 --- /dev/null +++ b/src/testSprites/falle.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/falle.png-858aa2a4f958f955dd4c5ee449d71762.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/falle.png" +dest_files=[ "res://.import/falle.png-858aa2a4f958f955dd4c5ee449d71762.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/flame.png b/src/testSprites/flame.png new file mode 100644 index 0000000..5370496 Binary files /dev/null and b/src/testSprites/flame.png differ diff --git a/src/testSprites/flame.png.import b/src/testSprites/flame.png.import new file mode 100644 index 0000000..081cf64 --- /dev/null +++ b/src/testSprites/flame.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/flame.png-b8cd34852af979f045ce8148b44529fa.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/flame.png" +dest_files=[ "res://.import/flame.png-b8cd34852af979f045ce8148b44529fa.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/green_Rubi.png b/src/testSprites/green_Rubi.png new file mode 100644 index 0000000..723b84c Binary files /dev/null and b/src/testSprites/green_Rubi.png differ diff --git a/src/testSprites/green_Rubi.png.import b/src/testSprites/green_Rubi.png.import new file mode 100644 index 0000000..6c14219 --- /dev/null +++ b/src/testSprites/green_Rubi.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/green_Rubi.png-659679d4a707d42e77f5dee224448c84.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/green_Rubi.png" +dest_files=[ "res://.import/green_Rubi.png-659679d4a707d42e77f5dee224448c84.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/red_Rubi.png b/src/testSprites/red_Rubi.png new file mode 100644 index 0000000..6a7901a Binary files /dev/null and b/src/testSprites/red_Rubi.png differ diff --git a/src/testSprites/red_Rubi.png.import b/src/testSprites/red_Rubi.png.import new file mode 100644 index 0000000..1001e99 --- /dev/null +++ b/src/testSprites/red_Rubi.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/red_Rubi.png-6854b9aa4bb192eb8324d652ac8da698.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/red_Rubi.png" +dest_files=[ "res://.import/red_Rubi.png-6854b9aa4bb192eb8324d652ac8da698.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/slime.png b/src/testSprites/slime.png new file mode 100644 index 0000000..61c2e91 Binary files /dev/null and b/src/testSprites/slime.png differ diff --git a/src/testSprites/slime.png.import b/src/testSprites/slime.png.import new file mode 100644 index 0000000..040c8d1 --- /dev/null +++ b/src/testSprites/slime.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/slime.png-a6522e01afef029b95bf429fc9a16878.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/slime.png" +dest_files=[ "res://.import/slime.png-a6522e01afef029b95bf429fc9a16878.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0 diff --git a/src/testSprites/wand.png b/src/testSprites/wand.png new file mode 100644 index 0000000..97b9084 Binary files /dev/null and b/src/testSprites/wand.png differ diff --git a/src/testSprites/wand.png.import b/src/testSprites/wand.png.import new file mode 100644 index 0000000..ccdbed4 --- /dev/null +++ b/src/testSprites/wand.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/wand.png-c2fe8db0134f32b9bf06b1df0358a83c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://testSprites/wand.png" +dest_files=[ "res://.import/wand.png-c2fe8db0134f32b9bf06b1df0358a83c.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 +stream=false +size_limit=0 +detect_3d=false +svg/scale=1.0