Moved the On Slaught cloak effect to the effect script

This commit is contained in:
Eddoursul 2024-02-07 09:30:33 +01:00
parent 42c8b565fe
commit 55865dc379
6 changed files with 3 additions and 24 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -22,6 +22,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
SetValues() SetValues()
MAGShoutSprint03.Apply() MAGShoutSprint03.Apply()
MAGShoutSprintFire.Play(PlayerREF) MAGShoutSprintFire.Play(PlayerREF)
_00E_A1_OnslaughtCloakSP.Cast(PlayerREF, PlayerREF)
bDashing = True bDashing = True
RegisterForSingleUpdate(fWaitTimer) RegisterForSingleUpdate(fWaitTimer)
@ -89,6 +90,7 @@ float fCollisionForce_Level_02 = 0.5
float fCollisionForce_Level_03 = 0.7 float fCollisionForce_Level_03 = 0.7
Spell Property _00E_A1_OnslaughtCloakDMG Auto Spell Property _00E_A1_OnslaughtCloakDMG Auto
SPell Property _00E_A1_OnslaughtCloakSP Auto
Perk Property _00E_Class_WarriorPerk_Talent_Onslaught Auto Perk Property _00E_Class_WarriorPerk_Talent_Onslaught Auto
Perk Property _00E_Class_WarriorPerk_Talent_Onslaught2 Auto Perk Property _00E_Class_WarriorPerk_Talent_Onslaught2 Auto

View File

@ -11,11 +11,6 @@ Function RegisterForActions()
RegisterForActorAction(4) RegisterForActorAction(4)
EndFunction EndFunction
Function UnregisterForActions()
UnregisterForActorAction(3)
UnregisterForActorAction(4)
EndFunction
; Called by the magic effect (_00E_Game_TalentCooldownSC) ; Called by the magic effect (_00E_Game_TalentCooldownSC)
Function RegisterCooldownMagicEffect(_00E_Game_TalentCooldownSC newCooldownMagicEffect) Function RegisterCooldownMagicEffect(_00E_Game_TalentCooldownSC newCooldownMagicEffect)
CooldownMagicEffect = newCooldownMagicEffect CooldownMagicEffect = newCooldownMagicEffect
@ -67,10 +62,6 @@ State RealPlayer
EndIf EndIf
EndEvent EndEvent
Event OnCellLoad()
RegisterForActions()
EndEvent
Event OnActorAction(int actionType, Actor akActor, Form source, int slot) Event OnActorAction(int actionType, Actor akActor, Form source, int slot)
Shout shoutUsed = source as Shout Shout shoutUsed = source as Shout
if(!shoutUsed) if(!shoutUsed)
@ -80,15 +71,6 @@ State RealPlayer
If actionType == 3 If actionType == 3
LastShoutUsed = shoutUsed LastShoutUsed = shoutUsed
EndIf EndIf
If shoutUsed == _00E_A1_Onslaught
If ActionType == 4
_00E_A1_OnslaughtCloakSP.Cast(self, self)
;How was this suppsosed to work?
;ElseIf ActionType == 3
; _00E_A1_Tutorial_Onslaught.ShowAsHelpMessage("Onslaught", 5, 1, 1)
EndIf
EndIf
EndEvent EndEvent
Event OnSpellCast(Form maybeSpell) Event OnSpellCast(Form maybeSpell)
@ -114,14 +96,9 @@ EndState
Actor Property PlayerREF Auto Actor Property PlayerREF Auto
;Message Property _00E_A1_Tutorial_Onslaught Auto
Spell Property _00E_A1_OnslaughtCloakSP Auto
Spell Property _00E_Game_AbTalentCooldown Auto Spell Property _00E_Game_AbTalentCooldown Auto
GlobalVariable Property _00E_Game_TalentControl_CooldownResetDesired Auto GlobalVariable Property _00E_Game_TalentControl_CooldownResetDesired Auto
Shout Property _00E_A1_Onslaught Auto
_00E_Game_TalentCooldownSC CooldownMagicEffect = None _00E_Game_TalentCooldownSC CooldownMagicEffect = None
Shout LastShoutUsed = None Shout LastShoutUsed = None