Reverted GetFormID() use

This commit is contained in:
Eddoursul 2024-02-11 20:27:09 +01:00
parent 7865ae13a3
commit 45d0d15f37
8 changed files with 7 additions and 9 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -5,7 +5,7 @@ Event OnEffectStart(Actor akTarget, Actor akCaster)
float fMagnitude = - akTarget.GetActorValue("Mood")
akTarget.SetActorValue("Mood", 0)
if akTarget.GetFormID() != 0x14
if akTarget != Game.GetForm(0x14)
return
endif

View File

@ -1,8 +1,8 @@
Scriptname _00E_ArkanistenfieberWohltatSCN extends activemagiceffect
Event OnEffectStart(actor akTarget, Actor akCaster)
Event OnEffectStart(Actor akTarget, Actor akCaster)
If akTarget.GetFormID() == 0x14
If akTarget == Game.GetForm(0x14)
akPlayer = akTarget
fOldAV = -1*(akPlayer.GetActorValue("LastFlattered"))
Else
@ -28,4 +28,4 @@ float fNewAV
Actor akPlayer
ImageSpaceModifier Property _00E_ArkanistenfieberIMOD Auto
Sound Property _00E_FS_IncreaseArcaneFeverM Auto
Message Property _00E_Player_sArcaneFeverIncreased Auto
Message Property _00E_Player_sArcaneFeverIncreased Auto

View File

@ -16,12 +16,12 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster)
fMagnitude = akTarget.GetActorValue(sActorValue)
endif
akTarget.RestoreActorValue(sActorValue, fMagnitude)
if akTarget.IsDead()
return
endif
akTarget.RestoreActorValue(sActorValue, fMagnitude)
Float fBonusDamage = fMagnitude * akCaster.GetActorValue("Illusion") / 3.0
If fBonusDamage < fMagnitude
fBonusDamage = fMagnitude

View File

@ -126,13 +126,11 @@ event OnGameReload()
Utility.Wait(FadeOutDuration / 1000.0 + 1.0)
Actor PlayerRef = Game.GetForm(0x14) as Actor
int i = _currentlyDisplayedActors.Length
While i > 0
i -= 1
Actor akActor = _currentlyDisplayedActors[i] as Actor
If !akActor || akActor.GetFormID() == 0 || akActor.IsDeleted() || akActor.IsDisabled()
If ! akActor || akActor.GetFormID() == 0 || akActor.IsDeleted() || akActor.IsDisabled() || ! akActor.IsInCombat()
_currentlyDisplayedActors[i] = None
else
AddActorRaw(akActor)