From 3b78c86e792bc4b02caef4ea4a027305aac19917 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Wed, 22 Jun 2022 16:06:25 +0200 Subject: [PATCH] Detect bookshelves by script --- Artifact Tracker.esp | Bin 6841 -> 6769 bytes Scripts/ETR_TrackFoundItems.pex | Bin 5013 -> 4808 bytes Scripts/ETR_TrackStoredItems.pex | Bin 5035 -> 4810 bytes Source/Scripts/ETR_TrackFoundItems.psc | 10 ++-------- Source/Scripts/ETR_TrackStoredItems.psc | 17 ++++++++++------- 5 files changed, 12 insertions(+), 15 deletions(-) diff --git a/Artifact Tracker.esp b/Artifact Tracker.esp index 0c747ce539e6072147018ec6af51db9f6c17f08b..9ac690ebc754a2c8677314daaab232ead9c46fb0 100644 GIT binary patch delta 184 zcmdmK`q5;98dDDMMvXj1CI*JhGZ-%lNwKgnFa(AMhcE!aH60KM;a_2%+$^HYbd729 zCK1EQ6U9|0pBI&$+##wsIY?A)a=w`8DvN delta 248 zcmexpveR^e8WT6iMvXj1rfWKzXE0tAlJa3;U?7pI4HYnU`7wQUClTFN4G+CdtWtVqBBm n#dIh0i&;#bA*Kq}E(5ZXG$Zzl$pMX#0J~9ETxxTN_)8`LQ@2c` diff --git a/Scripts/ETR_TrackFoundItems.pex b/Scripts/ETR_TrackFoundItems.pex index f272f6d5613a474fec39ab838298d88a78f7a695..1bdc9b87d3a1ae810979ef8a29bea6a00c2cc22c 100644 GIT binary patch literal 4808 zcmc&%=~5fn75-XCAU3huV7wqE%SXODtFq@;-XSlLC&^RfM{254&Uer4Zehp%9UY@S`*zQ{Eq{LhAOGyg!2&;xzfb)L zV@n&g&5h7*?k)!{-&u*(UNpTQHPN%=I6*6nT3#6?mEzNfu3yFvG4dKSx-8yOaXq$U zh3;EH92m5->aX~2jKQkE?%78wTn%jJmc6GmXEkWru^ae{JGQ^A&|CFCQhsaE3nGPL z)xW#%Xm9;=!OUuEFE~&RI(J;hQ9gQ`f$zB5-1bnasVx;Mzp3Uu*N)KV8skOQ6{BN? zU!$HK#Wz(HuSDxAjNB+znznz;xHn_IDg@H=N^oT))QLvkoqR?1q zMMvmr%*PU`;Sz~`*kyH(F&3MhKXNNFC!YF<~R!tvR^oFa26as^$|;0KRV&Q%P#i>;7@6sIkY z&||l8%S~0Up}SJi(eLqSdv4p&out+MDh@ZdT7FZHW`tpGh3Qk^@TBBSip-|SB@8r8-mF-53S;w*v*I7Hlps7>($8hr zV<5>WDKb;OzMLdnj(6<1938rGb4Nv_+^8JLCY0lVq$)@Is_AaI$|*;(>_uN4Cc9pb zLzaM^z+dtm!(;Oe(iiv(EY&wukG;EKM@mlzdTm!f&8iOAyP9aP9T|FQvmr#$9OvxC z47-$JGZ{9UVLW%9j&3*l*!Om*q3l3z+Xp6<0dvW)bIK8mE~0{zXnJf~p#_qCGF{ix zcr#gEGg&q>ZE2R*OqTV`9M0{_-Pj0%-DrpBp6yuF4Bh=W^L;hLE@#*kbh@kV9`D%R zW_xKf@ilbn(cz5u+F27LSUz$s7dzpcm%|lZ0{xQ;cJBRglWQs3}&I>5-wv7R|q;z z7ns3&cwY!+RL4!i5|#-o_z-spYgi|IEKtYBYv3;K;vV4>e44=nJbVQn;W1%Tpa}yG z6k#iYr`Ux@*dzFafUuuHjF!Lw4)9FU?FI|^0iFwd#@`6>=0v7+I>XKw_hv-SavtO}nc9|9WD0K?Q5U{If0Ahz#_>g( zB*a;KiP{MszqBb|_zm1<1)TR2TF^)G<<5TATp zl17}eaNR=1!bKs;zf646!YnaTbHs)v(3~iw(TW|SB1|jMD_giC_H#_->q5+m5p$ut zOZ?Vx`55hZ@#4k52gEPwGd+S$r_MX6c7~dKj23jtBL&dqH!Qqo;i`6N1QOLS{F097Vi zANiR-+H9~CKG@YMlj^7B>B90NV~=YE-Ma@uiY0ewRZ1^d zlFI+TBfOHb$pa_rA^#q6(jIeyH3qF6+F*g?6-&BqG%%7XsS#|=V<*c3t`&m93paJ3$2usH`B!1neqtUEQ)xbt zvXDd3vvpWKxb$JCS_RVlZ?>$RN-HGEeWJuR(Zo_mYnW(cH|RjvgH+zuo_j{bv*1aT zEEgR`+cKA&V2>piF4UIP{fu&EwUuVo`AQRVIN~(2b>dyG?l#FccKct_E{jf;8GGmW z*ee~IV^0~!-YIBzJ0$7ux`l5ihsStio&eXFIgT*1EwQ6hdfPF|-(ePsH!{a~*PF=Z zn>Hg_T4Dfm)qGb%x|*qbzH7nd-m|V4PTDM-NPF+iiE!*b zH;J(A-)rAF`fzBhuY*k{{W=G9zbONtt1=4TPfBGnI=H;}CiokutG$vIf2pOfk{n|` mZ|{$OK^BjZ$hXb(Z&dw`(AQ7lxK57VKGUr-A8UfIqyGXsC}wB? literal 5013 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 YWAOiBo413X*m=v)?~^t^iiI}uf5=dnHvj+t diff --git a/Scripts/ETR_TrackStoredItems.pex b/Scripts/ETR_TrackStoredItems.pex index 6736a8ca4a7f6b79f6477e347fe633a29a57c94f..670550f6fa1223174628e7862536b107d7edcf6b 100644 GIT binary patch literal 4810 zcmbVO>2eg;75;iOoAwQagaR5c#955c212qOkYof3LL!ndHV($EnJcN8nQqbDBSmI$ zQdufXCB#V{AWJz(W%-pC$dlwL^2=2z@|}Bo85AWyGN)$xZ1>!=_k4cu@Be7Yzyd#; ze>?Ll3|`+@d${4-vnx03x)RQ^SGGgPa~F1OcUz%-)xE9U z#zM^t6pE|v-Q9{$J3pLxu)vg9@*_>&#gFO%dR26<51T{*P7Z= zzH-ZIuIAVQIvith!E3l7T9){8dUjT#Sx~i_B*ETR3!WR=j;s8Kd$x~O+BGDO8&#bp zlQ6AO-17W-%?U#EH7Ts9eJ$;;*+IC@T$WSA=w97?q{?C99Y)N_JIW7eNV!a-_GOur zHq*Pgrh>BVrW(l3dtMELv$IU%#=)*K*}dsC0;P`>s_J0h^D7ugU04d53>*{wJ1PiY zG>@uB4VKXXJd*r&VT8AWCXOIcPkWi^d zO+lmYKch1JdQ_#*otQO+L2Kd@x)PZV2iXfyD=3=t~ES;ZUqa z3kl@0LxmUBeiCgr?ci24Q!|T^lcjLS4oktl6P9;WK#JM&^mLa(kEALEyQ<9Ws!A!) zyRqo1eX|*?33QhmK6hJ4AN3B!3C6kP?vdsB z2iN7f=+szq^hp{IDZl<|0KN(vzAOH#Qe-!Bx6Q83+kujqW!E|KH0!h5t_qPZv0l4+ zc+tgEGL^LMr3Aa2VABbf&eaSGOgG!LjuTDIyUw<$sp!4X!MIX?B+7(Za&_t1_wsts zZw_s%KvW||8G{vh4fWr3{d77a(+o~FV=_gthZAE7HlAP;2{xHvTr5%!CMbU2zCbJA zkrp!Y{uQJpMzTVk)Vv(fi4j7Ha3+DXc#UvgtK>mLUrpc*Tp(Q3q5^3B5-w|^2;9S4 zgtzfE!W`zYKv=|0!jgttSUv)7<2F_Zcd(8P!d(sb@E+lP4G-`k9v*^^U=ubqY{9@b zw($s6)Zr35!Y<)4!Pn5ho`!u0Jkf45NoVn0d{4vo@q-9{2m?RDkMR=?KgG`?c!3xA zIX>0!3;Z$ypbhQ7Fn*2SX!tFD7r|%v48O-8@J9`Q!k;7f3k3eEA%hN!wP0oVY5f#k z2IFrJy7|?gUi2BHAIA)GJVpj^!f*y-&XBG#SmI%P!N^V}tkVfL66=>@3uh9U^nw1I zOIYUwW3ePy9YxM1Ys zL=Q%J_eDO(Fpdd|CV6~{JZZscdVhuA8O-8M>bylcj|`Uid&nv|yzsmnnV{~dg@M?|7SfZX4SUi&Mq_C5akg$G;^jF&9A>%-K9bpAui$^EE_%Um@rnjCB{4LQBZ zILeHo!e=Law3#s;Rq0VWZdA9oUg^?W1VCM_(o6S&0>eqI$W8LxH7B!7Exo&b#mRPf*!fM(NcZP z=UF;im8kkSm^Hmjs%;vpQBo60o?(d=(@^JwUirH5T@f<+I_0MW@ir<{+WoJ1I;5n9pK6|>q{FHh7fBC&+@U3nw;nz5hTE|4SUauF?U;;cjwC=QL*6cX=^9}8JLK%^VKVO5?htCy`517>1xpDU6Oo*2A}T&2<^LRCcs_ J&a_hW`)}pyWJLe~ literal 5035 zcmbVP>2?&?5&n8KGa8Nd4G9P^EXLW4L2TBr3ZV^zge3uqF($2@Wj%><0ap&tS^S1uc|Ylst2bwf(nWg)vDL9Ns?a{~-cfF2 zyygW8g?abhMpdFwEzriQRaHfPES&bZy3;5ZRNdR8y1nALRYzjkHRRVE`nu>^P%Fw; zZbgmN96P{3%?`qwDhOwSyUGuoAXILM>{T_(xZ0Bykj=+ctrnRQq}tva7c@~Lw|t`!Y-6Aa_9RPM)&6}=+BvnQb?s5< z^r?35$`!-^?F7)3xa#<(oA*MBzOU8+Z6+@3jQtX5&l;d3*@I}2o%39U(aDBekwz

1@2z*k|zcV&N7sx*AIJ3;B~xSnIPaZUmWb3SG+ z#LUH*`2YpubLKR%(prgpCgDbKctcO{GRGm1aY*_C@Im=+vBW8`&+J*oGGxuFHcd?e<3xhf8O_r0jZK zuBA?1cQ@=nnTbUQ%@r<{%Ob$=1BR18%&Me|Rce^qtW$;l5svvxj@L-A$gg;&Na?9%vfR5ElRx<@T@;UjM^xt#+v=gGx1$%wIR^|AkP>Vh_ppL^V zx@auUqDYLlqdPHD5_mKaF*AbhXuP;qf3+|~7&GoBC(iS?C*(cp)YyuUB*x7wCeAFh ze0q}ZO=^@(*vLqtJDYIl5{~05`|+^iPk0t>{OnrD$R}NxmYB(kbWrPZKqpG1qoiXA z9mfgMN$rvc1ARN8_i&1ITANzI=ofHN3kAT&71C8)Bi+C_Zjz=jL%OAD7I*fbIm}_6 z^dXjZ&^_G4{T=iG5Aab!5ApFXdW26%k2O_bsER69v4$sDC)G%Gl1uV5`3N+H5PGUp zVd0M9C0=QIjW-c}#y@X_evF^sr<#6-pGWjLKF2TcOHIGRuOkAAXa{Tk8~j$&@9_JG zzQ7mw1OA9VY5Ft%6475F^fyfzbXYteo)-TV+tFn>K6}xP9?|jud(kHx(2oJb3?{aH z2{(jcW89AehB=6@8Rk&pbQnjBsubIf#xak@%Z?}BCt{~}V&-IGE8tx!HSkvE|8<6m zgnoP@wVc2=Q_E3&i~C1zhuLw%u`q=9(lsUaUlRHqcA$jx3pQ_}63io}3%z7l)oD360!xb1kHA;puq z$n#j@$v_V*9J6pW4s_i@f47AzR9U#bD{>2?+@!xQT9HP&33Lr3XM%Cl>v1rKh=MWf zRpT!(wSN?Bzc~S8yqOp&k8v}j9*fmI1TZPli~YK8nvb$dswDZ#TH?uQ?vlpCtS0n{ ze1~?{e1buBkK_q?=b?YMMIWk;ZpoGu>9ltr{3}Ud+`Z{Z9)Rqf<=aAu zrksSEqG%jGj@pX*QCUj6aZr{G(swWi=JAMMlX$==exid->$K=|%fj>#jrbO&+vNIm zuD7)V)0_|{Z<5kVK_PyG#FOFr+Xl~L>cp3TsXxfOPq+G)2EvILf=NWdZ1V zUAG(g$l-fYY{H=Rs)XiFg5)@_*tYa4$in8ZFLRhH9PTQA1@OPCSfO^6Z@C)QsCA<8 zf5Nx4bXDT@@tBov{c2HjiWa5w=T3xLCF&Kvn9{l~&akIxDZm$XTJS r#C_vgc}+-lJu7b_NYeLAL5tEfIuB`>A89w;= 0 && (bookShelf as PlayerBookShelfContainerScript).GetState() == "PlacingBooks" + while iLimit >= 0 && (lastDestContainer as PlayerBookShelfContainerScript).GetState() == "PlacingBooks" Debug.Notification("Waiting for shelf update") iLimit -= 1 Utility.wait(0.5) diff --git a/Source/Scripts/ETR_TrackStoredItems.psc b/Source/Scripts/ETR_TrackStoredItems.psc index 2f57c9c..261ffc7 100644 --- a/Source/Scripts/ETR_TrackStoredItems.psc +++ b/Source/Scripts/ETR_TrackStoredItems.psc @@ -8,7 +8,6 @@ FormList Property ETR_ItemsStored Auto FormList Property ETR_PersistentStorageList Auto Container Property ETR_CellStorageContainer Auto -Container Property PlayerBookShelfContainer Auto Keyword Property LocTypePlayerHouse Auto @@ -81,15 +80,19 @@ Event OnUpdate() bRescanHome = false ObjectReference bookShelf - if lastDestContainer && lastDestContainer.GetBaseObject() == PlayerBookShelfContainer - bookShelf = lastDestContainer - elseif lastSourceContainer && lastSourceContainer.GetBaseObject() == PlayerBookShelfContainer - bookShelf = lastSourceContainer + if lastDestContainer + if lastDestContainer as PlayerBookShelfContainerScript + bookShelf = lastDestContainer + endif + elseif lastSourceContainer + if lastSourceContainer as PlayerBookShelfContainerScript + bookShelf = lastSourceContainer + endif endif - if bookShelf && bookShelf as PlayerBookShelfContainerScript + if bookShelf int iLimit = 10 - while iLimit >= 0 && (bookShelf as PlayerBookShelfContainerScript).GetState() == "PlacingBooks" + while iLimit > 0 && (bookShelf as PlayerBookShelfContainerScript).GetState() == "PlacingBooks" Debug.Notification("Waiting for shelf update") iLimit -= 1 Utility.wait(0.5)