From c7b5660a7032b9cfb1342cd1c1c7141be917dc89 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Fri, 24 May 2024 14:03:02 -0500 Subject: [PATCH] Add missing boss indicator to Ursule and fix Ursule's overlay sprite being mirrored to its main sprite. Fix Ursule facing direction not updating correctly before charging. Release Build 9416. --- Adventures in Lestoria/Monster.cpp | 2 +- Adventures in Lestoria/Ursule.cpp | 1 + Adventures in Lestoria/Version.h | 2 +- .../assets/config/MonsterStrategies.txt | 2 +- .../assets/config/Monsters.txt | 3 +++ x64/Release/Adventures in Lestoria.exe | Bin 3691008 -> 3691008 bytes 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Adventures in Lestoria/Monster.cpp b/Adventures in Lestoria/Monster.cpp index 3847415b..ffc85daf 100644 --- a/Adventures in Lestoria/Monster.cpp +++ b/Adventures in Lestoria/Monster.cpp @@ -441,7 +441,7 @@ void Monster::Draw()const{ game->view.DrawPartialRotatedDecal(GetPos()-vf2d{0,GetZ()},GetFrame().GetSourceImage()->Decal(),spriteRot,GetFrame().GetSourceRect().size/2,GetFrame().GetSourceRect().pos,GetFrame().GetSourceRect().size,vf2d(GetSizeMult()*(!HasFourWaySprites()&&GetFacingDirection()==Direction::EAST?-1:1),GetSizeMult()),blendCol); if(overlaySprite.length()!=0){ - game->view.DrawPartialRotatedDecal(GetPos()-vf2d{0,GetZ()},GFX[overlaySprite].Decal(),spriteRot,GetFrame().GetSourceRect().size/2,GetFrame().GetSourceRect().pos,GetFrame().GetSourceRect().size,vf2d(GetSizeMult()*(!HasFourWaySprites()&&GetFacingDirection()==Direction::WEST?-1:1),GetSizeMult()),{blendCol.r,blendCol.g,blendCol.b,overlaySpriteTransparency}); + game->view.DrawPartialRotatedDecal(GetPos()-vf2d{0,GetZ()},GFX[overlaySprite].Decal(),spriteRot,GetFrame().GetSourceRect().size/2,GetFrame().GetSourceRect().pos,GetFrame().GetSourceRect().size,vf2d(GetSizeMult()*(!HasFourWaySprites()&&GetFacingDirection()==Direction::EAST?-1:1),GetSizeMult()),{blendCol.r,blendCol.g,blendCol.b,overlaySpriteTransparency}); } if(HasMountedMonster())game->view.DrawPartialRotatedDecal(GetPos()-vf2d{0,GetZ()}+mountedSprOffset,GetMountedFrame().value().GetSourceImage()->Decal(),spriteRot,GetMountedFrame().value().GetSourceRect().size/2,GetMountedFrame().value().GetSourceRect().pos,GetMountedFrame().value().GetSourceRect().size,vf2d(GetSizeMult()*(!HasFourWaySprites()&&GetFacingDirection()==Direction::EAST?-1:1),GetSizeMult()),blendCol); diff --git a/Adventures in Lestoria/Ursule.cpp b/Adventures in Lestoria/Ursule.cpp index d47d8338..6d783091 100644 --- a/Adventures in Lestoria/Ursule.cpp +++ b/Adventures in Lestoria/Ursule.cpp @@ -323,6 +323,7 @@ void Monster::STRATEGY::URSULE(Monster&m,float fElapsedTime,std::string strategy m.F(A::TARGET_TIMER)=ConfigFloat("Phase 3.Charge Max Run Time"); m.F(A::CHARGE_COOLDOWN)=ConfigFloat("Phase 3.Charge Attack Cooldown"); m.PerformAnimation("CHARGING"); + m.UpdateFacingDirection(m.target); } break; } diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 39acb80d..8fd6cfad 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 2 #define VERSION_PATCH 0 -#define VERSION_BUILD 9413 +#define VERSION_BUILD 9416 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/Adventures in Lestoria/assets/config/MonsterStrategies.txt b/Adventures in Lestoria/assets/config/MonsterStrategies.txt index 7783aa06..6117a740 100644 --- a/Adventures in Lestoria/assets/config/MonsterStrategies.txt +++ b/Adventures in Lestoria/assets/config/MonsterStrategies.txt @@ -458,7 +458,7 @@ MonsterStrategy Charge Attack Damage = 30 # Amount of knockback to cause to the player when hit by the charging attack. - Charge Attack Knockback Strength = 3.5 + Charge Attack Knockback Strength = 2.0 # Number of stomps to perform before doing a run towards the player. Stomp Count = 3 diff --git a/Adventures in Lestoria/assets/config/Monsters.txt b/Adventures in Lestoria/assets/config/Monsters.txt index e786dd27..d00b3ef5 100644 --- a/Adventures in Lestoria/assets/config/Monsters.txt +++ b/Adventures in Lestoria/assets/config/Monsters.txt @@ -381,6 +381,9 @@ Monsters XP = 200 + # A flag to show an arrow indicator when the boss is off-screen. + ShowBossIndicator = True + Strategy = Ursule # vvvvv Bear script overrides vvvvv diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index 43f7e4b57e3529c5ea35d1bf5142cc61e4e86bdc..963ede62d81d8a57416dae509095df33ac91760d 100644 GIT binary patch delta 3468 zcmZWr3sh9s6@7Px}AZ8l!m%>IDvc_Bs6 zlG`_JDxU%le}Z1!Bj}TT3Y2_ED{agLfwUTa$%RFPv{GdrypF@cJa`p{zC6goVZ{cx zi9={Uyn#bSKBVGsJ0Eg!ShNwY+qd!+CjvN*FK-AiDG*-(UlYZD{ZX3km1v=~_gB8` zAzPKU*a~|2(Q2NPOh5_(7{63V!bLu#VfLD-d0Gk$?nQg z@x`kQC%1wiLy67@!GpRKL95rVGdM0;yK^8}n?2M#0ZkJ>eyv*?haeXxe)sk1%mpa};=DkP>$_;M-2t<$NSqmVslv4-!m902Q^1#WZK|cK);v%98aWhH(b*GWg*?W+8e%)}q98MEYLFdkd ze}Cq=)R#R8)#1(RxYB$L%px0TjRwLMGZ)#RRr(uvC?+htBUK6d@4uD(e;4#Mj3?VZi`)8i z(i~)7|47sJq5>NF-d^x?)EHUntC#|7=!v}`4~Xv@mUzWLvy=J4r@vtibPmM?WO{WO z^-AGH`Eu&C9o$#DBONA(l|{K>)mY`Oi^CE+_3aj3aRXf`KT%}IHQSga{Iln|q||ve z2bTanIoYC80 z=JXA1)Iuz&rH{0bJbBYu!l7l1wEhr^#A|~pRHlTcR={NPE?r*%EA8%`AuQ~UIkc++ zRAd^J>p&<@Ht){aX2 zxv=}W)NE&_T+0^hB{0?A#6^;x*5OjT8}?92(Q6z?4D<1Fe3tFvl>A|-3JH2JGm>@Z zlJu1sEJw=z(ZkXQ1Jkkmj?{N*BD-PrEP=}Rfj9r*5tQIymXMf8Pii6Db7Va}(G=lk zeCkFO25IF!nCo(SzIh*ugy}8O8~ZSK#!(4*M)k*yq+?$qMm$+}$rz0!-F0J~5+^+y zmR?Sp6HDps9pJT~+j6%C?^*;8C3H)I?uIdm+bo&A`T-^n?_@v7zunHidF=`BH0|fj zH10hJq}_T@5HD)`0rZ75&UfatB?>g$!f$8%i`eiLeds5?{678*I;-7udL?+t&M&Fe zgO@|Zyb)U(66lY=12=MwmQ=!2l11w)!O!z^Z)^65QqX_r|DrtbkVT z1h42X|N2ors(cE?cDe)U$vSq;!`GKtsh4+I@?Z(OJ-VKyJQ$`u z1u%8;C()=gCVprWF*csJFo5i#G*O3YfQg$o^PEbTO+O0iIKphR(k1eipF)N2&Ay+M#v~}KCf27_uMQY^fwa}LR;4bqwUUv7# z+Qqzb)53#iJd~%m0YUr4J3Rfk^v$ z!OX=fi{{sWu(E&l7%oHDN_2^dT6LY8S9Icc!c%^ah;=+i&F4Q;^KU&v9XjXQaY<)c zamSw%tH(i+xpo|z#P8c+$0Ghg1C`f;%BVf5q3_m0yz9?_W29x#_F70FR@8=q-$Xs~ z#r|pRY`symaWA-%(=?TW54MAC6ns||M7^LWj51~)R!O=!tC{y-N$0&2XLJiNU-T$;6~IiZUi+q-ig2WNz-J zL3LPUTIu3C@CxWRQ6`F?M2@CRWRx0=Aoi|P15BsIw7L!g9FM+gG@y}fy+$wALAEmG zQV-T#t0nA2J5JE<>=LveG6F#-&)nn839<6kI27`_tAf^3D7AV8SGN6=&~77}opj?t zSgw#FFal~m{R+nHvGNSw=XlM$UnQyUF-|R?2FK{5gAn7M6K*Ou$~MinjFda3!~#}8 z;|@Vs@%!1RBIUey+zuw~dShDbX7G^4i_?@;RY-@<+W1t?H>ztHYH%sfx>%v|( z@;OtC$11HNN!KZkU&K7G&%iz_M0ASZ9U@$^o<2GR%K|Q+msoSuXJ7=y#tleko zX*WVMk(R6q^4?<`)MOi6S4(Em|9$2^M{~J87!iU9HC(O_yX8jSpbcMyt&sJ~G^8mE T5srvJ%t1sVq70;Iu5|eS;euLA delta 3481 zcmZWs3sjRw7XBv)0TKRy1e79RFCv1xMFACwP4rI*KB`#S`d%Mhihv3(dg_7#h7cl% z${@OG&$eAXZ9Ukvrcy;MZV^RgPg~!Q=&Jpxk5yqUmG1s~Ckc^C&iVM~aqpdP=H9t? zDE|01DMmEJ5LvRNB#!9g2!jmagcyKuMz|p42v>xgIgSjxvw-|VuUs?`;f@%D@IZJX zc!UDsh44lUM))9<2w#LBVhCa=!XNP(BEYO%G%WMqxMt3bKtvEC7%?32x;bYC}0cK6BU-h>(#F&9j$5H6ah^z2&f6RuV^JJ^&x{;`iYYAxEfR79^1( zIx`EjzIR*HA$c7B1e3-hm~JvBThDX(M>;L1+$W#`NxtKf{xxeW<*(awBW?UJ!j&4J)ue z2#b*4?6r_j=6iqy!epTYcGJv)Q8*GRY+R zH7a(hc*UNhtidZ(0iFEZW^8DOVB<_DpLqh&inxq8qct6GvkH3goxIlq^T%cI4dFX- z2O|gG&LN1d)k7#Lqy^GWbC#MekYi=Gdpa!6^Bikq%qRo|CKH%hfsM<#tlg@ zUZ#8NWd6wtoBbNAeN#2|#2ihZ6}Gb>W=!blk@&DDjZA^{zowRQ@RJ2+Sb0)~0p#y0 z94uY>+OV^{BlbvmjPpY*QTG0S-nb@?4K=hPHuJ%)?R^O0xCUr=miVr)@=;Uf{Nga`1c*J10aAPu^Rta(Ru>oAkNAwp1 z=!SmSL^#|8Q`ldR3!-wT8mUy$xfL*!Y@}-{V6NMvV}!ZcV1dk$uyiXeuFC^$aCK=Tw#!Xg*2L83FE!_R7Tt@rV;P6b>;uj`brq*{oN${ zIA#Ltcme%aC4|a6XWE>-XC1hXna~@NU8xu^I^$WZKeWb6){GU5bA>rXEk6VRp7c(uT57z?|e#g~u<$Uk-WBXYity&L(!>>7+2(XB-=bg}iKe7p#`zQb+)VqensM89FMC~hV*D$<%SEaZ zi-gCiXvcsav3Vttg_F3&=ckupQEJt-WnI1^;0Q)1U-ozW`>G?a>#Pi8y=@HVIv9RC zp+Cdj*I9Nls6+C_?`hc<2$HR~sncUyKpt?-5e@G!<-U0>lUlYw;LxuUkvPWv_`}3n zW!}SRXZPeJ^{WB!T)&Fv)W#(t`E0D33NIksnA0m0FGOx;d7pA`1hV8hfCw!IBgRSvY&!w=g8D7H;y$X z(iNC`gIEk~ZlJ?zK`rNlikTc;RErn6mKN5+M4#@6ehV+9t+kLsT&OFBks+IL2`snP zVs~e3-;?Prc1JJL^fds4(mzocF>mGAmkI?;!J6&LY|@zTOx?&q-1&f=QMZaeY(6Hl zMQFM4g`_qBuZ553qaBdsw>-|4oK!9PADAe&S0xyoSJH{~ z5L;BV)CITC-Z-Dczf#@veV$4VTff9IBMJ`RZ|hQO}to7IGu?;s)x72&o@h~h?*9n2gQRcP|n`IcOFlg zo$u!lUf`g|G5W`yFmn7n-wu>Fwxd`cQ<*2Bn6=o=ntVfQ(WGL|;#xFn58NyscM~2L z-dzEkgX!6wFd{TE3l&5^T()glbyp5>5qZGPUIU!_Cg48Z4xFM6xI22~EzE)P-K5XF`5X74JF>z!lS#|P1cb6t)(+9Z$k z$N!)7SLKoBtMaI(T6{nM_sdaZ^yhX*A)*m6=5xDaulbTly8o-#IWjjVJvkhUh(p99 Q#vl?9W6k97IBDnq0h~HoApigX