diff --git a/src/Maps/Tilesets/Room/tileset_room.tres b/src/Maps/Tilesets/Room/tileset_room.tres index d293cb0..d72e22a 100644 --- a/src/Maps/Tilesets/Room/tileset_room.tres +++ b/src/Maps/Tilesets/Room/tileset_room.tres @@ -1,6 +1,147 @@ -[gd_resource type="TileSet" load_steps=2 format=2] +[gd_resource type="TileSet" load_steps=49 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=14] +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 ) [resource] 47/name = "tileset_room.png 47" @@ -20,5 +161,292 @@ 47/autotile/z_index_map = [ ] 47/occluder_offset = Vector2( 0, 0 ) 47/navigation_offset = Vector2( 0, 0 ) -47/shapes = [ ] +47/shape_offset = Vector2( 0, 0 ) +47/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +47/shape = SubResource( 1 ) +47/shape_one_way = false +47/shape_one_way_margin = 1.0 +47/shapes = [ { +"autotile_coord": Vector2( 0, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 1 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 2 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 3 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 4 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 5 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 6 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 7 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"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( 3, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 9 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 10 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 11 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 12 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 13 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 14 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 15 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 16 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 17 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 18 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 19 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 20 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 21 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 22 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 23 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 24 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 25 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 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, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 27 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 10, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 28 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 10, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 29 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 9, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 30 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 31 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 32 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 33 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 34 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 35 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 4 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 36 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 37 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 38 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 3 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 39 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 40 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 41 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 8, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 42 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 43 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 44 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 45 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 2 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 46 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 47 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] 47/z_index = 0 diff --git a/src/Menus/DragNDrop/DragNDropUI.tscn b/src/Menus/DragNDrop/DragNDropUI.tscn index 16d59b7..63c4b5f 100644 --- a/src/Menus/DragNDrop/DragNDropUI.tscn +++ b/src/Menus/DragNDrop/DragNDropUI.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=8 format=2] -[ext_resource path="res://Menus/DragNDrop/DragSource.tscn" type="PackedScene" id=1] +[ext_resource path="res://Objects/Traps/Spike/SpikeCard.tscn" type="PackedScene" id=1] [ext_resource path="res://Menus/DragNDrop/DragSink.tscn" type="PackedScene" id=2] [ext_resource path="res://Objects/Banana/BananaCard.tscn" type="PackedScene" id=3] [ext_resource path="res://Objects/Traps/Bear/BearCard.tscn" type="PackedScene" id=4] @@ -26,15 +26,15 @@ __meta__ = { [node name="GenericCard4" parent="." instance=ExtResource( 6 )] -[node name="GenericCard5" parent="." instance=ExtResource( 1 )] -margin_left = 237.404 -margin_top = 221.267 -margin_right = 269.404 -margin_bottom = 253.267 - [node name="DragSink" parent="." instance=ExtResource( 2 )] anchor_right = 1.002 anchor_bottom = 0.87 margin_left = 2.0 margin_right = 0.0400085 margin_bottom = -30.9 + +[node name="SpikeCard" parent="." instance=ExtResource( 1 )] +margin_left = 236.922 +margin_top = 221.453 +margin_right = 268.922 +margin_bottom = 253.453 diff --git a/src/Menus/DragNDrop/DragSink.gd b/src/Menus/DragNDrop/DragSink.gd index 6ddddb8..366fd5c 100644 --- a/src/Menus/DragNDrop/DragSink.gd +++ b/src/Menus/DragNDrop/DragSink.gd @@ -17,7 +17,6 @@ func get_nearest_grid_pos(position, scale = 1): #what is to be done when data is dropped func drop_data(_pos, data:PackedScene): var new_pos = get_nearest_grid_pos(_pos) - grid._draw_object_grid() if grid.object_grid[new_pos.x - 1][new_pos.y - 1].back() == Grid.Kind.FIELD: var child = data.instance() child.position = get_nearest_grid_pos(_pos, 32) diff --git a/src/Objects/Traps/Spike/Animation/spikes_000.png b/src/Objects/Traps/Spike/Animation/spikes_000.png new file mode 100644 index 0000000..6d39a79 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_000.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_000.png.import b/src/Objects/Traps/Spike/Animation/spikes_000.png.import new file mode 100644 index 0000000..74ad1b4 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_000.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_000.png-88191fb3a99421730ae583035a4b3745.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_000.png" +dest_files=[ "res://.import/spikes_000.png-88191fb3a99421730ae583035a4b3745.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/Objects/Traps/Spike/Animation/spikes_001.png b/src/Objects/Traps/Spike/Animation/spikes_001.png new file mode 100644 index 0000000..bf74276 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_001.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_001.png.import b/src/Objects/Traps/Spike/Animation/spikes_001.png.import new file mode 100644 index 0000000..168a8b0 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_001.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_001.png-529cdfda3032477d3fb8b3e1832d04d4.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_001.png" +dest_files=[ "res://.import/spikes_001.png-529cdfda3032477d3fb8b3e1832d04d4.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/Objects/Traps/Spike/Animation/spikes_002.png b/src/Objects/Traps/Spike/Animation/spikes_002.png new file mode 100644 index 0000000..283d9d8 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_002.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_002.png.import b/src/Objects/Traps/Spike/Animation/spikes_002.png.import new file mode 100644 index 0000000..2916562 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_002.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_002.png-8b100d897ae22b3e824740fe46ad8ca1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_002.png" +dest_files=[ "res://.import/spikes_002.png-8b100d897ae22b3e824740fe46ad8ca1.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/Objects/Traps/Spike/Animation/spikes_003.png b/src/Objects/Traps/Spike/Animation/spikes_003.png new file mode 100644 index 0000000..38122e5 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_003.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_003.png.import b/src/Objects/Traps/Spike/Animation/spikes_003.png.import new file mode 100644 index 0000000..c72864d --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_003.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_003.png-1cd7cf32b4753ea6e6ce237e150e19c3.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_003.png" +dest_files=[ "res://.import/spikes_003.png-1cd7cf32b4753ea6e6ce237e150e19c3.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/Objects/Traps/Spike/Animation/spikes_004.png b/src/Objects/Traps/Spike/Animation/spikes_004.png new file mode 100644 index 0000000..4f4744d Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_004.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_004.png.import b/src/Objects/Traps/Spike/Animation/spikes_004.png.import new file mode 100644 index 0000000..bf7d5e0 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_004.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_004.png-9ef297fac74c0fb2c2756d9ee12dcb27.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_004.png" +dest_files=[ "res://.import/spikes_004.png-9ef297fac74c0fb2c2756d9ee12dcb27.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/Objects/Traps/Spike/Animation/spikes_005.png b/src/Objects/Traps/Spike/Animation/spikes_005.png new file mode 100644 index 0000000..5fa1344 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_005.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_005.png.import b/src/Objects/Traps/Spike/Animation/spikes_005.png.import new file mode 100644 index 0000000..7d9fa83 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_005.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_005.png-5e993bb82cac8cb93b1b4c2709adbdd5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_005.png" +dest_files=[ "res://.import/spikes_005.png-5e993bb82cac8cb93b1b4c2709adbdd5.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/Objects/Traps/Spike/Animation/spikes_006.png b/src/Objects/Traps/Spike/Animation/spikes_006.png new file mode 100644 index 0000000..2ca73a9 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_006.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_006.png.import b/src/Objects/Traps/Spike/Animation/spikes_006.png.import new file mode 100644 index 0000000..06333a9 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_006.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_006.png-efecbe6796a3b4adf0e8177bf486a62d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_006.png" +dest_files=[ "res://.import/spikes_006.png-efecbe6796a3b4adf0e8177bf486a62d.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/Objects/Traps/Spike/Animation/spikes_007.png b/src/Objects/Traps/Spike/Animation/spikes_007.png new file mode 100644 index 0000000..1ce269f Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_007.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_007.png.import b/src/Objects/Traps/Spike/Animation/spikes_007.png.import new file mode 100644 index 0000000..a038148 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_007.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_007.png-0716a15db9d33def18e42b367df31c80.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_007.png" +dest_files=[ "res://.import/spikes_007.png-0716a15db9d33def18e42b367df31c80.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/Objects/Traps/Spike/Animation/spikes_008.png b/src/Objects/Traps/Spike/Animation/spikes_008.png new file mode 100644 index 0000000..c0ca650 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_008.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_008.png.import b/src/Objects/Traps/Spike/Animation/spikes_008.png.import new file mode 100644 index 0000000..aadf2a4 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_008.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_008.png-2e3a0512ad8f29fa7e2a99bfd1996666.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_008.png" +dest_files=[ "res://.import/spikes_008.png-2e3a0512ad8f29fa7e2a99bfd1996666.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/Objects/Traps/Spike/Animation/spikes_009.png b/src/Objects/Traps/Spike/Animation/spikes_009.png new file mode 100644 index 0000000..de126df Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_009.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_009.png.import b/src/Objects/Traps/Spike/Animation/spikes_009.png.import new file mode 100644 index 0000000..1ebd9d0 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_009.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_009.png-5edf4f313a00ac8f2012ffe4aaa044e6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_009.png" +dest_files=[ "res://.import/spikes_009.png-5edf4f313a00ac8f2012ffe4aaa044e6.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/Objects/Traps/Spike/Animation/spikes_010.png b/src/Objects/Traps/Spike/Animation/spikes_010.png new file mode 100644 index 0000000..e16dc04 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_010.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_010.png.import b/src/Objects/Traps/Spike/Animation/spikes_010.png.import new file mode 100644 index 0000000..7e2babd --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_010.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_010.png-47f51474f659484a989282be7c740e30.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_010.png" +dest_files=[ "res://.import/spikes_010.png-47f51474f659484a989282be7c740e30.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/Objects/Traps/Spike/Animation/spikes_011.png b/src/Objects/Traps/Spike/Animation/spikes_011.png new file mode 100644 index 0000000..a83ce58 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_011.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_011.png.import b/src/Objects/Traps/Spike/Animation/spikes_011.png.import new file mode 100644 index 0000000..5956470 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_011.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_011.png-f6c58c27df97f3fe260b251769a99a39.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_011.png" +dest_files=[ "res://.import/spikes_011.png-f6c58c27df97f3fe260b251769a99a39.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/Objects/Traps/Spike/Animation/spikes_012.png b/src/Objects/Traps/Spike/Animation/spikes_012.png new file mode 100644 index 0000000..0df3c3c Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_012.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_012.png.import b/src/Objects/Traps/Spike/Animation/spikes_012.png.import new file mode 100644 index 0000000..be49ad1 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_012.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_012.png-d0eb463216c2621d67857a64304c641c.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_012.png" +dest_files=[ "res://.import/spikes_012.png-d0eb463216c2621d67857a64304c641c.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/Objects/Traps/Spike/Animation/spikes_013.png b/src/Objects/Traps/Spike/Animation/spikes_013.png new file mode 100644 index 0000000..0df3c3c Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_013.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_013.png.import b/src/Objects/Traps/Spike/Animation/spikes_013.png.import new file mode 100644 index 0000000..504775c --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_013.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_013.png-27d4c2a4bbf8e59c318c70c44e6c45d1.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_013.png" +dest_files=[ "res://.import/spikes_013.png-27d4c2a4bbf8e59c318c70c44e6c45d1.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/Objects/Traps/Spike/Animation/spikes_014.png b/src/Objects/Traps/Spike/Animation/spikes_014.png new file mode 100644 index 0000000..0df3c3c Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_014.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_014.png.import b/src/Objects/Traps/Spike/Animation/spikes_014.png.import new file mode 100644 index 0000000..c5e1e83 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_014.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_014.png-d1079af88beef1c0461b78d5e950880b.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_014.png" +dest_files=[ "res://.import/spikes_014.png-d1079af88beef1c0461b78d5e950880b.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/Objects/Traps/Spike/Animation/spikes_015.png b/src/Objects/Traps/Spike/Animation/spikes_015.png new file mode 100644 index 0000000..444fa9e Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_015.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_015.png.import b/src/Objects/Traps/Spike/Animation/spikes_015.png.import new file mode 100644 index 0000000..a07f021 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_015.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_015.png-1c7809b0b3f8294aaabce95149f9c523.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_015.png" +dest_files=[ "res://.import/spikes_015.png-1c7809b0b3f8294aaabce95149f9c523.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/Objects/Traps/Spike/Animation/spikes_016.png b/src/Objects/Traps/Spike/Animation/spikes_016.png new file mode 100644 index 0000000..d41d26e Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_016.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_016.png.import b/src/Objects/Traps/Spike/Animation/spikes_016.png.import new file mode 100644 index 0000000..aea88c0 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_016.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_016.png-7202b9b4cf19c548b85dca20bcc42784.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_016.png" +dest_files=[ "res://.import/spikes_016.png-7202b9b4cf19c548b85dca20bcc42784.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/Objects/Traps/Spike/Animation/spikes_017.png b/src/Objects/Traps/Spike/Animation/spikes_017.png new file mode 100644 index 0000000..44ef41e Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_017.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_017.png.import b/src/Objects/Traps/Spike/Animation/spikes_017.png.import new file mode 100644 index 0000000..85ddd88 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_017.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_017.png-31f758caecf815086d740a59f3f3d1e8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_017.png" +dest_files=[ "res://.import/spikes_017.png-31f758caecf815086d740a59f3f3d1e8.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/Objects/Traps/Spike/Animation/spikes_018.png b/src/Objects/Traps/Spike/Animation/spikes_018.png new file mode 100644 index 0000000..75fe0d3 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_018.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_018.png.import b/src/Objects/Traps/Spike/Animation/spikes_018.png.import new file mode 100644 index 0000000..60c6d57 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_018.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_018.png-48ced018e72f0f450bfb3981b248cff5.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_018.png" +dest_files=[ "res://.import/spikes_018.png-48ced018e72f0f450bfb3981b248cff5.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/Objects/Traps/Spike/Animation/spikes_019.png b/src/Objects/Traps/Spike/Animation/spikes_019.png new file mode 100644 index 0000000..d78667e Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_019.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_019.png.import b/src/Objects/Traps/Spike/Animation/spikes_019.png.import new file mode 100644 index 0000000..a3aa036 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_019.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_019.png-a4fdfe34e88ba503e32f890ec0568b63.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_019.png" +dest_files=[ "res://.import/spikes_019.png-a4fdfe34e88ba503e32f890ec0568b63.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/Objects/Traps/Spike/Animation/spikes_020.png b/src/Objects/Traps/Spike/Animation/spikes_020.png new file mode 100644 index 0000000..9af0fad Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_020.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_020.png.import b/src/Objects/Traps/Spike/Animation/spikes_020.png.import new file mode 100644 index 0000000..66a2dac --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_020.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_020.png-a7104c971a7d65d3761fb0f06b951b41.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_020.png" +dest_files=[ "res://.import/spikes_020.png-a7104c971a7d65d3761fb0f06b951b41.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/Objects/Traps/Spike/Animation/spikes_021.png b/src/Objects/Traps/Spike/Animation/spikes_021.png new file mode 100644 index 0000000..02dfe50 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_021.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_021.png.import b/src/Objects/Traps/Spike/Animation/spikes_021.png.import new file mode 100644 index 0000000..6a5bf01 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_021.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_021.png-8d8f3052c8ee5d04abd1c98e13ef1b0d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_021.png" +dest_files=[ "res://.import/spikes_021.png-8d8f3052c8ee5d04abd1c98e13ef1b0d.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/Objects/Traps/Spike/Animation/spikes_022.png b/src/Objects/Traps/Spike/Animation/spikes_022.png new file mode 100644 index 0000000..67f53c4 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_022.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_022.png.import b/src/Objects/Traps/Spike/Animation/spikes_022.png.import new file mode 100644 index 0000000..71cb0a6 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_022.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_022.png-40737160493626cbf4fdb313ff59dad6.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_022.png" +dest_files=[ "res://.import/spikes_022.png-40737160493626cbf4fdb313ff59dad6.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/Objects/Traps/Spike/Animation/spikes_023.png b/src/Objects/Traps/Spike/Animation/spikes_023.png new file mode 100644 index 0000000..70cb54b Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_023.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_023.png.import b/src/Objects/Traps/Spike/Animation/spikes_023.png.import new file mode 100644 index 0000000..5b57418 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_023.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_023.png-b2211b4e52ddf52793973f174bd5b1be.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_023.png" +dest_files=[ "res://.import/spikes_023.png-b2211b4e52ddf52793973f174bd5b1be.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/Objects/Traps/Spike/Animation/spikes_024.png b/src/Objects/Traps/Spike/Animation/spikes_024.png new file mode 100644 index 0000000..42b9562 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_024.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_024.png.import b/src/Objects/Traps/Spike/Animation/spikes_024.png.import new file mode 100644 index 0000000..70db0d8 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_024.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_024.png-a65e94e8ff4afe799683406e2a8d6ff9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_024.png" +dest_files=[ "res://.import/spikes_024.png-a65e94e8ff4afe799683406e2a8d6ff9.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/Objects/Traps/Spike/Animation/spikes_025.png b/src/Objects/Traps/Spike/Animation/spikes_025.png new file mode 100644 index 0000000..a376eae Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_025.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_025.png.import b/src/Objects/Traps/Spike/Animation/spikes_025.png.import new file mode 100644 index 0000000..4ac25da --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_025.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_025.png-5814ebe5864a7939d139dcb673ad2c87.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_025.png" +dest_files=[ "res://.import/spikes_025.png-5814ebe5864a7939d139dcb673ad2c87.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/Objects/Traps/Spike/Animation/spikes_026.png b/src/Objects/Traps/Spike/Animation/spikes_026.png new file mode 100644 index 0000000..6d39a79 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_026.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_026.png.import b/src/Objects/Traps/Spike/Animation/spikes_026.png.import new file mode 100644 index 0000000..1a5d314 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_026.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_026.png-dc52f4b00bbaa3dfbcf865e50debd218.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_026.png" +dest_files=[ "res://.import/spikes_026.png-dc52f4b00bbaa3dfbcf865e50debd218.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/Objects/Traps/Spike/Animation/spikes_027.png b/src/Objects/Traps/Spike/Animation/spikes_027.png new file mode 100644 index 0000000..6d39a79 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_027.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_027.png.import b/src/Objects/Traps/Spike/Animation/spikes_027.png.import new file mode 100644 index 0000000..a8a256c --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_027.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_027.png-5c603efd639f99600acaec87e7292bd8.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_027.png" +dest_files=[ "res://.import/spikes_027.png-5c603efd639f99600acaec87e7292bd8.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/Objects/Traps/Spike/Animation/spikes_028.png b/src/Objects/Traps/Spike/Animation/spikes_028.png new file mode 100644 index 0000000..6d39a79 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_028.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_028.png.import b/src/Objects/Traps/Spike/Animation/spikes_028.png.import new file mode 100644 index 0000000..e5d9e2c --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_028.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_028.png-f56049fc8c1ecbd9eaa9cbef20b8f465.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_028.png" +dest_files=[ "res://.import/spikes_028.png-f56049fc8c1ecbd9eaa9cbef20b8f465.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/Objects/Traps/Spike/Animation/spikes_029.png b/src/Objects/Traps/Spike/Animation/spikes_029.png new file mode 100644 index 0000000..6d39a79 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_029.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_029.png.import b/src/Objects/Traps/Spike/Animation/spikes_029.png.import new file mode 100644 index 0000000..31904d0 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_029.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_029.png-fb30ca68bf071dafe26c37b4b321be3d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_029.png" +dest_files=[ "res://.import/spikes_029.png-fb30ca68bf071dafe26c37b4b321be3d.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/Objects/Traps/Spike/Animation/spikes_030.png b/src/Objects/Traps/Spike/Animation/spikes_030.png new file mode 100644 index 0000000..6d39a79 Binary files /dev/null and b/src/Objects/Traps/Spike/Animation/spikes_030.png differ diff --git a/src/Objects/Traps/Spike/Animation/spikes_030.png.import b/src/Objects/Traps/Spike/Animation/spikes_030.png.import new file mode 100644 index 0000000..c22f313 --- /dev/null +++ b/src/Objects/Traps/Spike/Animation/spikes_030.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_030.png-0daa8d881cd479fd73b20901548f6296.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/Animation/spikes_030.png" +dest_files=[ "res://.import/spikes_030.png-0daa8d881cd479fd73b20901548f6296.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/Objects/Traps/Spike/Spike.gd b/src/Objects/Traps/Spike/Spike.gd new file mode 100644 index 0000000..a86ea86 --- /dev/null +++ b/src/Objects/Traps/Spike/Spike.gd @@ -0,0 +1,34 @@ +extends Node2D + +export(float, 0.1, 3.0) var time_to_recharge = 3.0 + +var time = Timer.new() + +func _ready(): + add_child(time) + $Sprite.play("out") + $"Hitbox/CollisionShape2D".disabled = true + +func on_timer_timeout(): + $Sprite.play("out") + time.stop() + +func _on_Sprite_animation_finished(): + if $Sprite.get_animation() == "default": + $"Hitbox/CollisionShape2D".disabled = false + if $Sprite.get_animation() == "out": + $Sprite.play("default") + elif $Sprite.get_animation() == "in": + $Sprite.play("in_frozen") + $"Hitbox/CollisionShape2D".disabled = true + elif $Sprite.get_animation() == "in_frozen": + time.connect("timeout", self, "on_timer_timeout") + time.set_wait_time(time_to_recharge) + time.start() + + +func _on_Hitbox_area_entered(area): + if($Sprite.get_animation()=="default"): + $Sprite.play("in") + + diff --git a/src/Objects/Traps/Spike/Spike.tscn b/src/Objects/Traps/Spike/Spike.tscn index 6e555f8..a6595c7 100644 --- a/src/Objects/Traps/Spike/Spike.tscn +++ b/src/Objects/Traps/Spike/Spike.tscn @@ -1,28 +1,88 @@ -[gd_scene load_steps=6 format=2] +[gd_scene load_steps=37 format=2] [ext_resource path="res://Overlap/HurtHit_Box/Hitbox.tscn" type="PackedScene" id=1] -[ext_resource path="res://Objects/Banana/Banana.gd" type="Script" id=2] -[ext_resource path="res://testSprites/Spike.png" type="Texture" id=3] +[ext_resource path="res://Objects/Traps/Spike/Spike.gd" type="Script" id=2] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_007.png" type="Texture" id=3] [ext_resource path="res://Overlap/Kind.tscn" type="PackedScene" id=4] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_005.png" type="Texture" id=5] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_012.png" type="Texture" id=6] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_018.png" type="Texture" id=7] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_020.png" type="Texture" id=8] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_017.png" type="Texture" id=9] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_021.png" type="Texture" id=10] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_023.png" type="Texture" id=11] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_025.png" type="Texture" id=12] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_000.png" type="Texture" id=13] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_024.png" type="Texture" id=14] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_010.png" type="Texture" id=15] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_008.png" type="Texture" id=16] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_011.png" type="Texture" id=17] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_013.png" type="Texture" id=18] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_004.png" type="Texture" id=19] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_016.png" type="Texture" id=20] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_030.png" type="Texture" id=21] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_002.png" type="Texture" id=22] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_006.png" type="Texture" id=23] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_003.png" type="Texture" id=24] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_009.png" type="Texture" id=25] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_001.png" type="Texture" id=26] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_015.png" type="Texture" id=27] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_014.png" type="Texture" id=28] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_019.png" type="Texture" id=29] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_022.png" type="Texture" id=30] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_029.png" type="Texture" id=31] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_028.png" type="Texture" id=32] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_027.png" type="Texture" id=33] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_026.png" type="Texture" id=34] -[sub_resource type="CapsuleShape2D" id=1] -height = 6.36237 +[sub_resource type="SpriteFrames" id=1] +animations = [ { +"frames": [ ExtResource( 18 ) ], +"loop": false, +"name": "default", +"speed": 60.0 +}, { +"frames": [ ExtResource( 28 ), ExtResource( 27 ), ExtResource( 20 ), ExtResource( 9 ), ExtResource( 7 ), ExtResource( 29 ), ExtResource( 8 ), ExtResource( 10 ), ExtResource( 30 ), ExtResource( 11 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 34 ) ], +"loop": false, +"name": "in", +"speed": 60.0 +}, { +"frames": [ ExtResource( 13 ), ExtResource( 26 ), ExtResource( 22 ), ExtResource( 24 ), ExtResource( 19 ), ExtResource( 5 ), ExtResource( 23 ), ExtResource( 3 ), ExtResource( 16 ), ExtResource( 25 ), ExtResource( 15 ), ExtResource( 17 ), ExtResource( 6 ) ], +"loop": false, +"name": "out", +"speed": 60.0 +}, { +"frames": [ ExtResource( 33 ), ExtResource( 32 ), ExtResource( 31 ), ExtResource( 21 ) ], +"loop": false, +"name": "in_frozen", +"speed": 3.0 +} ] + +[sub_resource type="CapsuleShape2D" id=2] +radius = 8.0 +height = 14.0 [node name="Spike" type="Node2D"] script = ExtResource( 2 ) +time_to_recharge = 0.1 [node name="Kind" parent="." instance=ExtResource( 4 )] kind = 10 -[node name="Sprite" type="Sprite" parent="."] +[node name="Sprite" type="AnimatedSprite" parent="."] position = Vector2( 0.220352, -3.63603 ) -texture = ExtResource( 3 ) +frames = SubResource( 1 ) +animation = "in_frozen" [node name="Hitbox" parent="." instance=ExtResource( 1 )] collision_layer = 16 +damage = 2.0 [node name="CollisionShape2D" parent="Hitbox" index="0"] +position = Vector2( 1, -1 ) rotation = 1.5708 -shape = SubResource( 1 ) +shape = SubResource( 2 ) +[connection signal="animation_finished" from="Sprite" to="." method="_on_Sprite_animation_finished"] +[connection signal="area_entered" from="Hitbox" to="." method="_on_Hitbox_area_entered"] [editable path="Hitbox"] diff --git a/src/Objects/Traps/Spike/SpikeCard.tscn b/src/Objects/Traps/Spike/SpikeCard.tscn index 56ccf1d..eb89e0c 100644 --- a/src/Objects/Traps/Spike/SpikeCard.tscn +++ b/src/Objects/Traps/Spike/SpikeCard.tscn @@ -1,15 +1,21 @@ -[gd_scene load_steps=9 format=2] +[gd_scene load_steps=10 format=2] -[ext_resource path="res://testSprites/Spike.png" type="Texture" id=1] +[ext_resource path="res://Objects/Traps/Spike/Animation/spikes_015.png" type="Texture" id=1] [ext_resource path="res://Objects/Card/card.png" type="Texture" id=2] [ext_resource path="res://Menus/DragNDrop/DragSource.gd" type="Script" id=3] [ext_resource path="res://Objects/Card/level0.png" type="Texture" id=4] [ext_resource path="res://Objects/Card/level2.png" type="Texture" id=5] [ext_resource path="res://Objects/Card/level1.png" type="Texture" id=6] [ext_resource path="res://Objects/Traps/Spike/Spike.tscn" type="PackedScene" id=7] +[ext_resource path="res://Objects/Traps/Spike/spikes_icon.png" type="Texture" id=8] [sub_resource type="SpriteFrames" id=1] animations = [ { +"frames": [ ExtResource( 5 ) ], +"loop": false, +"name": "lvl2", +"speed": 60.0 +}, { "frames": [ ExtResource( 4 ) ], "loop": false, "name": "lvl0", @@ -19,11 +25,6 @@ animations = [ { "loop": false, "name": "lvl1", "speed": 60.0 -}, { -"frames": [ ExtResource( 5 ) ], -"loop": false, -"name": "lvl2", -"speed": 60.0 } ] [node name="SpikeCard" type="TextureRect"] @@ -31,7 +32,7 @@ margin_left = 10.7364 margin_top = 227.792 margin_right = 42.7364 margin_bottom = 259.792 -texture = ExtResource( 1 ) +texture = ExtResource( 8 ) expand = true script = ExtResource( 3 ) __meta__ = { diff --git a/src/Objects/Traps/Spike/spikes_icon.png b/src/Objects/Traps/Spike/spikes_icon.png new file mode 100644 index 0000000..d84554a Binary files /dev/null and b/src/Objects/Traps/Spike/spikes_icon.png differ diff --git a/src/Objects/Traps/Spike/spikes_icon.png.import b/src/Objects/Traps/Spike/spikes_icon.png.import new file mode 100644 index 0000000..97df9cb --- /dev/null +++ b/src/Objects/Traps/Spike/spikes_icon.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/spikes_icon.png-512e3735f00cdb7d7520a442c979a9ee.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://Objects/Traps/Spike/spikes_icon.png" +dest_files=[ "res://.import/spikes_icon.png-512e3735f00cdb7d7520a442c979a9ee.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/Overlap/AI/AI_Hero.gd b/src/Overlap/AI/AI_Hero.gd index e298d71..506b7a2 100644 --- a/src/Overlap/AI/AI_Hero.gd +++ b/src/Overlap/AI/AI_Hero.gd @@ -310,7 +310,8 @@ func movement_execution(delta): run(Vector2(targetFieldCur[0]-currentPosition[0], targetFieldCur[1]-currentPosition[1]), delta*4) elif(ai_movement_state==ROLL): run(Vector2(targetFieldCur[0]-currentPosition[0], targetFieldCur[1]-currentPosition[1]), delta*4) - + else: + ExecutionState = AI_MOVE func reset_exeution_state(delta): threadDelta = threadDelta + delta diff --git a/src/Player/Player.gd b/src/Player/Player.gd index 2abd01c..f875ef0 100644 --- a/src/Player/Player.gd +++ b/src/Player/Player.gd @@ -177,15 +177,15 @@ func roll_finished(): func _on_Hurtbox_area_entered(area): - player_stats.health -= area.damage + if("damage" in area): + player_stats.health -= area.damage - if area.damage > 0: - damage_per_second += area.damage - pass - else: - heal_per_second += abs(area.damage) - pass - + if area.damage > 0: + damage_per_second += area.damage + pass + else: + heal_per_second += abs(area.damage) + pass func _on_Hurtbox_area_exited(area): if area.damage > 0: diff --git a/src/Player/Player.tscn b/src/Player/Player.tscn index b35f873..a032e86 100644 --- a/src/Player/Player.tscn +++ b/src/Player/Player.tscn @@ -619,19 +619,17 @@ height = 0.2 radius = 4.03497 height = 9.42006 -[sub_resource type="CircleShape2D" id=51] +[sub_resource type="CircleShape2D" id=49] radius = 13.3924 [sub_resource type="DynamicFont" id=50] size = 12 font_data = ExtResource( 6 ) - [node name="Player" type="KinematicBody2D" groups=[ "hero", ]] collision_mask = 14 - script = ExtResource( 1 ) ROLL_SPEED = 120 FRICTION = 270 @@ -724,7 +722,7 @@ damage = 0.0 [node name="CollisionShape2D" parent="Pivot/SwordRange" index="0"] position = Vector2( 0, -4.56405 ) -shape = SubResource( 51 ) +shape = SubResource( 49 ) [node name="DebugLabel" type="Label" parent="."] margin_left = -8.12021 @@ -738,7 +736,7 @@ __meta__ = { } [node name="Stats" parent="." instance=ExtResource( 5 )] -max_health = 5 +max_health = 20 [node name="AnimationStates" type="Node" parent="."] script = ExtResource( 15 ) diff --git a/src/World.tscn b/src/World.tscn index 7beac8a..29802bf 100644 --- a/src/World.tscn +++ b/src/World.tscn @@ -1,30 +1,20 @@ -[gd_scene load_steps=12 format=2] +[gd_scene load_steps=10 format=2] [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1] [ext_resource path="res://World.gd" type="Script" 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/Bonfire/Bonfire.tscn" type="PackedScene" id=4] [ext_resource path="res://Menus/DragNDrop/DragNDropUI.tscn" type="PackedScene" id=5] [ext_resource path="res://Menus/DialogueBox/DialogueBox.tscn" type="PackedScene" id=6] [ext_resource path="res://Maps/Background/Background.tscn" type="PackedScene" id=7] -[ext_resource path="res://Boss/SlimeBoss/SlimeBoss.tscn" type="PackedScene" id=8] -[ext_resource path="res://Objects/Bonfire/Bonfire.tscn" type="PackedScene" id=10] +[ext_resource path="res://Boss/Boss_template.tscn" type="PackedScene" id=8] [ext_resource path="res://Maps/Grid.tscn" type="PackedScene" id=18] -[sub_resource type="AnimationNodeStateMachinePlayback" id=1] - [node name="World" type="Node2D"] script = ExtResource( 2 ) -[node name="WallSprite" type="Sprite" parent="."] -visible = false -position = Vector2( 360, 176 ) -texture = ExtResource( 4 ) -region_enabled = true -region_rect = Rect2( 0, 0, 1280, 720 ) - [node name="Background" parent="." instance=ExtResource( 7 )] -frame = 6 +frame = 11 [node name="FloorTileMap" type="TileMap" parent="."] position = Vector2( 16, 16 ) @@ -33,32 +23,22 @@ cell_size = Vector2( 32, 32 ) collision_layer = 2 collision_mask = 0 format = 1 -tile_data = PoolIntArray( -131074, 47, 0, -131073, 47, 1, -196608, 47, 1, -196607, 47, 1, -196606, 47, 1, -196605, 47, 1, -196604, 47, 1, -196603, 47, 1, -196602, 47, 1, -196601, 47, 1, -196600, 47, 1, -196599, 47, 1, -196598, 47, 1, -196597, 47, 1, -196596, 47, 1, -196595, 47, 1, -196594, 47, 1, -196593, 47, 1, -196592, 47, 2, -65538, 47, 65536, -65537, 47, 65537, -131072, 47, 65537, -131071, 47, 65537, -131070, 47, 65537, -131069, 47, 65537, -131068, 47, 65537, -131067, 47, 65537, -131066, 47, 65537, -131065, 47, 65537, -131064, 47, 65537, -131063, 47, 65537, -131062, 47, 65537, -131061, 47, 65537, -131060, 47, 65537, -131059, 47, 65537, -131058, 47, 65537, -131057, 47, 65537, -131056, 47, 65538, -2, 47, 65536, -1, 47, 65541, -65536, 47, 131073, -65535, 47, 131073, -65534, 47, 131073, -65533, 47, 131073, -65532, 47, 131073, -65531, 47, 131073, -65530, 47, 131073, -65529, 47, 131073, -65528, 47, 131073, -65527, 47, 131073, -65526, 47, 131073, -65525, 47, 131073, -65524, 47, 131073, -65523, 47, 131073, -65522, 47, 65542, -65521, 47, 65537, -65520, 47, 65538, 65534, 47, 65536, 65535, 47, 65538, 14, 47, 65536, 15, 47, 65537, 16, 47, 65538, 131070, 47, 65536, 131071, 47, 65538, 65550, 47, 65536, 65551, 47, 65537, 65552, 47, 65538, 196606, 47, 65536, 196607, 47, 65538, 131086, 47, 65536, 131087, 47, 65537, 131088, 47, 65538, 262142, 47, 65536, 262143, 47, 65538, 196622, 47, 65536, 196623, 47, 65537, 196624, 47, 65538, 327678, 47, 65536, 327679, 47, 65538, 262158, 47, 65536, 262159, 47, 65537, 262160, 47, 65538, 393214, 47, 65536, 393215, 47, 65538, 327694, 47, 65536, 327695, 47, 65537, 327696, 47, 65538, 458750, 47, 65536, 458751, 47, 131077, 393216, 47, 1, 393217, 47, 1, 393218, 47, 1, 393219, 47, 1, 393220, 47, 1, 393221, 47, 1, 393222, 47, 1, 393223, 47, 1, 393224, 47, 1, 393225, 47, 1, 393226, 47, 1, 393227, 47, 1, 393228, 47, 1, 393229, 47, 1, 393230, 47, 131078, 393231, 47, 65537, 393232, 47, 65538, 524286, 47, 65536, 524287, 47, 65537, 458752, 47, 65537, 458753, 47, 65537, 458754, 47, 65537, 458755, 47, 65537, 458756, 47, 65537, 458757, 47, 65537, 458758, 47, 65537, 458759, 47, 65537, 458760, 47, 65537, 458761, 47, 65537, 458762, 47, 65537, 458763, 47, 65537, 458764, 47, 65537, 458765, 47, 65537, 458766, 47, 65537, 458767, 47, 65537, 458768, 47, 65538, 589822, 47, 65536, 589823, 47, 65537, 524288, 47, 65537, 524289, 47, 65537, 524290, 47, 65537, 524291, 47, 65537, 524292, 47, 65537, 524293, 47, 65537, 524294, 47, 65537, 524295, 47, 65537, 524296, 47, 65537, 524297, 47, 65537, 524298, 47, 65537, 524299, 47, 65537, 524300, 47, 65537, 524301, 47, 65537, 524302, 47, 65537, 524303, 47, 65537, 524304, 47, 65538, 655358, 47, 131072, 655359, 47, 131073, 589824, 47, 131073, 589825, 47, 131073, 589826, 47, 131073, 589827, 47, 131073, 589828, 47, 131073, 589829, 47, 131073, 589830, 47, 131073, 589831, 47, 131073, 589832, 47, 131073, 589833, 47, 131073, 589834, 47, 131073, 589835, 47, 131073, 589836, 47, 131073, 589837, 47, 131073, 589838, 47, 131073, 589839, 47, 131073, 589840, 47, 131074 ) -__meta__ = { -"_edit_group_": true -} +tile_data = PoolIntArray( -131074, 47, 0, -131073, 47, 1, -196608, 47, 1, -196607, 47, 1, -196606, 47, 1, -196605, 47, 1, -196604, 47, 1, -196603, 47, 1, -196602, 47, 1, -196601, 47, 1, -196600, 47, 1, -196599, 47, 1, -196598, 47, 1, -196597, 47, 1, -196596, 47, 1, -196595, 47, 1, -196594, 47, 1, -196593, 47, 1, -196592, 47, 2, -65538, 47, 65536, -65537, 47, 65537, -131072, 47, 65537, -131071, 47, 65537, -131070, 47, 65537, -131069, 47, 65537, -131068, 47, 65537, -131067, 47, 65537, -131066, 47, 65537, -131065, 47, 65537, -131064, 47, 65537, -131063, 47, 65537, -131062, 47, 65537, -131061, 47, 65537, -131060, 47, 65537, -131059, 47, 65537, -131058, 47, 65537, -131057, 47, 65537, -131056, 47, 65538, -2, 47, 65536, -1, 47, 65541, -65536, 47, 131073, -65535, 47, 131073, -65534, 47, 131073, -65533, 47, 131073, -65532, 47, 131073, -65531, 47, 131073, -65530, 47, 131073, -65529, 47, 65544, -65528, 47, 131073, -65527, 47, 131073, -65526, 47, 131073, -65525, 47, 65542, -65524, 47, 65541, -65523, 47, 131073, -65522, 47, 65542, -65521, 47, 65537, -65520, 47, 65538, 65534, 47, 65536, 65535, 47, 65538, 7, 47, 65539, 11, 47, 131072, 12, 47, 65543, 14, 47, 65536, 15, 47, 65537, 16, 47, 65538, 131070, 47, 65536, 131071, 47, 65538, 65543, 47, 65539, 65548, 47, 65539, 65550, 47, 65536, 65551, 47, 65537, 65552, 47, 65538, 196606, 47, 65536, 196607, 47, 65538, 131079, 47, 196612, 131080, 47, 196609, 131081, 47, 196610, 131084, 47, 131075, 131086, 47, 65536, 131087, 47, 65537, 131088, 47, 65538, 262142, 47, 65536, 262143, 47, 65538, 196622, 47, 65536, 196623, 47, 65537, 196624, 47, 65538, 327678, 47, 65536, 327679, 47, 65538, 262153, 47, 196608, 262154, 47, 7, 262156, 47, 3, 262158, 47, 65536, 262159, 47, 65537, 262160, 47, 65538, 393214, 47, 65536, 393215, 47, 65538, 327690, 47, 131076, 327691, 47, 1, 327692, 47, 131079, 327694, 47, 65536, 327695, 47, 65537, 327696, 47, 65538, 458750, 47, 65536, 458751, 47, 131077, 393216, 47, 1, 393217, 47, 1, 393218, 47, 1, 393219, 47, 1, 393220, 47, 1, 393221, 47, 1, 393222, 47, 1, 393223, 47, 1, 393224, 47, 1, 393225, 47, 1, 393226, 47, 131078, 393227, 47, 65537, 393228, 47, 131077, 393229, 47, 1, 393230, 47, 131078, 393231, 47, 65537, 393232, 47, 65538, 524286, 47, 65536, 524287, 47, 65537, 458752, 47, 65537, 458753, 47, 65537, 458754, 47, 65537, 458755, 47, 65537, 458756, 47, 65537, 458757, 47, 65537, 458758, 47, 65537, 458759, 47, 65537, 458760, 47, 65537, 458761, 47, 65537, 458762, 47, 65537, 458763, 47, 65537, 458764, 47, 65537, 458765, 47, 65537, 458766, 47, 65537, 458767, 47, 65537, 458768, 47, 65538, 589822, 47, 65536, 589823, 47, 65537, 524288, 47, 65537, 524289, 47, 65537, 524290, 47, 65537, 524291, 47, 65537, 524292, 47, 65537, 524293, 47, 65537, 524294, 47, 65537, 524295, 47, 65537, 524296, 47, 65537, 524297, 47, 65537, 524298, 47, 65537, 524299, 47, 65537, 524300, 47, 65537, 524301, 47, 65537, 524302, 47, 65537, 524303, 47, 65537, 524304, 47, 65538, 655358, 47, 131072, 655359, 47, 131073, 589824, 47, 131073, 589825, 47, 131073, 589826, 47, 131073, 589827, 47, 131073, 589828, 47, 131073, 589829, 47, 131073, 589830, 47, 131073, 589831, 47, 131073, 589832, 47, 131073, 589833, 47, 131073, 589834, 47, 131073, 589835, 47, 131073, 589836, 47, 131073, 589837, 47, 131073, 589838, 47, 131073, 589839, 47, 131073, 589840, 47, 131074 ) [node name="YSort" type="YSort" parent="."] -[node name="Bonfire" parent="YSort" instance=ExtResource( 10 )] -position = Vector2( 265.543, -16 ) - [node name="Player" parent="YSort" instance=ExtResource( 1 )] -position = Vector2( 344, 125.768 ) +position = Vector2( 376, 136 ) scale = Vector2( 2, 2 ) ROLL_SPEED = 140 FRICTION = 200 -[node name="SlimeBoss" parent="YSort" instance=ExtResource( 8 )] -position = Vector2( 104, 80 ) +[node name="Bonfire" parent="YSort" instance=ExtResource( 4 )] +position = Vector2( 304, 56 ) -[node name="Hurtbox" parent="YSort/SlimeBoss" index="5" groups=[ -"HittableByPlayer", -]] -collision_mask = 129 - -[node name="AnimationTree" parent="YSort/SlimeBoss" index="10"] -parameters/playback = SubResource( 1 ) +[node name="Boss_template" parent="YSort" instance=ExtResource( 8 )] +position = Vector2( 96, 128 ) +scale = Vector2( 2, 2 ) [node name="Grid" parent="." instance=ExtResource( 18 )] @@ -70,5 +50,3 @@ visible = false [node name="DragNDropUI" parent="CanvasLayer" instance=ExtResource( 5 )] anchor_top = -0.00171594 anchor_bottom = 0.998284 - -[editable path="YSort/SlimeBoss"]