Compare commits

..

No commits in common. "332c3e0690c6e90906a57775108c91b3b53e902f" and "9fc782ecf246541437da8dd1790bf8c829ee15ab" have entirely different histories.

9 changed files with 19 additions and 27 deletions

Binary file not shown.

Binary file not shown.

View File

@ -42,13 +42,11 @@ Event OnInit()
EndEvent
Event OnPlayerLoadGame()
If SKSE.GetVersion()
if self == PlayerREF
if GetState() != "RealPlayer"
GoToState("RealPlayer")
endif
RegisterForActions()
If self == PlayerREF && SKSE.GetVersion() > 0
if GetState() != "RealPlayer"
GoToState("RealPlayer")
endif
RegisterForActions()
else
Debug.Trace("NO SKSE: individual shout cooldowns are disabled")
if GetState() != "Disabled"

View File

@ -96,9 +96,7 @@ Event OnPackageChange(Package akOldPackage)
; Debug.Trace(self + ": OnPackageChange, " + Target + ", old package " + akOldPackage)
; Failsafe auto-stop smoking on package change
if Target
Target.RemoveSpell(_00E_Smoking_CrossLeggedMarkerSP)
endif
Target.RemoveSpell(_00E_Smoking_CrossLeggedMarkerSP)
EndEvent
Event OnEffectFinish(Actor akTarget, Actor akCaster)

View File

@ -140,10 +140,15 @@ function _addNamedPotion(Potion aPotion, string sName, string sModel)
endfunction
function _removeNamedPotion(int iIndex)
aCreatedPotions[iIndex] = None
aPotionNames[iIndex] = ""
aPotionModels[iIndex] = ""
function _removeNamedPotion(Potion aPotion)
if aPotion
int i = aCreatedPotions.Find(aPotion)
if i > -1
aCreatedPotions[i] = None
aPotionNames[i] = ""
aPotionModels[i] = ""
endif
endif
endfunction
Function _UpdatePotion(Potion item, Int count)
@ -396,10 +401,8 @@ EndFunction
Function _InitAchemyControl()
if GetState() != ""
GoToState("")
endif
GoToState("")
; Version update
If curScriptVersion < LATEST_SCRIPT_VERSION
Int oldScriptVersion = curScriptVersion
@ -460,11 +463,9 @@ Event OnPlayerLoadGame()
int i = 0
while i < 128
if aCreatedPotions[i] ; this may be None but return true when a potion no longer exists
if aCreatedPotions[i] as String == "[Potion <None>]"
_removeNamedPotion(i)
elseif PlayerREF.GetItemCount(aCreatedPotions[i]) == 0 && _00E_SecureChest_HostChestREF.GetItemCount(aCreatedPotions[i]) == 0
_removeNamedPotion(i)
if aCreatedPotions[i]
if PlayerREF.GetItemCount(aCreatedPotions[i]) == 0 && _00E_SecureChest_HostChestREF.GetItemCount(aCreatedPotions[i]) == 0
_removeNamedPotion(aCreatedPotions[i])
else
aCreatedPotions[i].SetName(aPotionNames[i])
if aPotionModels[i] != ""

View File

@ -105,11 +105,6 @@ Function TryPlayerActivate(ObjectReference myLinkedRef)
Return
EndIf
if _FS_TheriantrophistControlQuest.getControlQuest().IsTransformed()
(Game.GetFormFromFile(0x2F032, "Enderal - Forgotten Stories.esm") as Message).Show()
return
endif
If PlayerREF.GetItemCount(mineOreToolsList) < 1
FailureMessage.Show()
Return