diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/project.godot b/project.godot old mode 100755 new mode 100644 index c7c63e8f2e0c42cc606ff80727638973aed3c6f5..e659a5e0c768127f7110868b2db6fdb362b0b4a0 --- a/project.godot +++ b/project.godot @@ -41,54 +41,54 @@ fps=false move_up={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":87,"unicode":0,"echo":false,"script":null) ] } move_left={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":65,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null) ] } move_right={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"physical_scancode":0,"unicode":0,"echo":false,"script":null) -, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":68,"unicode":0,"echo":false,"script":null) +, Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null) ] } jump={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null) ] } quit={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) ] } change_fps={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":80,"unicode":0,"echo":false,"script":null) ] } attack={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null) ] } menu_pause={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null) ] } hit_self={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":79,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":79,"unicode":0,"echo":false,"script":null) ] } melee={ "deadzone": 0.5, -"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":47,"physical_scancode":0,"unicode":0,"echo":false,"script":null) +"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":47,"unicode":0,"echo":false,"script":null) ] } diff --git a/readme.txt b/readme.txt old mode 100755 new mode 100644 diff --git a/src/actors/enemy/EnemyShader.tres b/src/actors/enemy/EnemyShader.tres new file mode 100644 index 0000000000000000000000000000000000000000..b260e432fea851162ad8b073459f91bfb8145cff --- /dev/null +++ b/src/actors/enemy/EnemyShader.tres @@ -0,0 +1,14 @@ +[gd_resource type="ShaderMaterial" load_steps=2 format=2] + +[sub_resource type="Shader" id=1] +code = "shader_type canvas_item; +render_mode unshaded; + +void fragment() { + COLOR = texture(TEXTURE, UV); + float lumi = (COLOR.r + COLOR.g + COLOR.b) / 3f; + COLOR.rgb = vec3(lumi); +}" + +[resource] +shader = SubResource( 1 ) diff --git a/src/actors/enemy/Skeleton.tscn b/src/actors/enemy/Skeleton.tscn old mode 100755 new mode 100644 index 5fb761934a3cfb369edf3df2547b75813f272dcc..16f9bf2562e0bdc4b643673f51874f7cce5518e8 --- a/src/actors/enemy/Skeleton.tscn +++ b/src/actors/enemy/Skeleton.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=20 format=2] +[gd_scene load_steps=24 format=2] [ext_resource path="res://src/assets/actors/Enemy1/walk/skeleton-4.png" type="Texture" id=1] [ext_resource path="res://src/assets/actors/Enemy1/walk/skeleton-6.png" type="Texture" id=2] @@ -13,8 +13,12 @@ [ext_resource path="res://src/assets/actors/Enemy1/dead/enemy-death-4.png" type="Texture" id=11] [ext_resource path="res://src/assets/actors/Enemy1/dead/enemy-death-5.png" type="Texture" id=12] [ext_resource path="res://src/assets/actors/Enemy1/dead/enemy-death-1.png" type="Texture" id=13] -[ext_resource path="res://src/assets/actors/Enemy1/skeleton_sound/hurt.ogg" type="AudioStream" id=14] -[ext_resource path="res://src/assets/actors/Enemy1/skeleton_sound/kill.ogg" type="AudioStream" id=15] +[ext_resource path="res://src/assets/actors/Enemy1/skeleton_sound/Sound_kill.wav" type="AudioStream" id=14] +[ext_resource path="res://src/assets/actors/Enemy1/skeleton_sound/Sound_hurt.wav" type="AudioStream" id=15] +[ext_resource path="res://src/assets/actors/Enemy1/skeleton_sound/darsycho__zombie-moans.ogg" type="AudioStream" id=16] +[ext_resource path="res://src/assets/actors/Knight/health-bar-under.png" type="Texture" id=17] +[ext_resource path="res://src/assets/actors/Knight/health_bar_health.png" type="Texture" id=18] +[ext_resource path="res://src/assets/actors/Knight/health-bar-over.png" type="Texture" id=19] [sub_resource type="GDScript" id=1] script/source = "extends KinematicBody2D @@ -31,10 +35,21 @@ var is_alive = true var is_moving_right = true const is_stompable = true -var healthpoints = 3 +var healthpoints = 10 func _ready(): + + healthpoints = 10 + is_alive = true + + $Control/HealthBar.max_value = healthpoints + $Control/HealthBar.value = healthpoints + $Control/HealthBar.tint_progress = Color.green + print(\"ready\") + set_black_white(false) + add_to_group(\"Enemy\") + $Sound_voice.play() sprite.play(\"walk\") pass @@ -54,8 +69,21 @@ func _physics_process(delta): movement.x *= -1 sprite.flip_h = !sprite.flip_h +func set_black_white(boolean: bool): + if boolean: + $AnimatedSprite.material = load(\"res://src/actors/enemy/EnemyShader.tres\") + else: + $AnimatedSprite.material = null func on_stomp(): + healthpoints = healthpoints - 10 + if healthpoints >= 7: + $Control/HealthBar.tint_progress = Color.green + elif healthpoints >= 3: + $Control/HealthBar.tint_progress = Color.orange + else: + $Control/HealthBar.tint_progress = Color.red + $Control/HealthBar.value = healthpoints die() func turn_abyss(): @@ -77,12 +105,18 @@ func die(): func take_damage(n): $Sound_hurt.play() healthpoints -= n + if healthpoints >= 7: + $Control/HealthBar.tint_progress = Color.green + elif healthpoints >= 3: + $Control/HealthBar.tint_progress = Color.orange + else: + $Control/HealthBar.tint_progress = Color.red + $Control/HealthBar.value = healthpoints print(\"enemy hp: \" + str(healthpoints)) if healthpoints <= 0: die() - func _on_Area2D_body_entered(body): if body.is_in_group(\"player\"): body.take_damage(1) @@ -90,14 +124,14 @@ func _on_Area2D_body_entered(body): [sub_resource type="SpriteFrames" id=2] animations = [ { -"frames": [ ExtResource( 13 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ) ], +"frames": [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 1 ), ExtResource( 6 ), ExtResource( 8 ), ExtResource( 7 ), ExtResource( 2 ) ], "loop": true, -"name": "dead", +"name": "walk", "speed": 5.0 }, { -"frames": [ ExtResource( 3 ), ExtResource( 5 ), ExtResource( 4 ), ExtResource( 1 ), ExtResource( 6 ), ExtResource( 8 ), ExtResource( 7 ), ExtResource( 2 ) ], +"frames": [ ExtResource( 13 ), ExtResource( 13 ), ExtResource( 13 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 11 ), ExtResource( 12 ) ], "loop": true, -"name": "walk", +"name": "dead", "speed": 5.0 } ] @@ -122,7 +156,7 @@ script = SubResource( 1 ) position = Vector2( 0.18729, 0 ) frames = SubResource( 2 ) animation = "walk" -frame = 6 +frame = 3 playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="Skeleton"] @@ -141,12 +175,39 @@ position = Vector2( -0.0899086, 3.98409 ) shape = SubResource( 4 ) [node name="Sound_hurt" type="AudioStreamPlayer2D" parent="Skeleton"] -stream = ExtResource( 14 ) -volume_db = -10.0 +stream = ExtResource( 15 ) +volume_db = -2.0 +attenuation = 4.28709 [node name="Sound_kill" type="AudioStreamPlayer2D" parent="Skeleton"] -stream = ExtResource( 15 ) -volume_db = -10.0 +stream = ExtResource( 14 ) +volume_db = -8.0 +attenuation = 4.28709 + +[node name="Sound_voice" type="AudioStreamPlayer2D" parent="Skeleton"] +stream = ExtResource( 16 ) +volume_db = -12.0 +attenuation = 4.28709 + +[node name="Control" type="Control" parent="Skeleton"] +margin_right = 40.0 +margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="HealthBar" type="TextureProgress" parent="Skeleton/Control"] +margin_left = -32.137 +margin_top = -35.9334 +margin_right = 31.863 +margin_bottom = 4.06662 +max_value = 10.0 +texture_under = ExtResource( 17 ) +texture_over = ExtResource( 19 ) +texture_progress = ExtResource( 18 ) +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="animation_finished" from="Skeleton/AnimatedSprite" to="Skeleton" method="_on_AnimatedSprite_animation_finished"] [connection signal="body_entered" from="Skeleton/Area2D" to="Skeleton" method="_on_Area2D_body_entered"] diff --git a/src/actors/enemy/enemy_knight.tscn b/src/actors/enemy/enemy_knight.tscn old mode 100755 new mode 100644 index 51cffa40898aa13e6585f1ea539ff850c0ec8c83..a68dc177ddc9af877959a6681ada676b19132ba6 --- a/src/actors/enemy/enemy_knight.tscn +++ b/src/actors/enemy/enemy_knight.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=33 format=2] [ext_resource path="res://src/assets/actors/Knight/hero-attack/hero-attack-1.png" type="Texture" id=1] [ext_resource path="res://src/assets/actors/Knight/hero-attack/hero-attack-3.png" type="Texture" id=2] @@ -20,10 +20,13 @@ [ext_resource path="res://src/assets/actors/Knight/hero-run/hero-run-3.png" type="Texture" id=18] [ext_resource path="res://src/assets/actors/Knight/hero-run/hero-run-6.png" type="Texture" id=19] [ext_resource path="res://src/assets/actors/Knight/hero-run/hero-run-4.png" type="Texture" id=20] -[ext_resource path="res://src/assets/actors/Knight/knight_sound/jump.ogg" type="AudioStream" id=21] -[ext_resource path="res://src/assets/actors/Knight/knight_sound/kill.ogg" type="AudioStream" id=22] -[ext_resource path="res://src/assets/actors/Knight/knight_sound/attack.ogg" type="AudioStream" id=23] -[ext_resource path="res://src/assets/actors/Knight/knight_sound/hurt.ogg" type="AudioStream" id=24] +[ext_resource path="res://src/assets/actors/Knight/knight_sound/die.wav" type="AudioStream" id=21] +[ext_resource path="res://src/assets/actors/Knight/knight_sound/attack.wav" type="AudioStream" id=22] +[ext_resource path="res://src/assets/actors/Knight/knight_sound/hurt.wav" type="AudioStream" id=23] +[ext_resource path="res://src/assets/actors/Knight/knight_sound/Sound_voice.mp3" type="AudioStream" id=24] +[ext_resource path="res://src/assets/actors/Knight/health-bar-under.png" type="Texture" id=25] +[ext_resource path="res://src/assets/actors/Knight/health_bar_health.png" type="Texture" id=26] +[ext_resource path="res://src/assets/actors/Knight/health-bar-over.png" type="Texture" id=27] [sub_resource type="GDScript" id=1] script/source = "extends KinematicBody2D @@ -41,18 +44,29 @@ var is_moving_right = true var is_alive = true # Überprüft ob der Gegner noch am leben ist const is_stompable = false -var healthpoints = 15 +var healthpoints = 10 var attack_timer : Timer var hurt_timer : Timer const attack_cooldown : float = 5.0 -const invincible_cooldown : float = 5.0 +const invincible_cooldown : float = 1.0 var is_attacking : bool var is_hurt : bool func _ready(): + + healthpoints = 10 + is_alive = true + + $Control/HealthBar.max_value = healthpoints + $Control/HealthBar.value = healthpoints + $Control/HealthBar.tint_progress = Color.green + print(\"ready\") + set_black_white(false) + + $Sound_voice.play() $AnimatedSprite.play(\"run\") func _physics_process(delta): @@ -76,6 +90,11 @@ func _physics_process(delta): if is_on_wall(): jump() +func set_black_white(boolean: bool): + if boolean: + $AnimatedSprite.material = load(\"res://src/actors/enemy/EnemyShader.tres\") + else: + $AnimatedSprite.material = null func jump(): #if body.is_a_parent_of() @@ -83,7 +102,6 @@ func jump(): $AnimatedSprite.play(\"jump\") direction.y = jump_speed jump_x = floor(position.x) - $Sound_jump.play() # Was er nach dem Sprung tut func on_landing(): @@ -161,14 +179,24 @@ func take_damage(n): if is_hurt: return $AnimatedSprite.play(\"hurt\") - direction.x = 0 $Sound_hurt.play() + direction.x = 0 print(\"took damage\") healthpoints = healthpoints - n print(healthpoints) + if healthpoints >= 7: + $Control/HealthBar.tint_progress = Color.green + elif healthpoints >= 3: + $Control/HealthBar.tint_progress = Color.orange + else: + $Control/HealthBar.tint_progress = Color.red + $Control/HealthBar.value = healthpoints if healthpoints <= 0: is_alive = false + $Sound_death.play() + $AnimatedSprite.play(\"death\") is_hurt = true + hurt_timer = Timer.new() hurt_timer.one_shot = true hurt_timer.wait_time = invincible_cooldown @@ -178,8 +206,7 @@ func take_damage(n): func die(): if is_alive == false: - $AnimatedSprite.play(\"hurt\") - $Sound_kill.play() + $AnimatedSprite.play(\"death\") func attack_timer_timeout(): print(\"attack finished\") @@ -197,6 +224,11 @@ animations = [ { "name": "idle", "speed": 5.0 }, { +"frames": [ ExtResource( 8 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 13 ) ], +"loop": true, +"name": "jump", +"speed": 5.0 +}, { "frames": [ ExtResource( 1 ), ExtResource( 11 ), ExtResource( 2 ), ExtResource( 3 ), ExtResource( 15 ) ], "loop": true, "name": "attack", @@ -207,15 +239,15 @@ animations = [ { "name": "walk", "speed": 5.0 }, { -"frames": [ ExtResource( 8 ), ExtResource( 10 ), ExtResource( 12 ), ExtResource( 13 ) ], -"loop": true, -"name": "jump", -"speed": 5.0 -}, { "frames": [ ExtResource( 9 ) ], "loop": true, "name": "hurt", "speed": 5.0 +}, { +"frames": [ ExtResource( 9 ), ExtResource( 9 ) ], +"loop": true, +"name": "death", +"speed": 2.0 } ] [sub_resource type="RectangleShape2D" id=3] @@ -237,7 +269,7 @@ script = SubResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] frames = SubResource( 2 ) animation = "walk" -frame = 1 +frame = 5 playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="."] @@ -275,21 +307,47 @@ position = Vector2( 13.016, 26.0139 ) enabled = true cast_to = Vector2( 0, 49.501 ) -[node name="Sound_jump" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 21 ) -volume_db = -5.0 - [node name="Sound_attack" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 23 ) -volume_db = -10.0 +stream = ExtResource( 22 ) +volume_db = -2.0 +attenuation = 4.28 [node name="Sound_hurt" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 24 ) -volume_db = -10.0 +stream = ExtResource( 23 ) +volume_db = -7.0 +attenuation = 4.28709 -[node name="Sound_kill" type="AudioStreamPlayer2D" parent="."] -stream = ExtResource( 22 ) -volume_db = -10.0 +[node name="Sound_death" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 21 ) +volume_db = -2.0 +attenuation = 4.28 + +[node name="Sound_voice" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 24 ) +volume_db = 10.0 +attenuation = 4.28 + +[node name="Control" type="Control" parent="."] +margin_left = -10.0 +margin_top = -17.0 +margin_right = 40.0 +margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="HealthBar" type="TextureProgress" parent="Control"] +margin_left = -22.7417 +margin_top = -18.3433 +margin_right = 43.2583 +margin_bottom = -8.34331 +max_value = 10.0 +texture_under = ExtResource( 25 ) +texture_over = ExtResource( 27 ) +texture_progress = ExtResource( 26 ) +__meta__ = { +"_edit_use_anchors_": false +} [connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"] [connection signal="body_entered" from="PlayerDetector" to="." method="_on_PlayerDetector_body_entered"] diff --git a/src/actors/enemy/fireball_wizard.tscn b/src/actors/enemy/fireball_wizard.tscn old mode 100755 new mode 100644 index 5cebf6c27a12b5822a9a1b53d58e55f9656f5afb..e9928a24d4015a9684bf18fd123bb7b68219fbfb --- a/src/actors/enemy/fireball_wizard.tscn +++ b/src/actors/enemy/fireball_wizard.tscn @@ -1,8 +1,10 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=9 format=2] [ext_resource path="res://src/assets/actors/Wizard/fireball/fireball1.png" type="Texture" id=1] [ext_resource path="res://src/assets/actors/Wizard/fireball/fireball3.png" type="Texture" id=2] [ext_resource path="res://src/assets/actors/Wizard/fireball/fireball2.png" type="Texture" id=3] +[ext_resource path="res://src/assets/actors/Wizard/sound_wizzard/qubodupFireLoop.ogg" type="AudioStream" id=4] +[ext_resource path="res://src/assets/actors/Wizard/sound_wizzard/Fire impact 1.wav" type="AudioStream" id=5] [sub_resource type="GDScript" id=1] script/source = "extends Node2D @@ -12,7 +14,7 @@ const move_speed : int = 500 var direction : Vector2 func _ready(): - pass + $Sound_fire.play() func _process(delta): time -= delta @@ -56,4 +58,14 @@ playing = true [node name="CollisionShape2D" type="CollisionShape2D" parent="Area2D"] shape = SubResource( 3 ) +[node name="Sound_fire" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 4 ) +volume_db = -10.0 +attenuation = 4.28 + +[node name="Sound_death" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 5 ) +volume_db = -5.0 +attenuation = 4.28 + [connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"] diff --git a/src/actors/enemy/ghost.tscn b/src/actors/enemy/ghost.tscn old mode 100755 new mode 100644 index ea8b0566f0720d7be1636b06fac6dd034f5d4768..503eed8eb14d92b0cc7c62ae9085a686beffa8b1 --- a/src/actors/enemy/ghost.tscn +++ b/src/actors/enemy/ghost.tscn @@ -1,6 +1,10 @@ -[gd_scene load_steps=13 format=2] +[gd_scene load_steps=17 format=2] [ext_resource path="res://src/assets/actors/Ghost/PNG/ghost-idle.png" type="Texture" id=1] +[ext_resource path="res://src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan04.wav" type="AudioStream" id=2] +[ext_resource path="res://src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan02.wav" type="AudioStream" id=3] +[ext_resource path="res://src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan03.wav" type="AudioStream" id=5] +[ext_resource path="res://src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan01.wav" type="AudioStream" id=6] [sub_resource type="GDScript" id=1] script/source = "extends KinematicBody2D @@ -19,13 +23,17 @@ var is_hurt : bool const is_stompable = false func _ready(): + $Sound_voice_1.play() + $Sound_voice_2.play() + $Sound_voice_3.play() + $Sound_voice_4.play() $AnimatedSprite.play(\"idle\") func _physics_process(delta): if is_alive == false: return - + move_and_slide_with_snap(-direction, velocity, up_vector) if is_on_wall(): @@ -52,30 +60,37 @@ func _on_Area2D_body_entered(body): " [sub_resource type="AtlasTexture" id=2] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 0, 0, 64, 80 ) [sub_resource type="AtlasTexture" id=3] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 64, 0, 64, 80 ) [sub_resource type="AtlasTexture" id=4] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 128, 0, 64, 80 ) [sub_resource type="AtlasTexture" id=5] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 192, 0, 64, 80 ) [sub_resource type="AtlasTexture" id=6] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 256, 0, 64, 80 ) [sub_resource type="AtlasTexture" id=7] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 320, 0, 64, 80 ) [sub_resource type="AtlasTexture" id=8] +flags = 4 atlas = ExtResource( 1 ) region = Rect2( 384, 0, 64, 80 ) @@ -117,4 +132,24 @@ modulate = Color( 1, 0.0470588, 0, 1 ) position = Vector2( 0, -0.198421 ) shape = SubResource( 11 ) +[node name="Sound_voice_1" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 6 ) +volume_db = -10.0 +attenuation = 4.28709 + +[node name="Sound_voice_2" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 3 ) +volume_db = -10.0 +attenuation = 4.28709 + +[node name="Sound_voice_3" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 5 ) +volume_db = -10.0 +attenuation = 4.28 + +[node name="Sound_voice_4" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 2 ) +volume_db = -10.0 +attenuation = 4.28709 + [connection signal="body_entered" from="Area2D" to="." method="_on_Area2D_body_entered"] diff --git a/src/actors/enemy/wizard.tscn b/src/actors/enemy/wizard.tscn old mode 100755 new mode 100644 index 9fc984dcc2469af7dd3534039d7a587f2ac5461c..25e8a67c77ac75b0311b2ab884ccb0cb430afa8e --- a/src/actors/enemy/wizard.tscn +++ b/src/actors/enemy/wizard.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=30 format=2] +[gd_scene load_steps=36 format=2] [ext_resource path="res://src/assets/actors/Wizard/idle/wizard-idle-2.png" type="Texture" id=1] [ext_resource path="res://src/assets/actors/Wizard/attack/fire10.png" type="Texture" id=2] @@ -24,12 +24,24 @@ [ext_resource path="res://src/assets/actors/Wizard/death/enemy-death3.png" type="Texture" id=22] [ext_resource path="res://src/assets/actors/Wizard/death/enemy-death7.png" type="Texture" id=23] [ext_resource path="res://src/assets/actors/Wizard/death/enemy-death2.png" type="Texture" id=24] +[ext_resource path="res://src/assets/actors/Wizard/sound_wizzard/Spell_02.wav" type="AudioStream" id=25] +[ext_resource path="res://src/assets/actors/Wizard/sound_wizzard/Fire impact 1.wav" type="AudioStream" id=26] +[ext_resource path="res://src/assets/actors/Wizard/sound_wizzard/pain5.wav" type="AudioStream" id=27] +[ext_resource path="res://src/assets/actors/Knight/health-bar-under.png" type="Texture" id=28] +[ext_resource path="res://src/assets/actors/Knight/health_bar_health.png" type="Texture" id=29] +[ext_resource path="res://src/assets/actors/Knight/health-bar-over.png" type="Texture" id=30] [sub_resource type="GDScript" id=1] script/source = "extends KinematicBody2D var bullet = preload(\"res://src/actors/enemy/fireball_wizard.tscn\") +const move_speed : float = 32 * 2 / .8 +const jump_speed : int = -400 +const gravity : int = 1600 +const up_vector = Vector2(0, -1) +var direction = Vector2(0, 0) +var velocity = Vector2(0, 1) const is_stompable = true var is_alive = true @@ -47,20 +59,39 @@ var is_attacking : bool var is_hurt : bool func _ready(): + + healthpoints = 10 + is_alive = true + + $Control/HealthBar.max_value = healthpoints + $Control/HealthBar.value = healthpoints + $Control/HealthBar.tint_progress = Color.green + print(\"ready\") + set_black_white(false) + $AnimatedSprite.play(\"idle\") func _physics_process(delta): if is_alive == false: return - + + direction.y += gravity * delta + move_and_slide(direction, velocity) func _on_playerDetector_body_entered(body): if body.is_in_group(\"player\"): attack() +func set_black_white(boolean: bool): + if boolean: + $AnimatedSprite.material = load(\"res://src/actors/enemy/EnemyShader.tres\") + else: + $AnimatedSprite.material = null + func attack(): if is_attacking == true: return + $Sound_spell.play() $AnimatedSprite.play(\"attack\") fireball() is_attacking = true @@ -97,8 +128,15 @@ func on_stomp(): die() func take_damage(n): - #$Sound_hurt.play() + $Sound_hurt.play() healthpoints -= n + if healthpoints >= 7: + $Control/HealthBar.tint_progress = Color.green + elif healthpoints >= 3: + $Control/HealthBar.tint_progress = Color.orange + else: + $Control/HealthBar.tint_progress = Color.red + $Control/HealthBar.value = healthpoints print(\"wizard hp: \" + str(healthpoints)) if healthpoints <= 0: is_alive = false @@ -111,7 +149,7 @@ func hurt_timer_timeout(): func die(): $CollisionShape2D.queue_free() $AnimatedSprite.play(\"death\") - #$Sound_kill.play() + $Sound_death.play() func _on_AnimatedSprite_animation_finished(): if $AnimatedSprite.animation == \"death\": @@ -127,14 +165,14 @@ animations = [ { "name": "idle", "speed": 5.0 }, { -"frames": [ ExtResource( 20 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 23 ), ExtResource( 21 ), ExtResource( 17 ) ], +"frames": [ ExtResource( 5 ), ExtResource( 6 ), ExtResource( 12 ), ExtResource( 7 ), ExtResource( 11 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 2 ) ], "loop": true, -"name": "death", +"name": "attack", "speed": 5.0 }, { -"frames": [ ExtResource( 5 ), ExtResource( 6 ), ExtResource( 12 ), ExtResource( 7 ), ExtResource( 11 ), ExtResource( 8 ), ExtResource( 9 ), ExtResource( 10 ), ExtResource( 3 ), ExtResource( 2 ) ], +"frames": [ ExtResource( 20 ), ExtResource( 24 ), ExtResource( 22 ), ExtResource( 16 ), ExtResource( 18 ), ExtResource( 19 ), ExtResource( 23 ), ExtResource( 21 ), ExtResource( 17 ) ], "loop": true, -"name": "attack", +"name": "death", "speed": 5.0 } ] @@ -180,6 +218,40 @@ modulate = Color( 0, 0.298039, 1, 1 ) position = Vector2( -212.56, 11.445 ) shape = SubResource( 5 ) +[node name="Sound_spell" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 25 ) +attenuation = 4.28 + +[node name="Sound_death" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 26 ) +volume_db = -3.0 +attenuation = 4.28 + +[node name="Sound_hurt" type="AudioStreamPlayer2D" parent="."] +stream = ExtResource( 27 ) +volume_db = -8.0 +pitch_scale = 0.77 +attenuation = 4.28 + +[node name="Control" type="Control" parent="."] +margin_right = 40.0 +margin_bottom = 40.0 +__meta__ = { +"_edit_use_anchors_": false +} + +[node name="HealthBar" type="TextureProgress" parent="Control"] +margin_left = -31.9234 +margin_top = -31.541 +margin_right = 32.0766 +margin_bottom = 8.45898 +texture_under = ExtResource( 28 ) +texture_over = ExtResource( 30 ) +texture_progress = ExtResource( 29 ) +__meta__ = { +"_edit_use_anchors_": false +} + [connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"] [connection signal="body_entered" from="wizardHitbox" to="." method="_on_wizardHitbox_body_entered"] [connection signal="body_entered" from="playerDetector" to="." method="_on_playerDetector_body_entered"] diff --git a/src/actors/player/FireBall.gd b/src/actors/player/FireBall.gd old mode 100755 new mode 100644 diff --git a/src/actors/player/FireBall.tscn b/src/actors/player/FireBall.tscn old mode 100755 new mode 100644 diff --git a/src/actors/player/Player.gd b/src/actors/player/Player.gd old mode 100755 new mode 100644 index 91a75c97fe9c62ed75258e4e3e0e2324ea9fbc6d..f1ec72356d8b69443d8ba0dc9c35aa239acc889c --- a/src/actors/player/Player.gd +++ b/src/actors/player/Player.gd @@ -148,10 +148,12 @@ func input_process(delta): if Input.is_action_just_pressed("attack"): if !is_attacking: attack = true + $Sound_fire.play() attack_state = ATTACK_STATES.RANGED if Input.is_action_just_pressed("melee"): if !is_attacking: attack = true + $Sound_attack.play() attack_state = ATTACK_STATES.MELEE if Input.is_action_just_pressed("hit_self"): @@ -165,6 +167,7 @@ func jump_process(): # jump, normal if direction.y == -1 and is_on_floor(): print("normal") + $Sound_jump.play() velocity.y = jump_speed direction.y = 0 elif is_on_floor(): @@ -184,6 +187,7 @@ func jump_process(): # double jump elif direction.y == -1 and not double_jump and not is_on_floor(): print("double-jump") + $Sound_jump2.play() velocity.y = jump_speed direction.y = 0 double_jump = true @@ -231,7 +235,7 @@ func take_damage(n : int): hurt_timer.connect("timeout", self, "hurt_timer_timeout") add_child(hurt_timer) hurt_timer.start() - + $Sound_hurt.play() animation_state = ANIMATION_STATES.HURT hitpoints -= n if hitpoints >= 7: @@ -244,6 +248,7 @@ func take_damage(n : int): if hitpoints <= 0: print("dying") + $Sound_die.play() animation_state = ANIMATION_STATES.DEATH is_alive = false update_animation() diff --git a/src/actors/player/Player.tscn b/src/actors/player/Player.tscn old mode 100755 new mode 100644 index 3bb2911e2fde883ac1a250a07b75e2936b12beac..3335c79e5b2f4f5751bc4f3d02862608d0c52eb4 --- a/src/actors/player/Player.tscn +++ b/src/actors/player/Player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=56 format=2] +[gd_scene load_steps=62 format=2] [ext_resource path="res://src/assets/actors/Player/player_attack_melee.png" type="Texture" id=1] [ext_resource path="res://src/actors/player/Player.gd" type="Script" id=2] @@ -12,6 +12,12 @@ [ext_resource path="res://src/assets/actors/Player/health-bar-over.png" type="Texture" id=10] [ext_resource path="res://src/assets/actors/Player/health_bar_health.png" type="Texture" id=11] [ext_resource path="res://src/actors/player/PlayerShader.tres" type="Material" id=12] +[ext_resource path="res://src/assets/actors/Player/player_sound/jump1.wav" type="AudioStream" id=13] +[ext_resource path="res://src/assets/actors/Player/player_sound/hurt.wav" type="AudioStream" id=14] +[ext_resource path="res://src/assets/actors/Player/player_sound/attack.wav" type="AudioStream" id=15] +[ext_resource path="res://src/assets/actors/Player/player_sound/jump.wav" type="AudioStream" id=16] +[ext_resource path="res://src/assets/actors/Player/player_sound/death.wav" type="AudioStream" id=17] +[ext_resource path="res://src/assets/actors/Player/player_sound/fire.wav" type="AudioStream" id=18] [sub_resource type="AtlasTexture" id=1] flags = 4 @@ -33,227 +39,229 @@ flags = 4 atlas = ExtResource( 4 ) region = Rect2( 144, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=13] +[sub_resource type="AtlasTexture" id=5] flags = 4 atlas = ExtResource( 5 ) region = Rect2( 0, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=14] +[sub_resource type="AtlasTexture" id=6] flags = 4 atlas = ExtResource( 5 ) region = Rect2( 48, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=15] +[sub_resource type="AtlasTexture" id=7] flags = 4 atlas = ExtResource( 5 ) region = Rect2( 96, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=16] +[sub_resource type="AtlasTexture" id=8] flags = 4 atlas = ExtResource( 5 ) region = Rect2( 144, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=23] +[sub_resource type="AtlasTexture" id=9] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 7 ) +region = Rect2( 48, 0, 48, 48 ) + +[sub_resource type="AtlasTexture" id=10] +flags = 4 +atlas = ExtResource( 7 ) region = Rect2( 0, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=24] +[sub_resource type="AtlasTexture" id=11] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 8 ) +region = Rect2( 0, 0, 48, 48 ) + +[sub_resource type="AtlasTexture" id=12] +flags = 4 +atlas = ExtResource( 8 ) region = Rect2( 48, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=25] +[sub_resource type="AtlasTexture" id=13] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 8 ) region = Rect2( 96, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=26] +[sub_resource type="AtlasTexture" id=14] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 8 ) region = Rect2( 144, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=27] +[sub_resource type="AtlasTexture" id=15] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 8 ) region = Rect2( 192, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=28] +[sub_resource type="AtlasTexture" id=16] flags = 4 -atlas = ExtResource( 3 ) +atlas = ExtResource( 8 ) region = Rect2( 240, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=5] +[sub_resource type="AtlasTexture" id=17] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 0, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=6] +[sub_resource type="AtlasTexture" id=18] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 48, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=7] +[sub_resource type="AtlasTexture" id=19] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 96, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=8] +[sub_resource type="AtlasTexture" id=20] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 144, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=9] +[sub_resource type="AtlasTexture" id=21] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 192, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=10] +[sub_resource type="AtlasTexture" id=22] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 240, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=11] +[sub_resource type="AtlasTexture" id=23] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 288, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=12] +[sub_resource type="AtlasTexture" id=24] flags = 4 -atlas = ExtResource( 6 ) +atlas = ExtResource( 1 ) region = Rect2( 336, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=17] +[sub_resource type="AtlasTexture" id=25] flags = 4 -atlas = ExtResource( 8 ) +atlas = ExtResource( 3 ) region = Rect2( 0, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=18] +[sub_resource type="AtlasTexture" id=26] flags = 4 -atlas = ExtResource( 8 ) +atlas = ExtResource( 3 ) region = Rect2( 48, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=19] +[sub_resource type="AtlasTexture" id=27] flags = 4 -atlas = ExtResource( 8 ) +atlas = ExtResource( 3 ) region = Rect2( 96, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=20] +[sub_resource type="AtlasTexture" id=28] flags = 4 -atlas = ExtResource( 8 ) +atlas = ExtResource( 3 ) region = Rect2( 144, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=21] +[sub_resource type="AtlasTexture" id=29] flags = 4 -atlas = ExtResource( 8 ) +atlas = ExtResource( 3 ) region = Rect2( 192, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=22] +[sub_resource type="AtlasTexture" id=30] flags = 4 -atlas = ExtResource( 8 ) +atlas = ExtResource( 3 ) region = Rect2( 240, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=29] -flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 48, 0, 48, 48 ) - -[sub_resource type="AtlasTexture" id=42] +[sub_resource type="AtlasTexture" id=31] flags = 4 -atlas = ExtResource( 7 ) -region = Rect2( 0, 0, 48, 48 ) - -[sub_resource type="AtlasTexture" id=43] -flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 0, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=44] +[sub_resource type="AtlasTexture" id=32] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 48, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=45] +[sub_resource type="AtlasTexture" id=33] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 96, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=46] +[sub_resource type="AtlasTexture" id=34] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 144, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=47] +[sub_resource type="AtlasTexture" id=35] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 192, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=48] +[sub_resource type="AtlasTexture" id=36] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 240, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=49] +[sub_resource type="AtlasTexture" id=37] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 288, 0, 48, 48 ) -[sub_resource type="AtlasTexture" id=50] +[sub_resource type="AtlasTexture" id=38] flags = 4 -atlas = ExtResource( 1 ) +atlas = ExtResource( 6 ) region = Rect2( 336, 0, 48, 48 ) -[sub_resource type="SpriteFrames" id=38] +[sub_resource type="SpriteFrames" id=39] animations = [ { "frames": [ SubResource( 1 ), SubResource( 2 ), SubResource( 3 ), SubResource( 4 ) ], "loop": true, "name": "idle", "speed": 5.0 }, { -"frames": [ SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ) ], +"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ) ], "loop": true, "name": "jump", "speed": 2.0 }, { -"frames": [ SubResource( 23 ), SubResource( 24 ), SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ) ], +"frames": [ SubResource( 9 ), SubResource( 10 ), SubResource( 9 ), SubResource( 10 ), SubResource( 9 ), SubResource( 9 ), SubResource( 10 ) ], "loop": true, -"name": "move", +"name": "hurt", "speed": 5.0 }, { -"frames": [ SubResource( 5 ), SubResource( 6 ), SubResource( 7 ), SubResource( 8 ), SubResource( 9 ), SubResource( 10 ), SubResource( 11 ), SubResource( 12 ) ], -"loop": true, -"name": "attack1", -"speed": 20.0 -}, { -"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ), SubResource( 22 ) ], +"frames": [ SubResource( 11 ), SubResource( 12 ), SubResource( 13 ), SubResource( 14 ), SubResource( 15 ), SubResource( 16 ), SubResource( 16 ), SubResource( 16 ), SubResource( 16 ), SubResource( 16 ), SubResource( 16 ) ], "loop": false, "name": "death", "speed": 7.0 }, { -"frames": [ SubResource( 29 ), SubResource( 42 ), SubResource( 29 ), SubResource( 42 ), SubResource( 29 ), SubResource( 29 ), SubResource( 42 ) ], +"frames": [ SubResource( 17 ), SubResource( 18 ), SubResource( 19 ), SubResource( 20 ), SubResource( 21 ), SubResource( 22 ), SubResource( 23 ), SubResource( 24 ) ], "loop": true, -"name": "hurt", +"name": "melee", +"speed": 17.0 +}, { +"frames": [ SubResource( 25 ), SubResource( 26 ), SubResource( 27 ), SubResource( 28 ), SubResource( 29 ), SubResource( 30 ) ], +"loop": true, +"name": "move", "speed": 5.0 }, { -"frames": [ SubResource( 43 ), SubResource( 44 ), SubResource( 45 ), SubResource( 46 ), SubResource( 47 ), SubResource( 48 ), SubResource( 49 ), SubResource( 50 ) ], +"frames": [ SubResource( 31 ), SubResource( 32 ), SubResource( 33 ), SubResource( 34 ), SubResource( 35 ), SubResource( 36 ), SubResource( 37 ), SubResource( 38 ) ], "loop": true, -"name": "melee", -"speed": 17.0 +"name": "attack1", +"speed": 20.0 } ] -[sub_resource type="RectangleShape2D" id=39] +[sub_resource type="RectangleShape2D" id=40] extents = Vector2( 9.5, 15.5 ) -[sub_resource type="RectangleShape2D" id=40] +[sub_resource type="RectangleShape2D" id=41] extents = Vector2( 14.4844, 15.5 ) -[sub_resource type="RectangleShape2D" id=41] +[sub_resource type="RectangleShape2D" id=42] extents = Vector2( 9.11914, 2.77663 ) -[sub_resource type="RectangleShape2D" id=51] +[sub_resource type="RectangleShape2D" id=43] extents = Vector2( 12.751, 6.23259 ) -[node name="Player" type="KinematicBody2D" groups=["player"]] +[node name="Player" type="KinematicBody2D" groups=[ +"player", +]] collision_layer = 3 collision_mask = 249 collision/safe_margin = 0.01 @@ -262,15 +270,15 @@ script = ExtResource( 2 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="."] material = ExtResource( 12 ) position = Vector2( 10, -24 ) -frames = SubResource( 38 ) +frames = SubResource( 39 ) animation = "melee" -frame = 5 +frame = 3 playing = true [node name="Camera2D" type="Camera2D" parent="."] offset = Vector2( 0, -75 ) current = true -zoom = Vector2( 0.9, 0.9 ) +zoom = Vector2( 0.8, 0.8 ) limit_smoothed = true drag_margin_h_enabled = true drag_margin_v_enabled = true @@ -290,7 +298,7 @@ __meta__ = { [node name="CollisionShape2D" type="CollisionShape2D" parent="."] position = Vector2( 0, -15.5 ) -shape = SubResource( 39 ) +shape = SubResource( 40 ) [node name="EnemyDetector" type="Area2D" parent="."] position = Vector2( 0, -16 ) @@ -299,20 +307,20 @@ collision_mask = 2 [node name="CollisionShape2D" type="CollisionShape2D" parent="EnemyDetector"] position = Vector2( 0, -0.633541 ) -shape = SubResource( 40 ) +shape = SubResource( 41 ) [node name="StompDetector" type="Area2D" parent="."] position = Vector2( 0, -19 ) [node name="CollisionShape2D" type="CollisionShape2D" parent="StompDetector"] position = Vector2( 0, 17.2338 ) -shape = SubResource( 41 ) +shape = SubResource( 42 ) [node name="MeleeDetector" type="Area2D" parent="."] [node name="CollisionShape2D" type="CollisionShape2D" parent="MeleeDetector"] position = Vector2( 22.3487, -20.622 ) -shape = SubResource( 51 ) +shape = SubResource( 43 ) [node name="CanvasLayer" type="CanvasLayer" parent="."] @@ -338,6 +346,30 @@ __meta__ = { "_edit_use_anchors_": false } +[node name="Sound_hurt" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 14 ) +volume_db = -10.0 + +[node name="Sound_attack" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 15 ) +volume_db = -10.0 + +[node name="Sound_jump" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 16 ) +volume_db = -10.0 + +[node name="Sound_die" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 17 ) +volume_db = -10.0 + +[node name="Sound_jump2" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 13 ) +volume_db = -10.0 + +[node name="Sound_fire" type="AudioStreamPlayer" parent="."] +stream = ExtResource( 18 ) +volume_db = -10.0 + [connection signal="animation_finished" from="AnimatedSprite" to="." method="_on_AnimatedSprite_animation_finished"] [connection signal="area_entered" from="EnemyDetector" to="." method="_on_EnemyDetector_area_entered"] [connection signal="body_entered" from="EnemyDetector" to="." method="_on_EnemyDetector_body_entered"] diff --git a/src/actors/player/PlayerShader.tres b/src/actors/player/PlayerShader.tres old mode 100755 new mode 100644 index a0d39de55b70c7ceae1f1cbcfca25d21780c37ba..b260e432fea851162ad8b073459f91bfb8145cff --- a/src/actors/player/PlayerShader.tres +++ b/src/actors/player/PlayerShader.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[sub_resource type="Shader" id=52] +[sub_resource type="Shader" id=1] code = "shader_type canvas_item; render_mode unshaded; @@ -11,4 +11,4 @@ void fragment() { }" [resource] -shader = SubResource( 52 ) +shader = SubResource( 1 ) diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/Barrel (1).png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/Barrel (1).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/Barrel (2).png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/Barrel (2).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/Box.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/Box.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorLocked.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorLocked.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorOpen.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorOpen.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorOpenResized.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorOpenResized.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorUnlocked.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorUnlocked.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorUnlockedResized.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/DoorUnlockedResized.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/Saw.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/Switch (1).png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/Switch (1).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Objects/Switch (2).png b/src/assets/FreeSciFiPlatformTileSet/png/Objects/Switch (2).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Acid (1).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Acid (1).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Acid (2).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Acid (2).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (1).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (1).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (2).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (2).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (3).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (3).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (4).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (4).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (5).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (5).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (6).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (6).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (7).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/BGTile (7).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Fence (1).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Fence (1).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Fence (2).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Fence (2).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Fence (3).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Fence (3).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Spike.png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Spike.png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (1).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (1).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (10).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (10).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (11).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (11).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (12).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (12).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (13).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (13).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (14).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (14).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (15).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (15).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (2).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (2).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (3).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (3).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (4).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (4).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (5).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (5).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (6).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (6).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (7).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (7).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (8).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (8).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (9).png b/src/assets/FreeSciFiPlatformTileSet/png/Tiles/Tile (9).png old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/vector/Tile.ai b/src/assets/FreeSciFiPlatformTileSet/vector/Tile.ai old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/vector/Tile.cdr b/src/assets/FreeSciFiPlatformTileSet/vector/Tile.cdr old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/vector/Tile.eps b/src/assets/FreeSciFiPlatformTileSet/vector/Tile.eps old mode 100755 new mode 100644 diff --git a/src/assets/FreeSciFiPlatformTileSet/vector/Tile.svg b/src/assets/FreeSciFiPlatformTileSet/vector/Tile.svg old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/dead/enemy-death-1.png b/src/assets/actors/Enemy1/dead/enemy-death-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/dead/enemy-death-2.png b/src/assets/actors/Enemy1/dead/enemy-death-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/dead/enemy-death-3.png b/src/assets/actors/Enemy1/dead/enemy-death-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/dead/enemy-death-4.png b/src/assets/actors/Enemy1/dead/enemy-death-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/dead/enemy-death-5.png b/src/assets/actors/Enemy1/dead/enemy-death-5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/skeleton_sound/Sound_hurt.wav b/src/assets/actors/Enemy1/skeleton_sound/Sound_hurt.wav new file mode 100644 index 0000000000000000000000000000000000000000..fb3c05900cd47d2faa10c038469d8e75a38791ef Binary files /dev/null and b/src/assets/actors/Enemy1/skeleton_sound/Sound_hurt.wav differ diff --git a/src/assets/actors/Enemy1/skeleton_sound/Sound_kill.wav b/src/assets/actors/Enemy1/skeleton_sound/Sound_kill.wav new file mode 100644 index 0000000000000000000000000000000000000000..07d4d45b2dceb930671ff0aeae8327aa91b73fac Binary files /dev/null and b/src/assets/actors/Enemy1/skeleton_sound/Sound_kill.wav differ diff --git a/src/assets/actors/Enemy1/skeleton_sound/darsycho__zombie-moans.ogg b/src/assets/actors/Enemy1/skeleton_sound/darsycho__zombie-moans.ogg new file mode 100644 index 0000000000000000000000000000000000000000..83aab428a80366657ff3d4a98771addc0cd1e42d Binary files /dev/null and b/src/assets/actors/Enemy1/skeleton_sound/darsycho__zombie-moans.ogg differ diff --git a/src/assets/actors/Enemy1/skeleton_sound/hurt.ogg b/src/assets/actors/Enemy1/skeleton_sound/hurt.ogg deleted file mode 100755 index 30b7c940b476b042a6c0b42f3700c4bd5b30766f..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Enemy1/skeleton_sound/hurt.ogg and /dev/null differ diff --git a/src/assets/actors/Enemy1/skeleton_sound/kill.ogg b/src/assets/actors/Enemy1/skeleton_sound/kill.ogg deleted file mode 100755 index e57c7127c2e56eedb54f839989adfed5f4e534ba..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Enemy1/skeleton_sound/kill.ogg and /dev/null differ diff --git a/src/assets/actors/Enemy1/spawn/skeleton-rise-1.png b/src/assets/actors/Enemy1/spawn/skeleton-rise-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/spawn/skeleton-rise-2.png b/src/assets/actors/Enemy1/spawn/skeleton-rise-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/spawn/skeleton-rise-3.png b/src/assets/actors/Enemy1/spawn/skeleton-rise-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/spawn/skeleton-rise-4.png b/src/assets/actors/Enemy1/spawn/skeleton-rise-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/spawn/skeleton-rise-5.png b/src/assets/actors/Enemy1/spawn/skeleton-rise-5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/spawn/skeleton-rise-6.png b/src/assets/actors/Enemy1/spawn/skeleton-rise-6.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-1.png b/src/assets/actors/Enemy1/walk/skeleton-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-2.png b/src/assets/actors/Enemy1/walk/skeleton-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-3.png b/src/assets/actors/Enemy1/walk/skeleton-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-4.png b/src/assets/actors/Enemy1/walk/skeleton-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-5.png b/src/assets/actors/Enemy1/walk/skeleton-5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-6.png b/src/assets/actors/Enemy1/walk/skeleton-6.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-7.png b/src/assets/actors/Enemy1/walk/skeleton-7.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Enemy1/walk/skeleton-8.png b/src/assets/actors/Enemy1/walk/skeleton-8.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Ghost/PNG/ghost-appears.png b/src/assets/actors/Ghost/PNG/ghost-appears.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Ghost/PNG/ghost-idle.gif b/src/assets/actors/Ghost/PNG/ghost-idle.gif old mode 100755 new mode 100644 diff --git a/src/assets/actors/Ghost/PNG/ghost-idle.png b/src/assets/actors/Ghost/PNG/ghost-idle.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Ghost/PNG/ghost-shriek.png b/src/assets/actors/Ghost/PNG/ghost-shriek.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan01.wav b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan01.wav new file mode 100644 index 0000000000000000000000000000000000000000..a4feff05ddee4eb5e184108c831f79cbb8ef658e Binary files /dev/null and b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan01.wav differ diff --git a/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan02.wav b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan02.wav new file mode 100644 index 0000000000000000000000000000000000000000..557b0131e297231a7bdf04eae2de77d3ecaac0ab Binary files /dev/null and b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan02.wav differ diff --git a/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan03.wav b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan03.wav new file mode 100644 index 0000000000000000000000000000000000000000..17ce49f34e20d8e5e0493ca8f6895cfe95909206 Binary files /dev/null and b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan03.wav differ diff --git a/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan04.wav b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan04.wav new file mode 100644 index 0000000000000000000000000000000000000000..eafb26ca4c5cf3c954cda280400a3e1bf03a6fff Binary files /dev/null and b/src/assets/actors/Ghost/sound_ghost/qubodup-GhostMoan04.wav differ diff --git a/src/assets/actors/Knight/health-bar-over.png b/src/assets/actors/Knight/health-bar-over.png new file mode 100644 index 0000000000000000000000000000000000000000..8bdd984722d60004fd1414cc27de04ab8816a739 Binary files /dev/null and b/src/assets/actors/Knight/health-bar-over.png differ diff --git a/src/assets/actors/Knight/health-bar-under.png b/src/assets/actors/Knight/health-bar-under.png new file mode 100644 index 0000000000000000000000000000000000000000..e81f059f4c6f42afe4a376115945e92f3999e3f2 Binary files /dev/null and b/src/assets/actors/Knight/health-bar-under.png differ diff --git a/src/assets/actors/Knight/health_bar_health.png b/src/assets/actors/Knight/health_bar_health.png new file mode 100644 index 0000000000000000000000000000000000000000..f8de6a1b122ed56d78e9c959a02682879898ccf0 Binary files /dev/null and b/src/assets/actors/Knight/health_bar_health.png differ diff --git a/src/assets/actors/Knight/hero-attack/hero-attack-1.png b/src/assets/actors/Knight/hero-attack/hero-attack-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-attack/hero-attack-2.png b/src/assets/actors/Knight/hero-attack/hero-attack-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-attack/hero-attack-3.png b/src/assets/actors/Knight/hero-attack/hero-attack-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-attack/hero-attack-4.png b/src/assets/actors/Knight/hero-attack/hero-attack-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-attack/hero-attack-5.png b/src/assets/actors/Knight/hero-attack/hero-attack-5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-hurt/hero-hurt.png b/src/assets/actors/Knight/hero-hurt/hero-hurt.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-idle/hero-idle-1.png b/src/assets/actors/Knight/hero-idle/hero-idle-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-idle/hero-idle-2.png b/src/assets/actors/Knight/hero-idle/hero-idle-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-idle/hero-idle-3.png b/src/assets/actors/Knight/hero-idle/hero-idle-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-idle/hero-idle-4.png b/src/assets/actors/Knight/hero-idle/hero-idle-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-jump/hero-jump-1.png b/src/assets/actors/Knight/hero-jump/hero-jump-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-jump/hero-jump-2.png b/src/assets/actors/Knight/hero-jump/hero-jump-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-jump/hero-jump-3.png b/src/assets/actors/Knight/hero-jump/hero-jump-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-jump/hero-jump-4.png b/src/assets/actors/Knight/hero-jump/hero-jump-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-run/hero-run-1.png b/src/assets/actors/Knight/hero-run/hero-run-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-run/hero-run-2.png b/src/assets/actors/Knight/hero-run/hero-run-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-run/hero-run-3.png b/src/assets/actors/Knight/hero-run/hero-run-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-run/hero-run-4.png b/src/assets/actors/Knight/hero-run/hero-run-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-run/hero-run-5.png b/src/assets/actors/Knight/hero-run/hero-run-5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/hero-run/hero-run-6.png b/src/assets/actors/Knight/hero-run/hero-run-6.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Knight/jump.flac b/src/assets/actors/Knight/jump.flac new file mode 100644 index 0000000000000000000000000000000000000000..149f6692fa70cd8741dea41defd5a014f17967b9 Binary files /dev/null and b/src/assets/actors/Knight/jump.flac differ diff --git a/src/assets/actors/Knight/knight_sound/Sound_voice.mp3 b/src/assets/actors/Knight/knight_sound/Sound_voice.mp3 new file mode 100644 index 0000000000000000000000000000000000000000..44959a608edcda9f5631fbacc620cc76596086ad Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/Sound_voice.mp3 differ diff --git a/src/assets/actors/Knight/knight_sound/attack.flac b/src/assets/actors/Knight/knight_sound/attack.flac new file mode 100644 index 0000000000000000000000000000000000000000..077a297dd5d67994d19ce85dc84c7fcc87939e8c Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/attack.flac differ diff --git a/src/assets/actors/Knight/knight_sound/attack.ogg b/src/assets/actors/Knight/knight_sound/attack.ogg deleted file mode 100755 index 5a75835d73e2c3c5f00142a482a6891a4f66e5cb..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Knight/knight_sound/attack.ogg and /dev/null differ diff --git a/src/assets/actors/Knight/knight_sound/attack.wav b/src/assets/actors/Knight/knight_sound/attack.wav new file mode 100644 index 0000000000000000000000000000000000000000..eed3a95828a98fc828e61308caa882f417c38054 Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/attack.wav differ diff --git a/src/assets/actors/Knight/knight_sound/die.wav b/src/assets/actors/Knight/knight_sound/die.wav new file mode 100644 index 0000000000000000000000000000000000000000..7937159f329bf2970270883971fe7caed32334f5 Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/die.wav differ diff --git a/src/assets/actors/Knight/knight_sound/diee.flac b/src/assets/actors/Knight/knight_sound/diee.flac new file mode 100644 index 0000000000000000000000000000000000000000..ae955973452ad457aabf8331ef64090ab98b7004 Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/diee.flac differ diff --git a/src/assets/actors/Knight/knight_sound/hurt.ogg b/src/assets/actors/Knight/knight_sound/hurt.ogg deleted file mode 100755 index 30b7c940b476b042a6c0b42f3700c4bd5b30766f..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Knight/knight_sound/hurt.ogg and /dev/null differ diff --git a/src/assets/actors/Knight/knight_sound/hurt.wav b/src/assets/actors/Knight/knight_sound/hurt.wav new file mode 100644 index 0000000000000000000000000000000000000000..97620f59d33051f861f12bdd56686177196e5213 Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/hurt.wav differ diff --git a/src/assets/actors/Knight/knight_sound/jump.flac b/src/assets/actors/Knight/knight_sound/jump.flac new file mode 100644 index 0000000000000000000000000000000000000000..149f6692fa70cd8741dea41defd5a014f17967b9 Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/jump.flac differ diff --git a/src/assets/actors/Knight/knight_sound/jump.ogg b/src/assets/actors/Knight/knight_sound/jump.ogg deleted file mode 100755 index eda2bc0dcb25169a1b48728166a3ae75fa98919a..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Knight/knight_sound/jump.ogg and /dev/null differ diff --git a/src/assets/actors/Knight/knight_sound/kill.ogg b/src/assets/actors/Knight/knight_sound/kill.ogg deleted file mode 100755 index e57c7127c2e56eedb54f839989adfed5f4e534ba..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Knight/knight_sound/kill.ogg and /dev/null differ diff --git a/src/assets/actors/Knight/knight_sound/ori.flac b/src/assets/actors/Knight/knight_sound/ori.flac new file mode 100644 index 0000000000000000000000000000000000000000..077a297dd5d67994d19ce85dc84c7fcc87939e8c Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/ori.flac differ diff --git a/src/assets/actors/Knight/knight_sound/rise.ogg b/src/assets/actors/Knight/knight_sound/rise.ogg deleted file mode 100755 index a24f0b1c383f0ac24e0ce6eae7c0daf621794b73..0000000000000000000000000000000000000000 Binary files a/src/assets/actors/Knight/knight_sound/rise.ogg and /dev/null differ diff --git a/src/assets/actors/Knight/knight_sound/slightscream-08.flac b/src/assets/actors/Knight/knight_sound/slightscream-08.flac new file mode 100644 index 0000000000000000000000000000000000000000..f0093185150cb9ba0acae12ab3e6fee9d0d0a058 Binary files /dev/null and b/src/assets/actors/Knight/knight_sound/slightscream-08.flac differ diff --git a/src/assets/actors/Player/ectoplasma.png b/src/assets/actors/Player/ectoplasma.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/health-bar-over.png b/src/assets/actors/Player/health-bar-over.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/health-bar-under.png b/src/assets/actors/Player/health-bar-under.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/health_bar_health.png b/src/assets/actors/Player/health_bar_health.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_attack1.png b/src/assets/actors/Player/player_attack1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_attack2.pdn b/src/assets/actors/Player/player_attack2.pdn old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_attack2.png b/src/assets/actors/Player/player_attack2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_attack3.png b/src/assets/actors/Player/player_attack3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_attack_melee.png b/src/assets/actors/Player/player_attack_melee.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_climb.png b/src/assets/actors/Player/player_climb.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_death.png b/src/assets/actors/Player/player_death.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_doublejump.png b/src/assets/actors/Player/player_doublejump.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_hurt.png b/src/assets/actors/Player/player_hurt.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_idle.png b/src/assets/actors/Player/player_idle.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_jump.png b/src/assets/actors/Player/player_jump.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_punch.png b/src/assets/actors/Player/player_punch.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_run.png b/src/assets/actors/Player/player_run.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_run_attack.png b/src/assets/actors/Player/player_run_attack.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Player/player_sound/attack.wav b/src/assets/actors/Player/player_sound/attack.wav new file mode 100644 index 0000000000000000000000000000000000000000..ff0568f953fb66a52b2436002754ea6e70b5b155 Binary files /dev/null and b/src/assets/actors/Player/player_sound/attack.wav differ diff --git a/src/assets/actors/Player/player_sound/death.wav b/src/assets/actors/Player/player_sound/death.wav new file mode 100644 index 0000000000000000000000000000000000000000..b89d65a3f8d4be16fac3a29cb13fbc76689826dd Binary files /dev/null and b/src/assets/actors/Player/player_sound/death.wav differ diff --git a/src/assets/actors/Player/player_sound/fire.wav b/src/assets/actors/Player/player_sound/fire.wav new file mode 100644 index 0000000000000000000000000000000000000000..01101406c156bff8682e00f54a351596bb19d531 Binary files /dev/null and b/src/assets/actors/Player/player_sound/fire.wav differ diff --git a/src/assets/actors/Player/player_sound/hurt.wav b/src/assets/actors/Player/player_sound/hurt.wav new file mode 100644 index 0000000000000000000000000000000000000000..822d6cb09a260ca9b566902940e1cb5fe2d121f7 Binary files /dev/null and b/src/assets/actors/Player/player_sound/hurt.wav differ diff --git a/src/assets/actors/Player/player_sound/jump.wav b/src/assets/actors/Player/player_sound/jump.wav new file mode 100644 index 0000000000000000000000000000000000000000..00b08e6229ac908b4b63f376af79e9fb627bb14c Binary files /dev/null and b/src/assets/actors/Player/player_sound/jump.wav differ diff --git a/src/assets/actors/Player/player_sound/jump1.wav b/src/assets/actors/Player/player_sound/jump1.wav new file mode 100644 index 0000000000000000000000000000000000000000..95fb13ea7ff037c8aaf0effea7ee84c443925a32 Binary files /dev/null and b/src/assets/actors/Player/player_sound/jump1.wav differ diff --git a/src/assets/actors/Wizard/attack/fire1.png b/src/assets/actors/Wizard/attack/fire1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire10.png b/src/assets/actors/Wizard/attack/fire10.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire2.png b/src/assets/actors/Wizard/attack/fire2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire3.png b/src/assets/actors/Wizard/attack/fire3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire4.png b/src/assets/actors/Wizard/attack/fire4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire5.png b/src/assets/actors/Wizard/attack/fire5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire6.png b/src/assets/actors/Wizard/attack/fire6.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire7.png b/src/assets/actors/Wizard/attack/fire7.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire8.png b/src/assets/actors/Wizard/attack/fire8.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/attack/fire9.png b/src/assets/actors/Wizard/attack/fire9.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death1.png b/src/assets/actors/Wizard/death/enemy-death1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death2.png b/src/assets/actors/Wizard/death/enemy-death2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death3.png b/src/assets/actors/Wizard/death/enemy-death3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death4.png b/src/assets/actors/Wizard/death/enemy-death4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death5.png b/src/assets/actors/Wizard/death/enemy-death5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death6.png b/src/assets/actors/Wizard/death/enemy-death6.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death7.png b/src/assets/actors/Wizard/death/enemy-death7.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death8.png b/src/assets/actors/Wizard/death/enemy-death8.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/death/enemy-death9.png b/src/assets/actors/Wizard/death/enemy-death9.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/fireball/fireball1.png b/src/assets/actors/Wizard/fireball/fireball1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/fireball/fireball2.png b/src/assets/actors/Wizard/fireball/fireball2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/fireball/fireball3.png b/src/assets/actors/Wizard/fireball/fireball3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/idle/wizard-idle-1.png b/src/assets/actors/Wizard/idle/wizard-idle-1.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/idle/wizard-idle-2.png b/src/assets/actors/Wizard/idle/wizard-idle-2.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/idle/wizard-idle-3.png b/src/assets/actors/Wizard/idle/wizard-idle-3.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/idle/wizard-idle-4.png b/src/assets/actors/Wizard/idle/wizard-idle-4.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/idle/wizard-idle-5.png b/src/assets/actors/Wizard/idle/wizard-idle-5.png old mode 100755 new mode 100644 diff --git a/src/assets/actors/Wizard/sound_wizzard/Fire impact 1.wav b/src/assets/actors/Wizard/sound_wizzard/Fire impact 1.wav new file mode 100644 index 0000000000000000000000000000000000000000..4533d020205a1b7ecf769773cd9a735247bc20a7 Binary files /dev/null and b/src/assets/actors/Wizard/sound_wizzard/Fire impact 1.wav differ diff --git a/src/assets/actors/Wizard/sound_wizzard/Fire.aif b/src/assets/actors/Wizard/sound_wizzard/Fire.aif new file mode 100644 index 0000000000000000000000000000000000000000..502b8812235fc8d7db50b8e302505e74616e09db Binary files /dev/null and b/src/assets/actors/Wizard/sound_wizzard/Fire.aif differ diff --git a/src/assets/actors/Wizard/sound_wizzard/Spell_02.wav b/src/assets/actors/Wizard/sound_wizzard/Spell_02.wav new file mode 100644 index 0000000000000000000000000000000000000000..2e81a14e18780dbd96f1ecaf894ef4fee0e9673c Binary files /dev/null and b/src/assets/actors/Wizard/sound_wizzard/Spell_02.wav differ diff --git a/src/assets/actors/Wizard/sound_wizzard/pain5.wav b/src/assets/actors/Wizard/sound_wizzard/pain5.wav new file mode 100644 index 0000000000000000000000000000000000000000..392889dc9f1da53f98ca05d8393712828faba99d Binary files /dev/null and b/src/assets/actors/Wizard/sound_wizzard/pain5.wav differ diff --git a/src/assets/actors/Wizard/sound_wizzard/qubodupFireLoop.ogg b/src/assets/actors/Wizard/sound_wizzard/qubodupFireLoop.ogg new file mode 100644 index 0000000000000000000000000000000000000000..963a9c1d1191c7efb385a10f6a630fadade1a0a8 Binary files /dev/null and b/src/assets/actors/Wizard/sound_wizzard/qubodupFireLoop.ogg differ diff --git a/src/assets/actors/godot_robot.png b/src/assets/actors/godot_robot.png old mode 100755 new mode 100644 diff --git a/src/assets/colleticbles/coin/gold_1.png b/src/assets/colleticbles/coin/gold_1.png old mode 100755 new mode 100644 diff --git a/src/assets/colleticbles/coin/gold_2.png b/src/assets/colleticbles/coin/gold_2.png old mode 100755 new mode 100644 diff --git a/src/assets/colleticbles/coin/gold_3.png b/src/assets/colleticbles/coin/gold_3.png old mode 100755 new mode 100644 diff --git a/src/assets/colleticbles/coin_gold.png b/src/assets/colleticbles/coin_gold.png old mode 100755 new mode 100644 diff --git a/src/assets/colleticbles/crystal-qubodup-ccby3-32-green.png b/src/assets/colleticbles/crystal-qubodup-ccby3-32-green.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/04B_30__.TTF b/src/assets/menu_assets/04B_30__.TTF old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/ButtonTextur.png b/src/assets/menu_assets/ButtonTextur.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/ButtonTexturHover.png b/src/assets/menu_assets/ButtonTexturHover.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/Geist SpriteSheet.png b/src/assets/menu_assets/Geist SpriteSheet.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kb_a.png b/src/assets/menu_assets/kb_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kb_d.png b/src/assets/menu_assets/kb_d.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kb_enter.png b/src/assets/menu_assets/kb_enter.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kb_escape.png b/src/assets/menu_assets/kb_escape.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kb_s.png b/src/assets/menu_assets/kb_s.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kb_w.png b/src/assets/menu_assets/kb_w.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_0.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_0.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_1.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_1.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_2.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_2.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_3.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_3.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_4.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_4.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_5.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_5.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_6.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_6.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_7.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_7.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_8.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_8.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_9.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_9.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_a.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_alt.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_alt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_alt_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_alt_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_alt_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_alt_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_down.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_down.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_up.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_arrow_up.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_b.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_b.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_backslash.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_backslash.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_backspace.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_backspace.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_bracket_l.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_bracket_l.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_bracket_r.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_bracket_r.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_c.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_c.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_caps.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_caps.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_comma.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_comma.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_ctrl.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_ctrl.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_ctrl_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_ctrl_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_ctrl_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_ctrl_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_d.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_d.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_del.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_del.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_e.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_e.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_end.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_end.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_enter.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_enter.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_equal.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_equal.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_escape.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_escape.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f1.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f1.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f10.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f10.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f11.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f11.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f12.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f12.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f2.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f2.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f3.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f3.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f4.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f4.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f5.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f5.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f6.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f6.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f7.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f7.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f8.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f8.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f9.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_f9.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_g.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_g.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_h.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_h.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_home.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_home.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_i.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_i.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_insert.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_insert.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_j.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_j.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_k.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_k.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_l.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_l.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_m.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_m.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_minus.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_minus.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_n.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_n.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_0.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_0.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_1.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_1.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_2.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_2.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_3.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_3.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_4.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_4.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_5.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_5.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_6.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_6.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_7.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_7.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_8.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_8.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_9.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_9.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_asterisk.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_asterisk.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_enter.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_enter.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_minus.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_minus.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_period.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_period.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_plus.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_plus.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_slash.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_num_slash.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_o.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_o.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_p.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_p.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_pagedown.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_pagedown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_pageup.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_pageup.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_pause.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_pause.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_period.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_period.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_printscreen.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_printscreen.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_q.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_q.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_quote.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_quote.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_r.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_r.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_s.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_s.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_scroll.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_scroll.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_semicolon.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_semicolon.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_shift.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_shift.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_shift_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_shift_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_shift_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_shift_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_slash.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_slash.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_space.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_space.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_t.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_t.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_tab.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_tab.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_tilde.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_tilde.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_u.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_u.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_v.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_v.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_w.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_w.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_x.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_x.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_y.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_y.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_z.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/kb_z.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/keyboard_blank_square.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/keyboard_blank_square.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/keyboard_blank_wide.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/keyboard_blank_wide.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_4.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_4.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_5.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_5.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_6.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_6.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_middle.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_middle.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_wheel_down.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_wheel_down.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_wheel_up.png b/src/assets/menu_assets/kf_controller_prompts_r6/keyboard/mouse_wheel_up.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts.afdesign b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts.afdesign old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts.eps b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts.eps old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts.svg b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts.svg old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_2048.png b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_2048.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_2048.xcf b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_2048.xcf old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb.afdesign b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb.afdesign old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb.eps b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb.eps old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb.svg b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb.svg old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb_2048.png b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb_2048.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb_2048.xcf b/src/assets/menu_assets/kf_controller_prompts_r6/kf_prompts_kb_2048.xcf old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_a.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_b.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_b.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_x.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_x.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_y.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps5_y.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_a.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_b.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_b.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad_all.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad_all.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_dpad_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds3_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds3_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds3_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds3_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds5_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds5_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds5_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ds5_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_lb.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_lb.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_ls_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_lt.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_lt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rb.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rb.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rs_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rt.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_rt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_touchpad.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_touchpad.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_touchpad_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_touchpad_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_touchpad_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_touchpad_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_x.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_x.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_y.png b/src/assets/menu_assets/kf_controller_prompts_r6/ps/ps_y.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/readme & license.txt b/src/assets/menu_assets/kf_controller_prompts_r6/readme & license.txt old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_a.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_b.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_b.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad_all.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad_all.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_dpad_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_home.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_home.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_a.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_b.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_b.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_down.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_down.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad_all.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad_all.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_dpad_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_left.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_ls_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_right.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_sl.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_sl.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_sr.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_sr.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_up.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_up.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_x.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_x.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_y.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_jc_y.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_lb.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_lb.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_ls_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_lt.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_lt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_pro_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_pro_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_pro_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_pro_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rb.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rb.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rs_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rt.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_rt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_square.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_square.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_x.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_x.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_y.png b/src/assets/menu_assets/kf_controller_prompts_r6/switch/switch_y.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_360_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_360_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_360_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_360_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_a.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_a.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_b.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_b.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad_all.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad_all.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_dpad_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_lb.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_lb.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_ls_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_lt.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_lt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rb.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rb.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs_click.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs_click.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs_leftright.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs_leftright.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs_updown.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rs_updown.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rt.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_rt.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_select.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_select.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_start.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_start.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_x.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_x.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_y.png b/src/assets/menu_assets/kf_controller_prompts_r6/xbox/xbox_y.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/mouse_left.png b/src/assets/menu_assets/mouse_left.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/mouse_right.png b/src/assets/menu_assets/mouse_right.png old mode 100755 new mode 100644 diff --git a/src/assets/menu_assets/spaceHintergrund.png b/src/assets/menu_assets/spaceHintergrund.png old mode 100755 new mode 100644 diff --git a/src/assets/sounds/click1.wav b/src/assets/sounds/click1.wav old mode 100755 new mode 100644 diff --git a/src/assets/sounds/coin1.wav b/src/assets/sounds/coin1.wav old mode 100755 new mode 100644 diff --git a/src/assets/sounds/feuer.wav b/src/assets/sounds/feuer.wav old mode 100755 new mode 100644 diff --git a/src/assets/sounds/files (online-audio-converter.com).zip b/src/assets/sounds/files (online-audio-converter.com).zip old mode 100755 new mode 100644 diff --git a/src/assets/sounds/jump.wav b/src/assets/sounds/jump.wav old mode 100755 new mode 100644 diff --git a/src/assets/sounds/kristallsound.wav b/src/assets/sounds/kristallsound.wav old mode 100755 new mode 100644 diff --git a/src/assets/sounds/maintheme.wav b/src/assets/sounds/maintheme.wav old mode 100755 new mode 100644 diff --git a/src/assets/sounds/schwert.wav b/src/assets/sounds/schwert.wav old mode 100755 new mode 100644 diff --git a/src/assets/tilesets/godot_test_tileset.png b/src/assets/tilesets/godot_test_tileset.png old mode 100755 new mode 100644 diff --git a/src/assets/tilesets/main_scifi_tileset.png b/src/assets/tilesets/main_scifi_tileset.png old mode 100755 new mode 100644 diff --git a/src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png b/src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png deleted file mode 100755 index 6fc805ca85a4f0e1265045775167d0db03d9a0f2..0000000000000000000000000000000000000000 Binary files a/src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png and /dev/null differ diff --git a/src/scenes/Acid.gd b/src/scenes/Acid.gd old mode 100755 new mode 100644 diff --git a/src/scenes/Acid.tscn b/src/scenes/Acid.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Door.tscn b/src/scenes/Door.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Fader.tscn b/src/scenes/Fader.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Game.tscn b/src/scenes/Game.tscn old mode 100755 new mode 100644 index 68a45192b88b89555f674b5ac9a3a955a732bb22..8966e60028b796f25d54f0937fc4514b6e69f881 --- a/src/scenes/Game.tscn +++ b/src/scenes/Game.tscn @@ -56,5 +56,5 @@ current = true [node name="musik" type="AudioStreamPlayer" parent="."] stream = ExtResource( 1 ) -volume_db = 1.0 +volume_db = -15.0 autoplay = true diff --git a/src/scenes/Menu.gd b/src/scenes/Menu.gd old mode 100755 new mode 100644 diff --git a/src/scenes/Menu.tscn b/src/scenes/Menu.tscn old mode 100755 new mode 100644 index 93a8da5b1bb91f2539d486ee109078f548c26296..cf633269b60fb80ef82d533a3488bcf2a87b308e --- a/src/scenes/Menu.tscn +++ b/src/scenes/Menu.tscn @@ -17,13 +17,6 @@ font_data = ExtResource( 2 ) [sub_resource type="Theme" id=2] -[sub_resource type="DynamicFont" id=6] -size = 32 -outline_size = 4 -outline_color = Color( 0, 0, 0, 1 ) -extra_spacing_bottom = 6 -font_data = ExtResource( 2 ) - [sub_resource type="StyleBoxTexture" id=3] texture = ExtResource( 5 ) region_rect = Rect2( 0, 0, 361, 101 ) @@ -36,12 +29,11 @@ region_rect = Rect2( 0, 0, 361, 101 ) texture = ExtResource( 3 ) region_rect = Rect2( 0, 0, 361, 101 ) -[sub_resource type="DynamicFont" id=10] -size = 22 +[sub_resource type="DynamicFont" id=6] +size = 32 outline_size = 4 outline_color = Color( 0, 0, 0, 1 ) -extra_spacing_bottom = 3 -extra_spacing_char = 2 +extra_spacing_bottom = 6 font_data = ExtResource( 2 ) [sub_resource type="StyleBoxTexture" id=7] @@ -56,12 +48,12 @@ region_rect = Rect2( 0, 0, 361, 101 ) texture = ExtResource( 3 ) region_rect = Rect2( 0, 0, 361, 101 ) -[sub_resource type="DynamicFont" id=14] -size = 32 +[sub_resource type="DynamicFont" id=10] +size = 22 outline_size = 4 outline_color = Color( 0, 0, 0, 1 ) -extra_spacing_bottom = 5 -extra_spacing_char = 5 +extra_spacing_bottom = 3 +extra_spacing_char = 2 font_data = ExtResource( 2 ) [sub_resource type="StyleBoxTexture" id=11] @@ -76,6 +68,14 @@ region_rect = Rect2( 0, 0, 361, 101 ) texture = ExtResource( 3 ) region_rect = Rect2( 0, 0, 361, 101 ) +[sub_resource type="DynamicFont" id=14] +size = 32 +outline_size = 4 +outline_color = Color( 0, 0, 0, 1 ) +extra_spacing_bottom = 5 +extra_spacing_char = 5 +font_data = ExtResource( 2 ) + [sub_resource type="AtlasTexture" id=15] flags = 4 atlas = ExtResource( 4 ) @@ -139,10 +139,10 @@ margin_top = -108.0 margin_right = 449.0 margin_bottom = -40.0 theme = SubResource( 2 ) -custom_fonts/font = SubResource( 6 ) custom_styles/hover = SubResource( 3 ) custom_styles/pressed = SubResource( 4 ) custom_styles/normal = SubResource( 5 ) +custom_fonts/font = SubResource( 6 ) text = "START" __meta__ = { "_edit_use_anchors_": false @@ -153,10 +153,10 @@ margin_left = 130.0 margin_top = 384.0 margin_right = 450.0 margin_bottom = 448.0 -custom_fonts/font = SubResource( 10 ) custom_styles/hover = SubResource( 7 ) custom_styles/pressed = SubResource( 8 ) custom_styles/normal = SubResource( 9 ) +custom_fonts/font = SubResource( 10 ) text = "EINSTELLUNGEN" __meta__ = { "_edit_use_anchors_": false @@ -167,10 +167,10 @@ margin_left = 128.0 margin_top = 512.0 margin_right = 448.0 margin_bottom = 576.0 -custom_fonts/font = SubResource( 14 ) custom_styles/hover = SubResource( 11 ) custom_styles/pressed = SubResource( 12 ) custom_styles/normal = SubResource( 13 ) +custom_fonts/font = SubResource( 14 ) text = "ENDE" __meta__ = { "_edit_use_anchors_": false @@ -180,6 +180,7 @@ __meta__ = { position = Vector2( 1080, 248 ) scale = Vector2( 2.81113, 2.65621 ) frames = SubResource( 18 ) +frame = 2 speed_scale = 0.8 playing = true diff --git a/src/scenes/PauseController.gd b/src/scenes/PauseController.gd old mode 100755 new mode 100644 diff --git a/src/scenes/PauseController.tscn b/src/scenes/PauseController.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFHFast.tscn b/src/scenes/Platforms/PFHFast.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFHSlow.tscn b/src/scenes/Platforms/PFHSlow.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFHSmallFast.tscn b/src/scenes/Platforms/PFHSmallFast.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFHSmallSlow.tscn b/src/scenes/Platforms/PFHSmallSlow.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFS.tscn b/src/scenes/Platforms/PFS.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFVSlow.tscn b/src/scenes/Platforms/PFVSlow.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Platforms/PFVSmallSlow.tscn b/src/scenes/Platforms/PFVSmallSlow.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Saw.gd b/src/scenes/Saw.gd old mode 100755 new mode 100644 diff --git a/src/scenes/Saw.tscn b/src/scenes/Saw.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/SawMove.tscn b/src/scenes/SawMove.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/SawMoveDamage.gd b/src/scenes/SawMoveDamage.gd old mode 100755 new mode 100644 diff --git a/src/scenes/SawMoveKill.gd b/src/scenes/SawMoveKill.gd old mode 100755 new mode 100644 diff --git a/src/scenes/SawMoveLR.tscn b/src/scenes/SawMoveLR.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/SawRotation.gd b/src/scenes/SawRotation.gd old mode 100755 new mode 100644 diff --git a/src/scenes/SawRotationMove.gd b/src/scenes/SawRotationMove.gd old mode 100755 new mode 100644 diff --git a/src/scenes/Settings.gd b/src/scenes/Settings.gd old mode 100755 new mode 100644 diff --git a/src/scenes/Settings.tscn b/src/scenes/Settings.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/Sprite.gd b/src/scenes/Sprite.gd old mode 100755 new mode 100644 diff --git a/src/scenes/coin.tscn b/src/scenes/coin.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/levels/Level0.tscn b/src/scenes/levels/Level0.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/levels/Level1.tscn b/src/scenes/levels/Level1.tscn old mode 100755 new mode 100644 index 7a0042cb1dceee54c4dcb0d299654592a2f059db..50816275571c681b0d0b468e6c5f313c517e4f25 --- a/src/scenes/levels/Level1.tscn +++ b/src/scenes/levels/Level1.tscn @@ -1,7 +1,6 @@ -[gd_scene load_steps=46 format=2] +[gd_scene load_steps=45 format=2] [ext_resource path="res://src/actors/player/Player.tscn" type="PackedScene" id=1] -[ext_resource path="res://src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png" type="Texture" id=2] [ext_resource path="res://src/assets/tilesets/main_scifi_tileset.png" type="Texture" id=3] [ext_resource path="res://src/scenes/Door.tscn" type="PackedScene" id=4] [ext_resource path="res://src/scenes/shards.tscn" type="PackedScene" id=5] @@ -832,7 +831,7 @@ font_data = ExtResource( 11 ) [node name="BackGroundPNG" type="Sprite" parent="Level1/ParallaxBackground"] position = Vector2( 640.5, 368.667 ) scale = Vector2( 1.49457, 1.79794 ) -texture = ExtResource( 2 ) +texture = ExtResource( 3 ) [node name="BackGround" type="TileMap" parent="Level1"] tile_set = SubResource( 12 ) @@ -1146,7 +1145,7 @@ position = Vector2( 2097, 422 ) position = Vector2( 3412, 326 ) [node name="Node2D3" parent="Level1/Enemies/Skelletons" instance=ExtResource( 12 )] -position = Vector2( 3728, 326 ) +position = Vector2( 4230.96, 396.324 ) [node name="Node2D4" parent="Level1/Enemies/Skelletons" instance=ExtResource( 12 )] position = Vector2( 3536, 198 ) @@ -1196,7 +1195,7 @@ position = Vector2( 10494, 354 ) position = Vector2( 11167, 292 ) [node name="Player" parent="Level1" instance=ExtResource( 1 )] -position = Vector2( 455, 448 ) +position = Vector2( 499.46, 426.182 ) collision_mask = 16 [node name="Level" type="TileMap" parent="Level1"] @@ -1237,8 +1236,8 @@ margin_left = 1144.0 margin_top = 24.0 margin_right = 1264.0 margin_bottom = 56.0 -custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 ) custom_fonts/font = SubResource( 30 ) +custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 ) align = 1 valign = 1 __meta__ = { @@ -1247,7 +1246,7 @@ __meta__ = { [node name="coinSound" type="AudioStreamPlayer" parent="Level1/Score"] stream = ExtResource( 15 ) -volume_db = 6.058 +volume_db = -12.0 [connection signal="coin_collected" from="Level1/Objects/Coins/coin" to="Level1/Score" method="_on_coin_collected"] [connection signal="coin_collected" from="Level1/Objects/Coins/coin3" to="Level1/Score" method="_on_coin_collected"] diff --git a/src/scenes/levels/Level2.tscn b/src/scenes/levels/Level2.tscn old mode 100755 new mode 100644 index a50df49d545b524513706c12b7c2d38cb3a17426..b0492d6ab8304d0c3d6c2e8abc7f12a924467c46 --- a/src/scenes/levels/Level2.tscn +++ b/src/scenes/levels/Level2.tscn @@ -1,6 +1,5 @@ -[gd_scene load_steps=50 format=2] +[gd_scene load_steps=49 format=2] -[ext_resource path="res://src/assets/tilesets/png-transparent-nebula-atmosphere-sky-nebula-space-astronomy-space-miscellaneous-purple-texture.png" type="Texture" id=1] [ext_resource path="res://src/assets/tilesets/main_scifi_tileset.png" type="Texture" id=2] [ext_resource path="res://src/scenes/PauseController.tscn" type="PackedScene" id=3] [ext_resource path="res://src/actors/player/Player.tscn" type="PackedScene" id=4] @@ -775,7 +774,7 @@ font_data = ExtResource( 8 ) [node name="BackGroundPNG" type="Sprite" parent="Level0/ParallaxBackground"] position = Vector2( 646.653, 462.091 ) scale = Vector2( 1.41689, 1.43723 ) -texture = ExtResource( 1 ) +texture = ExtResource( 2 ) [node name="BackGround" type="TileMap" parent="Level0"] tile_set = SubResource( 12 ) @@ -980,8 +979,8 @@ margin_left = 1144.0 margin_top = 24.0 margin_right = 1264.0 margin_bottom = 56.0 -custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 ) custom_fonts/font = SubResource( 31 ) +custom_colors/font_color = Color( 0.988235, 1, 0.321569, 1 ) align = 1 valign = 1 __meta__ = { diff --git a/src/scenes/levels/Level3.tscn b/src/scenes/levels/Level3.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/levels/Level4.tscn b/src/scenes/levels/Level4.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/levels/LevelX.tscn b/src/scenes/levels/LevelX.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/levels/Score.gd b/src/scenes/levels/Score.gd old mode 100755 new mode 100644 diff --git a/src/scenes/readmeCaseSensitive.txt b/src/scenes/readmeCaseSensitive.txt old mode 100755 new mode 100644 diff --git a/src/scenes/shards.gd b/src/scenes/shards.gd old mode 100755 new mode 100644 diff --git a/src/scenes/shards.tscn b/src/scenes/shards.tscn old mode 100755 new mode 100644 diff --git a/src/scenes/spike.gd b/src/scenes/spike.gd old mode 100755 new mode 100644 diff --git a/src/scenes/spike.tscn b/src/scenes/spike.tscn old mode 100755 new mode 100644 diff --git a/src/scripts/Acid.gd b/src/scripts/Acid.gd old mode 100755 new mode 100644 diff --git a/src/scripts/ColorRect.gd b/src/scripts/ColorRect.gd old mode 100755 new mode 100644 diff --git a/src/scripts/Global.gd b/src/scripts/Global.gd old mode 100755 new mode 100644 diff --git a/src/scripts/Menu.gd b/src/scripts/Menu.gd old mode 100755 new mode 100644 diff --git a/src/scripts/PauseController.gd b/src/scripts/PauseController.gd old mode 100755 new mode 100644 diff --git a/src/scripts/Saw.gd b/src/scripts/Saw.gd old mode 100755 new mode 100644 diff --git a/src/scripts/SawRotation.gd b/src/scripts/SawRotation.gd old mode 100755 new mode 100644 diff --git a/src/scripts/Settings.gd b/src/scripts/Settings.gd old mode 100755 new mode 100644 diff --git a/src/scripts/Sprite.gd b/src/scripts/Sprite.gd old mode 100755 new mode 100644 diff --git a/src/scripts/coin.gd b/src/scripts/coin.gd old mode 100755 new mode 100644 diff --git a/src/scripts/readmeCaseSensitive.txt b/src/scripts/readmeCaseSensitive.txt old mode 100755 new mode 100644 diff --git a/src/scripts/shards.gd b/src/scripts/shards.gd old mode 100755 new mode 100644 diff --git a/src/scripts/spike.gd b/src/scripts/spike.gd old mode 100755 new mode 100644