Removed some obsolete functions

This commit is contained in:
Eddoursul 2024-01-14 18:09:05 +01:00
parent df2832f5d7
commit e15bec3672
13 changed files with 8 additions and 29 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -30,11 +30,11 @@ Int iLockLevel = akTargetRef.GetLockLevel()
If iLockLevel <= LOCK_LEVEL_APPRENTICE If iLockLevel <= LOCK_LEVEL_APPRENTICE
bPlayerCanActivate = True bPlayerCanActivate = True
ElseIf iLockLevel <= LOCK_LEVEL_ADEPT 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 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 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 Else
bPlayerCanActivate = True bPlayerCanActivate = True
EndIf EndIf

View File

@ -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

View File

@ -1,7 +1,7 @@
Scriptname _00E_CombatSoundtrackScript extends Actor Scriptname _00E_CombatSoundtrackScript extends Actor
Event OnUpdate() Event OnUpdate()
Actor player = Game.GetPlayer() Actor player = Game.GetForm(0x14) as Actor
If player.IsInCombat() If player.IsInCombat()
RegisterForSingleUpdate(2.0) RegisterForSingleUpdate(2.0)
ElseIf Triggered ElseIf Triggered
@ -17,7 +17,7 @@ Event OnCombatStateChanged(Actor akTarget, int aeCombatState)
EndIf EndIf
If aeCombatState == 1 If aeCombatState == 1
Actor player = Game.GetPlayer() Actor player = Game.GetForm(0x14) as Actor
If akTarget == player If akTarget == player
Int encounterLevel = GetLevel() 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 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 GlobalVariable Property PlayerLevel Auto
Keyword Property ActorTypeBoss Auto Keyword Property ActorTypeBoss Auto
Bool Triggered = False Bool Triggered = False

View File

@ -9,10 +9,6 @@ Event OnDeath(Actor akKiller)
RewardExp = 50 RewardExp = 50
EndIf EndIf
If PlayerREF == None
PlayerREF = Game.GetPlayer()
EndIf
_00E_EPHandler.GiveEP(RewardExp) _00E_EPHandler.GiveEP(RewardExp)
EndIf EndIf

View File

@ -64,7 +64,7 @@ event onCellAttach()
SetNoFavorAllowed() SetNoFavorAllowed()
If !PlayerREF ; Just in case If !PlayerREF ; Just in case
PlayerREF = Game.GetPlayer() PlayerREF = Game.GetForm(0x14) as Actor
EndIf EndIf
if !getLinkedRef() if !getLinkedRef()

View File

@ -23,7 +23,7 @@ Event OnLoad()
BlockActivation(true) BlockActivation(true)
If !PlayerREF ; Just in case If !PlayerREF ; Just in case
PlayerREF = Game.GetPlayer() PlayerREF = Game.GetForm(0x14) as Actor
EndIf EndIf
if isFurnitureInUse() if isFurnitureInUse()
@ -34,7 +34,7 @@ endEvent
Event OnUnload() Event OnUnload()
; safety measures ; safety measures
If !PlayerREF ; Just in case If !PlayerREF ; Just in case
PlayerREF = Game.GetPlayer() PlayerREF = Game.GetForm(0x14) as Actor
EndIf EndIf
UnregisterForEvents() UnregisterForEvents()