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 4f33161..0000000 Binary files a/assets/actors/players/playerE/Player Idle 48x48.png and /dev/null differ 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 88a0ca8..0000000 Binary files a/lib/templates/Actor/resources/Smiley.png and /dev/null differ 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 )]