diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 089988d5..f286c91b 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Skyrim.esm b/Skyrim.esm index daf2958b..ffa7db2f 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/scripts/_00e_a1_onslaughtsc.pex b/scripts/_00e_a1_onslaughtsc.pex index e1ebfb06..1bc3c453 100644 Binary files a/scripts/_00e_a1_onslaughtsc.pex and b/scripts/_00e_a1_onslaughtsc.pex differ diff --git a/scripts/_00e_game_talentcontrolsc.pex b/scripts/_00e_game_talentcontrolsc.pex index edbeb9f2..c59824a2 100644 Binary files a/scripts/_00e_game_talentcontrolsc.pex and b/scripts/_00e_game_talentcontrolsc.pex differ diff --git a/source/scripts/_00e_a1_onslaughtsc.psc b/source/scripts/_00e_a1_onslaughtsc.psc index f026d0bb..1e7d46ac 100644 --- a/source/scripts/_00e_a1_onslaughtsc.psc +++ b/source/scripts/_00e_a1_onslaughtsc.psc @@ -21,7 +21,8 @@ Event OnEffectStart(Actor akTarget, Actor akCaster) SetValues() MAGShoutSprint03.Apply() - MAGShoutSprintFire.Play(PlayerREF) + MAGShoutSprintFire.Play(PlayerREF) + _00E_A1_OnslaughtCloakSP.Cast(PlayerREF, PlayerREF) bDashing = True RegisterForSingleUpdate(fWaitTimer) @@ -89,6 +90,7 @@ float fCollisionForce_Level_02 = 0.5 float fCollisionForce_Level_03 = 0.7 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_Onslaught2 Auto diff --git a/source/scripts/_00e_game_talentcontrolsc.psc b/source/scripts/_00e_game_talentcontrolsc.psc index efc83f31..adcf9ecb 100644 --- a/source/scripts/_00e_game_talentcontrolsc.psc +++ b/source/scripts/_00e_game_talentcontrolsc.psc @@ -11,11 +11,6 @@ Function RegisterForActions() RegisterForActorAction(4) EndFunction -Function UnregisterForActions() - UnregisterForActorAction(3) - UnregisterForActorAction(4) -EndFunction - ; Called by the magic effect (_00E_Game_TalentCooldownSC) Function RegisterCooldownMagicEffect(_00E_Game_TalentCooldownSC newCooldownMagicEffect) CooldownMagicEffect = newCooldownMagicEffect @@ -67,10 +62,6 @@ State RealPlayer EndIf EndEvent - Event OnCellLoad() - RegisterForActions() - EndEvent - Event OnActorAction(int actionType, Actor akActor, Form source, int slot) Shout shoutUsed = source as Shout if(!shoutUsed) @@ -80,15 +71,6 @@ State RealPlayer If actionType == 3 LastShoutUsed = shoutUsed 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 Event OnSpellCast(Form maybeSpell) @@ -114,14 +96,9 @@ EndState Actor Property PlayerREF Auto -;Message Property _00E_A1_Tutorial_Onslaught Auto - -Spell Property _00E_A1_OnslaughtCloakSP Auto Spell Property _00E_Game_AbTalentCooldown Auto GlobalVariable Property _00E_Game_TalentControl_CooldownResetDesired Auto -Shout Property _00E_A1_Onslaught Auto - _00E_Game_TalentCooldownSC CooldownMagicEffect = None Shout LastShoutUsed = None