diff --git a/Action RPG Resources/UI/TouchButtons.aseprite b/Action RPG Resources/UI/TouchButtons.aseprite new file mode 100644 index 0000000..5742cbf Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons.aseprite differ diff --git a/Action RPG Resources/UI/TouchButtons1.png b/Action RPG Resources/UI/TouchButtons1.png new file mode 100644 index 0000000..0963f03 Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons1.png differ diff --git a/Action RPG Resources/UI/TouchButtons2.png b/Action RPG Resources/UI/TouchButtons2.png new file mode 100644 index 0000000..d8044c7 Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons2.png differ diff --git a/Action RPG Resources/UI/TouchButtons3.png b/Action RPG Resources/UI/TouchButtons3.png new file mode 100644 index 0000000..6572fd7 Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons3.png differ diff --git a/Action RPG Resources/UI/TouchButtons4.png b/Action RPG Resources/UI/TouchButtons4.png new file mode 100644 index 0000000..4dfc73a Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons4.png differ diff --git a/Action RPG Resources/UI/TouchButtons5.png b/Action RPG Resources/UI/TouchButtons5.png new file mode 100644 index 0000000..079c8aa Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons5.png differ diff --git a/Action RPG Resources/UI/TouchButtons6.png b/Action RPG Resources/UI/TouchButtons6.png new file mode 100644 index 0000000..13fb748 Binary files /dev/null and b/Action RPG Resources/UI/TouchButtons6.png differ diff --git a/ActionRPG-HeartBeast/Effects/Effect.gd b/ActionRPG-HeartBeast/Effects/Effect.gd new file mode 100644 index 0000000..ad6d0f8 --- /dev/null +++ b/ActionRPG-HeartBeast/Effects/Effect.gd @@ -0,0 +1,9 @@ +extends AnimatedSprite + +func _ready(): + connect("animation_finished", self, "_on_animation_finished") + frame = 0 + play("Animate") + +func _on_animation_finished(): + queue_free() diff --git a/ActionRPG-HeartBeast/Effects/EnemyDeathEffect.tscn b/ActionRPG-HeartBeast/Effects/EnemyDeathEffect.tscn new file mode 100644 index 0000000..e94917a --- /dev/null +++ b/ActionRPG-HeartBeast/Effects/EnemyDeathEffect.tscn @@ -0,0 +1,58 @@ +[gd_scene load_steps=14 format=2] + +[ext_resource path="res://Effects/Effect.gd" type="Script" id=1] +[ext_resource path="res://Effects/EnemyDeathEffect.png" type="Texture" id=2] + +[sub_resource type="AtlasTexture" id=1] +atlas = ExtResource( 2 ) +region = Rect2( 0, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=2] +atlas = ExtResource( 2 ) +region = Rect2( 32, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=3] +atlas = ExtResource( 2 ) +region = Rect2( 64, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=4] +atlas = ExtResource( 2 ) +region = Rect2( 96, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=5] +atlas = ExtResource( 2 ) +region = Rect2( 128, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=6] +atlas = ExtResource( 2 ) +region = Rect2( 160, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=7] +atlas = ExtResource( 2 ) +region = Rect2( 192, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=8] +atlas = ExtResource( 2 ) +region = Rect2( 224, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=9] +atlas = ExtResource( 2 ) +region = Rect2( 256, 0, 32, 32 ) + +[sub_resource type="AtlasTexture" id=10] +atlas = ExtResource( 2 ) +region = Rect2( 288, 0, 32, 32 ) + +[sub_resource type="SpriteFrames" id=11] +animations = [ { +"frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], +"loop": true, +"name": "Animation", +"speed": 15.0 +} ] + +[node name="EnemyDeathEffect" type="AnimatedSprite"] +frames = SubResource( 11 ) +animation = "Animation" +offset = Vector2( 0, -8 ) +script = ExtResource( 1 ) diff --git a/ActionRPG-HeartBeast/Effects/GrassEffect.gd b/ActionRPG-HeartBeast/Effects/GrassEffect.gd deleted file mode 100644 index 03525a4..0000000 --- a/ActionRPG-HeartBeast/Effects/GrassEffect.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Node2D - -onready var animatedSprite = $AnimatedSprite - -func _ready(): - animatedSprite.frame = 0 - animatedSprite.play("Animate") - -func _on_AnimatedSprite_animation_finished(): - queue_free() diff --git a/ActionRPG-HeartBeast/Effects/GrassEffect.tscn b/ActionRPG-HeartBeast/Effects/GrassEffect.tscn index f8cb10c..a9d5214 100644 --- a/ActionRPG-HeartBeast/Effects/GrassEffect.tscn +++ b/ActionRPG-HeartBeast/Effects/GrassEffect.tscn @@ -1,43 +1,39 @@ [gd_scene load_steps=9 format=2] -[ext_resource path="res://Effects/GrassEffect.gd" type="Script" id=1] -[ext_resource path="res://Effects/GrassEffect.png" type="Texture" id=2] +[ext_resource path="res://Effects/GrassEffect.png" type="Texture" id=1] +[ext_resource path="res://Effects/Effect.gd" type="Script" id=2] [sub_resource type="AtlasTexture" id=1] -atlas = ExtResource( 2 ) +atlas = ExtResource( 1 ) region = Rect2( 0, 0, 32, 32 ) [sub_resource type="AtlasTexture" id=2] -atlas = ExtResource( 2 ) +atlas = ExtResource( 1 ) region = Rect2( 32, 0, 32, 32 ) [sub_resource type="AtlasTexture" id=3] -atlas = ExtResource( 2 ) +atlas = ExtResource( 1 ) region = Rect2( 64, 0, 32, 32 ) [sub_resource type="AtlasTexture" id=4] -atlas = ExtResource( 2 ) +atlas = ExtResource( 1 ) region = Rect2( 96, 0, 32, 32 ) [sub_resource type="AtlasTexture" id=5] -atlas = ExtResource( 2 ) +atlas = ExtResource( 1 ) region = Rect2( 128, 0, 32, 32 ) [sub_resource type="SpriteFrames" id=6] animations = [ { "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ), SubResource( 5 ) ], -"loop": false, +"loop": true, "name": "Animate", "speed": 15.0 } ] -[node name="GrassEffect" type="Node2D"] -script = ExtResource( 1 ) - -[node name="AnimatedSprite" type="AnimatedSprite" parent="."] +[node name="GrassEffect" type="AnimatedSprite"] frames = SubResource( 6 ) animation = "Animate" -frame = 4 centered = false - -[connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"] +offset = Vector2( -8, -8 ) +script = ExtResource( 2 ) diff --git a/ActionRPG-HeartBeast/Enemies/Bat.gd b/ActionRPG-HeartBeast/Enemies/Bat.gd index c527f65..10b93a2 100644 --- a/ActionRPG-HeartBeast/Enemies/Bat.gd +++ b/ActionRPG-HeartBeast/Enemies/Bat.gd @@ -1,5 +1,7 @@ extends KinematicBody2D +const EnemyDeathEffect = preload("res://Effects/EnemyDeathEffect.tscn") + var knockback = Vector2.ZERO onready var stats = $Stats @@ -15,3 +17,6 @@ func _on_Hurtbox_area_entered(area): func _on_Stats_no_health(): queue_free() + var enemyDeathEffect = EnemyDeathEffect.instance() + get_parent().add_child(enemyDeathEffect) + enemyDeathEffect.global_position = global_position diff --git a/ActionRPG-HeartBeast/Player/Player.tscn b/ActionRPG-HeartBeast/Player/Player.tscn index 374adbb..dbe99f3 100644 --- a/ActionRPG-HeartBeast/Player/Player.tscn +++ b/ActionRPG-HeartBeast/Player/Player.tscn @@ -677,10 +677,10 @@ anims/RunUp = SubResource( 5 ) tree_root = SubResource( 18 ) anim_player = NodePath("../AnimationPlayer") parameters/playback = SubResource( 19 ) -parameters/Attack/blend_position = Vector2( 0, 0 ) -parameters/Idle/blend_position = Vector2( 0, 0 ) -parameters/Roll/blend_position = Vector2( -0.00132686, 0.00234544 ) -parameters/Run/blend_position = Vector2( 0, 0 ) +parameters/Attack/blend_position = Vector2( 0, 1 ) +parameters/Idle/blend_position = Vector2( 0, 1 ) +parameters/Roll/blend_position = Vector2( 0, 1 ) +parameters/Run/blend_position = Vector2( 0, 1 ) [node name="HitboxPivot" type="Position2D" parent="."] position = Vector2( 0, -4 ) diff --git a/ActionRPG-HeartBeast/World/Grass.gd b/ActionRPG-HeartBeast/World/Grass.gd index 4320b28..9290c5a 100644 --- a/ActionRPG-HeartBeast/World/Grass.gd +++ b/ActionRPG-HeartBeast/World/Grass.gd @@ -1,16 +1,16 @@ extends Node2D - +const GrassEffect = preload("res://Effects/GrassEffect.tscn") # Called when the node enters the scene tree for the first time. func _ready(): pass # Replace with function body. # Called every frame. 'delta' is the elapsed time since the previous frame. func create_grass_effect(): - var GrassEffect = load("res://Effects/GrassEffect.tscn") + #var GrassEffect = load("res://Effects/GrassEffect.tscn") var grassEffect = GrassEffect.instance() - var world = get_tree().current_scene - world.add_child(grassEffect) + # var world = get_tree().current_scene + get_parent().add_child(grassEffect) grassEffect.global_position = global_position func _on_Hurtbox_area_entered(area): diff --git a/ActionRPG-HeartBeast/build/.DS_Store b/ActionRPG-HeartBeast/build/.DS_Store index 73cb3e4..72dc846 100644 Binary files a/ActionRPG-HeartBeast/build/.DS_Store and b/ActionRPG-HeartBeast/build/.DS_Store differ diff --git a/ActionRPG-HeartBeast/build/web/.DS_Store b/ActionRPG-HeartBeast/build/web/.DS_Store index 2fb2bd6..a09edd2 100644 Binary files a/ActionRPG-HeartBeast/build/web/.DS_Store and b/ActionRPG-HeartBeast/build/web/.DS_Store differ