diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index 4ab48a1d..e4ba78da 100644 Binary files a/Enderal - Forgotten Stories.esm and b/Enderal - Forgotten Stories.esm differ diff --git a/Skyrim.esm b/Skyrim.esm index fa883dbd..e9fed5bc 100644 Binary files a/Skyrim.esm and b/Skyrim.esm differ diff --git a/scripts/_00E_EnderalControls.pex b/scripts/_00E_EnderalControls.pex index 62cab17c..0371adab 100644 Binary files a/scripts/_00E_EnderalControls.pex and b/scripts/_00E_EnderalControls.pex differ diff --git a/scripts/_00E_MiningControl.pex b/scripts/_00E_MiningControl.pex new file mode 100644 index 00000000..a8f13bf4 Binary files /dev/null and b/scripts/_00E_MiningControl.pex differ diff --git a/scripts/_00e_fs_forgottenstories_functions.pex b/scripts/_00e_fs_forgottenstories_functions.pex deleted file mode 100644 index 9dc56233..00000000 Binary files a/scripts/_00e_fs_forgottenstories_functions.pex and /dev/null differ diff --git a/scripts/_00e_playerfunctions.pex b/scripts/_00e_playerfunctions.pex index 28c64dc0..8f58ce51 100644 Binary files a/scripts/_00e_playerfunctions.pex and b/scripts/_00e_playerfunctions.pex differ diff --git a/scripts/mineoreenderal.pex b/scripts/mineoreenderal.pex new file mode 100644 index 00000000..b0299dc8 Binary files /dev/null and b/scripts/mineoreenderal.pex differ diff --git a/scripts/mineorefurnitureenderal.pex b/scripts/mineorefurnitureenderal.pex new file mode 100644 index 00000000..eeb69733 Binary files /dev/null and b/scripts/mineorefurnitureenderal.pex differ diff --git a/scripts/mineorefurniturescript.pex b/scripts/mineorefurniturescript.pex deleted file mode 100644 index 3225ae6f..00000000 Binary files a/scripts/mineorefurniturescript.pex and /dev/null differ diff --git a/scripts/mineorescript.pex b/scripts/mineorescript.pex deleted file mode 100644 index 4698d802..00000000 Binary files a/scripts/mineorescript.pex and /dev/null differ diff --git a/source/scripts/_00E_EnderalControls.psc b/source/scripts/_00E_EnderalControls.psc index f68cfc86..eb69bd98 100644 --- a/source/scripts/_00E_EnderalControls.psc +++ b/source/scripts/_00E_EnderalControls.psc @@ -17,3 +17,5 @@ _00E_BrawlControl Property BrawlControl Auto _00E_SoundControl Property SoundControl Auto _00E_SympathyControl Property SympathyControl Auto + +_00E_MiningControl Property MiningControl Auto diff --git a/source/scripts/_00e_fs_forgottenstories_functions.psc b/source/scripts/_00E_MiningControl.psc similarity index 76% rename from source/scripts/_00e_fs_forgottenstories_functions.psc rename to source/scripts/_00E_MiningControl.psc index ea6bf43f..783236fe 100644 --- a/source/scripts/_00e_fs_forgottenstories_functions.psc +++ b/source/scripts/_00E_MiningControl.psc @@ -1,14 +1,10 @@ -Scriptname _00E_FS_ForgottenStories_Functions extends Quest - -;===================================================================================== -; EVENTS -;===================================================================================== +Scriptname _00E_MiningControl extends Quest Hidden ;===================================================================================== ; FUNCTIONS ;===================================================================================== -Function TransmuteOre(Form akSource, MineOreScript oreREF, int iCurrentResources) +Function TransmuteOre(Form akSource, MineOreEnderal oreREF, int iCurrentResources) if akSource == _05E_FS_SaldrinsTouch @@ -49,8 +45,6 @@ EndFunction Actor Property PlayerREF Auto -Projectile Property AlterPosProjectile Auto - MiscObject Property Gold001 Auto Sound Property _00E_FS_MAGSaldrinsTouchM Auto @@ -62,4 +56,4 @@ Message Property MiningDepletedMessage Auto ImageSpaceModifier Property _00E_MAGEldritchCastIMOD Auto -GlobalVariable Property _00E_OreVeinsMined Auto \ No newline at end of file +GlobalVariable Property _00E_OreVeinsMined Auto diff --git a/source/scripts/_00e_playerfunctions.psc b/source/scripts/_00e_playerfunctions.psc index bdc1f13a..004010a5 100644 --- a/source/scripts/_00e_playerfunctions.psc +++ b/source/scripts/_00e_playerfunctions.psc @@ -60,6 +60,10 @@ _00E_BrawlControl function GetBrawlControl() Global return (Game.GetForm(0x14) as _00E_PlayerFunctions).ControlRepository.BrawlControl endfunction +_00E_MiningControl function GetMiningControl() Global + return (Game.GetForm(0x14) as _00E_PlayerFunctions).ControlRepository.MiningControl +endfunction + ;===================================================================================== ; Stop/restart random headtracking diff --git a/source/scripts/mineorescript.psc b/source/scripts/mineoreenderal.psc similarity index 95% rename from source/scripts/mineorescript.psc rename to source/scripts/mineoreenderal.psc index e14c829d..cbf22e48 100644 --- a/source/scripts/mineorescript.psc +++ b/source/scripts/mineoreenderal.psc @@ -1,4 +1,4 @@ -scriptName MineOreScript extends objectReference +scriptName MineOreEnderal extends objectReference ; ;This script handles the Ore Veins and handshakes with the mining furniture ;=================================================================== @@ -130,7 +130,7 @@ Function TryPlayerActivate(ObjectReference myLinkedRef) PlayerIsInFurniture = True EndIf - (myLinkedRef as mineOreFurnitureScript).lastActivateRef = self + (myLinkedRef as MineOreFurnitureEnderal).lastActivateRef = self myLinkedRef.activate(PlayerREF) ; Give some time for the animations to warm up/settle down before we can start reacting on OnActivate again. @@ -182,8 +182,7 @@ Event OnHit(ObjectReference akAggressor, Form akSource, Projectile akProjectile, ResourceCountCurrent = ResourceCountTotal EndIf - _00E_FS_ForgottenStories_Functions _00E_FS_ControlQuest = Game.GetFormFromFile(0x01016E89, "Enderal - Forgotten Stories.esm") as _00E_FS_ForgottenStories_Functions - _00E_FS_ControlQuest.TransmuteOre(akSource, self as MineOreScript, ResourceCountCurrent) + _00E_PlayerFunctions.GetMiningControl().TransmuteOre(akSource, self as MineOreEnderal, ResourceCountCurrent) ; ADDED IN ENDERAL - FORGOTTEN STORIES @@ -296,7 +295,7 @@ function giveOre() endif elseif ResourceCountCurrent == 0 myLinkedRef.activate(self) - (myLinkedRef as MineOreFurnitureScript).goToDepletedState() + (myLinkedRef as MineOreFurnitureEnderal).goToDepletedState() DepletedMessage.Show() endif @@ -308,6 +307,3 @@ function depleteOreDueToFailure() self.setDestroyed(true) ResourceCountCurrent = 0 endFunction - - - diff --git a/source/scripts/mineorefurniturescript.psc b/source/scripts/mineorefurnitureenderal.psc similarity index 98% rename from source/scripts/mineorefurniturescript.psc rename to source/scripts/mineorefurnitureenderal.psc index a3afbad2..aa59f01e 100644 --- a/source/scripts/mineorefurniturescript.psc +++ b/source/scripts/mineorefurnitureenderal.psc @@ -1,4 +1,4 @@ -Scriptname MineOreFurnitureScript extends ObjectReference Conditional +Scriptname MineOreFurnitureEnderal extends ObjectReference Conditional {script for furniture which the player can use to get resources} @@ -209,7 +209,7 @@ function UnregisterForEvents(Bool bNotifyLastActivateRef = False) UnRegisterForAnimationEvent(PlayerREF, "IdleFurnitureExit") If bNotifyLastActivateRef && lastActivateRef - (lastActivateRef as MineOreScript).OnFurnitureExit() + (lastActivateRef as MineOreEnderal).OnFurnitureExit() EndIf ; debug.Trace(self + " should be unregistered for anim events") endif