Skip to content

Commit

Permalink
Merge pull request #51 from den3606/heal_voice
Browse files Browse the repository at this point in the history
  • Loading branch information
den3606 authored Aug 25, 2022
2 parents c3a48a4 + c431b3b commit 9397fee
Show file tree
Hide file tree
Showing 15 changed files with 262 additions and 1 deletion.
1 change: 1 addition & 0 deletions files/audio/GUIDs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified files/audio/mod_voices.bank
Binary file not shown.
15 changes: 15 additions & 0 deletions files/entities/sounds/heal_voice.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Entity name="heal_voice">
<AudioComponent file="mods/akanechan_voice/files/audio/mod_voices.snd"
event_root="akanechan"
audio_physics_material="character_player"
set_latest_event_position="1"
remove_latest_event_on_destroyed="1"
send_message_on_event_dead="1"
>
</AudioComponent>
<LuaComponent execute_on_added="1"
execute_every_n_frame="-1"
script_source_file="mods/akanechan_voice/files/scripts/sounds/heal_voice.lua"
script_audio_event_dead="mods/akanechan_voice/files/scripts/sounds/heal_voice.lua">
</LuaComponent>
</Entity>
1 change: 1 addition & 0 deletions files/scripts/lib/utils/global_values.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
4 changes: 3 additions & 1 deletion files/scripts/player/damage_received.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 10 additions & 0 deletions files/scripts/sounds/heal_voice.lua
Original file line number Diff line number Diff line change
@@ -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")
Binary file not shown.
Binary file not shown.
Binary file modified resources/FMOD/Build/Desktop/Master Bank.strings.bank
Binary file not shown.
Binary file modified resources/FMOD/Build/Desktop/mod_voices.bank
Binary file not shown.
1 change: 1 addition & 0 deletions resources/FMOD/Build/GUIDs.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="EncodableAsset" id="{a806703b-fa3b-4af3-b20d-43e95429538f}">
<property name="assetPath">
<value>player/heal/</value>
</property>
<relationship name="masterAssetFolder">
<destination>{eb2a4d4a-1287-481b-8086-c8771a725107}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{57e96c7b-fd87-4717-a598-3faa7af6d69f}">
<property name="assetPath">
<value>player/heal/20220826021938_琴葉 茜[嬉しい大]_怪我が治っていくで-0.wav</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>1</value>
</property>
<property name="length">
<value>1.9392063492063492</value>
</property>
<relationship name="masterAssetFolder">
<destination>{eb2a4d4a-1287-481b-8086-c8771a725107}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="AudioFile" id="{b601c8f5-f6e0-4848-8c86-710ea8813ab4}">
<property name="assetPath">
<value>player/heal/20220826021724_琴葉 茜[確認用]_はぁぁぁ癒やされるなぁ-0.wav</value>
</property>
<property name="frequencyInKHz">
<value>44.0999985</value>
</property>
<property name="channelCount">
<value>1</value>
</property>
<property name="length">
<value>2.7969841269841269</value>
</property>
<relationship name="masterAssetFolder">
<destination>{eb2a4d4a-1287-481b-8086-c8771a725107}</destination>
</relationship>
</object>
</objects>
Original file line number Diff line number Diff line change
@@ -0,0 +1,180 @@
<?xml version="1.0" encoding="UTF-8"?>
<objects serializationModel="Studio.02.01.00">
<object class="Event" id="{09ef12da-c1a3-49d5-a241-b07bd483c546}">
<property name="name">
<value>heal</value>
</property>
<property name="outputFormat">
<value>2</value>
</property>
<relationship name="folder">
<destination>{73dd73df-7a60-497f-93be-fc6633708e9a}</destination>
</relationship>
<relationship name="mixer">
<destination>{e1fd631f-55fb-4771-a754-e42c287889c2}</destination>
</relationship>
<relationship name="masterTrack">
<destination>{0c755f69-9c99-4e94-a5a2-9317f5abae80}</destination>
</relationship>
<relationship name="mixerInput">
<destination>{cb833417-b105-4055-9999-78c3d3154e0f}</destination>
</relationship>
<relationship name="automatableProperties">
<destination>{e09d947f-b066-4d70-8a30-38d6ad552d53}</destination>
</relationship>
<relationship name="markerTracks">
<destination>{7c0cd30c-ae76-4212-a654-69836f3e06b2}</destination>
</relationship>
<relationship name="groupTracks">
<destination>{b4f53f1f-1728-4db5-bc8e-6fa781d4b05f}</destination>
</relationship>
<relationship name="timeline">
<destination>{ddcecae3-506b-4aff-b2a3-d24181fc9211}</destination>
</relationship>
<relationship name="banks">
<destination>{91582d81-bc04-4e28-971c-5f71aeefedd7}</destination>
</relationship>
</object>
<object class="EventMixer" id="{e1fd631f-55fb-4771-a754-e42c287889c2}">
<relationship name="masterBus">
<destination>{34737c95-2883-46bf-a536-b732aba87e00}</destination>
</relationship>
</object>
<object class="MasterTrack" id="{0c755f69-9c99-4e94-a5a2-9317f5abae80}">
<relationship name="automationTracks">
<destination>{98f31f1d-52e5-409b-94fc-151e10f41d3b}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{34737c95-2883-46bf-a536-b732aba87e00}</destination>
</relationship>
</object>
<object class="MixerInput" id="{cb833417-b105-4055-9999-78c3d3154e0f}">
<relationship name="effectChain">
<destination>{b3c6378b-6306-4dab-b39f-52ddb82ba2fe}</destination>
</relationship>
<relationship name="panner">
<destination>{5e2d8f68-7116-4bea-9d8c-ad8d88484a82}</destination>
</relationship>
<relationship name="output">
<destination>{fd1ec6a6-24b7-4a2e-9988-9733b99dc81e}</destination>
</relationship>
</object>
<object class="EventAutomatableProperties" id="{e09d947f-b066-4d70-8a30-38d6ad552d53}" />
<object class="MarkerTrack" id="{7c0cd30c-ae76-4212-a654-69836f3e06b2}" />
<object class="GroupTrack" id="{b4f53f1f-1728-4db5-bc8e-6fa781d4b05f}">
<relationship name="modules">
<destination>{011bb5cf-4db4-42ed-ab61-f78127c6d817}</destination>
</relationship>
<relationship name="mixerGroup">
<destination>{da5d5acf-69b1-49ce-84f4-df882a2aef7d}</destination>
</relationship>
</object>
<object class="Timeline" id="{ddcecae3-506b-4aff-b2a3-d24181fc9211}">
<relationship name="modules">
<destination>{011bb5cf-4db4-42ed-ab61-f78127c6d817}</destination>
</relationship>
</object>
<object class="EventMixerMaster" id="{34737c95-2883-46bf-a536-b732aba87e00}">
<relationship name="automators">
<destination>{bd6b568c-3435-4631-9cd5-8fc52665f2e7}</destination>
</relationship>
<relationship name="effectChain">
<destination>{7535cb92-e528-4009-875c-b7af4f3f9b8c}</destination>
</relationship>
<relationship name="panner">
<destination>{10871bb0-8712-4599-8952-0d8ab26a4f76}</destination>
</relationship>
<relationship name="mixer">
<destination>{e1fd631f-55fb-4771-a754-e42c287889c2}</destination>
</relationship>
</object>
<object class="AutomationTrack" id="{98f31f1d-52e5-409b-94fc-151e10f41d3b}">
<relationship name="automator">
<destination>{bd6b568c-3435-4631-9cd5-8fc52665f2e7}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{b3c6378b-6306-4dab-b39f-52ddb82ba2fe}">
<relationship name="effects">
<destination>{9b504b54-4f49-4a55-99de-74033b13b78d}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{5e2d8f68-7116-4bea-9d8c-ad8d88484a82}" />
<object class="MultiSound" id="{011bb5cf-4db4-42ed-ab61-f78127c6d817}">
<property name="length">
<value>2.1694206090569947</value>
</property>
<relationship name="sounds">
<destination>{be0c0604-2cdc-4e58-90d4-9322724f0580}</destination>
<destination>{0dd6f4da-65ed-4fd8-967e-135cc300bd07}</destination>
<destination>{81e39442-cba0-49df-b37b-3296bfc3761d}</destination>
</relationship>
<relationship name="playPercentages">
<destination>{af692cd7-d1d9-4ff3-9703-3f92095714f1}</destination>
</relationship>
</object>
<object class="EventMixerGroup" id="{da5d5acf-69b1-49ce-84f4-df882a2aef7d}">
<property name="volume">
<value>-17</value>
</property>
<property name="name">
<value>Audio 1</value>
</property>
<relationship name="effectChain">
<destination>{c71127de-aa92-47a1-a8fd-3735190e2027}</destination>
</relationship>
<relationship name="panner">
<destination>{6f6ed514-ef4e-467e-80ae-2480d6377690}</destination>
</relationship>
<relationship name="output">
<destination>{34737c95-2883-46bf-a536-b732aba87e00}</destination>
</relationship>
</object>
<object class="Automator" id="{bd6b568c-3435-4631-9cd5-8fc52665f2e7}">
<property name="nameOfPropertyBeingAutomated">
<value>volume</value>
</property>
</object>
<object class="MixerBusEffectChain" id="{7535cb92-e528-4009-875c-b7af4f3f9b8c}">
<relationship name="effects">
<destination>{a6b058f6-cdf7-4774-9f83-8e6b9c37d1a5}</destination>
<destination>{a3ca656a-0a56-4715-898a-dc6232e0818a}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{10871bb0-8712-4599-8952-0d8ab26a4f76}" />
<object class="MixerBusFader" id="{9b504b54-4f49-4a55-99de-74033b13b78d}" />
<object class="SingleSound" id="{be0c0604-2cdc-4e58-90d4-9322724f0580}">
<relationship name="audioFile">
<destination>{57e96c7b-fd87-4717-a598-3faa7af6d69f}</destination>
</relationship>
</object>
<object class="SingleSound" id="{0dd6f4da-65ed-4fd8-967e-135cc300bd07}">
<relationship name="audioFile">
<destination>{b601c8f5-f6e0-4848-8c86-710ea8813ab4}</destination>
</relationship>
</object>
<object class="SingleSound" id="{81e39442-cba0-49df-b37b-3296bfc3761d}" />
<object class="PlayPercentage" id="{af692cd7-d1d9-4ff3-9703-3f92095714f1}">
<property name="percentage">
<value>50</value>
</property>
<relationship name="sound">
<destination>{81e39442-cba0-49df-b37b-3296bfc3761d}</destination>
</relationship>
</object>
<object class="MixerBusEffectChain" id="{c71127de-aa92-47a1-a8fd-3735190e2027}">
<relationship name="effects">
<destination>{b9ae3f0f-88de-4b4c-b276-007382d680e0}</destination>
</relationship>
</object>
<object class="MixerBusPanner" id="{6f6ed514-ef4e-467e-80ae-2480d6377690}" />
<object class="SpatialiserEffect" id="{a6b058f6-cdf7-4774-9f83-8e6b9c37d1a5}">
<property name="minimumDistance">
<value>500</value>
</property>
<property name="maximumDistance">
<value>1000</value>
</property>
</object>
<object class="MixerBusFader" id="{a3ca656a-0a56-4715-898a-dc6232e0818a}" />
<object class="MixerBusFader" id="{b9ae3f0f-88de-4b4c-b276-007382d680e0}" />
</objects>

0 comments on commit 9397fee

Please sign in to comment.