enderal
/
enderalse
4
Fork 0
Code Releases Activity

Moved RemoveCombatSoundtracks() to CombatMusicControl

Browse Source
remove-levelsystem
Eddoursul 4 months ago
parent a5929ffdb3
commit a406dddbb9
37 changed files with 39 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      CombatMusicControl.esp
  2. BIN
      scripts/_00E_CombatMusicControl.pex
  3. BIN
      scripts/_00e_fs_cqt01_functions.pex
  4. BIN
      scripts/_00e_fs_nq01_functions.pex
  5. BIN
      scripts/_00e_fs_nqr02_functions.pex
  6. BIN
      scripts/_00e_fs_nqr03_functions.pex
  7. BIN
      scripts/_00e_fs_nqr04_functions.pex
  8. BIN
      scripts/_00e_fs_nqr05_functions.pex
  9. BIN
      scripts/_00e_mq02_functions.pex
  10. BIN
      scripts/_00e_mq03_functions.pex
  11. BIN
      scripts/_00e_mq07b_sc02_failsavesc.pex
  12. BIN
      scripts/_00e_mq14_functions.pex
  13. BIN
      scripts/_00e_mq17_functions.pex
  14. BIN
      scripts/_00e_nq_g_03_functions.pex
  15. BIN
      scripts/_00e_nq_g_07_functions.pex
  16. BIN
      scripts/_00e_nqr01_functions.pex
  17. BIN
      scripts/_00e_questfunctions.pex
  18. BIN
      scripts/_00e_removesilenceandcombatsoundtrack.pex
  19. BIN
      scripts/_00e_suntemple_weathercontrolsc.pex
  20. 14
      source/scripts/_00E_CombatMusicControl.psc
  21. 4
      source/scripts/_00e_fs_cqt01_functions.psc
  22. 8
      source/scripts/_00e_fs_nq01_functions.psc
  23. 2
      source/scripts/_00e_fs_nqr02_functions.psc
  24. 2
      source/scripts/_00e_fs_nqr03_functions.psc
  25. 2
      source/scripts/_00e_fs_nqr04_functions.psc
  26. 2
      source/scripts/_00e_fs_nqr05_functions.psc
  27. 2
      source/scripts/_00e_mq02_functions.psc
  28. 2
      source/scripts/_00e_mq03_functions.psc
  29. 2
      source/scripts/_00e_mq07b_sc02_failsavesc.psc
  30. 2
      source/scripts/_00e_mq14_functions.psc
  31. 2
      source/scripts/_00e_mq17_functions.psc
  32. 4
      source/scripts/_00e_nq_g_03_functions.psc
  33. 10
      source/scripts/_00e_nq_g_07_functions.psc
  34. 2
      source/scripts/_00e_nqr01_functions.psc
  35. 14
      source/scripts/_00e_questfunctions.psc
  36. 2
      source/scripts/_00e_removesilenceandcombatsoundtrack.psc
  37. 2
      source/scripts/_00e_suntemple_weathercontrolsc.psc

BIN
CombatMusicControl.esp
View File

Binary file not shown.

BIN
scripts/_00E_CombatMusicControl.pex
View File

Binary file not shown.

BIN
scripts/_00e_fs_cqt01_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_fs_nq01_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_fs_nqr02_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_fs_nqr03_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_fs_nqr04_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_fs_nqr05_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_mq02_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_mq03_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_mq07b_sc02_failsavesc.pex
View File

Binary file not shown.

BIN
scripts/_00e_mq14_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_mq17_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_nq_g_03_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_nq_g_07_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_nqr01_functions.pex
View File

Binary file not shown.

BIN
scripts/_00e_questfunctions.pex
View File

Binary file not shown.

BIN
scripts/_00e_removesilenceandcombatsoundtrack.pex
View File

Binary file not shown.

BIN
scripts/_00e_suntemple_weathercontrolsc.pex
View File

Binary file not shown.

14
source/scripts/_00E_CombatMusicControl.psc
Unescape View File

@ -157,3 +157,17 @@ Int Function _AddUniqueMusicToArray(MusicType[] musics, MusicType newMusic)
Return -1
EndIf
EndFunction
Function RemoveCombatSoundtracks()
int iIndex = _00E_MUS_AllCombatSoundtracks.GetSize()
while iIndex > 0
iIndex -= 1
MusicType musicToRemove = _00E_MUS_AllCombatSoundtracks.GetAt(iIndex) as MusicType
musicToRemove.Remove()
endwhile
EndFunction
FormList Property _00E_MUS_AllCombatSoundtracks Auto

4
source/scripts/_00e_fs_cqt01_functions.psc
Unescape View File

@ -34,7 +34,7 @@ EndFunction
Function FinishUp()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
_00E_EPHandler.GiveEP(iRewardEXP)
FS_CQT01.CompleteAllObjectives()
FS_NQR04.SetStage(85)
@ -46,7 +46,7 @@ Function FailQuest()
_00E_FS_CQT01_TharaelMsg.Show()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
FS_CQT01.FailAllObjectives()
FS_NQR04.SetStage(85)

8
source/scripts/_00e_fs_nq01_functions.psc
Unescape View File

@ -89,7 +89,7 @@ EndFunction
Function RefreshCombatState()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
FS_NQ01_YuslanREF.StopCombat()
FS_NQ01_YuslanREF.StopCombatAlarm()
@ -105,7 +105,7 @@ EndFunction
Function StartSC03()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
_00E_TeleportGlobal.SetValueInt(1)
FS_NQ01_SC03_MercenaryREF.Enable()
_00E_FS_NQ01_EventualityShiftIMOD.Apply()
@ -751,7 +751,7 @@ Function FinishUp()
UndercityBarracks2ZorkbansCellar.SetActorOwner(FS_NQ01_ZorkbanREF.GetActorBase())
Timescale.SetValue(10)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
CompleteQuest()
TeleportYuslan()
@ -780,7 +780,7 @@ Function FinishUpDreamflower()
UndercityBarracks2ZorkbansCellar.SetActorOwner(FS_NQ01_ZorkbanREF.GetActorBase())
Timescale.SetValue(10)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
TeleportYuslan()
EndFunction

2
source/scripts/_00e_fs_nqr02_functions.psc
Unescape View File

@ -186,7 +186,7 @@ Function FinishUp()
SetObjectiveCompleted(35)
_00E_Func_SetNPCAsCompanion.SetNPCAsCompanion(FS_NQR02_TharaelREF, False)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.SetAllowIdleChatter(True)
_00E_EPHandler.GiveEP(__Config_iRewardEXP)
FS_NQR03.SetStage(5)

2
source/scripts/_00e_fs_nqr03_functions.psc
Unescape View File

@ -278,7 +278,7 @@ Function FinishUp()
SetObjectiveCompleted(50) ; in case the player didn't teleport back with the brother greed
SetObjectiveCompleted(51)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.SetAllowIdleChatter(True)
FS_NQR03_SC03_SecretDoorREF.SetOpen(False)
FS_NQR03_SC03_SecretDoorREF.BlockActivation(True)

2
source/scripts/_00e_fs_nqr04_functions.psc
Unescape View File

@ -303,7 +303,7 @@ Function FinishUp()
_00E_EPHandler.GiveEP(iRewardEXP)
Levelsystem.SetAllowIdleChatter(True)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
FS_NQR04_SC05_TharaelWalkAway.ForceStart()
FS_NQR05.setStage(5)

2
source/scripts/_00e_fs_nqr05_functions.psc
Unescape View File

@ -1820,7 +1820,7 @@ Function FinishUp()
CompleteAllObjectives()
Weather.ReleaseOverride()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
FS_NQR03_BrotherGreedREF.Disable()
FS_NQR05_SiteCampfireParentREF.Disable()
FS_NQR05_SC04_BrotherSorrowREF.Disable()

2
source/scripts/_00e_mq02_functions.psc
Unescape View File

@ -304,7 +304,7 @@ EndFunction
Function FinishQuest()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
EnablePlayerControls()
MQ03.SetStage(5)
; SE: No such objective.

2
source/scripts/_00e_mq03_functions.psc
Unescape View File

@ -126,7 +126,7 @@ EndFunction
Function GiveRewardEXP()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
_00E_EPHandler.GiveEP(__Config_RewardEXP)
_00E_MC_KonstantinREF.EvaluatePackage()
_00E_MC_JesparREF.EvaluatePackage()

2
source/scripts/_00e_mq07b_sc02_failsavesc.psc
Unescape View File

@ -5,7 +5,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
if akActionRef == PlayerREF && MQ07b.GetStage() == 35
Levelsystem.SetAllowIdleChatter(False)
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
if !MQ07b_SC02_Lishari.IsPlaying()
MQ07b_SC02_Lishari.ForceStart()

2
source/scripts/_00e_mq14_functions.psc
Unescape View File

@ -632,7 +632,7 @@ Function FinishQuest()
MQ07b_NuminosREF.Disable()
_00E_EPHandler.GiveEP(__Config_iRewardEXP)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
if akCompanion == _00E_MC_CaliaREF
_00E_MC_CaliaREF.SetOutfit(_00E_MC_Calia_Outfit)

2
source/scripts/_00e_mq17_functions.psc
Unescape View File

@ -722,7 +722,7 @@ Function GetIntoTemple()
_00E_Music_Special_Romance.Remove()
_00E_SilenceAbruptHighPriority.Remove()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
_00E_Music_Special_Cleansing.Add()
EndFunction

4
source/scripts/_00e_nq_g_03_functions.psc
Unescape View File

@ -8,7 +8,7 @@ Import Utility
;=====================================================================================
Event OnUpdate()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
EndEvent
;=====================================================================================
@ -89,7 +89,7 @@ EndFunction
Function StartSC02()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
NQ_G_03_SC02_PetrifiedExamineCaravan.ForceStart()

10
source/scripts/_00e_nq_g_07_functions.psc
Unescape View File

@ -784,7 +784,7 @@ Function StartKontorCombat()
NQG07_TheaterDoor_01.BlockActivation(True)
NQG07_TheaterDoor_02.BlockActivation(True)
_00E_SilenceAbruptHighPriority.Remove()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.RemoveSilence()
wait(0.1)
@ -1082,7 +1082,7 @@ EndFunction
Function CleanSounds()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
EndFunction
@ -1097,7 +1097,7 @@ Function FinishQuest()
_00E_NQ_G_07_RogashREF.Enable()
ReEnablePrisonGuards()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.SetAllowIdleChatter(True)
if bDijaamHanged == true
@ -1124,7 +1124,7 @@ Function FinishQuestDijaam()
ReEnablePrisonGuards()
NQG07Dijaam_SC4_EscapeCollision.Disable()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.SetAllowIdleChatter(True)
EndFunction
@ -1142,7 +1142,7 @@ Function FinishQuestDijaamLeora()
ResetGraveyardScene()
_00E_EPHandler.GiveEP(__Config_RewardEXP)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.SetAllowIdleChatter(True)
EndFunction

2
source/scripts/_00e_nqr01_functions.psc
Unescape View File

@ -658,7 +658,7 @@ Function GiveRewardEXP(bool bDeclined)
_00E_SC_TharaelREF.UnEquipItemEx(_00E_FS_NQR05_Tharael_Dagger, 1, true)
_00E_SC_TharaelREF.UnEquipItemEx(_00E_FS_NQR05_Tharael_Dagger, 2, true)
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
Levelsystem.SetAllowIdleChatter(True)
NQR01_SC05_Explanation.Stop()
SetObjectiveCompleted(50)

14
source/scripts/_00e_questfunctions.psc
Unescape View File

@ -217,18 +217,6 @@ Function RemoveSilence()
EndFunction
Function RemoveCombatSoundtracks()
int iIndex = _00E_MUS_AllCombatSoundtracks.GetSize()
while iIndex > 0
iIndex -= 1
MusicType musicToRemove = _00E_MUS_AllCombatSoundtracks.GetAt(iIndex) as MusicType
musicToRemove.Remove()
endwhile
EndFunction
Function ShowFailedMessage(String companionName = "Jespar")
if companionName == "Jespar" && _00E_DisableQuestTutorials.GetValueInt() == 0
@ -312,8 +300,6 @@ MusicType Property _00E_SilenceTransitionHighPriority Auto
MusicType Property _00E_SilenceAbruptHighPriority Auto
MusicType Property _00E_Music_Special_TavernSilence Auto
Formlist Property _00E_MUS_AllCombatSoundtracks Auto
;--------------------------------------LEVELSYSTEM-----------------------------------
GlobalVariable Property SympathyRyneus auto

2
source/scripts/_00e_removesilenceandcombatsoundtrack.psc
Unescape View File

@ -5,7 +5,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
if akActionRef == PlayerREF && !bDone
bDone = True
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
EndIf
EndEvent

2
source/scripts/_00e_suntemple_weathercontrolsc.psc
Unescape View File

@ -10,7 +10,7 @@ Event OnTriggerEnter(ObjectReference akActionRef)
_00E_MQ17_Purge_Weather.ForceActive(True)
_00E_Music_Special_Cleansing.Add()
Levelsystem.RemoveSilence()
Levelsystem.RemoveCombatSoundtracks()
_00E_PlayerFunctions.GetCombatMusicControl().RemoveCombatSoundtracks()
_00E_SilenceAbruptHighPriority.Remove()
_00E_Music_Special_Cleansing.Add()
EndIf

Write Preview
Loading…
Cancel
Save