Moved brawl functions to BrawlControl

4 months ago · 110eafb620
parent df3b281721
commit 110eafb620
17 changed files with 33 additions and 26 deletions
--- a/BrawlControl.esp
+++ b/BrawlControl.esp
--- a/scripts/_00E_BrawlControl.pex
+++ b/scripts/_00E_BrawlControl.pex
--- a/scripts/_00E_EnderalControls.pex
+++ b/scripts/_00E_EnderalControls.pex
--- a/scripts/_00e_fs_nq06_functions.pex
+++ b/scripts/_00e_fs_nq06_functions.pex
--- a/scripts/_00e_nq_g_04_functions.pex
+++ b/scripts/_00e_nq_g_04_functions.pex
--- a/scripts/_00e_playerfunctions.pex
+++ b/scripts/_00e_playerfunctions.pex
--- a/scripts/_00e_questfunctions.pex
+++ b/scripts/_00e_questfunctions.pex
--- a/scripts/qf_environmentscene01_001296f6.pex
+++ b/scripts/qf_environmentscene01_001296f6.pex
--- a/scripts/tif__00119bb3.pex
+++ b/scripts/tif__00119bb3.pex
--- a/source/scripts/_00E_BrawlControl.psc
+++ b/source/scripts/_00E_BrawlControl.psc
@ -0,0 +1,22 @@
+Scriptname _00E_BrawlControl extends Quest Hidden 
+
+Function Brawl(Actor pTarget, Actor pTargetFriend = None)
+
+	FavorBrawlEvent.SendStoryEvent(None, pTarget, pTargetFriend)
+	
+EndFunction
+
+Function ShowBrawlTutorial()
+
+	If _00E_DisableSkillTutorials.GetValueInt() == 0
+		Message.ResetHelpMessage("Brawl")
+		_00E_Tutorial_Brawl.ShowAsHelpMessage("Brawl", 3, 3, 1)
+	EndIf
+
+EndFunction
+
+GlobalVariable Property _00E_DisableSkillTutorials  Auto  
+
+Message Property _00E_Tutorial_Brawl  Auto  
+
+Keyword Property FavorBrawlEvent  Auto  
--- a/source/scripts/_00E_EnderalControls.psc
+++ b/source/scripts/_00E_EnderalControls.psc
@ -11,3 +11,5 @@ _00E_SafeItemRemove Property SafeItemRemove  Auto
 _00E_VisionControl Property VisionControl  Auto  

 _00E_CombatMusicControl Property CombatMusicControl  Auto  
+
+_00E_BrawlControl Property BrawlControl  Auto  
--- a/source/scripts/_00e_fs_nq06_functions.psc
+++ b/source/scripts/_00e_fs_nq06_functions.psc
@ -71,7 +71,7 @@ EndFunction
 Function Bolzerei()

 	_00E_FS_NQ06_DariusKupferhammerREF.SetGhost(false)
-	Levelsystem.Brawl(_00E_FS_NQ06_DariusKupferhammerREF)
+	_00E_PlayerFunctions.GetBrawlControl().Brawl(_00E_FS_NQ06_DariusKupferhammerREF)
 	; _00E_FS_NQ06_DariusKupferhammerREF.StartCombat(PlayerREF)

 EndFunction
@ -138,7 +138,6 @@ EndFunction
 ;              							PROPERTIES                  					 
 ;=====================================================================================
 MiscObject Property Gold001 Auto
-_00E_QuestFunctions Property Levelsystem Auto

 Actor Property PlayerREF Auto
 Actor Property _00E_FS_NQ06_OldManREF Auto
--- a/source/scripts/_00e_nq_g_04_functions.psc
+++ b/source/scripts/_00e_nq_g_04_functions.psc
@ -112,7 +112,7 @@ EndFunction
 Function DuulAttack()

 	_00E_NQ_G_04_Duul.SetGhost(false)
-	Levelsystem.Brawl(_00E_NQ_G_04_Duul)
+	_00E_PlayerFunctions.GetBrawlControl().Brawl(_00E_NQ_G_04_Duul)

 EndFunction

--- a/source/scripts/_00e_playerfunctions.psc
+++ b/source/scripts/_00e_playerfunctions.psc
@ -48,6 +48,10 @@ _00E_SafeItemRemove function GetSafeItemRemove() Global
 	return (Game.GetForm(0x14) as _00E_PlayerFunctions).ControlRepository.SafeItemRemove
 endfunction

+_00E_BrawlControl function GetBrawlControl() Global
+	return (Game.GetForm(0x14) as _00E_PlayerFunctions).ControlRepository.BrawlControl
+endfunction
+

 ;=====================================================================================
 ; Stop/restart random headtracking
--- a/source/scripts/_00e_questfunctions.psc
+++ b/source/scripts/_00e_questfunctions.psc
@ -97,12 +97,6 @@ EndFunction
 ;              							GLOBAL FUNCTIONS                  					 
 ;=====================================================================================

-Function Brawl(Actor pTarget, Actor pTargetFriend = None)
-
-	BrawlKeyword.SendStoryEvent(None, pTarget, pTargetFriend)
-	
-EndFunction
-
 function PlayerAIWalkStop() Global

 	Game.ShowFirstPersonGeometry(True)
@ -227,15 +221,6 @@ Function ShowFailedMessage(String companionName = "Jespar")
 	
 EndFunction

-Function ShowBrawlTutorial()
-
-	If _00E_DisableSkillTutorials.GetValueInt() == 0
-		Message.ResetHelpMessage("Brawl")
-		_00E_Tutorial_Brawl.ShowAsHelpMessage("Brawl", 3, 3, 1)
-	EndIf
-
-EndFunction
-
 Function PriestHeal()
 {Called in dialoges with priests}
 	
@ -305,13 +290,11 @@ MusicType Property _00E_Music_Special_TavernSilence Auto
 GlobalVariable Property SympathyRyneus auto
 GlobalVariable Property _00E_DisableQuestTutorials Auto
 GlobalVariable Property _00E_DisableSkillTutorials Auto
-Keyword Property BrawlKeyword Auto

 ;-------------------------------------TELEPORT SCRIPT-----------------------------------

 Actor Property PlayerREF Auto

-Message Property _00E_Tutorial_Brawl Auto
 Message Property _00E_Tutorial_Companions02_Jespar Auto
 Message Property _00E_Tutorial_Companions02_Calia Auto

--- a/source/scripts/qf_environmentscene01_001296f6.psc
+++ b/source/scripts/qf_environmentscene01_001296f6.psc
@ -10,8 +10,8 @@ ReferenceAlias Property Alias_Betrunkener Auto
 ;BEGIN FRAGMENT Fragment_2
 Function Fragment_2()
 ;BEGIN CODE
-Levelsystem.ShowBrawlTutorial()
-Levelsystem.Brawl(Betrunkener)
+_00E_PlayerFunctions.GetBrawlControl().ShowBrawlTutorial()
+_00E_PlayerFunctions.GetBrawlControl().Brawl(Betrunkener)
 ;END CODE
 EndFunction
 ;END FRAGMENT
@ -19,5 +19,3 @@ EndFunction
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment

 actor Property Betrunkener Auto
-
-_00E_QuestFunctions Property Levelsystem Auto
--- a/source/scripts/tif__00119bb3.psc
+++ b/source/scripts/tif__00119bb3.psc
@ -6,7 +6,7 @@ Scriptname TIF__00119BB3 Extends TopicInfo Hidden
 Function Fragment_0(ObjectReference akSpeakerRef)
 Actor akSpeaker = akSpeakerRef as Actor
 ;BEGIN CODE
-Levelsystem.Brawl(akSpeaker)
+_00E_PlayerFunctions.GetBrawlControl().Brawl(akSpeaker)
 GetOwningQuest().SetStage(20)
 Utility.Wait(2)
 _00E_Tutorial_Brawl.ShowAsHelpMessage("NQ11Brawl", 5, 1, 1)
@ -17,5 +17,4 @@ EndFunction
 ;END FRAGMENT CODE - Do not edit anything between this and the begin comment


-_00E_QuestFunctions Property Levelsystem Auto
 Message Property _00E_Tutorial_Brawl Auto