From f98a271ca09de88210aaef353ac9d9bd6a644c81 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Sun, 30 Apr 2023 11:38:46 -0400 Subject: [PATCH] Battle background updates --- public/images/arenas/default_bg.png | Bin 0 -> 624 bytes public/images/arenas/plains_a.png | Bin 495 -> 1273 bytes public/images/arenas/plains_b.png | Bin 801 -> 2335 bytes public/images/arenas/plains_bg.png | Bin 624 -> 679 bytes public/images/arenas/swamp_bg.png | Bin 734 -> 644 bytes src/battle-phases.ts | 7 ++++--- src/battle-scene.ts | 2 +- 7 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 public/images/arenas/default_bg.png diff --git a/public/images/arenas/default_bg.png b/public/images/arenas/default_bg.png new file mode 100644 index 0000000000000000000000000000000000000000..3c1ae88d03218043037d754f15a74886489e4526 GIT binary patch literal 624 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoTR7N&Bt&0 zhXq+R`tA%N2@H%J0SU}3n~uGow~k@O0R|?41p$rse?Q}LFlJa^xtnPL6ElZHgA=Qr z+5JSuiwtwRj~{5@;!$8=6cVk7<_l+-#hAg&0yaiq1eCIR2ypn35PgUHx3vIVCg!0EUdDQ~&?~ literal 0 HcmV?d00001 diff --git a/public/images/arenas/plains_a.png b/public/images/arenas/plains_a.png index eccb820f002e244f109b98eb54249428da38d06b..ada3c63ccd853e72747d5ff096d37bed95378cf4 100644 GIT binary patch delta 1116 zcmV-i1f%=!1NjM%BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj9iAh93RCr$P z+P{k&Wf%wWQMfze`706prIjkRJSCoagr4VP~|Q3Xx%re`*gjElcRF z_uo8hW{-UO!Dl`*SP&1>k|{&)g;#c(xruMTyeR}>K|DxHB*L#N^xA|VEQW{Zl+5bR zjtRf7zqrxNRn@hRKKI$dF?ona$^aXxy!zI;`tBQtFTHlTS(?a7t}pz`zzcn$H|E@i z9Cv$IRSz~TGu-|A-+D|gf5W0nt`mXR{HZtmLhdiNEA8*^*Wnj|S5D2#M`GKUVn6MD zlybdhaY~%utnFc43BbZoP^4KQ7$We>5R5P@rwF*z6+GX6b!%o9H_jo>C8j?4e)bEV_P(DA$SoY&|sjerX5Lb1z@4wzs#df1me$tCycT|9IU- zI7R@D(GIUTX2|1~;h5)>=iGijeeWCA*_pZFvuf)b=bASFLxf<+aEpM+(8*v+8E|b8 zcoBs2iv73undegmUnv7J?7Vn>YWsNY>C6A0$A|BHGU~pVbxmQ}otYaq1FWlZ%kWEC zErqgjYX@M2&@Vsyf8H!r)sxRYHdV>pOR(Lmu0ZV5wQd=XrMwOoFP*E~2*(V*p)U+r z1!sB;@V$@UK8&eZoD#uThF=6hId&H!M4oy6!qHSZ&F~9j!!OLUZeE9@xmf8jM&p2y8^_Ug9J(6t(> z6qBwp%VsTZ$g+DI@k&XPb{E~&u8035#_!5%FN1IU{3CTc zkNv$ro4JWHe-uxmLhKXQ>BsMGH%t9LzJv(C_>pDo4=ivR)-nJ?Rxe$ZUWC!3n;Q!c zxjqpTSN?jUy8iI5b=wZUJ9qzS=BAz7+Gys6UEjQ2T{*Z=w`I__EixSQIAiu1@4x)l zp7=a;hgk+Ie-p+yQ@e{>${=i4Cu6F-e8{`Pawup@f3fZB8#_}W6>aJZztWf>EcgHF z?$%M*mhB%0lVhD!x4BDuOf?BY?zfe_`7-!Y{$p{Md8(CCY!?Am21gn*eixxL6nTF00002@?#vZ3f=+Sb79;ahQMvrXi z0#bsA5Q#~kJkP?Pgp3idOazg!fsw!zf51QSVG7DR=by{ug)YB#AXS!Vaja5AmBbJM++y^`f3YhS zy40_NazBRg@w4|UanBNATogqyL;zO|UwgXDMX!yzcS2C+)f)Zapg0InUr zA$mvsjV%%EA#O|Nu!(LyhC+w{t`olBJ0I-$V=lc~6Ts;hep(SCfbR>R0B++qSqRyZ ZKRNlX3>_-oApigX07*qoM6N<$0fOJqnN9!z diff --git a/public/images/arenas/plains_b.png b/public/images/arenas/plains_b.png index 8da1f3e11ee7c19726f0ab4e5aea9ae9e16f3fa6..b75b9825b21b84899d67189c67c38b5e92a7b102 100644 GIT binary patch delta 2158 zcmV-!2$A=p2A>j;BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1pojDuSrBfRCr$P z-A$+*RT{?eR!D+gbtWQ-E+hnki@^a!1L7=P&BnbLSAuQ?H!c*B0T+TB6?ZNb+-StT z8&@tI2ApBQkt{?A!G$J>@#`u{WHLTA^<3Zk-gBy}`s;Re{t!R7RCRS#byqd@^n1>! zP9~9IM3HbIe_*UmJ^ScY{k0FVVAr=(0KwxgK6X`q?ZbVc;CtY&$J<9(hU?lXfWYDN zj}OmIPQUivuIr=}jBmg6Zt+^`yRO&sb20q7-b3wm(GL|MHikl>6gcMRr>z$$gmM$~ z($D{$-20bfyZ-Y2{2F;ZZJT*L)8knAb-joDx)_FUe-CU7S55!^_*}6vidB_pJ&Ef+ z_r?=VpnQ3Dy9pjs6?W*x-|GbhP<&pzPU$(x`;fe@)+uc(u@a2OQafIANK!5C#RTe~ePV<HOnJ)ZNz{L>k z3c&pq1GpA~;-I_zPk$(`=jY>b#&dA&{=+-le{}_5KHu%^Mj-$(3JSZ}FPEzw>06O? zRas+GIu+0N} zrc@1OT~*wv%SYR}-@@bY&F$P|^5*sz&GgBw6V230%eOE7*v{<^!%P9Bkp1ZBrJbqX z+oHqJ`tCbdiShgsfWRDb@L8$Ka}Y{xe*j<>3W6APQ4GCEL8sSO0KD|j$!6J$AAQoi zZ|yG!qs1_cV(2}5`L@Xi2ft|^D=?Q8fPMJO!K31m2UiF{U?2ydJKrNOuT^=vD03(O zJRE?vuq%1x^D~pX?>^GZD+CmLar);6k4zpp(6350g`UH29YU~AH-e5;pVe6Ve*pGu%hg`#Hja`$&D%b-pND_Cb*=!+x0dLb93Vr3Fj5FAp!c&1?4o0}F$N(4h?N=A z++CGf!cSrVP77i^UkbrrE?sHo{_loE2im#a)NEcx6}X6C)joVU&XTNB{!A$>CS( z_q*$!+Xh{TzKHvVkk^;m$Zj7V{HRedm_pC}dD+ka6c3=}k>oysn2$dWx=ahRp~loN zNC0A~d|zKwx*<1KC4Fdpg`Y0mKIRF%=>03_ih=9ki=n4=ZAcT?%e$(d0$fsKN&*+?(K{Le-_9;uCMve-!JS`QL~s<`RxaVpQk#uS;9|Y#f^TT}sd7|BrC?FGxsr?(rIzb? z{nc(m8ER8eSaQ7 z)CClO1)_`0RgRzY=w%FxX-c8jXOLl4V#sM4Z?^vIvkT3@Hlg`|J&MNQ$nj>FNF zl7Bb+x0ClZ(4`|5f=R&qL5et!x@g=4G$MO_p*{IW3zpD_r6eWeRXzZuoV)R#gphF_GIE6f~d zTJCKfU^(oDe^h_oR~Exh(?wEwDFvDKU#bSR zZ!3jdZM$q!LoXr#F$xMpP2>LoyePWRYx~o4HKnjDE%QI$pF^y6Ye}r&q)%AQ%g5hit;{X5v delta 663 zcmV;I0%-l85}^i=BRc})|Gj7ftMe=jP}2$8`@e_+3!+y(I8d-wO_;vf2M+YPDei@$E_7mry1 zggfIl4BFOlTO*Q#pG8st*?Z(pQOh-MOGol}DUJe&*iCBVaCW_m_Mx}29&OKIiR}?Z z0c3x%JH>4rwfCs9yic0wFUInwNbWR>0!Z4?>$|IBcPVmf1g<`YqC0Ne-1SEXfAXd{ zR&_*G7acfFvEhHV)B6dspysnbuO;&L;Z#7#0vh0VK)ry)8K9<$Soh^ld#&de_{yP4w|x z=tL-h6dS%hS|flZhfn}XB7VY`e~)iNm{|k`5boA1MDX!`*^R6k zztiXXOn%9!tNQZ^<#_%VHYkQd7mJFZ;Q6Ys8X0jxH3RBt=v5T-IK4c%msVJ@;#*_o- zOOXVSl42O)YcVGRcXQ;1HL)99`dUobK@_JVdE$%F1rT-}#jJ^)0K!=u$6?GhlEX7= xhU@r=oB+bzksR7Ok`t#5iW`x^GZ;Xr{s98D(i}*SxflQd002ovPDHLkV1gHOLvjEB diff --git a/public/images/arenas/plains_bg.png b/public/images/arenas/plains_bg.png index 3c1ae88d03218043037d754f15a74886489e4526..0ab30c7ee418f89ac781a904dd4f17f4c5aae7f8 100644 GIT binary patch literal 679 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoTR7N&5jgR z3=A9lx&I`xGB7Zid%8G=RK&f#yU~+5k)iG3@1y5D@0`$?pfp!_N4M}2-jv=3;Tsw1 zVoi#Q1;R@>V(vX}6sUgq^zpylr+@shoTt{Xp#7(`f;&T_4kODZ7J(B&4hr6AoHZXm zetjNjp>UFkWz!xW#uJ<1@wy%=QP`c0;vsF@^Yfp6veHpF z4e|sZH_Q_1w26hU4Fn}8Y@me$+a?rUA(ve ztZFA42RK-=f!+sdf^mVNgc1^YEo@+2y%+GAjiQA}4ltDTKeb<+|L^!8@$V15Uwr?$ zxVk&KVfu&8`+q;yKmE4sC6DgBt&0 zhXq+R`tA%N2@H%J0SU}3n~uGow~k@O0R|?41p$rse?Q}LFlJa^xtnPL6ElZHgA=Qr z+5JSuiwtwRj~{5@;!$8=6cVk7<_l+-#hAg&0yaiq1eCIR2ypn35PgUHx3vIVCg!0EUdDQ~&?~ diff --git a/public/images/arenas/swamp_bg.png b/public/images/arenas/swamp_bg.png index 2cf27141483cd2f1c8e3eaf046019f95a5b03a19..00679534cdb98301992d37efd49f6eddcfee90f6 100644 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoTR7N&5jgR z3=A9lx&I`xGB7ZSc)B=-RK&f#t0?3c$k2AN{Ou*JI3u@h+@UJ71=l)EWVyLwlFP>K z_j8ii@Bg{?bzNa~?LJ|L3y=PDPEc-en8v^q$;6SusW3qmjdRT+W`0~N^CTSyh101V z4%1lSs)7>~PBXD=Vi7nYHU0SQ@C1dEK%Pt!L!=m{DY(rC$t0KW+RZQEv5BEkhmmDd zOecRzB+wPk0xr_7ELqt=j>*>fp3M!{19SvJ5f;wr(g?8Ack*$cfLa4} z=~Dp~u*i9!1>7)G)@-!Rw_#=hds@?ALMkJ!(3uwgumPm)la>rv)jXg|p!c6jDj;*w z!*rUw6Ej#@`vv3x#Tf_qLk}h1lI_<0F|?YH!pIbO`3p0Hx%c8VE*7(a>4h&f!ZXd+ amq822<^W<4xD-4YM0vXUxvX5jgR z3=A9lx&I`xGB7aZdAc};RK&f#YpBPP$k6ui@78q>nDSIEb~Fj^XgDW2MN4q&Eygb{ z>K8LjlrAgW=-_MJ`q9omS$XESv*!QL81bE7H$R=hQTy|J21_Q6l-};y?%NMIOk(9o zspMcviEMC~#=sN_l;BjDpbF>wRO6VC%E%PCj}xv$u8AR1Oku)PMTpEfhDIH3ffGe+ z94R|l**4u_V#Y88V&b(OyJqj<;8g(``BY5eL=iU+*j8f)h0{zdo9xapbulpFA zz54ZM|MxNPf6Xu0``Z5Z>esqJ6~PG#*>mFWaw|-D0@V8{{$azKjiq}u8yqG@Cn%iO zH2}LZ`Eka5CYDJ$4hr5tS240|Vi7nYgp(t+TmAMw2`2C4s#(wGKlmQmpwoK&L#KTA zv-63JARmH4pTV=zD|& zMqp~mKmwDC9ogql)1LAOoY;iL*?Tzt@?O4d@}K38y4VBpBmDpL^_?(nG3E0svtea} z`5l{*r>+@b*Y9EHK#lIFrV?NYU}$}kQvf+JaPv*>S$j`qxE87C15+YjYJ_K+uP=iZ Xkj(+aAaE&oGKlhY^>bP0l+XkKM*{M? diff --git a/src/battle-phases.ts b/src/battle-phases.ts index 323b0f81baf..ea1e8145b7e 100644 --- a/src/battle-phases.ts +++ b/src/battle-phases.ts @@ -314,14 +314,15 @@ export class SwitchBiomePhase extends BattlePhase { this.scene.time.delayedCall(1000, () => this.scene.arena.playBgm()); this.scene.tweens.add({ - targets: [ this.scene.arenaBgTransition, this.scene.arenaPlayerTransition ], + targets: [ this.scene.arenaPlayer, this.scene.arenaBgTransition, this.scene.arenaPlayerTransition ], duration: 1000, delay: 1000, ease: 'Sine.easeInOut', - alpha: 1, + alpha: (target: any) => target === this.scene.arenaPlayer ? 0 : 1, onComplete: () => { this.scene.arenaBg.setTexture(bgTexture); this.scene.arenaPlayer.setTexture(playerTexture); + this.scene.arenaPlayer.setAlpha(1); this.scene.arenaEnemy.setTexture(enemyTexture); this.scene.arenaNextEnemy.setTexture(enemyTexture); this.scene.arenaBgTransition.setVisible(false); @@ -329,7 +330,7 @@ export class SwitchBiomePhase extends BattlePhase { this.end(); } - }) + }); } }); } diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 0c497a2d25f..90799e9446f 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -480,7 +480,7 @@ export default class BattleScene extends Phaser.Scene { this.arenaBgTransition.setPosition(0, 0); this.arenaPlayer.setPosition(300, 0); - this.arenaPlayerTransition.setPosition(40, 0); + this.arenaPlayerTransition.setPosition(0, 0); this.arenaEnemy.setPosition(-280, 0); this.arenaNextEnemy.setPosition(-280, 0);