From 755f0687135a9541d101b9a087ac079889f3be0a Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Mon, 5 Feb 2024 14:15:49 +0100 Subject: [PATCH] Rewrote _00E_LootContainer, fixed double sound on picking up gold stacks --- Enderal - Forgotten Stories.esm | Bin 10450194 -> 10450133 bytes Skyrim.esm | Bin 191480852 -> 191480743 bytes scripts/_00e_lootcontainer.pex | Bin 1867 -> 1689 bytes source/scripts/_00e_lootcontainer.psc | 69 +++++++++++--------------- 4 files changed, 30 insertions(+), 39 deletions(-) diff --git a/Enderal - Forgotten Stories.esm b/Enderal - Forgotten Stories.esm index c413306afe87237c2b18eae236fa731be325066c..ef312f387889f4d82c5ed96771b14765a85407a1 100644 GIT binary patch delta 671 zcmWmA$y$v8002-|KQbh9$fdy)A~Hqfx@Deah|HSIAydkb+%))8h^QB^;cL;8wDSVB zY1Ojtb1cpaoUW1aU}$(e=*)`z{*zr6i&PIZ#D*eGVLTDWBTOWTfJsbd3du}m8q=9U z3NuM%7PFbdT;?&K1*EZ%MJy(rB}7@uGBU^{i)@y&f|aadH94$dE$hf-JsZelBb&%) zGh5ioHnvm14t7$=E_PGI9%Ag}|3xt+>|;L%ILILmbA+QD<2WZc$tg}#${Egbj`Ngp zfs2%LiOXE!D%ZHq4Q^6FB~?^Y!!2%ehr8V4J`bqnA&+=W9Zz`5GoJH;dS22%Bd>VP z8{X2yJDPb| IX#ZIAKPUMdF8}}l delta 729 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 delta 14965 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 diff --git a/scripts/_00e_lootcontainer.pex b/scripts/_00e_lootcontainer.pex index 9b67c8a6b62aeece3a8a5da35efffce6b8ffd6fa..bbc9fc56a2b4ac591976c1e25d99e482d61dc910 100644 GIT binary patch literal 1689 zcmY*Y>rUK87(KHWU>BA!rEV%K`AbS>6sgKnM z$a7R}AEdu}W@b&mBYVE09cg(-%vk~o$M6Q>uy$;h0^uFRy0BxX7tN7d%N@2BSc zCd@E?nd*x$rI>^lsYIjGvHo^@$GPjhB#*QMLgPU;h6iz|e9%hb%~4;GomPRl3QdsT zCMLR)IkhAYJVIbJRT<>hGD^CMjDy_OI-=z5pwv$$OVlN5osI?lOoDZ-4pr>km0YG> z40k$S9nhK`UZL)w8b%gtz+|@&o)^MiA-q7% zmv(k|gvw>ulboG2M;6WAqZ3x*t7`n3H;gy=+jone~oEVE_=;+?y{}VTB;s^87s7mxNV7F8dj}8rfJn#SDCU- z#fLVB3j4Z0ZIz`iv$uC`5O~5t)i~r$JjE{@aSdB6vc=+Tx3^hfn|9lRg+~HA0=ohm z_E2Fzv&4N$1CMP}qV|l^guoV&sjyl~TdZiyhL;!p)C2=J1jg8s=dSrJhvE*XFXL)~s68 M*WZsRvu#!U54GJVH2?qr literal 1867 zcmZuw>r&fB7(I(^jP2Mi4uOR9;CT;SQ5z-n|gw`Xk!}MYL zE`5?dKp&yMdUjVbbQ-TmI^Wsva`b(>|GfY6ufhZb_>+J9{WE4yyWNA+7fR`Um1sXo zWV$*S2B;o{p&F&bQQSsD=6LlwO4|4lEk?=Hm{CC<#e`EwQoq%{mZ%<sI;@Nsg09 zqk57&3v~3sY|rms$l&r&rAI0bkCPykSCYkbq!QG}w%NqwMHGfIL5+pN$awfMnkQ$! z$w0r6eVNK6keH74M=7B;G5cziXcUh5X!T#m{_iq6GTN3o6uaTNGkrD%GdOZDd9&<2$JAmfjJd1?HA9XNi-@*zrR z&s8E(+*2w>W$c1-Ruq+SIuu_S*NW$v_dAMd?!^?GwaYZ6IFxZ8yN9EMEmTQcU--H` zypD8mA&0c0VcThMYeiGGhXWZz{YZxGp&iInBCoS~yw#~`LscaQN$9w;=Q(gkC42Hb zN}SdCZ@pCNQJR=?vK_c~=h;0^%d0`Ji>VCt#%O(vHc;%V^a?Zm@rYl`G%%Atmnc6A z!((Ov#h7GUIoQs@P7Zc)hbPTAyHVF^u~{m8=f@+7+U;rAeA`Er@UZ0Z-5m6Cu%3gB z96ZgzCW`0&l{wNJs8_3rLrhtlYx4!Tby{uY3 z%S?F339O^xKog%hFzvR?2b8Gku489#&jF**{tA?L&!sG51`il-^OyO7^9;+37J*=Q zig@TK6D;tlG3Nw66Zo8#sU}LMZ4dE=@lBzwKkda zDv7h1rr|z9%kG&n8;6{UOQi zn!qY6tP8XR*6hXvHn_q68UroWyerUk)GU$lGCeHc$ij>b<&4Me5qQc&QpP5yw?(u~ zQ9BgLiw7?gIQKx{TY>KcHcdQOaErJpu+4B9B#5?Ib=x?UXz$$qlwDhvB-MKY)-+id zftf6opoITR{J4S}X&l#Pb_zKzdheFNyg%I3 I6s4@{zpp_%$N&HU diff --git a/source/scripts/_00e_lootcontainer.psc b/source/scripts/_00e_lootcontainer.psc index 6acc9358..0997d6c1 100644 --- a/source/scripts/_00e_lootcontainer.psc +++ b/source/scripts/_00e_lootcontainer.psc @@ -5,25 +5,29 @@ Scriptname _00E_LootContainer extends ObjectReference ;===================================================================================== Event OnInit() - - Self.BlockActivation(True) - + BlockActivation() EndEvent Event OnActivate(ObjectReference akActionRef) - if AkActionRef == Game.GetPlayer() && Self.GetItemCount(Gold001) > 0 + Actor PlayerREF = Game.GetForm(0x14) as Actor + + if AkActionRef != PlayerREF + return + endif + + int iCurrentGoldCount = GetItemCount(Gold001) + + if iCurrentGoldCount == 0 + return + endif - if !bDone - CheckForGoldIncrementation() - EndIf + DisableNoWait() - ;RemoveAllItems(Game.GetPlayer(), abKeepOwnership = true) - ITMGoldUp.Play(PlayerREF) - Game.GetPlayer().AddItem(Gold001, Self.GetItemCount(Gold001)) - DisableNoWait() - - endif + iCurrentGoldCount += GetGoldBonus(PlayerREF.GetActorValue("Lockpicking"), iCurrentGoldCount) + PlayerREF.AddItem(Gold001, iCurrentGoldCount) + + RemoveAllItems() EndEvent @@ -31,24 +35,21 @@ EndEvent ; FUNCTIONS ;===================================================================================== -Function CheckForGoldIncrementation() +int Function GetGoldBonus(float fPlayerLockpicking, int iCurrentGoldCount) - bDone = True - - iCurrentGoldCount = Self.GetItemCount(Gold001) - fPlayerLockpicking = PlayerREF.GetActorValue("Lockpicking") - - if fPlayerLockpicking >= 15 - IncrementGold() - EndIf - -EndFunction + if fPlayerLockpicking as int < 15 + return 0 + endif -Function IncrementGold() + int iGoldMultiplicator = _00E_GoldMult.GetValue() as int + + if iGoldMultiplicator <= 0 + iGoldMultiplicator = 5 + endif - float fIncrementPercentage = (fPlayerLockpicking/iGoldMultiplicator)/100 + float fIncrementPercentage = (fPlayerLockpicking / iGoldMultiplicator) / 100 - Self.AddItem(Gold001, (iCurrentGoldCount*fIncrementPercentage) as Int) + return (iCurrentGoldCount * fIncrementPercentage) as Int EndFunction @@ -56,15 +57,5 @@ EndFunction ; PROPERTIES ;===================================================================================== -bool bDone - -; Use this to control how much the lockpicking skill increments the gold found in chest. When changing, remember to change in _00E_ChestAndDoorLockScript.psc as well! -; Current calculation: Gold in chest*((Lockpicking/iGoldMultiplicator)/100) -int iGoldMultiplicator = 5 - -float fPlayerLockpicking -int iCurrentGoldCount - -Actor Property PlayerREF Auto -Sound Property ITMGoldUp Auto -MiscObject Property Gold001 Auto \ No newline at end of file +MiscObject Property Gold001 Auto +GlobalVariable Property _00E_GoldMult Auto