diff --git a/assets/Spider1.png b/assets/Spider1.png new file mode 100644 index 0000000..aa36f95 Binary files /dev/null and b/assets/Spider1.png differ diff --git a/assets/Spider1.png.import b/assets/Spider1.png.import new file mode 100644 index 0000000..318f086 --- /dev/null +++ b/assets/Spider1.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/Spider1.png-85cc52177a93c8766bb76a39a26b9d70.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/Spider1.png" +dest_files=[ "res://.import/Spider1.png-85cc52177a93c8766bb76a39a26b9d70.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/src/Actors/Enemies/Spider/Spider.tscn b/src/Actors/Enemies/Spider/Spider.tscn new file mode 100644 index 0000000..05ed7af --- /dev/null +++ b/src/Actors/Enemies/Spider/Spider.tscn @@ -0,0 +1,91 @@ +[gd_scene load_steps=11 format=2] + +[ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1] +[ext_resource path="res://src/components/Hurtbox_Component.tscn" type="PackedScene" id=2] + +[sub_resource type="StreamTexture" id=1] +load_path = "res://.import/Spider1.png-85cc52177a93c8766bb76a39a26b9d70.stex" + +[sub_resource type="AtlasTexture" id=2] +atlas = SubResource( 1 ) +region = Rect2( 0, 26, 20, 26 ) + +[sub_resource type="AtlasTexture" id=3] +atlas = SubResource( 1 ) +region = Rect2( 0, 0, 20, 26 ) + +[sub_resource type="AtlasTexture" id=4] +atlas = SubResource( 1 ) +region = Rect2( 20, 0, 20, 26 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = SubResource( 1 ) +region = Rect2( 40, 0, 20, 26 ) + +[sub_resource type="SpriteFrames" id=6] +animations = [ { +"frames": [ SubResource( 2 ) ], +"loop": false, +"name": "die", +"speed": 10.0 +}, { +"frames": [ SubResource( 3 ) ], +"loop": false, +"name": "idle", +"speed": 10.0 +}, { +"frames": [ SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], +"loop": false, +"name": "jump", +"speed": 10.0 +}, { +"frames": [ SubResource( 5 ), SubResource( 4 ), SubResource( 3 ) ], +"loop": false, +"name": "land", +"speed": 10.0 +} ] + +[sub_resource type="RectangleShape2D" id=7] +extents = Vector2( 10, 12 ) + +[sub_resource type="CircleShape2D" id=8] + +[node name="Spider" instance=ExtResource( 1 )] + +[node name="AnimatedSprite" parent="." index="0"] +frames = SubResource( 6 ) +animation = "idle" +frame = 0 +__meta__ = { +"_aseprite_wizard_config_": { +"layer": "", +"o_ex_p": "", +"o_folder": "res://assets", +"o_name": "", +"only_visible": true, +"op_exp": false, +"slice": "", +"source": "D:/Sync/Assets/Library/Spider1.ase" +} +} + +[node name="idle" parent="movement_state_machine" index="0"] +animation_sequence = [ "idle" ] + +[node name="fall" parent="movement_state_machine" index="1"] +animation_sequence = [ "land" ] + +[node name="CollisionShape2D" parent="Hurtbox_Component" index="0"] +position = Vector2( 0, -1 ) + +[node name="CollisionShape2D" type="CollisionShape2D" parent="." index="5"] +position = Vector2( 0, -2 ) +shape = SubResource( 7 ) + +[node name="VisibilityNotifier2D" type="VisibilityNotifier2D" parent="." index="6"] + +[node name="Hurtbox_Component2" parent="." index="7" instance=ExtResource( 2 )] + +[node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox_Component2" index="0"] +modulate = Color( 1, 0, 0, 1 ) +shape = SubResource( 8 ) diff --git a/src/Actors/Platform/PlatformVMove/PlatformVMove.tscn b/src/Actors/Platform/PlatformVMove/PlatformVMove.tscn index 37fc13e..4f1a6ce 100644 --- a/src/Actors/Platform/PlatformVMove/PlatformVMove.tscn +++ b/src/Actors/Platform/PlatformVMove/PlatformVMove.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=13 format=2] [ext_resource path="res://src/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/Actors/Platform/PlatformVMove/states2/move.gd" type="Script" id=2] -[ext_resource path="res://src/Actors/Platform/PlatformVMove/states2/idle.gd" type="Script" id=3] +[ext_resource path="res://src/Actors/Platform/PlatformVMove/states/move.gd" type="Script" id=2] +[ext_resource path="res://src/Actors/Platform/PlatformVMove/states/idle.gd" type="Script" id=3] [sub_resource type="StreamTexture" id=1] load_path = "res://.import/elevator.png-acbb9d6b280a7beb809eaa023b52f90b.stex" diff --git a/src/Actors/Platform/PlatformVMove/states2/idle.gd b/src/Actors/Platform/PlatformVMove/states/idle.gd similarity index 100% rename from src/Actors/Platform/PlatformVMove/states2/idle.gd rename to src/Actors/Platform/PlatformVMove/states/idle.gd diff --git a/src/Actors/Platform/PlatformVMove/states2/move.gd b/src/Actors/Platform/PlatformVMove/states/move.gd similarity index 100% rename from src/Actors/Platform/PlatformVMove/states2/move.gd rename to src/Actors/Platform/PlatformVMove/states/move.gd diff --git a/src/Levels/Level.tscn b/src/Levels/Level.tscn index 4c58b92..3c394f8 100644 --- a/src/Levels/Level.tscn +++ b/src/Levels/Level.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=18 format=2] +[gd_scene load_steps=19 format=2] [ext_resource path="res://src/Actors/Platform/PlatformVMove/PlatformVMove.tscn" type="PackedScene" id=1] [ext_resource path="res://assets/Tiles/Assets/Demo TileSet.tres" type="TileSet" id=2] @@ -11,6 +11,7 @@ [ext_resource path="res://src/components/Hitbox_Component.tscn" type="PackedScene" id=9] [ext_resource path="res://src/Level.gd" type="Script" id=10] [ext_resource path="res://src/components/Modifier_Component.tscn" type="PackedScene" id=11] +[ext_resource path="res://src/Actors/Enemies/Spider/Spider.tscn" type="PackedScene" id=12] [sub_resource type="SegmentShape2D" id=1] b = Vector2( 1500, 0 ) @@ -178,3 +179,6 @@ shape = SubResource( 6 ) [node name="PlatformVMove" parent="." instance=ExtResource( 1 )] position = Vector2( 359, 319 ) + +[node name="Spider" parent="." instance=ExtResource( 12 )] +position = Vector2( 137, 302 )