From 1a570950c183c52d442dd30351452e61c7beb3b9 Mon Sep 17 00:00:00 2001
From: Dustin <relay01@gmail.com>
Date: Wed, 12 Mar 2025 21:41:58 -0700
Subject: [PATCH] Clean up and new template based player

---
 Main.tscn                                     |   7 +--
 .../players/playerE/Player Idle 48x48.png     | Bin 1772 -> 0 bytes
 .../playerE/Player Idle 48x48.png.import      |  35 -----------
 lib/templates/Actor/ActorTemplate.tscn        |  58 +-----------------
 lib/templates/Actor/resources/Smiley.png      | Bin 508 -> 0 bytes
 .../Actor/resources/Smiley.png.import         |  35 -----------
 project.godot                                 |   8 +--
 src/actors/players/playerE/PlayerE.tscn       |   5 ++
 8 files changed, 10 insertions(+), 138 deletions(-)
 delete mode 100644 assets/actors/players/playerE/Player Idle 48x48.png
 delete mode 100644 assets/actors/players/playerE/Player Idle 48x48.png.import
 delete mode 100644 lib/templates/Actor/resources/Smiley.png
 delete mode 100644 lib/templates/Actor/resources/Smiley.png.import
 create mode 100644 src/actors/players/playerE/PlayerE.tscn

diff --git a/Main.tscn b/Main.tscn
index 267187c..239fc96 100644
--- a/Main.tscn
+++ b/Main.tscn
@@ -1,15 +1,10 @@
-[gd_scene load_steps=3 format=2]
-
-[ext_resource path="res://lib/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
+[gd_scene load_steps=2 format=2]
 
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 208, 20 )
 
 [node name="Main" type="Node2D"]
 
-[node name="ActorTemplate" parent="." instance=ExtResource( 1 )]
-position = Vector2( 152, 64 )
-
 [node name="ColorRect" type="ColorRect" parent="."]
 margin_top = 160.0
 margin_right = 416.0
diff --git a/assets/actors/players/playerE/Player Idle 48x48.png b/assets/actors/players/playerE/Player Idle 48x48.png
deleted file mode 100644
index 4f331613241caa3f77c58aee63fe5f1fb17f2c53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1772
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
O0000<MNUMnLSTXv_cj9n

diff --git a/assets/actors/players/playerE/Player Idle 48x48.png.import b/assets/actors/players/playerE/Player Idle 48x48.png.import
deleted file mode 100644
index 6d285fa..0000000
--- a/assets/actors/players/playerE/Player Idle 48x48.png.import	
+++ /dev/null
@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Player Idle 48x48.png-eec2a2bcc99a731fac49b2105239676a.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://assets/actors/players/playerE/Player Idle 48x48.png"
-dest_files=[ "res://.import/Player Idle 48x48.png-eec2a2bcc99a731fac49b2105239676a.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/lib/templates/Actor/ActorTemplate.tscn b/lib/templates/Actor/ActorTemplate.tscn
index b06774b..87ced12 100644
--- a/lib/templates/Actor/ActorTemplate.tscn
+++ b/lib/templates/Actor/ActorTemplate.tscn
@@ -1,65 +1,24 @@
-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=4 format=2]
 
-[ext_resource path="res://lib/components/Hurtbox_Component.tscn" type="PackedScene" id=1]
 [ext_resource path="res://lib/classes/state_machine_animated_actor.gd" type="Script" id=2]
-[ext_resource path="res://lib/templates/Actor/states/idle.tres" type="Resource" id=4]
 [ext_resource path="res://src/classes/movement_component.gd" type="Script" id=5]
 [ext_resource path="res://lib/classes/actor.gd" type="Script" id=8]
 
-[sub_resource type="StreamTexture" id=83]
-load_path = "res://.import/Player Idle 48x48.png-eec2a2bcc99a731fac49b2105239676a.stex"
-
-[sub_resource type="AtlasTexture" id=84]
-atlas = SubResource( 83 )
-region = Rect2( 0, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=85]
-atlas = SubResource( 83 )
-region = Rect2( 48, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=86]
-atlas = SubResource( 83 )
-region = Rect2( 96, 0, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=87]
-atlas = SubResource( 83 )
-region = Rect2( 0, 48, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=88]
-atlas = SubResource( 83 )
-region = Rect2( 48, 48, 48, 48 )
-
-[sub_resource type="AtlasTexture" id=89]
-atlas = SubResource( 83 )
-region = Rect2( 96, 48, 48, 48 )
-
-[sub_resource type="SpriteFrames" id=90]
-animations = [ {
-"frames": [ SubResource( 84 ), SubResource( 85 ), SubResource( 86 ), SubResource( 87 ), SubResource( 87 ), SubResource( 88 ), SubResource( 84 ), SubResource( 89 ), SubResource( 89 ), SubResource( 89 ) ],
-"loop": true,
-"name": "default",
-"speed": 11.0
-} ]
-
-[sub_resource type="CircleShape2D" id=82]
-
 [node name="ActorTemplate" type="KinematicBody2D"]
 collision_layer = 2
 script = ExtResource( 8 )
 
 [node name="AnimatedSprite" type="AnimatedSprite" parent="."]
-frames = SubResource( 90 )
-playing = true
 __meta__ = {
 "_aseprite_wizard_config_": {
 "layer": "",
 "o_ex_p": "BG",
 "o_folder": "res://assets/actors/players/playerE",
-"o_name": "",
+"o_name": "template-jump",
 "only_visible": true,
 "op_exp": true,
 "slice": "",
-"source": "/home/relay01/Assets/Library/Asset Packs 1-5/Asset Packs 1-4 (final)/Asset Pack-V1/Player Idle/Player Idle 48x48.aseprite"
+"source": "/home/relay01/Assets/Library/Asset Packs 1-5/Asset Packs 1-4 (final)/Asset Pack-V1/Player Jump/player jump 48x48.aseprite"
 }
 }
 
@@ -68,16 +27,5 @@ script = ExtResource( 5 )
 
 [node name="movement_state_machine" type="Node" parent="."]
 script = ExtResource( 2 )
-debug_state_machine = true
-states = {
-"default": ExtResource( 4 )
-}
-
-[node name="Hurtbox_Component" parent="." instance=ExtResource( 1 )]
-
-[node name="CollisionShape2D" type="CollisionShape2D" parent="Hurtbox_Component"]
-modulate = Color( 1, 0, 0, 1 )
-position = Vector2( -1, 1 )
-shape = SubResource( 82 )
 
 [node name="SE_Player" type="AudioStreamPlayer" parent="."]
diff --git a/lib/templates/Actor/resources/Smiley.png b/lib/templates/Actor/resources/Smiley.png
deleted file mode 100644
index 88a0ca8bdfb9e5473ebfbaade72a6116f219f191..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 508
zcmV<Y0R#StP)<h;3K|Lk000e1NJLTq003YB002M;1^@s6<uq~*00001b5ch_0Itp)
z=>Px$wn;=mRCt{2o6T{<AP`2aOma;F>BDuT3)hq`Qb+no1HSqoUnGyl!|ww61b*)-
zi3jX}1{O{y00000fZdr2zMUJC`Evf;%08q&|KH9RE?>VT<tO`Z*R%75kI%oZ{5chz
zeVy)O2}Z3>n0<}*v2@0v{i&79?);TXLC9|WN~It)^QTnI-1#eoK`=Ldr7#Fh{ckb3
ztMi}c`RMbd4Bt;H=yx^#X`YQfU&=V7KNbLJOeg@wQ_mK|C@3EKTMVOM7e6CF3;_^h
z3P5aXsyTJJh)oSOr;gTsMt~RsAcg>l2?bz^Ex2+ptcIu9f+q*VYS`rWedF`LXB#$n
zR=m65YiR2qaBV+(L1I6<p<+Mz0I{EpnAlHFxL-d200000002NP>;;Ma=H1Xyb|cmP
ztbD+T`|)ajaz<>_jFj4+loK8~C#&{H?+1*2K40zUV3wHR{eV|EpRe{a0>lsiF{S{F
zbUt70X9S2L0AiX1pysjiqxn<H&hZED2UyR?2No|?&gX~f)!Ki%o~!!J_XCvY^Fy7`
yo1eWPv7g;gv7dZ^*iS}G>?bGOuO9#aI_C}r*le~xXlL&L0000<MNUMnLSTaIW#)wd

diff --git a/lib/templates/Actor/resources/Smiley.png.import b/lib/templates/Actor/resources/Smiley.png.import
deleted file mode 100644
index ade4fd8..0000000
--- a/lib/templates/Actor/resources/Smiley.png.import
+++ /dev/null
@@ -1,35 +0,0 @@
-[remap]
-
-importer="texture"
-type="StreamTexture"
-path="res://.import/Smiley.png-2f59c79aee2a45c4593491b462fdf12b.stex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://lib/templates/Actor/resources/Smiley.png"
-dest_files=[ "res://.import/Smiley.png-2f59c79aee2a45c4593491b462fdf12b.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/project.godot b/project.godot
index abea56d..06f6957 100644
--- a/project.godot
+++ b/project.godot
@@ -107,7 +107,7 @@ config/icon="res://icon.png"
 
 [aseprite]
 
-animation/layers/exclusion_pattern="_+"
+animation/layers/exclusion_pattern="-.*"
 animation/layers/only_include_visible_layers_by_default=true
 
 [autoload]
@@ -138,12 +138,6 @@ enabled=PoolStringArray( "res://addons/AsepriteWizard/plugin.cfg" )
 
 common/drop_mouse_on_gui_input_disabled=true
 
-[importer_defaults]
-
-texture={
-"flags/filter": false
-}
-
 [input]
 
 ui_accept={
diff --git a/src/actors/players/playerE/PlayerE.tscn b/src/actors/players/playerE/PlayerE.tscn
new file mode 100644
index 0000000..be06cd7
--- /dev/null
+++ b/src/actors/players/playerE/PlayerE.tscn
@@ -0,0 +1,5 @@
+[gd_scene load_steps=2 format=2]
+
+[ext_resource path="res://lib/templates/Actor/ActorTemplate.tscn" type="PackedScene" id=1]
+
+[node name="PlayerE" instance=ExtResource( 1 )]