Updated combat music control in Starcity

This commit is contained in:
Eddoursul 2024-02-02 14:38:29 +01:00
parent c34034d6d4
commit d80a4ef671
5 changed files with 17 additions and 7 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -15,6 +15,17 @@ Function RemoveSilence()
EndFunction EndFunction
Function RemoveCombatSoundtracks()
Int iIndex = 0
Form[] tracks = _00E_MUS_AllCombatSoundtracks.ToArray()
While iIndex < tracks.Length
(tracks[iIndex] as MusicType).Remove()
iIndex += 1
EndWhile
EndFunction
MusicType Property _00E_SilenceTransitionLowPriority02 Auto MusicType Property _00E_SilenceTransitionLowPriority02 Auto
MusicType Property _00E_Music_Special_MQ12b_Samael Auto MusicType Property _00E_Music_Special_MQ12b_Samael Auto
MusicType Property _00E_SilenceLongTransitionHighPriority Auto MusicType Property _00E_SilenceLongTransitionHighPriority Auto
@ -26,3 +37,5 @@ MusicType Property _00E_Music_Special_TavernSilence Auto
SoundCategory Property AudioCategoryAMB Auto SoundCategory Property AudioCategoryAMB Auto
SoundCategory Property AudioCategoryAMBr Auto SoundCategory Property AudioCategoryAMBr Auto
SoundCategory Property AudioCategorySFX Auto SoundCategory Property AudioCategorySFX Auto
FormList Property _00E_MUS_AllCombatSoundtracks Auto

View File

@ -458,6 +458,7 @@ Function ActivateTurret02()
Game.RequestAutoSave() Game.RequestAutoSave()
SetObjectiveCompleted(15) SetObjectiveCompleted(15)
_00E_PlayerFunctions.GetSoundControl().RemoveSilence() _00E_PlayerFunctions.GetSoundControl().RemoveSilence()
_00E_PlayerFunctions.GetSoundControl().RemoveCombatSoundtracks()
_00E_Music_Combat_Shieldbrothers.Add() _00E_Music_Combat_Shieldbrothers.Add()
_00E_MQ13c_TurretChargeSoundM.Play(MQ13c_SC06_TurretFX) _00E_MQ13c_TurretChargeSoundM.Play(MQ13c_SC06_TurretFX)
MQ13c_SC06_TurretFX.PlayGamebryoAnimation("mCharge") MQ13c_SC06_TurretFX.PlayGamebryoAnimation("mCharge")
@ -576,21 +577,17 @@ Function SpawnSteelbird()
SetObjectiveCompleted(25) SetObjectiveCompleted(25)
SetObjectiveDisplayed(35) SetObjectiveDisplayed(35)
RequestAutoSave() RequestAutoSave()
akSteelbirdAtrium.SetGhost(False)
akSteelbird = MQ13c_SC08_SteelbirdSpawn.PlaceActorAtMe(MQ13c_SC03_SteelbirdREF.GetActorBase(), 1) as Actor akSteelbird = MQ13c_SC08_SteelbirdSpawn.PlaceActorAtMe(MQ13c_SC03_SteelbirdREF.GetActorBase(), 1) as Actor
_00E_MQ13c_Steelbird_RoarSingleM.Play(PlayerREF) _00E_MQ13c_Steelbird_RoarSingleM.Play(PlayerREF)
_00E_PlayerFunctions.GetSoundControl().RemoveSilence() _00E_PlayerFunctions.GetSoundControl().RemoveSilence()
_00E_Music_Combat_Shieldbrothers.Remove() _00E_PlayerFunctions.GetSoundControl().RemoveCombatSoundtracks()
_00E_Music_Special_Zyklus_OneSelection.Remove() _00E_Music_Special_Zyklus_OneSelection.Remove()
_00E_Music_Combat_EpicOneSelection.Remove() _00E_Music_Combat_BonehunterNoCond.Add()
_00E_Music_Combat_Epic.Remove()
_00E_SilenceAbruptHighPriority.Remove()
_00E_Music_Combat_BonehunterNoCond.Remove()
akSteelbird.Enable() akSteelbird.Enable()
akSteelbird.MoveTo(MQ13c_SC08_SteelbirdSpawn) akSteelbird.MoveTo(MQ13c_SC08_SteelbirdSpawn)
akSteelbird.StartCombat(PlayerREF) akSteelbird.StartCombat(PlayerREF)
akSteelbird.SetGhost(true)
Utility.Wait(1) Utility.Wait(1)
_00E_Music_Combat_BonehunterNoCond.Add()
MQ13c_AtriumDoorREF.BlockActivation(False) MQ13c_AtriumDoorREF.BlockActivation(False)
bSteelbirdAtriumSpawned = True bSteelbirdAtriumSpawned = True