diff --git a/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.md5 b/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.md5 index 104e086..47b2e69 100644 --- a/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.md5 +++ b/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.md5 @@ -1,3 +1,3 @@ source_md5="50010937a0008f8857e99b68ecf8cf26" -dest_md5="cd9243ceb07604925dba2d627b2c4524" +dest_md5="3691b6a615aaac170ce751aaf67badb7" diff --git a/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.oggstr b/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.oggstr index 64b8916..2a38593 100644 Binary files a/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.oggstr and b/.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.oggstr differ diff --git a/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.md5 b/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.md5 index f3292ee..01efe57 100644 --- a/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.md5 +++ b/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.md5 @@ -1,3 +1,3 @@ source_md5="a85f3b809a8dc6eced55feb12e6e3ddd" -dest_md5="a94161e5f611fd4a9ddd5101aa20d4ba" +dest_md5="ad05b30e5d400587666fbbec3b161d69" diff --git a/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.oggstr b/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.oggstr index 49cbcdd..98ce7b5 100644 Binary files a/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.oggstr and b/.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.oggstr differ diff --git a/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.md5 b/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.md5 index 484f16a..c6d68dc 100644 --- a/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.md5 +++ b/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.md5 @@ -1,3 +1,3 @@ source_md5="8920823388579e692abc54a105e82880" -dest_md5="49d3ec2412cd56cd0e2618c618bc1ea8" +dest_md5="a0930dbf9758117cebba212c9a6bab01" diff --git a/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.oggstr b/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.oggstr index de36c07..1de9681 100644 Binary files a/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.oggstr and b/.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.oggstr differ diff --git a/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.md5 b/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.md5 index c18f69a..933456c 100644 --- a/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.md5 +++ b/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.md5 @@ -1,3 +1,3 @@ source_md5="de765597b1083dd078ea4f6fca4fd7de" -dest_md5="c10e903514f2bdaae62d215034e5a3fc" +dest_md5="3675071a31137abe82b48e06ea6ebabc" diff --git a/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.oggstr b/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.oggstr index abe13cc..a815ad3 100644 Binary files a/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.oggstr and b/.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.oggstr differ diff --git a/.import/equip.ogg-d2884a375a4158917c3155b455e88238.md5 b/.import/equip.ogg-d2884a375a4158917c3155b455e88238.md5 index da5867c..5243dcd 100644 --- a/.import/equip.ogg-d2884a375a4158917c3155b455e88238.md5 +++ b/.import/equip.ogg-d2884a375a4158917c3155b455e88238.md5 @@ -1,3 +1,3 @@ source_md5="c562987476d78f9c83def30e0e0a344d" -dest_md5="c4d2b2916f2303b1ff80b9d8bd569eac" +dest_md5="91d7db848e518fd99bf44c2db273cc88" diff --git a/.import/equip.ogg-d2884a375a4158917c3155b455e88238.oggstr b/.import/equip.ogg-d2884a375a4158917c3155b455e88238.oggstr index 36b5da2..b3de619 100644 Binary files a/.import/equip.ogg-d2884a375a4158917c3155b455e88238.oggstr and b/.import/equip.ogg-d2884a375a4158917c3155b455e88238.oggstr differ diff --git a/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.md5 b/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.md5 index 658b531..d4221d8 100644 --- a/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.md5 +++ b/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.md5 @@ -1,3 +1,3 @@ source_md5="a497865d78241d0f0a25678628183055" -dest_md5="44bcbf3a6a12376f2ad1b19b19bf0373" +dest_md5="e9576403864c2471342885463c3d29cc" diff --git a/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.oggstr b/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.oggstr index 08605af..b4859b3 100644 Binary files a/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.oggstr and b/.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.oggstr differ diff --git a/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.md5 b/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.md5 index 0037788..9912af7 100644 --- a/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.md5 +++ b/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.md5 @@ -1,3 +1,3 @@ source_md5="98c326a36e3fb2a26474bbee06dac7c7" -dest_md5="d5a73d0a562c6502a6c25bd88657f7e0" +dest_md5="2a8aa00c6c9eae3cae37f9cd2765669a" diff --git a/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.oggstr b/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.oggstr index a300796..5a2a958 100644 Binary files a/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.oggstr and b/.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.oggstr differ diff --git a/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.md5 b/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.md5 index 9dadcfb..5650e96 100644 --- a/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.md5 +++ b/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.md5 @@ -1,3 +1,3 @@ source_md5="b454d99e5322fb8b784140ca84fbe092" -dest_md5="99fd2ce166c5d346bea9c71a903b7b6a" +dest_md5="f09590535c7d9d6c63d617a2791e85d6" diff --git a/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggstr b/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggstr index 3a22d5d..2cced83 100644 Binary files a/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggstr and b/.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggstr differ diff --git a/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.md5 b/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.md5 index 75dd1f6..a598f0b 100644 --- a/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.md5 +++ b/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.md5 @@ -1,3 +1,3 @@ source_md5="60514c3844e365d1aecfc555e1a44548" -dest_md5="1adb04621553370458c19304359c525f" +dest_md5="a169cfea77fabfc53aa7c8a7731b3fa6" diff --git a/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.stex b/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.stex index 74e2baa..fd52627 100644 Binary files a/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.stex and b/.import/mota.png-02d33da8bf0f085bff84efd72f4babc5.stex differ diff --git a/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.md5 b/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.md5 index ce1f2c9..86c5459 100644 --- a/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.md5 +++ b/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.md5 @@ -1,3 +1,3 @@ source_md5="8ce231e6f36adb8c4b104830265c50ce" -dest_md5="b05eb83d9a1e2cb3cd78350b89a74073" +dest_md5="5301ae1b1de46bade5fde958841aacfe" diff --git a/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.oggstr b/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.oggstr index d240e1e..ce88b9b 100644 Binary files a/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.oggstr and b/.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.oggstr differ diff --git a/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.md5 b/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.md5 index 7ed86bd..9ce4b2c 100644 --- a/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.md5 +++ b/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.md5 @@ -1,3 +1,3 @@ source_md5="0d38c88de1975840c0cd77f66735e683" -dest_md5="322c122c471553d86017465847bc8e38" +dest_md5="841c64d97d216114deadbefd865d4e97" diff --git a/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.oggstr b/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.oggstr index 007237d..50ab922 100644 Binary files a/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.oggstr and b/.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.oggstr differ diff --git a/images/mota.png.import b/images/mota.png.import index 2472098..972b64b 100644 --- a/images/mota.png.import +++ b/images/mota.png.import @@ -20,7 +20,7 @@ compress/hdr_mode=0 compress/bptc_ldr=0 compress/normal_map=0 flags/repeat=0 -flags/filter=true +flags/filter=false flags/mipmaps=false flags/anisotropic=false flags/srgb=2 diff --git a/music/attack.mp3 b/music/attack.mp3 deleted file mode 100644 index 259b759..0000000 Binary files a/music/attack.mp3 and /dev/null differ diff --git a/music/bgm.mp3 b/music/bgm.mp3 deleted file mode 100644 index 199d0bb..0000000 Binary files a/music/bgm.mp3 and /dev/null differ diff --git a/music/bomb.mp3 b/music/bomb.mp3 deleted file mode 100644 index bf65b83..0000000 Binary files a/music/bomb.mp3 and /dev/null differ diff --git a/music/centerFly.mp3 b/music/centerFly.mp3 deleted file mode 100644 index 8246763..0000000 Binary files a/music/centerFly.mp3 and /dev/null differ diff --git a/music/door.mp3 b/music/door.mp3 deleted file mode 100644 index ea6706d..0000000 Binary files a/music/door.mp3 and /dev/null differ diff --git a/music/equip.mp3 b/music/equip.mp3 deleted file mode 100644 index 5d82178..0000000 Binary files a/music/equip.mp3 and /dev/null differ diff --git a/music/floor.mp3 b/music/floor.mp3 deleted file mode 100644 index 96dc4fa..0000000 Binary files a/music/floor.mp3 and /dev/null differ diff --git a/music/item.mp3 b/music/item.mp3 deleted file mode 100644 index 5d82178..0000000 Binary files a/music/item.mp3 and /dev/null differ diff --git a/music/jump.mp3 b/music/jump.mp3 deleted file mode 100644 index b8ce8f7..0000000 Binary files a/music/jump.mp3 and /dev/null differ diff --git a/music/pickaxe.mp3 b/music/pickaxe.mp3 deleted file mode 100644 index be59c53..0000000 Binary files a/music/pickaxe.mp3 and /dev/null differ diff --git a/music/zone.mp3 b/music/zone.mp3 deleted file mode 100644 index eccf53c..0000000 Binary files a/music/zone.mp3 and /dev/null differ diff --git a/project.godot b/project.godot index a9d90f2..33b03aa 100644 --- a/project.godot +++ b/project.godot @@ -82,6 +82,7 @@ config/icon="res://settings/icon.png" GameFloorManager="*res://scripts/GameFloorManager.gd" GameArchiveManager="*res://scripts/GameArchiveManager.gd" +AffectAudioPlayer="*res://scripts/AffectAudioPlayer.gd" [display] @@ -94,4 +95,8 @@ window/stretch/aspect="keep" [rendering] +quality/driver/fallback_to_gles2=true +quality/intended_usage/framebuffer_allocation=0 +quality/intended_usage/framebuffer_allocation.mobile=0 +quality/2d/use_pixel_snap=true environment/default_environment="res://settings/default_env.tres" diff --git a/scripts/AffectAudioPlayer.gd b/scripts/AffectAudioPlayer.gd new file mode 100644 index 0000000..7a462d0 --- /dev/null +++ b/scripts/AffectAudioPlayer.gd @@ -0,0 +1,29 @@ +extends AudioStreamPlayer2D + +onready var attack = preload("res://sounds/attack.ogg") + +onready var bomb = preload("res://sounds/bomb.ogg") + +onready var center_fly = preload("res://sounds/centerFly.ogg") + +onready var door = preload("res://sounds/door.ogg") + +onready var equip = preload("res://sounds/equip.ogg") + +onready var f = preload("res://sounds/floor.ogg") + +onready var item = preload("res://sounds/item.ogg") + +onready var jump = preload("res://sounds/jump.ogg") + +onready var pickaxe = preload("res://sounds/pickaxe.ogg") + +onready var zone = preload("res://sounds/zone.ogg") + +func play_door(): + stream = door + play() + +func play_item(): + stream = item + play() diff --git a/scripts/BgmAudioPlayer.gd b/scripts/BgmAudioPlayer.gd index a9ea782..c3e50c6 100644 --- a/scripts/BgmAudioPlayer.gd +++ b/scripts/BgmAudioPlayer.gd @@ -5,5 +5,5 @@ class_name BgmAudioPlayer func _ready(): stream = load("res://sounds/bgm.ogg") playing = true - volume_db -= 10 + volume_db -= 20 pass diff --git a/scripts/DoorStaticBody2D.gd b/scripts/DoorStaticBody2D.gd index b89a381..1c679f4 100644 --- a/scripts/DoorStaticBody2D.gd +++ b/scripts/DoorStaticBody2D.gd @@ -22,4 +22,5 @@ func on_player_touched(): GameArchiveManager.player_info.red_key -= 1 $"/root/Main/UI/KeyBackground/RedKeyCountLabel".text = GameArchiveManager.player_info.red_key as String door_sprite.queue_free() + AffectAudioPlayer.play_door() GameArchiveManager.add_used_item(door_sprite.get_path()) diff --git a/scripts/ElixirsSprite.gd b/scripts/ElixirsSprite.gd index f800edc..f13b99e 100644 --- a/scripts/ElixirsSprite.gd +++ b/scripts/ElixirsSprite.gd @@ -30,4 +30,5 @@ func _on_Area2D_body_entered(body): GameArchiveManager.player_info.hp += elixirs_value $"/root/Main/UI/HpSprite/HpBackground/HpLabel".text = GameArchiveManager.player_info.hp as String GameArchiveManager.add_used_item(get_path()) + AffectAudioPlayer.play_item() queue_free() diff --git a/scripts/KeySprite.gd b/scripts/KeySprite.gd index 8ab10a6..59956c7 100644 --- a/scripts/KeySprite.gd +++ b/scripts/KeySprite.gd @@ -43,3 +43,4 @@ func _on_Area2D_body_entered(body): $"/root/Main/UI/KeyBackground/GreenKeyCountLabel".text = GameArchiveManager.player_info.green_key as String queue_free() GameArchiveManager.add_used_item(get_path()) + AffectAudioPlayer.play_item() diff --git a/sounds/attack.ogg.import b/sounds/attack.ogg.import index 34fa08f..0b24bc6 100644 --- a/sounds/attack.ogg.import +++ b/sounds/attack.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/attack.ogg-f76ff4e84a599d537dd165b167a572d4.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/bomb.ogg.import b/sounds/bomb.ogg.import index 23c2127..4d0f494 100644 --- a/sounds/bomb.ogg.import +++ b/sounds/bomb.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/bomb.ogg-5efebe2cad43415d948de40416af48a8.oggstr" ] [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/centerFly.ogg.import b/sounds/centerFly.ogg.import index d34c498..dc966b9 100644 --- a/sounds/centerFly.ogg.import +++ b/sounds/centerFly.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/centerFly.ogg-a5ae664f2f23559847fabf1b6ad35834.oggst [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/door.ogg.import b/sounds/door.ogg.import index 083dc17..4a7fd47 100644 --- a/sounds/door.ogg.import +++ b/sounds/door.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/door.ogg-cf3de28e49b4d64c2a8dab40e5ce65a9.oggstr" ] [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/equip.ogg.import b/sounds/equip.ogg.import index 33a0273..0916696 100644 --- a/sounds/equip.ogg.import +++ b/sounds/equip.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/equip.ogg-d2884a375a4158917c3155b455e88238.oggstr" ] [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/floor.ogg.import b/sounds/floor.ogg.import index 30e3285..faf5450 100644 --- a/sounds/floor.ogg.import +++ b/sounds/floor.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/floor.ogg-179348b5537b3ab90093a87b3d5e7d35.oggstr" ] [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/item.ogg.import b/sounds/item.ogg.import index c120356..492d71d 100644 --- a/sounds/item.ogg.import +++ b/sounds/item.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/item.ogg-9d12925afedc51e40ec0abb1b0542aa0.oggstr" ] [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/jump.ogg.import b/sounds/jump.ogg.import index 3b93166..1ebdac3 100644 --- a/sounds/jump.ogg.import +++ b/sounds/jump.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/jump.ogg-de8df8640ff526968292c23fe5ec784f.oggstr" ] [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/pickaxe.ogg.import b/sounds/pickaxe.ogg.import index 2037883..ce839d4 100644 --- a/sounds/pickaxe.ogg.import +++ b/sounds/pickaxe.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/pickaxe.ogg-660fd619fe121f210ac6f9430a16ab5c.oggstr" [params] -loop=true +loop=false loop_offset=0 diff --git a/sounds/zone.ogg.import b/sounds/zone.ogg.import index e9c4a4c..e43bb72 100644 --- a/sounds/zone.ogg.import +++ b/sounds/zone.ogg.import @@ -11,5 +11,5 @@ dest_files=[ "res://.import/zone.ogg-bc2bc36f8117bfa094934330d5ee9201.oggstr" ] [params] -loop=true +loop=false loop_offset=0