diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 5ea93c97..843b2815 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/scripts/PRKF__00E_LockpickingReqPerk_030039BA.pex b/scripts/PRKF__00E_LockpickingReqPerk_030039BA.pex index 72409667..8b4b4388 100644 Binary files a/scripts/PRKF__00E_LockpickingReqPerk_030039BA.pex and b/scripts/PRKF__00E_LockpickingReqPerk_030039BA.pex differ diff --git a/scripts/PRKF__00E_SE_2_0_12_UpgradeP_030090B3.pex b/scripts/PRKF__00E_SE_2_0_12_UpgradeP_030090B3.pex deleted file mode 100644 index 3b0b384b..00000000 Binary files a/scripts/PRKF__00E_SE_2_0_12_UpgradeP_030090B3.pex and /dev/null differ diff --git a/scripts/_00e_combatsoundtrackscript.pex b/scripts/_00e_combatsoundtrackscript.pex index 88e42847..36da9b9c 100644 Binary files a/scripts/_00e_combatsoundtrackscript.pex and b/scripts/_00e_combatsoundtrackscript.pex differ diff --git a/scripts/_00e_epondeath.pex b/scripts/_00e_epondeath.pex index 9f0148a8..af390742 100644 Binary files a/scripts/_00e_epondeath.pex and b/scripts/_00e_epondeath.pex differ diff --git a/scripts/mineoreenderal.pex b/scripts/mineoreenderal.pex index b0299dc8..1734af46 100644 Binary files a/scripts/mineoreenderal.pex and b/scripts/mineoreenderal.pex differ diff --git a/scripts/mineorefurnitureenderal.pex b/scripts/mineorefurnitureenderal.pex index eeb69733..cd0476c1 100644 Binary files a/scripts/mineorefurnitureenderal.pex and b/scripts/mineorefurnitureenderal.pex differ diff --git a/source/scripts/PRKF__00E_LockpickingReqPerk_030039BA.psc b/source/scripts/PRKF__00E_LockpickingReqPerk_030039BA.psc index 7784deb4..e5784687 100644 --- a/source/scripts/PRKF__00E_LockpickingReqPerk_030039BA.psc +++ b/source/scripts/PRKF__00E_LockpickingReqPerk_030039BA.psc @@ -30,11 +30,11 @@ Int iLockLevel = akTargetRef.GetLockLevel() If iLockLevel <= LOCK_LEVEL_APPRENTICE bPlayerCanActivate = True ElseIf iLockLevel <= LOCK_LEVEL_ADEPT - bPlayerCanActivate = (akActor.HasPerk(_00E_Class_Trickster_P04_ThiefApprentice) || akActor.GetActorValue("Lockpicking") >= 25) + bPlayerCanActivate = (akActor.GetActorValue("Lockpicking") >= 25 || akActor.HasPerk(_00E_Class_Trickster_P04_ThiefApprentice)) ElseIf iLockLevel <= LOCK_LEVEL_EXPERT - bPlayerCanActivate = (akActor.HasPerk(_00E_Class_Trickster_P06_ExpertLocksmith) || akActor.GetActorValue("Lockpicking") >= 50) + bPlayerCanActivate = (akActor.GetActorValue("Lockpicking") >= 50 || akActor.HasPerk(_00E_Class_Trickster_P06_ExpertLocksmith)) ElseIf iLockLevel <= LOCK_LEVEL_MASTER - bPlayerCanActivate = (akActor.HasPerk(_00E_Class_Trickster_P09_MasterThief) || akActor.GetActorValue("Lockpicking") >= 75) + bPlayerCanActivate = (akActor.GetActorValue("Lockpicking") >= 75 || akActor.HasPerk(_00E_Class_Trickster_P09_MasterThief)) Else bPlayerCanActivate = True EndIf diff --git a/source/scripts/PRKF__00E_SE_2_0_12_UpgradeP_030090B3.psc b/source/scripts/PRKF__00E_SE_2_0_12_UpgradeP_030090B3.psc deleted file mode 100644 index 837eadf4..00000000 --- a/source/scripts/PRKF__00E_SE_2_0_12_UpgradeP_030090B3.psc +++ /dev/null @@ -1,16 +0,0 @@ -;BEGIN FRAGMENT CODE - Do not edit anything between this and the end comment -;NEXT FRAGMENT INDEX 3 -Scriptname PRKF__00E_SE_2_0_12_UpgradeP_030090B3 Extends Perk Hidden - -;BEGIN FRAGMENT Fragment_0 -Function Fragment_0(ObjectReference akTargetRef, Actor akActor) -;BEGIN CODE -if akTargetRef.IsActivationBlocked() - akTargetRef.Activate(akActor, true) - akTargetRef.BlockActivation(False) -endif -;END CODE -EndFunction -;END FRAGMENT - -;END FRAGMENT CODE - Do not edit anything between this and the begin comment diff --git a/source/scripts/_00e_combatsoundtrackscript.psc b/source/scripts/_00e_combatsoundtrackscript.psc index 2073cbff..4842a383 100644 --- a/source/scripts/_00e_combatsoundtrackscript.psc +++ b/source/scripts/_00e_combatsoundtrackscript.psc @@ -1,7 +1,7 @@ Scriptname _00E_CombatSoundtrackScript extends Actor Event OnUpdate() - Actor player = Game.GetPlayer() + Actor player = Game.GetForm(0x14) as Actor If player.IsInCombat() RegisterForSingleUpdate(2.0) ElseIf Triggered @@ -17,7 +17,7 @@ Event OnCombatStateChanged(Actor akTarget, int aeCombatState) EndIf If aeCombatState == 1 - Actor player = Game.GetPlayer() + Actor player = Game.GetForm(0x14) as Actor If akTarget == player Int encounterLevel = GetLevel() If encounterLevel >= 20 || (encounterLevel >= (PlayerLevel.GetValue() - 15)) || HasKeyword(ActorTypeBoss) ; Frage ab ob Gegnerstufe über Spielerstufe oder Boss ist, wenn ja spiele Combatmusic @@ -36,4 +36,3 @@ MusicType Property _00E_Music_Combat_Regular Auto GlobalVariable Property PlayerLevel Auto Keyword Property ActorTypeBoss Auto Bool Triggered = False - diff --git a/source/scripts/_00e_epondeath.psc b/source/scripts/_00e_epondeath.psc index 8403c292..aeae005f 100644 --- a/source/scripts/_00e_epondeath.psc +++ b/source/scripts/_00e_epondeath.psc @@ -9,10 +9,6 @@ Event OnDeath(Actor akKiller) RewardExp = 50 EndIf - If PlayerREF == None - PlayerREF = Game.GetPlayer() - EndIf - _00E_EPHandler.GiveEP(RewardExp) EndIf diff --git a/source/scripts/mineoreenderal.psc b/source/scripts/mineoreenderal.psc index cbf22e48..fd4d7670 100644 --- a/source/scripts/mineoreenderal.psc +++ b/source/scripts/mineoreenderal.psc @@ -64,7 +64,7 @@ event onCellAttach() SetNoFavorAllowed() If !PlayerREF ; Just in case - PlayerREF = Game.GetPlayer() + PlayerREF = Game.GetForm(0x14) as Actor EndIf if !getLinkedRef() diff --git a/source/scripts/mineorefurnitureenderal.psc b/source/scripts/mineorefurnitureenderal.psc index aa59f01e..dd763b7f 100644 --- a/source/scripts/mineorefurnitureenderal.psc +++ b/source/scripts/mineorefurnitureenderal.psc @@ -23,7 +23,7 @@ Event OnLoad() BlockActivation(true) If !PlayerREF ; Just in case - PlayerREF = Game.GetPlayer() + PlayerREF = Game.GetForm(0x14) as Actor EndIf if isFurnitureInUse() @@ -34,7 +34,7 @@ endEvent Event OnUnload() ; safety measures If !PlayerREF ; Just in case - PlayerREF = Game.GetPlayer() + PlayerREF = Game.GetForm(0x14) as Actor EndIf UnregisterForEvents()