diff --git a/Assets/Audio/Wilhelm_Scream.ogg b/Assets/Audio/Wilhelm_Scream.ogg new file mode 100644 index 0000000..31aff8b Binary files /dev/null and b/Assets/Audio/Wilhelm_Scream.ogg differ diff --git a/Assets/Audio/Wilhelm_Scream.ogg.import b/Assets/Audio/Wilhelm_Scream.ogg.import new file mode 100644 index 0000000..74bf4e1 --- /dev/null +++ b/Assets/Audio/Wilhelm_Scream.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://bi63o8min1xh2" +path="res://.godot/imported/Wilhelm_Scream.ogg-a37e4be3d48490fffa081eb98e89e944.oggvorbisstr" + +[deps] + +source_file="res://Assets/Audio/Wilhelm_Scream.ogg" +dest_files=["res://.godot/imported/Wilhelm_Scream.ogg-a37e4be3d48490fffa081eb98e89e944.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Assets/Audio/levelup.mp3 b/Assets/Audio/levelup.mp3 new file mode 100644 index 0000000..71eefc4 Binary files /dev/null and b/Assets/Audio/levelup.mp3 differ diff --git a/Assets/Audio/levelup.mp3.import b/Assets/Audio/levelup.mp3.import new file mode 100644 index 0000000..2e7b0dd --- /dev/null +++ b/Assets/Audio/levelup.mp3.import @@ -0,0 +1,19 @@ +[remap] + +importer="mp3" +type="AudioStreamMP3" +uid="uid://d4iu6bpkblkwn" +path="res://.godot/imported/levelup.mp3-b37586dcc940d38c85af254dc95401d2.mp3str" + +[deps] + +source_file="res://Assets/Audio/levelup.mp3" +dest_files=["res://.godot/imported/levelup.mp3-b37586dcc940d38c85af254dc95401d2.mp3str"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Assets/Audio/mixkit-melodic-gold-price-2000.wav b/Assets/Audio/mixkit-melodic-gold-price-2000.wav new file mode 100644 index 0000000..a7e47a4 Binary files /dev/null and b/Assets/Audio/mixkit-melodic-gold-price-2000.wav differ diff --git a/Assets/Audio/mixkit-melodic-gold-price-2000.wav.import b/Assets/Audio/mixkit-melodic-gold-price-2000.wav.import new file mode 100644 index 0000000..45a6b6d --- /dev/null +++ b/Assets/Audio/mixkit-melodic-gold-price-2000.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bj50nnmwohbal" +path="res://.godot/imported/mixkit-melodic-gold-price-2000.wav-494a1fd5885adce96f175fae6a79e43d.sample" + +[deps] + +source_file="res://Assets/Audio/mixkit-melodic-gold-price-2000.wav" +dest_files=["res://.godot/imported/mixkit-melodic-gold-price-2000.wav-494a1fd5885adce96f175fae6a79e43d.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/Assets/Audio/mixkit-melodic-gold-price-2000.wav.reapeaks b/Assets/Audio/mixkit-melodic-gold-price-2000.wav.reapeaks new file mode 100644 index 0000000..b3d8df7 Binary files /dev/null and b/Assets/Audio/mixkit-melodic-gold-price-2000.wav.reapeaks differ diff --git a/Assets/Audio/mixkit-quick-ninja-strike-2146.wav b/Assets/Audio/mixkit-quick-ninja-strike-2146.wav new file mode 100644 index 0000000..0cd2818 Binary files /dev/null and b/Assets/Audio/mixkit-quick-ninja-strike-2146.wav differ diff --git a/Assets/Audio/mixkit-quick-ninja-strike-2146.wav.import b/Assets/Audio/mixkit-quick-ninja-strike-2146.wav.import new file mode 100644 index 0000000..277af04 --- /dev/null +++ b/Assets/Audio/mixkit-quick-ninja-strike-2146.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://brcd05avby5a3" +path="res://.godot/imported/mixkit-quick-ninja-strike-2146.wav-2ff44f2f1499615b6e183abf9ce1f8fe.sample" + +[deps] + +source_file="res://Assets/Audio/mixkit-quick-ninja-strike-2146.wav" +dest_files=["res://.godot/imported/mixkit-quick-ninja-strike-2146.wav-2ff44f2f1499615b6e183abf9ce1f8fe.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/Assets/Audio/mixkit-sword-slides-a-body-2791.wav b/Assets/Audio/mixkit-sword-slides-a-body-2791.wav new file mode 100644 index 0000000..4accfb4 Binary files /dev/null and b/Assets/Audio/mixkit-sword-slides-a-body-2791.wav differ diff --git a/Assets/Audio/mixkit-sword-slides-a-body-2791.wav.import b/Assets/Audio/mixkit-sword-slides-a-body-2791.wav.import new file mode 100644 index 0000000..0bf678d --- /dev/null +++ b/Assets/Audio/mixkit-sword-slides-a-body-2791.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://b84f35hna0qq6" +path="res://.godot/imported/mixkit-sword-slides-a-body-2791.wav-6a3d5a1770e97ed5cec7cbd876f87f72.sample" + +[deps] + +source_file="res://Assets/Audio/mixkit-sword-slides-a-body-2791.wav" +dest_files=["res://.godot/imported/mixkit-sword-slides-a-body-2791.wav-6a3d5a1770e97ed5cec7cbd876f87f72.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/Assets/Audio/mixkit-weak-fast-blow-2145.wav b/Assets/Audio/mixkit-weak-fast-blow-2145.wav new file mode 100644 index 0000000..35cec4c Binary files /dev/null and b/Assets/Audio/mixkit-weak-fast-blow-2145.wav differ diff --git a/Assets/Audio/mixkit-weak-fast-blow-2145.wav.import b/Assets/Audio/mixkit-weak-fast-blow-2145.wav.import new file mode 100644 index 0000000..dd56e8d --- /dev/null +++ b/Assets/Audio/mixkit-weak-fast-blow-2145.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bmu622w5ea05y" +path="res://.godot/imported/mixkit-weak-fast-blow-2145.wav-783f4dd31fd5338659090f47938a41c8.sample" + +[deps] + +source_file="res://Assets/Audio/mixkit-weak-fast-blow-2145.wav" +dest_files=["res://.godot/imported/mixkit-weak-fast-blow-2145.wav-783f4dd31fd5338659090f47938a41c8.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=0 diff --git a/Assets/Audio/whoosh.ogg b/Assets/Audio/whoosh.ogg new file mode 100644 index 0000000..23a2135 Binary files /dev/null and b/Assets/Audio/whoosh.ogg differ diff --git a/Assets/Audio/whoosh.ogg.import b/Assets/Audio/whoosh.ogg.import new file mode 100644 index 0000000..bb68b69 --- /dev/null +++ b/Assets/Audio/whoosh.ogg.import @@ -0,0 +1,19 @@ +[remap] + +importer="oggvorbisstr" +type="AudioStreamOggVorbis" +uid="uid://dj7884l6tki3g" +path="res://.godot/imported/whoosh.ogg-f7b1e76d5fdb09ce4eaffca4c81e4fdf.oggvorbisstr" + +[deps] + +source_file="res://Assets/Audio/whoosh.ogg" +dest_files=["res://.godot/imported/whoosh.ogg-f7b1e76d5fdb09ce4eaffca4c81e4fdf.oggvorbisstr"] + +[params] + +loop=false +loop_offset=0 +bpm=0 +beat_count=0 +bar_beats=4 diff --git a/Scenes/enemy.tscn b/Scenes/enemy.tscn index 5bb4e5d..c7d9f9c 100644 --- a/Scenes/enemy.tscn +++ b/Scenes/enemy.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=57 format=3 uid="uid://b5lnjonlf4i1b"] +[gd_scene load_steps=61 format=3 uid="uid://b5lnjonlf4i1b"] [ext_resource type="Script" path="res://Scripts/Enemy.gd" id="1_xj62t"] [ext_resource type="Texture2D" uid="uid://xn7yb3f5w17m" path="res://Assets/Knight/noBKG_KnightAttack_strip.png" id="2_dclcl"] @@ -6,6 +6,10 @@ [ext_resource type="Texture2D" uid="uid://feql3aiqdh1s" path="res://Assets/Knight/noBKG_KnightDeath_strip.png" id="3_iqd0b"] [ext_resource type="Texture2D" uid="uid://bof6qeuo2rnso" path="res://Assets/Knight/noBKG_KnightRun_strip.png" id="4_saf4v"] [ext_resource type="Texture2D" uid="uid://dhvo0324eu5my" path="res://Assets/star.png" id="6_53bg1"] +[ext_resource type="AudioStream" uid="uid://d4iu6bpkblkwn" path="res://Assets/Audio/levelup.mp3" id="7_eoo4h"] +[ext_resource type="AudioStream" uid="uid://bi63o8min1xh2" path="res://Assets/Audio/Wilhelm_Scream.ogg" id="7_y6usn"] +[ext_resource type="AudioStream" uid="uid://dj7884l6tki3g" path="res://Assets/Audio/whoosh.ogg" id="8_ygdkj"] +[ext_resource type="AudioStream" uid="uid://bmu622w5ea05y" path="res://Assets/Audio/mixkit-weak-fast-blow-2145.wav" id="9_myh6x"] [sub_resource type="AtlasTexture" id="AtlasTexture_6gjg8"] atlas = ExtResource("2_dclcl") @@ -427,6 +431,19 @@ scale_amount_max = 0.01 color = Color(1, 1, 1, 0.423529) [node name="LvlUpSnd" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("7_eoo4h") +pitch_scale = 1.5 + +[node name="AtkSnd" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("8_ygdkj") +pitch_scale = 1.78 + +[node name="HitSnd" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("9_myh6x") +pitch_scale = 0.77 + +[node name="DeathSnd" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource("7_y6usn") [node name="CharacterCollision" type="CollisionShape2D" parent="."] position = Vector2(0, -3) diff --git a/Scripts/Enemy.gd b/Scripts/Enemy.gd index c1c3210..35887bb 100644 --- a/Scripts/Enemy.gd +++ b/Scripts/Enemy.gd @@ -14,9 +14,9 @@ extends CharacterBody2D @export var state: String = "Idle" @export var damage: int = 5 @export var maxAtks: int = 1 -@export var currentcooldown: float = 0 @export var maxcooldown: float = 0.5 +@onready var currentcooldown: float = 0 @onready var killcount: int = 0 @onready var currAtks: int = 0 @onready var anim: Node = get_node("Sprite") @@ -60,7 +60,8 @@ func _process(delta): setAnimState("Die") is_attacking = false is_dying = true - + $DeathSnd.play() + if is_dying: pass if abs(velocity.x) < 1 && abs(velocity.y) < 1 && !is_attacking: @@ -119,6 +120,7 @@ func processAI(objs): func attack(): is_attacking = true + $AtkSnd.play() setAnimState(atk) if is_facing_left: @@ -140,6 +142,7 @@ func setAnimState(newstate): func receive_damage(dmg): + $HitSnd.play() if hitanim.is_emitting(): pass hp -= dmg @@ -201,7 +204,7 @@ func _on_sprite_animation_looped(): func _on_attack_area_body_entered(body): if typeof(body) == typeof(TemplateSpawnable): body.receive_damage(damage) - + func _on_death_timeout(): pass