From 3e454f57858928859493e500a228235f44c54b13 Mon Sep 17 00:00:00 2001
From: Nitsud Yarg <relay01@gmail.com>
Date: Sat, 13 Jul 2024 12:22:48 -0700
Subject: [PATCH] Start add of spider enemy.

---
 assets/Spider1.png                            | Bin 0 -> 1072 bytes
 assets/Spider1.png.import                     |  35 +++++++
 src/Actors/Enemies/Spider/Spider.tscn         |  91 ++++++++++++++++++
 .../Platform/PlatformVMove/PlatformVMove.tscn |   4 +-
 .../PlatformVMove/{states2 => states}/idle.gd |   0
 .../PlatformVMove/{states2 => states}/move.gd |   0
 src/Levels/Level.tscn                         |   6 +-
 7 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 assets/Spider1.png
 create mode 100644 assets/Spider1.png.import
 create mode 100644 src/Actors/Enemies/Spider/Spider.tscn
 rename src/Actors/Platform/PlatformVMove/{states2 => states}/idle.gd (100%)
 rename src/Actors/Platform/PlatformVMove/{states2 => states}/move.gd (100%)

diff --git a/assets/Spider1.png b/assets/Spider1.png
new file mode 100644
index 0000000000000000000000000000000000000000..aa36f957b6cbaea89e440b06cab9dfd41b5e2be3
GIT binary patch
literal 1072
zcmV-01kd}4P)<h;3K|Lk000e1NJLTq002Ay001-y1^@s6)~{P100001b5ch_0Itp)
z=>Px&>PbXFRA_<iS|O0DIut#;c>-C9L`EW!$jVA25?NV^tgJ*Lk(EefWMm|AB{D8w
zWJ3caOS{A0UG{Nin0Cp{X-*C|33nFw$KZYU06vQ#7xIv*?|ls%+6bKUMLnAoY>L&;
zqG`Z~d-o2=y0OMTUopTn;SxLG=)=DS0Dx2OqY5F-*i8wZily;GtajHw9soj==tj&$
zf0^JQ7m~E<3UVO{A#%Cb7>5)<9;pjJOyBRf5n?~Wr3J+K4d5K2>2dGo9A6@M>dYYp
z`h<ZHBKrixHGTZ1=xczn05t0cXOA>P8mGw13xcdrqMIIQ1ZaoH=R2H&*KoupRu6o@
zLe7~uv=PLO4&RYS2qS`HenL~;5yk`}N`XcU?oM5{3SP^RHFC}b=iIyT3(oaP@iB&D
zegcUIYWkSPdk4@Ch(q<+65<xTsv|4p+!RGscwwXjoa1b`Usd%iR*N<F=aJyG9a$si
zT<8;qCawSgobgfH)hB2PnTZ8}zvdr<BLGmcks|<bX@Tqc4gL*-Bc~4rrE;!&aI^sY
z2p!`?&UGvWn%bFjE*xnFDi|7}917#dWBbvGYjBuSCT))Jn|fSgKe9V=?m=ocBc_ze
z%elZb=Wet@US80#@rg+1+=&Zh)XrCxwFH2UafA^;8mBmy7aa2w+VYN$@>#!L2uUfM
z@57vN>ng|@A08RoDrmNw;EbcAe3o;rctD9>;sbz+)t;U(GhR=`w4e3&`l~Pd1hU8q
znMJ82gvee9DOe!;t1k&5vMOttMX9Vp$Q){w?ytTSESTl6<^zBtD`b$X?M?G($MkRM
z>lr>1nhyZ<?lJ9W@;w%<ch{_|U?ZHXAQ~~BJ%dl<NV8!rKqE%8&N=t=^(^1CO=A`_
z;rn9-w#E`|u7Xn%a}{(A!sIh^PPcWGqb={&eoK6=KDHR=!Q&K;8?+<h{5Is4hUp0H
z-uKc8Og=N`G+)O!ZU_5Qv&3gY^SNTCd?SZ7Oh@z~!{rEoA;!dXW-C^EMOAn@wqmvC
za`PEJTkJD2R)?pK0B%Rj7!w~k@=DCwd{&2npX12de9j!!_-;r3FFs^ZYCR7N7RVfG
zZ?nbZfOX&eseFqCfILf3eo*Wy0WZ&zC7R9fIcN6On62>rJNRr#=cnVZtD#RA2qL*u
z*xnkJtCla6bT$oLuoEnhLL}<7E>W+8TNdqf__IZ}&4N-Ui>#12l&gKBUi$UtcaQJ0
za60^KVS8(E3Vyb*y<^9Y9XodH*s<eP^a-S`H1ccD(y!Evw*;r)mukEl!tSufZ*|y-
qXDa<$#LNGBxK!!?b=a%;8^eF#xQ7BhR19wb0000<MNUMnLSTZa;`p}!

literal 0
HcmV?d00001

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 )