From c14077d3e93a2eb7a7bd684b8b5416404b0f4827 Mon Sep 17 00:00:00 2001 From: CaptainSegis Date: Thu, 17 Nov 2016 17:51:51 -0500 Subject: [PATCH] Made NPCs able to mega evolve their pokemon --- .../2.5DHero/Battle/BattleSystemV2/Battle.vb | 20 ++++++++++++++++++ 2.5DHero/2.5DHeroContent/Content.mgcb | 12 +++++++++++ .../Pokemon/Overworld/Normal/6_mega_x.png | Bin 3712 -> 3079 bytes .../Pokemon/Overworld/Shiny/6_mega_x.png | Bin 0 -> 2919 bytes 4 files changed, 32 insertions(+) create mode 100644 2.5DHero/2.5DHeroContent/Pokemon/Overworld/Shiny/6_mega_x.png diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index ff9cf4551..8645bfe33 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -369,6 +369,7 @@ End If 'AI move here: If BattleScreen.IsTrainerBattle AndAlso Not BattleScreen.IsRemoteBattle Then + AI_MegaEvolve(BattleScreen) Return TrainerAI.GetAIMove(BattleScreen, OwnStep) Else Return New RoundConst() With {.StepType = RoundConst.StepTypes.Move, .Argument = BattleScreen.OppPokemon.Attacks(Core.Random.Next(0, BattleScreen.OppPokemon.Attacks.Count))} @@ -416,6 +417,25 @@ Public SelectedMoveOwn As Boolean = True Public SelectedMoveOpp As Boolean = True + Sub AI_MegaEvolve(ByVal BattleScreen As BattleScreen) + For i = 0 To BattleScreen.Trainer.Pokemons.Count - 1 + Dim _str As String = BattleScreen.Trainer.Pokemons(i).AdditionalData + Select Case _str + Case "mega", "mega_x", "mega_y" + Exit Sub + Case Else + 'do nothing + End Select + Next + Dim p As Pokemon = BattleScreen.OppPokemon + If p.Item IsNot Nothing AndAlso p.Item.IsMegaStone = True Then + Dim megaStone = CType(p.Item, Items.MegaStone) + If p.Number = megaStone.MegaPokemonNumber Then + BattleScreen.IsMegaEvolvingOpp = True + End If + End If + End Sub + 'Does the MegaEvolution Sub DoMegaEvolution(ByVal BattleScreen As BattleScreen, ByVal own As Boolean) diff --git a/2.5DHero/2.5DHeroContent/Content.mgcb b/2.5DHero/2.5DHeroContent/Content.mgcb index 7da24a455..df03f63d3 100644 --- a/2.5DHero/2.5DHeroContent/Content.mgcb +++ b/2.5DHero/2.5DHeroContent/Content.mgcb @@ -42828,3 +42828,15 @@ /processorParam:TextureFormat=Color /build:Textures/NPC/ManaphyEgg.png +#begin Pokemon/Overworld/Shiny/6_mega_x.png +/importer:TextureImporter +/processor:TextureProcessor +/processorParam:ColorKeyColor=255,0,255,255 +/processorParam:ColorKeyEnabled=True +/processorParam:GenerateMipmaps=False +/processorParam:PremultiplyAlpha=True +/processorParam:ResizeToPowerOfTwo=False +/processorParam:MakeSquare=False +/processorParam:TextureFormat=Color +/build:Pokemon/Overworld/Shiny/6_mega_x.png + diff --git a/2.5DHero/2.5DHeroContent/Pokemon/Overworld/Normal/6_mega_x.png b/2.5DHero/2.5DHeroContent/Pokemon/Overworld/Normal/6_mega_x.png index a6981ab73f5416c17a2bfed73e4fc4782ea7f61b..20202aef167da437724ea34f26486add0056ef4f 100644 GIT binary patch delta 1987 zcmV;!2R!(I9fue$iBL{Q4GJ0x0000DNk~Le0001B0001h2m=5B0K)>DhyVZp0drDE zLIAGL9O6W_+$`eP`OKi}Mo>@j3ZEK?pQd_-m-xiM zEps=4ZeEIK<~9Dbn$rUra$R}H_=KzJVcclcc@%w+4_c}wyGm75F<{f@X`Q^%2 z^hs9~5K%gdmH>G1m;9itPYkvUWxaF8FCK%=m&T~9PXiU;7X`$I1D%`P3UB$xZe_O+ zRMH;?P8l}+se|1#P93}t2e3M8h-5@Xzi)*ul40zvgR$A5%X<{>7aWY&>C7Bz`fZ~d zr`}l)N#K9_DLqWfub%Z7EWYn;uycp1J{pi?oJJRV=-5ovn*q-N0$j+S8`SlQfifr} z_HS3~{#28|1@1zAbJz!>t`8x59~~oL8%h7jD2?eDTz$ocZXe*femAgY4)W;VZr~VU z{=jfBX23Ro!~`_-7Gi_oIQ=0(*Rw;@CI@)%G!}nP0yb8%M+&s`(Lfg&537)Xhm|h0 z{8FWxqPaZOzwPJ(TKZ_fci>5&L1g!NGC-+*8Q-4`>iY1Z&#u??#aNQb5}a;lJ8+=~ zCxeDQN#Y17Coot7K^w6xLs_4Ox=sYL&J z1>S!Kw|E=e;?Fa@Yp}67wUe1rrSepKi8A#Cf_7x!%;6t0jezzKS=9@r1z!au#k zV0UQg?O++yQM`rF3;4%laz}=YAK)1zr77~c-VF53>cJ>KegFdKLga*lABMq5>u7&u z8~P;4*UV*LGy(k03_#$?KRgEOUupo#`plr8s4G9#m5BAcPTTom9R`uB#w1dPvi?Z& zwXk&LFN?$#em%c02t0l423XdV8jr{c6@6}CHzljYb>*>=-L5;Yn+aYKS^kxrR9b7TT4`ov(iTM&Oa*d~9$917RD zl)x`3pU=jIihegx0t#^ZdrqL|BQx;9tDZPLQ)~Lfz*7Sv}WjM(g4D6Zn6ho|=u~@^DZoNY%daLh)#KB0!r4uNbb@0C6?sOm9b0O5(?3JzeM zItr`$$h*LPz==y%{{7!&4FX3!~Nmv^>*8z$2`c;N6iOwDo^7urvc}EnCj9 za2TEFjoF}g*OAZLn|hst2vy%yPT$-wS%M9(@rMES-K;kaGZBgJh8OvL%W>fIGJ}PP zQi6=X1l0700cG*bDiO?m!QoZ@*q}1TUAz`^g#;;oeg9t5AAw|WI>LEY0bWdS@E5wO zPYjrhEW$QoV}cj?B$9vHTeUrFfd0FbK+PebT*8<2rOYk$J^i*Z-ZO> zaR%J!ajS?Mx)g9WnCDiG8@d#59wK|uR8Mk47Xoqvdmh^F@ueJ^a2qrz1RMt5FP&pP zq5~>!(iE!2DVO^S9Z=CHN3gH}!e6XFU-m3Ggw;`*4k+sr19*Qs#P}bb^chol7EGF^ z91F+-9Z}ZHAg)FjVwP8WEjEU?-CG9lSz9oRXmM7c+j={K@B$Q?4l-j;)&kwu#}q6do=?j9@ba7ptMo(hz}m*?-TFtF78?4Hf&izV9Jms~J9?wz z)a}VXY6VoLK}&zHf6{V*d<}|Fh^Nrprf$yyne_^^e&4vzH+nwAlf#xNicp?JuEEtB ziDm1D{ep6)+xo-cG1xkVYhaweA{zi_zX+Jcm2T_JVDa{Yz%Z=v{nTF!T>MRd{8zfI zmjPYS?*Z#N@EjSr7rP}(;am?%em!QcbX%{XV#wl80^ENj+#Tl(ES@YN+@n{zskd{1 zv7Q{d2X%dQ{l&lnYIIX?29`kxkCAaXjq=7@2Mcsd9}IX)p8+2N;{F+B{VDo(4R8~1rk~Hh0id0h V^x>IKTZ<5Ku;E*ZIuI7fc5p*h+i zmpaD}$y|B-&BKog-$b_t)%6k?VD#SLx~7RxM$Ct)n=&?n z>ZF%FDUR+lebX!}Mqn}oqnK$s?k`!f$eZ0UtDjI0o(&t2Jt7z4Pv1<>dAq(It2^~N z%3jte`-B2CXAPUa^Mr5y_;HO7Aa6Q*$cqtcM$DJXbLTQeZbaB(MqC%Ia60cSp_Ur! zaY%B3(n|y@|Z4Q9HO^Y-=WtZl2*^y)VY8@mtBtU(k2b*k_iws)UWA%3w~$q|yh;Z& zb9)5^5G#Ss4rG?z*v=vRBjy0*ZDQ4)!&j6ro4{Xl`3t&){7cl^UJ`HZ;{{GtkPc*I z+*}@%If*Ip zpcvMD403K{)I5rK@|M$&kfdUNyYh!B?+>>4PBDo#aDEO`+B@vOyPvxqr-BN#geAtk zH(@65_Y?NI_ z-S6-u?;;p%6))nD#jfA9;qZu;!IqZt0;mReWxl8^RVMRAZ@vvLY3w1BaP>W>w2~|~ zZpU}sH8(QL?uI@+j;i#27ebad(f`eL|Fa_T0VK$K;-J0%sHKvNF7rxlLw!oo@OTDYQe~e9y!auav#0gm91Z0`R1wFQ&sh(aNP^z*4clhK9@P8?0iK} zl)y&eSJa%F$J@}r;tFGFTKd-2RBh}ZGa_%ysRH_-RxO*b{{Zb&Nm*YI2zw5-Tus#? zP=Bctc>P?bGiY$xE)l$^lO*}xJ&YV|yrB^k2zhik?&*MOO&`98x#{F?P|o(^xCt$P zXl;8q%74&)B(qA#q_3PSqPkSnmK!O`x&ie$yQ<499w7;Nu&qsv|B2%Uw`X`pSW25Q zxEa+jK>3RuZcomo5ip>r0;UvcU18=5CaCFGpv)quy`3@^YIDKa8^u?w-I=8K#p4~= zb-uIVXw@0Fa|#~pV4c0apFM4%*%RXVL$50lX*NNUFs7&mQceKrum>@fpK|N!?pv!2 zY3Og%u&7`{^XmooN0y*O<#1v(f+mYoc)ZWK>xG7JFtBN_{V^{*HZqX z4+{<+ggHRn$v8#wDW&ap^Wc}OM})ZPl!>e$oxpp1nkj5wSbElK?A5zK`&U|8Ug4bdSCT8H(n>L;hHy%GUzqqm zS8IZW*wL{jd$};C1>?Cyv!>`oZjKx{aIYT2R@@M|&%9N;K*K(~+zKSa=1%VBJ(&^v zygP7h%XzEui3z>eov*T=b`;3+QS~npx6F=$Eac+!#Q~^qHrxD#>d63Kba}>^)hR7z z?)}a`X6j7CY*y9;CKZ0ddN}?@Mkg@@9OO!<+Wd6>YNb}RLn=`li;#%$VH525SskIn z1yH$Ne{@l9`ch@F2q3-XQT3Knm;$SVev$T7N&4NBJJ6+ zQjBr5!(P9Z`t6_w?2Z<$pzOLs=3*_*I92X(R99oUkDC=z=5&qaIG*latw!T=HEvJt zP!&zntawGeL!`FMnw=!Zc`ytklJr^vt_*n_U#Owp49{Mg*{a~x3TPAXjLg*SM4k6m z)zHxu-LI8A)DMpR7zk*+wagmtbn`87DubA^Xei}#-|eKcokWN;t6@6Bsima+6XetC zA_>iksU%K2N+%^AO-g=;6OXvn8Mq>g(<^dLgqbKb&Ewo20tYL|4x6U3HnLdlnyswb z2HkO;e}xA0Y{850frf%IW9%f*RP@f(t^Qj)0jTfw7w5z3dlD%poJDHv3(P z6}oIW?d(VKfwbkwWaemgS*+o<3GLQv-hZ82v{rr6|6u4xk4u##1?4BcV)S9kE>H*h zif@+{!-SU@8zT9k@kHaS%?R&Xfk3$Z!|pVo7Tk9#{P$1CK6@Ltl~4}M(Ygqt;S*jGSJ>A-NrbZ1XF`av-^2*$ebP@w zV?RIKp1!opq5IpJ<|y}+8^?wq?Ht~RcU3*vkgc~!)JqO>y)~(#bw|4iU@CSV qE9|&)G<3ny-(#8sHnYCs)}0s@ahLI-7X6B?5b$vIqTY3(r~D1WaH~@Q diff --git a/2.5DHero/2.5DHeroContent/Pokemon/Overworld/Shiny/6_mega_x.png b/2.5DHero/2.5DHeroContent/Pokemon/Overworld/Shiny/6_mega_x.png new file mode 100644 index 0000000000000000000000000000000000000000..9ba92f895c92da15a09ab3b5256f4e298a3f61f4 GIT binary patch literal 2919 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 R_;&yR002ovPDHLkV1m~Z#NYq` literal 0 HcmV?d00001