diff --git a/files/audio/GUIDs.txt b/files/audio/GUIDs.txt index 320bb9f..7620464 100644 --- a/files/audio/GUIDs.txt +++ b/files/audio/GUIDs.txt @@ -19,6 +19,7 @@ {fd468381-c98d-41be-9be3-09b5d255ccad} event:/akanechan/player/buy/temple_products {39fd5b19-b7ac-469e-8862-baf88373cd64} event:/akanechan/player/dead {3bc6e0aa-4740-4598-9830-294b308cd37e} event:/akanechan/player/fungal_shift +{09ef12da-c1a3-49d5-a241-b07bd483c546} event:/akanechan/player/heal {784a8eb4-d6d3-41cf-a997-8ecaa6251dab} event:/akanechan/player/kick {c98a2fd1-09a6-47b7-a361-b8cad7764bde} event:/akanechan/player/pickup/refresher {94462a59-9dea-42a8-b738-9853069151b7} event:/akanechan/player/pickup/temple_health diff --git a/files/audio/mod_voices.bank b/files/audio/mod_voices.bank index b66b205..007f474 100644 Binary files a/files/audio/mod_voices.bank and b/files/audio/mod_voices.bank differ diff --git a/files/entities/sounds/heal_voice.xml b/files/entities/sounds/heal_voice.xml new file mode 100644 index 0000000..89370e2 --- /dev/null +++ b/files/entities/sounds/heal_voice.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/files/scripts/lib/utils/global_values.lua b/files/scripts/lib/utils/global_values.lua index 6908320..d17788b 100644 --- a/files/scripts/lib/utils/global_values.lua +++ b/files/scripts/lib/utils/global_values.lua @@ -3,6 +3,7 @@ AKANECHAN = { SOUND_FILE_STORAGE_NAME = function(self) return self.SOUND_PLAYER_NAME .. "." .. "sound_xml_file" end, RECEIVED_DAMAGE = function(self) return self.SOUND_PLAYER_NAME .. "." .. "received_damage" end, RECEIVED_FIRE_DAMAGE = function(self) return self.SOUND_PLAYER_NAME .. "." .. "received_fire_damage" end, + RECEIVED_HEAL = function(self) return self.SOUND_PLAYER_NAME .. "." .. "received_heal" end, PICKED_WAND = function(self) return self.SOUND_PLAYER_NAME .. "." .. "picked_wand" end, ENEMY_PICKED_WAND = function(self) return self.SOUND_PLAYER_NAME .. "." .. "enemy_picked_wand" end, } diff --git a/files/scripts/player/damage_received.lua b/files/scripts/player/damage_received.lua index 872af45..b1250e4 100644 --- a/files/scripts/player/damage_received.lua +++ b/files/scripts/player/damage_received.lua @@ -11,7 +11,9 @@ local function playDamageSound(player_entity_id, akanechan_voice, damage) local is_heal = damage < 0 if is_heal then - -- TODO: 回復用音声を追加する + WaitFrame:tryCall(player_entity_id, AKANECHAN:RECEIVED_HEAL(), function() + SoundPlayer:registerOnlyEmptySoundEntity(akanechan_voice, "mods/akanechan_voice/files/entities/sounds/heal_voice.xml") + end, 60 * 10) return end diff --git a/files/scripts/sounds/heal_voice.lua b/files/scripts/sounds/heal_voice.lua new file mode 100644 index 0000000..88877df --- /dev/null +++ b/files/scripts/sounds/heal_voice.lua @@ -0,0 +1,10 @@ +dofile_once("mods/akanechan_voice/files/scripts/lib/utilities.lua") + +function audio_event_dead(bank_file, event_root) + SoundPlayer:deleteSoundEntity(GetUpdatedEntityID()) +end + +-------------- +-- main +-------------- +GameEntityPlaySound(GetUpdatedEntityID(), "player/heal") diff --git "a/resources/FMOD/Assets/player/heal/20220826021724_\347\220\264\350\221\211 \350\214\234[\347\242\272\350\252\215\347\224\250]_\343\201\257\343\201\201\343\201\201\343\201\201\347\231\222\343\202\204\343\201\225\343\202\214\343\202\213\343\201\252\343\201\201-0.wav" "b/resources/FMOD/Assets/player/heal/20220826021724_\347\220\264\350\221\211 \350\214\234[\347\242\272\350\252\215\347\224\250]_\343\201\257\343\201\201\343\201\201\343\201\201\347\231\222\343\202\204\343\201\225\343\202\214\343\202\213\343\201\252\343\201\201-0.wav" new file mode 100644 index 0000000..7526394 Binary files /dev/null and "b/resources/FMOD/Assets/player/heal/20220826021724_\347\220\264\350\221\211 \350\214\234[\347\242\272\350\252\215\347\224\250]_\343\201\257\343\201\201\343\201\201\343\201\201\347\231\222\343\202\204\343\201\225\343\202\214\343\202\213\343\201\252\343\201\201-0.wav" differ diff --git "a/resources/FMOD/Assets/player/heal/20220826021938_\347\220\264\350\221\211 \350\214\234[\345\254\211\343\201\227\343\201\204\345\244\247]_\346\200\252\346\210\221\343\201\214\346\262\273\343\201\243\343\201\246\343\201\204\343\201\217\343\201\247-0.wav" "b/resources/FMOD/Assets/player/heal/20220826021938_\347\220\264\350\221\211 \350\214\234[\345\254\211\343\201\227\343\201\204\345\244\247]_\346\200\252\346\210\221\343\201\214\346\262\273\343\201\243\343\201\246\343\201\204\343\201\217\343\201\247-0.wav" new file mode 100644 index 0000000..ef063fd Binary files /dev/null and "b/resources/FMOD/Assets/player/heal/20220826021938_\347\220\264\350\221\211 \350\214\234[\345\254\211\343\201\227\343\201\204\345\244\247]_\346\200\252\346\210\221\343\201\214\346\262\273\343\201\243\343\201\246\343\201\204\343\201\217\343\201\247-0.wav" differ diff --git a/resources/FMOD/Build/Desktop/Master Bank.strings.bank b/resources/FMOD/Build/Desktop/Master Bank.strings.bank index eb0cae2..c6de34d 100644 Binary files a/resources/FMOD/Build/Desktop/Master Bank.strings.bank and b/resources/FMOD/Build/Desktop/Master Bank.strings.bank differ diff --git a/resources/FMOD/Build/Desktop/mod_voices.bank b/resources/FMOD/Build/Desktop/mod_voices.bank index b66b205..007f474 100644 Binary files a/resources/FMOD/Build/Desktop/mod_voices.bank and b/resources/FMOD/Build/Desktop/mod_voices.bank differ diff --git a/resources/FMOD/Build/GUIDs.txt b/resources/FMOD/Build/GUIDs.txt index 320bb9f..7620464 100644 --- a/resources/FMOD/Build/GUIDs.txt +++ b/resources/FMOD/Build/GUIDs.txt @@ -19,6 +19,7 @@ {fd468381-c98d-41be-9be3-09b5d255ccad} event:/akanechan/player/buy/temple_products {39fd5b19-b7ac-469e-8862-baf88373cd64} event:/akanechan/player/dead {3bc6e0aa-4740-4598-9830-294b308cd37e} event:/akanechan/player/fungal_shift +{09ef12da-c1a3-49d5-a241-b07bd483c546} event:/akanechan/player/heal {784a8eb4-d6d3-41cf-a997-8ecaa6251dab} event:/akanechan/player/kick {c98a2fd1-09a6-47b7-a361-b8cad7764bde} event:/akanechan/player/pickup/refresher {94462a59-9dea-42a8-b738-9853069151b7} event:/akanechan/player/pickup/temple_health diff --git a/resources/FMOD/Metadata/Asset/{a806703b-fa3b-4af3-b20d-43e95429538f}.xml b/resources/FMOD/Metadata/Asset/{a806703b-fa3b-4af3-b20d-43e95429538f}.xml new file mode 100644 index 0000000..4babc05 --- /dev/null +++ b/resources/FMOD/Metadata/Asset/{a806703b-fa3b-4af3-b20d-43e95429538f}.xml @@ -0,0 +1,11 @@ + + + + + player/heal/ + + + {eb2a4d4a-1287-481b-8086-c8771a725107} + + + diff --git a/resources/FMOD/Metadata/AudioFile/{57e96c7b-fd87-4717-a598-3faa7af6d69f}.xml b/resources/FMOD/Metadata/AudioFile/{57e96c7b-fd87-4717-a598-3faa7af6d69f}.xml new file mode 100644 index 0000000..df59de0 --- /dev/null +++ b/resources/FMOD/Metadata/AudioFile/{57e96c7b-fd87-4717-a598-3faa7af6d69f}.xml @@ -0,0 +1,20 @@ + + + + + player/heal/20220826021938_琴葉 茜[嬉しい大]_怪我が治っていくで-0.wav + + + 44.0999985 + + + 1 + + + 1.9392063492063492 + + + {eb2a4d4a-1287-481b-8086-c8771a725107} + + + diff --git a/resources/FMOD/Metadata/AudioFile/{b601c8f5-f6e0-4848-8c86-710ea8813ab4}.xml b/resources/FMOD/Metadata/AudioFile/{b601c8f5-f6e0-4848-8c86-710ea8813ab4}.xml new file mode 100644 index 0000000..4ef93c3 --- /dev/null +++ b/resources/FMOD/Metadata/AudioFile/{b601c8f5-f6e0-4848-8c86-710ea8813ab4}.xml @@ -0,0 +1,20 @@ + + + + + player/heal/20220826021724_琴葉 茜[確認用]_はぁぁぁ癒やされるなぁ-0.wav + + + 44.0999985 + + + 1 + + + 2.7969841269841269 + + + {eb2a4d4a-1287-481b-8086-c8771a725107} + + + diff --git a/resources/FMOD/Metadata/Event/{09ef12da-c1a3-49d5-a241-b07bd483c546}.xml b/resources/FMOD/Metadata/Event/{09ef12da-c1a3-49d5-a241-b07bd483c546}.xml new file mode 100644 index 0000000..862b672 --- /dev/null +++ b/resources/FMOD/Metadata/Event/{09ef12da-c1a3-49d5-a241-b07bd483c546}.xml @@ -0,0 +1,180 @@ + + + + + heal + + + 2 + + + {73dd73df-7a60-497f-93be-fc6633708e9a} + + + {e1fd631f-55fb-4771-a754-e42c287889c2} + + + {0c755f69-9c99-4e94-a5a2-9317f5abae80} + + + {cb833417-b105-4055-9999-78c3d3154e0f} + + + {e09d947f-b066-4d70-8a30-38d6ad552d53} + + + {7c0cd30c-ae76-4212-a654-69836f3e06b2} + + + {b4f53f1f-1728-4db5-bc8e-6fa781d4b05f} + + + {ddcecae3-506b-4aff-b2a3-d24181fc9211} + + + {91582d81-bc04-4e28-971c-5f71aeefedd7} + + + + + {34737c95-2883-46bf-a536-b732aba87e00} + + + + + {98f31f1d-52e5-409b-94fc-151e10f41d3b} + + + {34737c95-2883-46bf-a536-b732aba87e00} + + + + + {b3c6378b-6306-4dab-b39f-52ddb82ba2fe} + + + {5e2d8f68-7116-4bea-9d8c-ad8d88484a82} + + + {fd1ec6a6-24b7-4a2e-9988-9733b99dc81e} + + + + + + + {011bb5cf-4db4-42ed-ab61-f78127c6d817} + + + {da5d5acf-69b1-49ce-84f4-df882a2aef7d} + + + + + {011bb5cf-4db4-42ed-ab61-f78127c6d817} + + + + + {bd6b568c-3435-4631-9cd5-8fc52665f2e7} + + + {7535cb92-e528-4009-875c-b7af4f3f9b8c} + + + {10871bb0-8712-4599-8952-0d8ab26a4f76} + + + {e1fd631f-55fb-4771-a754-e42c287889c2} + + + + + {bd6b568c-3435-4631-9cd5-8fc52665f2e7} + + + + + {9b504b54-4f49-4a55-99de-74033b13b78d} + + + + + + 2.1694206090569947 + + + {be0c0604-2cdc-4e58-90d4-9322724f0580} + {0dd6f4da-65ed-4fd8-967e-135cc300bd07} + {81e39442-cba0-49df-b37b-3296bfc3761d} + + + {af692cd7-d1d9-4ff3-9703-3f92095714f1} + + + + + -17 + + + Audio 1 + + + {c71127de-aa92-47a1-a8fd-3735190e2027} + + + {6f6ed514-ef4e-467e-80ae-2480d6377690} + + + {34737c95-2883-46bf-a536-b732aba87e00} + + + + + volume + + + + + {a6b058f6-cdf7-4774-9f83-8e6b9c37d1a5} + {a3ca656a-0a56-4715-898a-dc6232e0818a} + + + + + + + {57e96c7b-fd87-4717-a598-3faa7af6d69f} + + + + + {b601c8f5-f6e0-4848-8c86-710ea8813ab4} + + + + + + 50 + + + {81e39442-cba0-49df-b37b-3296bfc3761d} + + + + + {b9ae3f0f-88de-4b4c-b276-007382d680e0} + + + + + + 500 + + + 1000 + + + + +