Player sprite changed

Player/Player.tscn

@@ -1,11 +1,11 @@
-[gd_scene load_steps=15 format=2]
+[gd_scene load_steps=16 format=2]
 
 [ext_resource path="res://script/player.gd" type="Script" id=1]
 [ext_resource path="res://ui/PlayerStats.tscn" type="PackedScene" id=2]
 [ext_resource path="res://meta/BoundedCamera.tscn" type="PackedScene" id=3]
 [ext_resource path="res://script/PlayerStateMachine.gd" type="Script" id=4]
 [ext_resource path="res://ui/Inventory.tscn" type="PackedScene" id=5]
-[ext_resource path="res://art/WizardM.png" type="Texture" id=6]
+[ext_resource path="res://art/Elf.png" type="Texture" id=6]
 [ext_resource path="res://script/WandPosition.gd" type="Script" id=7]
 [ext_resource path="res://art/Paralax Dungeon.png" type="Texture" id=8]
 [ext_resource path="res://Sound Effects/Enemy Hit.wav" type="AudioStream" id=9]
@@ -66,6 +66,23 @@ tracks/0/keys = {
 "values": [ 4, 5, 6, 7 ]
 }
 
+[sub_resource type="Animation" id=6]
+resource_name = "Hit"
+length = 0.1
+step = 0.05
+tracks/0/type = "value"
+tracks/0/path = NodePath("Sprite:modulate")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/keys = {
+"times": PoolRealArray( 0, 0.1 ),
+"transitions": PoolRealArray( 1, 1 ),
+"update": 1,
+"values": [ Color( 10, 10, 10, 1 ), Color( 1, 1, 1, 1 ) ]
+}
+
 [node name="Player" type="KinematicBody2D"]
 collision_mask = 2
 script = ExtResource( 1 )
@@ -91,7 +108,7 @@ position = Vector2( 0, -9 )
 script = ExtResource( 7 )
 
 [node name="Sprite" type="Sprite" parent="."]
-position = Vector2( 0, -12 )
+position = Vector2( 0, -16 )
 texture = ExtResource( 6 )
 vframes = 3
 hframes = 4
@@ -111,6 +128,9 @@ anims/Idle = SubResource( 3 )
 anims/Jumping = SubResource( 4 )
 anims/Running = SubResource( 5 )
 
+[node name="HitAnimation" type="AnimationPlayer" parent="."]
+anims/Hit = SubResource( 6 )
+
 [node name="CoyoteTimer" type="Timer" parent="."]
 wait_time = 0.1
 one_shot = true
@@ -138,4 +158,4 @@ texture = ExtResource( 8 )
 
 [node name="Enemy Hit" type="AudioStreamPlayer2D" parent="."]
 stream = ExtResource( 9 )
-volume_db = -8.077
+volume_db = 1.0

ai/Scenes/Demon.tscn

@@ -1,10 +1,12 @@
 [gd_scene load_steps=7 format=2]
 
 [ext_resource path="res://art/Hell Dude.png" type="Texture" id=1]
-[ext_resource path="res://ai/Hell.gd" type="Script" id=2]
+[ext_resource path="res://ai/Script/Demon.gd" type="Script" id=2]
 [ext_resource path="res://Music and Fonts(Misc.)/Hell Hit.tres" type="Animation" id=3]
 [ext_resource path="res://Music and Fonts(Misc.)/Ogre Hit.tres" type="Animation" id=4]
 
+
+
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 5.06709, 5.78183 )
 

ai/Scenes/DemonFireball.tscn

@@ -1,10 +1,12 @@
 [gd_scene load_steps=6 format=2]
 
-[ext_resource path="res://ai/Hell Projectile.gd" type="Script" id=1]
+[ext_resource path="res://ai/Script/Demon Fireball.gd" type="Script" id=1]
 [ext_resource path="res://art/Fireball.png" type="Texture" id=2]
 [ext_resource path="res://Sound Effects/Enemy Hit Wall.wav" type="AudioStream" id=3]
 [ext_resource path="res://Sound Effects/Enemy Hit.wav" type="AudioStream" id=4]
 
+
+
 [sub_resource type="CircleShape2D" id=1]
 radius = 4.54199
 

ai/Scenes/Skeleton Enemy.tscn

@@ -1,10 +1,11 @@
 [gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://ai/Skeleton Enemy.gd" type="Script" id=1]
+[ext_resource path="res://ai/Script/Skeleton Enemy.gd" type="Script" id=1]
 [ext_resource path="res://Music and Fonts(Misc.)/Skeleton Hit.tres" type="Animation" id=2]
 [ext_resource path="res://art/Skeleton.png" type="Texture" id=3]
 [ext_resource path="res://Music and Fonts(Misc.)/Ogre Hit.tres" type="Animation" id=4]
 
+
 [sub_resource type="RectangleShape2D" id=1]
 extents = Vector2( 5, 7 )
 

ai/Scenes/SpinningBone.tscn

@@ -1,7 +1,8 @@
 [gd_scene load_steps=5 format=2]
 
 [ext_resource path="res://art/SpinningBone.png" type="Texture" id=1]
-[ext_resource path="res://ai/SpinningBone.gd" type="Script" id=2]
+[ext_resource path="res://ai/Script/SpinningBone.gd" type="Script" id=2]
+
 
 [sub_resource type="Animation" id=1]
 resource_name = "Bone Throw"

ai/Scenes/ogre.tscn

@@ -1,10 +1,11 @@
 [gd_scene load_steps=7 format=2]
 
-[ext_resource path="res://ai/ogre.gd" type="Script" id=1]
+[ext_resource path="res://ai/Script/ogre.gd" type="Script" id=1]
 [ext_resource path="res://art/Ogre_Run.png" type="Texture" id=2]
 [ext_resource path="res://Music and Fonts(Misc.)/Ogre Hit.tres" type="Animation" id=3]
 [ext_resource path="res://Music and Fonts(Misc.)/Ogre Run.tres" type="Animation" id=4]
 
+
 [sub_resource type="CapsuleShape2D" id=1]
 height = 4.0
 

art/Elf.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/Elf.png-be8b8a01896b4861e3df7c9d33c5f98e.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://art/Elf.png"
+dest_files=[ "res://.import/Elf.png-be8b8a01896b4861e3df7c9d33c5f98e.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
+stream=false
+size_limit=0
+detect_3d=false
+svg/scale=1.0

levels/test.tscn

@@ -1,12 +1,8 @@
-[gd_scene load_steps=8 format=2]
+[gd_scene load_steps=4 format=2]
 
 [ext_resource path="res://Player/Player.tscn" type="PackedScene" id=1]
 [ext_resource path="res://meta/DungeonTilemap.tscn" type="PackedScene" id=2]
-[ext_resource path="res://ai/ogre.tscn" type="PackedScene" id=3]
+[ext_resource path="res://ai/Scenes/ogre.tscn" type="PackedScene" id=3]
-[ext_resource path="res://Items/Wand Pickups/ChargeWandPickup.tscn" type="PackedScene" id=4]
-[ext_resource path="res://Items/Wand Pickups/TripleWandPickup.tscn" type="PackedScene" id=5]
-[ext_resource path="res://Items/Wand Pickups/BounceWandCollectable.tscn" type="PackedScene" id=6]
-[ext_resource path="res://Items/Wand Pickups/PrismWandPickup.tscn" type="PackedScene" id=7]
 
 [node name="Node2D" type="Node2D"]
 
@@ -21,15 +17,3 @@ position = Vector2( 286, 170 )
 
 [node name="Ogre2" parent="." instance=ExtResource( 3 )]
 position = Vector2( 347, 159 )
-
-[node name="PrismWandPickup" parent="." instance=ExtResource( 7 )]
-position = Vector2( 189, 151 )
-
-[node name="ChargeWandPickup" parent="PrismWandPickup" instance=ExtResource( 4 )]
-position = Vector2( -98, -9 )
-
-[node name="TripleWand" parent="PrismWandPickup" instance=ExtResource( 5 )]
-position = Vector2( -64, -9 )
-
-[node name="BounceWandPickup" parent="PrismWandPickup" instance=ExtResource( 6 )]
-position = Vector2( -33, -6 )

project.godot

@@ -22,12 +22,12 @@ _global_script_classes=[ {
 "base": "KinematicBody2D",
 "class": "Enemy",
 "language": "GDScript",
-"path": "res://ai/Enemy.gd"
+"path": "res://ai/Script/Enemy.gd"
 }, {
 "base": "KinematicBody2D",
 "class": "EnemyProjectile",
 "language": "GDScript",
-"path": "res://ai/EnemyProjectile.gd"
+"path": "res://ai/Script/EnemyProjectile.gd"
 }, {
 "base": "KinematicBody2D",
 "class": "Projectile",

script/player.gd

@@ -36,6 +36,7 @@ onready var energy = Stats.energy setget set_energy, get_energy
 
 func play_hitsound():
 	HitSound.play(0.0)
+	$HitAnimation.play("Hit")
 
 func get_current_conduit():
 	return Inventory.active_conduit