From e9fe6cb4331dc51de65713b926b388abc39062f7 Mon Sep 17 00:00:00 2001 From: ChaosMarc Date: Sat, 24 Apr 2021 13:13:48 +0200 Subject: [PATCH] v14.02 by Yohann --- PlugY/InfinityStash.cpp | 3 ++- PlugY/PlugY.rc | Bin 5084 -> 5084 bytes PlugY/PlugY.suo | Bin 102912 -> 102912 bytes PlugY/parameters.h | 2 +- PlugYInstall/PlugYInstall.rc | 2 +- PlugYInstall/PlugYInstall.suo | Bin 15360 -> 15360 bytes PlugYInstaller/PlugY.ini | 2 +- PlugYInstaller/PlugY.nsi | 2 +- PlugYInstaller/PlugY/LocalizedStrings.ini | Bin 52704 -> 52704 bytes PlugYInstaller/PlugY/PlugYDefault.ini | 2 +- PlugYInstaller/PlugY/PlugYFixed.ini | 2 +- .../PlugY_The_Survival_Kit_-_Liesmich.txt | 5 ++++- .../PlugY_The_Survival_Kit_-_LisezMoi.txt | 7 +++++-- .../PlugY_The_Survival_Kit_-_Readme.txt | 5 ++++- .../PlugY_The_Survival_Kit_-_讀我檔案.txt | Bin 47922 -> 47922 bytes PlugYRun/PlugYRun.rc | Bin 6264 -> 6264 bytes PlugYRun/PlugYRun.suo | Bin 33792 -> 33792 bytes 17 files changed, 21 insertions(+), 11 deletions(-) diff --git a/PlugY/InfinityStash.cpp b/PlugY/InfinityStash.cpp index 7055a32..fad23b8 100644 --- a/PlugY/InfinityStash.cpp +++ b/PlugY/InfinityStash.cpp @@ -1160,7 +1160,8 @@ FCT_ASM ( caller_carry1OutOfStash_114 ) CALL D2ItemGetPage CMP AL,4 JNZ continue_carry1OutOfStash - SUB DWORD PTR SS:[ESP],0xC + //SUB DWORD PTR SS:[ESP],0xC + ADD DWORD PTR SS:[ESP],0x17D RETN continue_carry1OutOfStash: MOV EDI,DWORD PTR SS:[EBP-4] diff --git a/PlugY/PlugY.rc b/PlugY/PlugY.rc index e310f7eacf1e86b8072f910f6bda48b0e1bdffbf..ce1e8ff092d035cd7a3e5275469bdb7d750c1f85 100644 GIT binary patch delta 60 zcmcbken)-72QEgV$sf6l8I3lpa=&F_HDb_XFqj<3t2^0+&jl!TkY93g1Hahj9eiAj OKyDzf_~u*uOe_FW4iU}( delta 58 zcmcbken)-72QEg#$sf6l84Wk9a=&F_HDu6ZFqj<3t2^0+&xP5L!5qZiyn~O65vVSZ LSA6p=ekK+G92*d9 diff --git a/PlugY/PlugY.suo b/PlugY/PlugY.suo index 8203822c4b732c84542e8d0c135774f45aac3324..142daf6187c3dbf10c5362003d8ffd74c1372b08 100644 GIT binary patch delta 3237 zcmb7He^Aud5&!P_Jvi`y1HYW)Jdfi%FZ2ZDl*WoizbK}Rz2JeEYI7hc)rf=~_@hQa z4<;DLpyI8`YdaJeg2WJYOum7$sUoNoTgOqfj^>a4U>qk^#!~8-)Ygo4-}ersP5x*f zv%LL&c>CVI-F>@@zca$$8F8Xgj6AV=UtNvvrm{&a0G&|~geNpmPD@2OPE;OhFC}O{ zB6I>CY@CFiv?MHTCOF9rEO#@wlr5%5Sz@$C5ODLdpQGLD#NpXS>|brrzC=Mz?|iidcLKq@$_88n_^%)hpulQ_cw+geu&% zG+D6}-il&1HZU_oENGP!?;OBuzI;62=4AN}u*EE)qndk&;{SxTd%W z^L<$mKzQ*D94)g$92T^uyLudn~gA>{wMDtDLXCp~I}Ut(e_q)aq!< zLaaYNQhE4~zFuz>+Hj+?QxB@1WmaALbpR5EIB=){rxR}*k>u^GGEW<_pn0dXRk zL>bzh7c=!S*;7wnF+{OMaYP29c%sM3l0(0VWHo!C939(C=(*#;_799;#IhEKMXh2;`U`okg$~p=&uE=|rd5h~FI6sYkP8 zGMKUVa3;UJ4o!!RSl&{B?hl+;)b$Yay$<~1h%IE96Lt}uM=bC5L$-DgcRn{SUB?76 z);G+>+UYv@0S>gyWR)6_*s)@Wo*)SOLauN5&`LgaVqcdPN=cQuID|&+PiY$x{;><2 zx+U^WAsdmvguYG@GiRE?f+@k}INF`9igwqT(QmaVmZP_{Q9hC^P^IBOI*#T_uothM zO6T5AV(D2Btrdi&6t!oz=0GmS_oQRx%NFedl9-RMGaY^F4KNd3Z7cYRvDm&i4QyD~ zkOOmByaXz0BBP3YYux>51|FRz!K<{bTWmHngjh9bFkoQy@#^TVTOs$pVLP5~(i^i7I zv7}KaYZgHa^j#KD###5GVTPo9*=GWFNF<+85a{(8!dk&cKZ1}ZVBf~K==l`1hF`}> zV*<)YMD0fUYsmi<4aNyO$E0!BW zh8K^Cf&jD^y)xkp@pEXtFb=y&{3^l*!x)94aFh6-(EJCS_m_9(4%1gUef=Z6Vk+^+ ziRa@9&0I@Cs1i0&*4aY#C>P3v%>qwa1wWguT}Z3ej3pQoy6@UmcMjjNpgmZ~jhuw- zcdXAoe4S=(3<>SWM|T@zmJ?^<2k}D?4$j^cx=sXP2}E373lYB}mokL;1e{zsvtNJ$R-wI54Awth#coWufVO5(f@>>1gH0iWqR zYG(ra|0c)P2yY4*!fSMjhiC!j_+5d~#duD1Mf8%1WDRcron2`iT?3flO$etT6Z4dS z$YNt5l2l8^2A`81=Na$P{VbHd{p^|uUNk?r9VnJj{z}GAzc8SuSQjqCroh+zu!=2o zfa||%@sqCyF!Qwh$wL{iqgX=A+BC)g&s@;*SgU&WivM*b3b@YPPQ3Y09z1G_h~fwj z_yE=$=LGvT;08S2x^k?=5cxx3ax} zyKf?$TOCx@+;@|h+X%YAJxnv>#j7CEY+VS=r6Yhtw}HhxF^aG zu2FWomd9P;Qw{aJVG`jTHQc(-I$#4YBy4aBRZf0a{}j3_DX^akQZ!p#07gnH%hYN} z1%Z8ThDEH>3=ZDcv12ZisqQc* z)78imOIfoO-eUa#ezwv|J;3?u3}&@a-6(INQkE*Skrc9iyHC&lm``SHD~2Req)y!= z(@ufUJA<*J|NUo98ze773RUUlIOv>D0Zdh86?GdqBQx;cXA;Yv4t8cpCYS%oPTga! z4RYDF>5xGCsnL3?lEs~DNVfwpZHs0=>Y2vqwE@8tiVts?XLKxTy^^}XL}7+HTc_@8!*P#)Y>1NGv# zF7fCzUDr0yPj=BC{_w(}yn|jQyFHEC*?S$jaO>#~`s+Z}Va;hP a^-tE`-SFFq^c=(gUFf$`e&pqakADLJlf?D_ delta 2594 zcma)84Nz3q6@F*)c3BMKiko$3U6*BDHn8rlU`;iKz~g5uu~Zgpt+7BBB#Eww3o$W; zLZ23FhggbxOmEu(LnyO~k__b$)@BTSSjWVUgEZ|h(`l!Jj!hdTO&Eq++q6l~eJj@K zG}FGBop#0*q!s5I&^`C0`awD@5gv z{#u%zTP%38a}@@CRt)u!*;)qr^R#&7l36)y`^P5n6TbIw`44a~Scais3HIJ`V@@y! zODeXbyUL4s3l_|&FtZXD@JSZr{g@E|37H zBQBikwZ-$Y;4)ylvJLZJ$!8rt$U9kEs+9I$fHSI(F8gCSt_Ju9bucRdufNsEBsZjC zFec*VzA!p2I?xyk;OrR@1NJoiKBA>eyYmum3+!Y!4Dc25Va0H+6L&RxQEe%~iI`Vo zI-9Uq^gXn33-O-K{B@A}fFOK_pOS(7ttK3Ci(;L{%<=Em&CL$KD|) zyOl}Y5>YOAntkLZ!pYGCAwj@`ZxzF1=s*8mY*s?i^En`KA2>2*g)VG!W+;x~n|duY zc&^O}75J&*N9ipyY``0%<*2?O;q0iGNR7~+c<4-YQV*7ljiPVNnqVdTdkaRYL^zJG z2K^W~?SOjioZ)q5_!{PpKZyfxL@C|8STxnUoBE5M9&=`@J$p#J_x#*^1@KW$xiJOHd+!%Xn7mf_r=<-&Sj!DptKT#iw zPE3i9o_+Tun%0|@_aF`viNtt`QQm6mnk%xa*hJ`N{DDp2# zlPP7E%6suw*A2iczIw@|EdE*qU8R66Uvw*unOW20!=fMndD78ug2tQaedRveRT@7@ zw(EColw!gRjrY*|xA@o}UwZU?n)zvV`|gUhG=7c7{P~359DpD+3eQo=KQBax=UU;g zuwQ7z+R4qRhK_?Z5sL5?n?8>=)lq#HGuc8V-#cy8HDj$M1J0 zzf2&Vj^cM-8U4j49I$QL%3OjJJsUZ4SHQFML-jRUStp-Vv z|5gH;m^3aS#l^p0Pvp$UCk#w#1u3rTpbXGaZDS@67?<;C>=Od?6NK+!MeHEXea?dF zQzm^HS?+=Sye9e+F%Rq`{oo2?W*117c|~=zIs+VI3l6AZssU1%>;{qL8^E2AnBFAt zXeFclfv=aEVn$jZ6B-C%LLa1u7 za7>d%<}(w;C1VZPkZFZ%oa{S@Q$dIRAzHLmJB5O6N}>rFYLx`GyA{|?nE0ZwzJtx!nSGL%Ma%wZNRD~-pCIr zi3T@a?V_y7^}v3fFhORhfk~aPjuLIvcovl87`g0lA>m&$@x!~}+Jmgf2U)zq$B)&+ z1eIV+V)8Q}<3O*Eqw-*=S7b9?5RR+Qf~3RfnH{_hG~eIHMTj*}C#X!K(!1DaWL4QP zxYXI>yt4z7BXlWUWE)p`)*pa=rZ$00$4~YZ#N}p?MK)@nOHoTtG7-um;eUL*P+`Yj z1l@ltYzGscg^MV+*y8jd;{n_lv1ooNw!zQ*oG``ZHjs>XOp(Tq!#fY+J8OI?FOV{x IAUOQ_7m<34KmY&$ diff --git a/PlugY/parameters.h b/PlugY/parameters.h index 8e4c7b8..9945faa 100644 --- a/PlugY/parameters.h +++ b/PlugY/parameters.h @@ -6,7 +6,7 @@ =================================================================*/ #pragma once -#define PLUGY_VERSION "14.01" +#define PLUGY_VERSION "14.02" enum TargetMod { diff --git a/PlugYInstall/PlugYInstall.rc b/PlugYInstall/PlugYInstall.rc index 4febfbf..ee4ecb3 100644 --- a/PlugYInstall/PlugYInstall.rc +++ b/PlugYInstall/PlugYInstall.rc @@ -50,7 +50,7 @@ BEGIN VALUE "LegalCopyright", "Copyright (C) 2017" VALUE "OriginalFilename", "PlugYInstall.exe" VALUE "ProductName", "PlugY, The Survival Kit" - VALUE "ProductVersion", "14.01" + VALUE "ProductVersion", "14.02" END END BLOCK "VarFileInfo" diff --git a/PlugYInstall/PlugYInstall.suo b/PlugYInstall/PlugYInstall.suo index ff99e695bad6d3170bda9033535164e65a1f6ebd..6e394eda8491ec7d3a8b0af5c8cbfc66a335cdb9 100644 GIT binary patch delta 147 zcmZpuXsFoW!@|fjS&>Day`e?d;xha7&BZK%jFVjy4JIGpW!e0L)ti-#ft`VYfon3O zvi9Z@?f{m_E&>LVzwigJ@&bjqLBgy8KoDa-JngO;Mk*Un~PZj89Brl7#RKo!Q?o3rO5^?Y?BZ0vTXjr z>dnf=$PSd^n#`!Iy}5)tfQ5q>UF8@4fXPSr4Oj($65Nw31-#f8*nmtPu$C_Ze2h$t bjGI}6j<7K@Lxdy(I3^!qHP~FD*dql1CtfP} diff --git a/PlugYInstaller/PlugY.ini b/PlugYInstaller/PlugY.ini index 4764551..750a08a 100644 --- a/PlugYInstaller/PlugY.ini +++ b/PlugYInstaller/PlugY.ini @@ -5,7 +5,7 @@ ; ; ; by Yohann Nicolas ; ; ; -; version 14.01 ; +; version 14.02 ; ; ; ;--------------------------------------------------------------------------------------; diff --git a/PlugYInstaller/PlugY.nsi b/PlugYInstaller/PlugY.nsi index 8145048..614b766 100644 --- a/PlugYInstaller/PlugY.nsi +++ b/PlugYInstaller/PlugY.nsi @@ -3,7 +3,7 @@ Unicode True !include "MUI2.nsh" -!define VERSION "v14.01" +!define VERSION "v14.02" !define D2FILES "." !define NAME "PlugY, The Survival Kit" !define MOD_DIR "Mod PlugY" diff --git a/PlugYInstaller/PlugY/LocalizedStrings.ini b/PlugYInstaller/PlugY/LocalizedStrings.ini index c5c9af60410bd88bb15232586c00194da085941e..ecb3173faba009f17f8c8dcf7a8c2970d32ec1e2 100644 GIT binary patch delta 16 YcmaDboB6?P<_!s~j7FOiS?f;#06d2Vr2qf` delta 16 YcmaDboB6?P<_!s~jE0*NS?f;#06c*PqyPW_ diff --git a/PlugYInstaller/PlugY/PlugYDefault.ini b/PlugYInstaller/PlugY/PlugYDefault.ini index 45622bc..6e8c279 100644 --- a/PlugYInstaller/PlugY/PlugYDefault.ini +++ b/PlugYInstaller/PlugY/PlugYDefault.ini @@ -6,7 +6,7 @@ ; ; ; by Yohann Nicolas ; ; ; -; version 14.01 ; +; version 14.02 ; ; ; ;--------------------------------------------------------------------------------------; diff --git a/PlugYInstaller/PlugY/PlugYFixed.ini b/PlugYInstaller/PlugY/PlugYFixed.ini index 004e6d8..b7f9e39 100644 --- a/PlugYInstaller/PlugY/PlugYFixed.ini +++ b/PlugYInstaller/PlugY/PlugYFixed.ini @@ -6,7 +6,7 @@ ; ; ; by Yohann Nicolas ; ; ; -; version 14.01 ; +; version 14.02 ; ; ; ;--------------------------------------------------------------------------------------; diff --git a/PlugYInstaller/PlugY_The_Survival_Kit_-_Liesmich.txt b/PlugYInstaller/PlugY_The_Survival_Kit_-_Liesmich.txt index bf2eede..3c1033f 100644 --- a/PlugYInstaller/PlugY_The_Survival_Kit_-_Liesmich.txt +++ b/PlugYInstaller/PlugY_The_Survival_Kit_-_Liesmich.txt @@ -4,7 +4,7 @@ ; ; ; von Yohann Nicolas ; ; ; -; version 14.01 ; +; version 14.02 ; ; ; ;--------------------------------------------------------------------------------------; @@ -75,6 +75,9 @@ Jedes Feature kann via PlugY.ini an/ausgeschaltet werden (siehe "Kommentare aus /listcube: (Beta) Erstellt eine "cube.txt" Datei im Savegame-Verzeichnis mit allen Würfelrezepten. /renamechar newname: (Beta) Speichert und benennt den Char um. +v14.02 Änderungen : +- Behebt Fehler, durch den mehrere identische, einzigartige Charms im Inventar gespeichert werden können. + v14.01 Änderungen : - Fehler behoben, der das Löschen von Truhen-Items hervorgerufen hat, wenn der Character zum ersten Mal geladen wurde. diff --git a/PlugYInstaller/PlugY_The_Survival_Kit_-_LisezMoi.txt b/PlugYInstaller/PlugY_The_Survival_Kit_-_LisezMoi.txt index 9474aeb..03a26d2 100644 --- a/PlugYInstaller/PlugY_The_Survival_Kit_-_LisezMoi.txt +++ b/PlugYInstaller/PlugY_The_Survival_Kit_-_LisezMoi.txt @@ -4,7 +4,7 @@ ; ; ; par Yohann Nicolas ; ; ; -; version 14.01 ; +; version 14.02 ; ; ; ;--------------------------------------------------------------------------------------; @@ -75,11 +75,14 @@ Toutes ces fonctions peuvent être activé/désactivé via PlugY.ini (voir "COMM /listcube : (beta) Crée un fichier "cube.txt" dans le répertoire de sauvegarde contenant toutes les formules du cube. /renamechar newname : (beta) Renomme la personnage et le sauvegarde. +Changements apportés par la v14.02 : +- Corrige un bug permettant d'avoir plusieurs charmes uniques identiques dans l'inventaire. + Changements apportés par la v14.01 : - Corrige la perte des objets du coffre lors du chargement d'un personnage pour la première fois. Changements apportés par la v14.00: -- Ajout de la compatibilité avec la version 1.13d de LOD. (merci à Haxifix) +- Ajout de la compatibilité avec la version 1.14d de LOD. (merci à Haxifix) - Crée un backup des fichiers de sauvegardes avant de sauvegarder. - Empéche la fermeture du portail de Nihlathak. - Déplace Deckar Cain à coté du portail d'Harrogath. diff --git a/PlugYInstaller/PlugY_The_Survival_Kit_-_Readme.txt b/PlugYInstaller/PlugY_The_Survival_Kit_-_Readme.txt index bca673c..b5f9162 100644 --- a/PlugYInstaller/PlugY_The_Survival_Kit_-_Readme.txt +++ b/PlugYInstaller/PlugY_The_Survival_Kit_-_Readme.txt @@ -4,7 +4,7 @@ ; ; ; by Yohann Nicolas ; ; ; -; version 14.01 ; +; version 14.02 ; ; ; ;--------------------------------------------------------------------------------------; @@ -75,6 +75,9 @@ Each features can be turn on/off via PlugY.ini (see "COMMENTS ON THE CONFIGURATI /listcube : (beta) Create a "cube.txt" file in save directory containing all cube's receipts. /renamechar newname : (beta) Rename your character and save it. +v14.02 changes : +- Fix a bug allowing multiple identical unique charms to be in inventory. + v14.01 changes : - Fix stash items lost on loading a character for the first time. diff --git a/PlugYInstaller/PlugY_The_Survival_Kit_-_讀我檔案.txt b/PlugYInstaller/PlugY_The_Survival_Kit_-_讀我檔案.txt index 9b448be24a204f76914f6f585daa5a41503985dc..91bef09ee7a90f894a72bf6e658926f8dc672bb9 100644 GIT binary patch delta 197 zcmdn=jcL<2rVSHV7>zbhWVy-9TE<|=U@}?IP1sj~ftP`cL6<>+;hleSHcyCNRYq}T zQF-_3KDBC&|Mlqs(VYL^2lIqDrP-zC)$d8oEIJs%lHF3~#1P8h&cI{<(hb5869Z+1 z4Ny&-Hd8U1vp+TPQfE<7!n!s7}6P18H#~? zD+Z7nT_DSiA(Np3NEb7d096zN)hPf)N`UHe!76hY^1*TnKspa72jV9(qyW``Oj7`| zVWt-W*~uWC77Rr|!8D*k5M2T^G8N3v1oA=FfW$I^#-{?E2XY47xs$s!d5gg>@&h2)i&FF&Ki`6~fPe Ssy7OYPwo&A+T0=Xff)eAO%$X6 delta 68 zcmexi@WWukI(|mO$?N%zSq&L<7z`#G3P^4exWokH=>d5gg>@&h2)i&FGMIze6~fPe Ssy7OYPwo&A+T0=Xff)eA8x*Ag diff --git a/PlugYRun/PlugYRun.suo b/PlugYRun/PlugYRun.suo index f9be07e7c1bf29a2af1f76795b83d8d73529bf55..7425a5e739ea429294e98463d2ea379949610807 100644 GIT binary patch delta 409 zcmZqZU~1@K+K|J-&LFM3uZZLN{Cc8*Y+pHq3!py`2v7vY zoLnQWG5K6A&*odz@0gI>Tj$Ttpb9ie9juA91jvk-Tv_im*}1`R@|SwB<0qFi_;WI9 O0Ht95-2A11hZz80ubOQD delta 393 zcmZqZU~1@K+K|J-Uhrl<^YKU5CKt0@WK(5eU=U`Q?9i+=*@1&)as{gon-EZl10vMG z%d+_g>m5dxexTUq8|-hGCc9`DO#Z@ko|BOoDD)o)CSR!0*!+b%fQgM2D8dQRSi%>; z29o50aKG@KXJ=psO7nyHo4@b}KujtT3Sr`bsu2p{;6^fYa*442WM>V-&0mBASlN_; zGU8CPB`-`qpgn1_f;7uy7b&mJD$**%gvLEdfeRnOs@##m=AxWNJWV>-{Gmt~Z=q O(g37cfPQJ