Skip to content

Commit

Permalink
DV Merge 9.12.21
Browse files Browse the repository at this point in the history 
Merged Vitrial's Fixes - Primarily Navmesh, Game.GetPlayer -> PlayerRef, Location

Co-Authored-By: DarthVitrial <[email protected]>
  • Loading branch information
@themayor897 @DarthVitrial
themayor897 and DarthVitrial committed Sep 13, 2021
1 parent 250c688 commit c6e1cc6
Show file tree
Hide file tree
Showing 20 changed files with 235 additions and 128 deletions.
Binary file removed WEBFixesPart2.7z
View file
Binary file not shown.
Binary file removed WEBFixespart1.7z
View file
Binary file not shown.
Binary file removed WEBLoc.esp
View file
Binary file not shown.
Binary file modified WorldEaterBeater.esp
View file
Binary file not shown.
Binary file modified scripts/_aa_cometreleasescript.pex
View file
Binary file not shown.
Binary file modified scripts/_aa_scenetransfer.pex
View file
Binary file not shown.
Binary file modified scripts/_aa_stage3_bigshoutscript.pex
View file
Binary file not shown.
Binary file modified scripts/_aa_stage3bridgescript.pex
View file
Binary file not shown.
Binary file modified scripts/_aa_stage3meteorscript.pex
View file
Binary file not shown.
Binary file modified scripts/_aa_stage4firingscript.pex
View file
Binary file not shown.
Binary file modified scripts/_aa_stomachfiringmodule.pex
View file
Binary file not shown.
32 changes: 17 additions & 15 deletions scripts/source/_aa_cometreleasescript.psc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@ ObjectReference Property alduinBack auto
Spell Property bigExplosion auto
Sound Property roar auto

spell Property unShout auto
ActorBase Property shadesofAlduin auto
Actor Property alduin auto
ObjectReference dragon1
ObjectReference dragon2

Actor Property playerRef auto
Int startingState = 0
GlobalVariable Property dragonBornsFreed auto
GlobalVariable Property alduinHealth auto
bool doOnce = false
Bool doOnce = false
MusicType Property music1 auto
MusicType Property music2 auto

Expand All @@ -45,15 +46,15 @@ MagicEffect Property unrelentingForce3 auto


Event OnMagicEffectApply(ObjectReference akCaster, MagicEffect akEffect)
if(akCaster== Game.GetPlayer())
if(akCaster== playerRef)

if(akEffect== unrelentingForce1 || akEffect== unrelentingForce2 || akEffect== unrelentingForce3)

if(startingState < 10)
if startingState < 10

self.TranslateToRef(marker1, 1000)
startingState = 11
Game.ShakeCamera(Game.GetPlayer(), 1, 1)
Game.ShakeCamera(playerRef, 1, 1)
elseif(startingState > 11)
if(doOnce == False)
doOnce = True
Expand All @@ -65,15 +66,16 @@ Event OnMagicEffectApply(ObjectReference akCaster, MagicEffect akEffect)
bigExplosion.Cast(self, alduin)
self.Disable()
alduinHealth.setValue(alduinHealth.GetValue() + 1)
roar.Play(Game.GetPlayer())
Game.ShakeCamera(Game.GetPlayer(), 1, 1)
roar.Play(playerRef)
Game.ShakeCamera(playerRef, 1, 1)
if(alduinHealth.GetValue() >= 10)
Game.GetPlayer().TranslateToRef(alduin, 700)
Game.ShakeCamera(Game.GetPlayer(), 1, 6)
playerRef.TranslateToRef(alduin, 700)
Game.ShakeCamera(playerRef, 1, 6)
Utility.Wait(4)
music1.Remove()
Game.GetPlayer().StopTranslation()
Game.GetPlayer().MoveTo(alduinBack)
playerRef.StopTranslation()
playerRef.RemoveSpell(unShout)
playerRef.MoveTo(alduinBack)
Utility.Wait(3)
music2.Add()
endif
Expand All @@ -87,12 +89,12 @@ Event OnMagicEffectApply(ObjectReference akCaster, MagicEffect akEffect)
EndEvent

Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
if(akAggressor == Game.GetPlayer())
if(akAggressor == playerRef)
startingState += 5
if(startingState == 10)
self.TranslateToRef(marker1, 600)
startingState = 11
Game.ShakeCamera(Game.GetPlayer(), 1, 1)
Game.ShakeCamera(playerRef, 1, 1)
endif
endif
EndEvent
Expand Down Expand Up @@ -124,9 +126,9 @@ Event OnTranslationComplete()
self.TranslateToRef(marker9, 1000)
elseif(startingState == 19)
startingState = 20
self.TranslateToRef(marker1, 1000)
self.TranslateToRef(marker1, 1000)
elseif(startingState == 20)
startingState = 12
self.TranslateToRef(marker2, 1000)
self.TranslateToRef(marker2, 1000)
endif
EndEvent
73 changes: 37 additions & 36 deletions scripts/source/_aa_scenetransfer.psc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Actor Property dragonborn1 auto
Actor Property dragonborn2 auto
Actor Property dragonborn3 auto
Actor Property Alduin auto
Actor Property playerRef auto
GlobalVariable property AlduinVariable auto
ImageSpaceModifier Property blackScreen auto
Sound Property eatingSound auto
Expand All @@ -17,47 +18,47 @@ bool DoOnce = False
MusicType Property myType auto

Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, bool abPowerAttack, bool abSneakAttack, bool abBashAttack, bool abHitBlocked)
if(Alduin.GetActorValue("health") < 15000 && !DoOnce)
DoOnce = true;
;Disable player's controls and make them invicible
Game.DisablePlayerControls()
Game.GetPlayer().SetGhost(True)
Alduin.DispelAllSpells()
AlduinVariable.SetValue(1)
Alduin.EvaluatePackage()
if(Alduin.GetActorValue("health") < 15000 && !DoOnce)
DoOnce = true;
;Disable player's controls and make them invicible
Game.DisablePlayerControls()
playerRef.SetGhost(True)
Alduin.DispelAllSpells()
AlduinVariable.SetValue(1)
Alduin.EvaluatePackage()

endif
endif

EndEvent


Event OnPackageEnd(Package akOldPackage)

if(akOldPackage == AlduinPackage1)

Game.GetPlayer().PushActorAway(dragonborn1, 30)
Game.GetPlayer().PushActorAway(dragonborn2, 30)
Game.GetPlayer().PushActorAway(dragonborn3, 30)
AlduinVariable.SetValue(2)
Alduin.EvaluatePackage()
elseif(akOldPackage == AlduinPackage2)
AlduinVariable.SetValue(3)
Alduin.EvaluatePackage()
dragonborn1.DisableNoWait(true)
dragonborn2.DisableNoWait(true)
dragonborn3.DisableNoWait(true)
elseif(akOldPackage == AlduinPackage3)
;Increase his size
AlduinVariable.SetValue(4)
blackScreen.Apply()
Utility.Wait(10)
eatingSound.Play(Game.GetPlayer())
myType.Remove()
Utility.Wait(3)
Game.GetPlayer().MoveTo(wombEntrance)
Utility.Wait(1)
wombThrow.PushActorAway(Game.GetPlayer(), 30)
blackScreen.Remove()
endif
if(akOldPackage == AlduinPackage1)

playerRef.PushActorAway(dragonborn1, 30)
playerRef.PushActorAway(dragonborn2, 30)
playerRef.PushActorAway(dragonborn3, 30)
AlduinVariable.SetValue(2)
Alduin.EvaluatePackage()
elseif(akOldPackage == AlduinPackage2)
AlduinVariable.SetValue(3)
Alduin.EvaluatePackage()
dragonborn1.DisableNoWait(true)
dragonborn2.DisableNoWait(true)
dragonborn3.DisableNoWait(true)
elseif(akOldPackage == AlduinPackage3)
;Increase his size
AlduinVariable.SetValue(4)
blackScreen.Apply()
Utility.Wait(10)
eatingSound.Play(playerRef)
myType.Remove()
Utility.Wait(3)
playerRef.MoveTo(wombEntrance)
Utility.Wait(1)
wombThrow.PushActorAway(playerRef, 30)
blackScreen.Remove()
endif
endEvent
109 changes: 55 additions & 54 deletions scripts/source/_aa_stage3_bigshoutscript.psc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Spell Property spell2 auto ;Fire bridge
Spell Property spell3 auto ;Ice bridge
Spell Property spell4 auto ;break bridge
Spell Property cometSpell auto ;Fire comet
Actor Property playerRef auto
GlobalVariable Property bridge auto
ObjectReference Property xMarker auto

Expand All @@ -31,58 +32,58 @@ Sound Property iceShout auto
Sound Property bridgeShout auto

Event OnSpellCast(Form akSpell)
if(akSpell == spell1)
cometSpell.cast(xMarker, Game.GetPlayer())
cometShout.Play(Game.GetPlayer())
elseif(akSpell == spell2)
if(bridge.GetValue() == 1)
island1.EnableNoWait(true)
elseif(bridge.GetValue() == 2)
island2.EnableNoWait(true)
elseif(bridge.GetValue() == 3)
island3.EnableNoWait(true)
elseif(bridge.GetValue() == 4)
island4.EnableNoWait(true)
elseif(bridge.GetValue() == 5)
island5.EnableNoWait(true)
endif
cometShout.Play(Game.GetPlayer())
island6.DisableNoWait(true)
island7.DisableNoWait(true)
island8.DisableNoWait(true)
island9.DisableNoWait(true)
island10.DisableNoWait(true)
elseif(akSpell == spell3)
if(bridge.GetValue() == 1)
island6.EnableNoWait(true)
elseif(bridge.GetValue() == 2)
island7.EnableNoWait(true)
elseif(bridge.GetValue() == 3)
island8.EnableNoWait(true)
elseif(bridge.GetValue() == 4)
island9.EnableNoWait(true)
elseif(bridge.GetValue() == 5)
island10.EnableNoWait(true)
endif
iceShout.Play(Game.GetPlayer())
island1.DisableNoWait(true)
island2.DisableNoWait(true)
island3.DisableNoWait(true)
island4.DisableNoWait(true)
island5.DisableNoWait(true)
elseif(akSpell == spell4)
if(bridge.GetValue() == 1)
island11.DisableNoWait(true)
elseif(bridge.GetValue() == 2)
island12.DisableNoWait(true)
elseif(bridge.GetValue() == 3)
island13.DisableNoWait(true)
elseif(bridge.GetValue() == 4)
island14.DisableNoWait(true)
elseif(bridge.GetValue() == 5)
island15.DisableNoWait(true)
endif
bridgeShout.Play(Game.GetPlayer())
endif
Game.ShakeCamera(Game.GetPlayer(), 1, 1)
if(akSpell == spell1)
cometSpell.cast(xMarker, playerRef)
cometShout.Play(playerRef)
elseif(akSpell == spell2)
if(bridge.GetValue() == 1)
island1.EnableNoWait(true)
elseif(bridge.GetValue() == 2)
island2.EnableNoWait(true)
elseif(bridge.GetValue() == 3)
island3.EnableNoWait(true)
elseif(bridge.GetValue() == 4)
island4.EnableNoWait(true)
elseif(bridge.GetValue() == 5)
island5.EnableNoWait(true)
endif
cometShout.Play(playerRef)
island6.DisableNoWait(true)
island7.DisableNoWait(true)
island8.DisableNoWait(true)
island9.DisableNoWait(true)
island10.DisableNoWait(true)
elseif(akSpell == spell3)
if(bridge.GetValue() == 1)
island6.EnableNoWait(true)
elseif(bridge.GetValue() == 2)
island7.EnableNoWait(true)
elseif(bridge.GetValue() == 3)
island8.EnableNoWait(true)
elseif(bridge.GetValue() == 4)
island9.EnableNoWait(true)
elseif(bridge.GetValue() == 5)
island10.EnableNoWait(true)
endif
iceShout.Play(playerRef)
island1.DisableNoWait(true)
island2.DisableNoWait(true)
island3.DisableNoWait(true)
island4.DisableNoWait(true)
island5.DisableNoWait(true)
elseif(akSpell == spell4)
if(bridge.GetValue() == 1)
island11.DisableNoWait(true)
elseif(bridge.GetValue() == 2)
island12.DisableNoWait(true)
elseif(bridge.GetValue() == 3)
island13.DisableNoWait(true)
elseif(bridge.GetValue() == 4)
island14.DisableNoWait(true)
elseif(bridge.GetValue() == 5)
island15.DisableNoWait(true)
endif
bridgeShout.Play(playerRef)
endif
Game.ShakeCamera(playerRef, 1, 1)
EndEvent
11 changes: 6 additions & 5 deletions scripts/source/_aa_stage3bridgescript.psc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ Scriptname _AA_Stage3BridgeScript extends ObjectReference
GlobalVariable Property shoutValue auto
GlobalVariable Property platformValue auto
Actor Property alduin auto
Actor Property playerRef auto
float Property thisPlatform auto
int randomShout

Event OnTriggerEnter(ObjectReference akActionRef)
if(akActionRef == Game.GetPlayer())
platformValue.setValue(thisPlatform) ;What platform are we on?
randomShout = Utility.RandomInt(1, 4) ;0 is fire, 1 is ice, 2 is unrelenting force, 3 is shout the platform to pieces.
shoutValue.setValue(randomShout)
alduin.EvaluatePackage()
if(akActionRef == playerRef)
platformValue.setValue(thisPlatform) ;What platform are we on?
randomShout = Utility.RandomInt(1, 4) ;0 is fire, 1 is ice, 2 is unrelenting force, 3 is shout the platform to pieces.
shoutValue.setValue(randomShout)
alduin.EvaluatePackage()
endif
EndEvent
8 changes: 4 additions & 4 deletions scripts/source/_aa_stage3meteorscript.psc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Scriptname _AA_Stage3MeteorScript extends ObjectReference

GlobalVariable Property shoutValue auto
Actor Property alduin auto

Actor Property playerRef auto

Event OnTriggerEnter(ObjectReference akActionRef)
if(shoutValue.GetValue() != 0)
if(akActionRef == Game.GetPlayer())
shoutValue.setValue(5)
alduin.EvaluatePackage()
if(akActionRef == playerRef)
shoutValue.setValue(5)
alduin.EvaluatePackage()
endif
endif
EndEvent
7 changes: 4 additions & 3 deletions scripts/source/_aa_stage4firingscript.psc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@ Scriptname _AA_Stage4FiringScript extends ObjectReference

ObjectReference Property target auto
Spell Property fireball auto

Event OnLoad()
RegisterForSingleUpdate(Utility.RandomInt(1, 3))
EndEvent

Event OnUpdate()
fireball.Cast(self, target)
if self.is3DLoaded()
fireball.Cast(self, target)
endif
RegisterForSingleUpdate(Utility.RandomInt(1, 3))
EndEvent

Event OnUnload()
UnregisterForUpdate()
EndEvent
EndEvent
Loading

0 comments on commit c6e1cc6

Please sign in to comment.