From 1a0c470173aff10e89c15ddd3f452e1177a1c03d Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Wed, 27 Mar 2024 22:40:10 -0400 Subject: [PATCH] Add hardware acceleration notice in initial tutorial --- public/images/ui/bgb.png | Bin 3205 -> 0 bytes src/data/dialogue.ts | 2 +- src/data/move.ts | 2 ++ src/data/weather.ts | 1 + src/tutorial.ts | 3 ++- 5 files changed, 6 insertions(+), 2 deletions(-) delete mode 100644 public/images/ui/bgb.png diff --git a/public/images/ui/bgb.png b/public/images/ui/bgb.png deleted file mode 100644 index 7de677ddf9fb96cec9bf4429b20f1ddbf267d2b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3205 zcmai$WmFUV`^LW$q)Q|vq@<)%VAMvZz;L8)AdC=4DWy21MG0we2r3;S$PlT~B||`R zgp>$8;PViITckHlP!l2rB|Q1`r%ROVkGBQv%e0tIHC&DGg9!PkxL79R46X3<4a}1lb|^ zDL~+|Tbv&7&;S)fx1Q+(J2}ASZrZ5^CZ&O#G1A=#RM!I{iG{uf&@ccwtGH+hKp6&5 zy~4u5ASxTM8Ehk=|6Q+QS(Q9bD!T^SAfl!p;YcIxM~y_v@Qag-Ij^&+pf8|vbY$8? zvbhx^l$gKod;uUoh5h{6os(b^Qx%D%l1N~>BfZ{AbtdHEvUIvKRPL(-z(Qd7@Trt+ z?G>B`70&1M&9yB`kK6S55B3w>YnXNFK>pe^a>w^?Hu?q04O3Gq%gd7{oiImqKl1S@ zru_~Pd2;VhIP`db?|aLlNQ8oOgdyd@_x3NlW`(>%FKMG(W_~0Y9@o>K9rKL}bsD=g z*h#W2S+V*h>g7D&Q79COhrN{Ox;AolcX3|oh(c>#8B}{|LBdj`OPpOPew&K1*aZ?7 z_W{^$#I}7Cr=h@kL@o>ko&C~2G0eXPaPG!0{Q$VFCnAIBuhs6M0YEQ5Lb6(yXSa<@ zib%!Vc5$YS{urea1rzCPhq1uu?&5g;Q4$qTVd61^)qIjD*>5_0N<=GUO4bAsfxb94DzP}Q(Xr>2vsnYcVDT#RYB1h zzvnviA&8PSLZ3*hLKy@TK=bPw*_qi{Od6F4@QNs1nx<8yrHHa>7ZXY?G5sj|`O=?G zE*Ay)SUV#r;c?ca%d#wCaqv!65!QIPf>=ZH1>+Cz5F@N31|#>ah1aA?bCry)2&eW< z-}SDcR!fr-xZWGRj9>0pR$S&;7Tk8E!@KDCy*sd36u0j8GT~lfSy5V{a?4WCwSAjo zJzG+MxTKuq0IMt@SiiT5ExD}pAV+O5lEc`vu<}j%=oJr6kA2VgKLbBsnoZ}o$oz^N z8CWy?nfa4qH;92ThCQ+;4kON;%SFwF;SS<@pJi6WJ(|GXgOF2|-^g0cX3oai+DQ^5 zAF-$O)1{lFi>C8P$|6e3ipu87=xujw2M|f6w{0F*8Q3b?ES1uJ%P6-k!{6Mn;jzJ# zYLvv5VM?$F?RVk!C-GGF9cCSt@OM`EAMPwQbqmnDa@Ph+33@Y@$2^Eo?iBqnIQ8hE zWMkF|Ut@x1S!sb9T+u`kS!=zM=B`b>l;wBuD$s&M+!KG`1fe^zkk4jp(QIvt(45S7v}41GIh@WO!kxo5Z2lE{)zw@>$5Q7TbEQB(7E z^Q|0f^M)dcA`LSQv!1~(gKq}Mvz2o-HJtZ}YNA;GUoJLg>gIKDRcv zeY1r8eoJM`b1Qb{^%ter5_$HD0be_M;oq%RhPCNmr^|WISA<)_Eh8{>tHQFbvMI>Q ziR${opt61RFHWuBTK=z>w3eW%a|(0zcfP0+>wD`5EIY7yccSOvPlV6zo`s$bgJRq@ z2!hE+;EL&q%6;zruPx-60<9M7+9Uk^^h zNt%bg{3oSJIYgvOu~2HIAxf+?xyg*tY&KUtk0a-yfRBQvdb51w%amk4Sec-CDgm>O z`QiR>pu#P>=Ctd6LcJ`1I(46SZF0p$duciXtmr4gL3~1zx(4HhbZ;Gu?^nwx&$~Xj z`K7j>oUHol*Xy%Q)^^r~mxRI?Q=~MX-H+x9FSQz|UkI6QiT&dBm|Ij8&`-|@l0IXW z<(tUNs_8y+im?%+v*_R8}znxE76ZPW+pbBE$w9O=j+giF?b#=_V{O2Y-G+% z_9v6#Gr=o7vDp6B?3uKWrRALscZb|Z+}D20N#{8-Wt3(9$Yi?DI5qu|asJlF&As3H zWZBF?adKlM0p9So75b^kt+0UX6w)s2lt1!c*2@~EB!M@c5K=| z(dug<+d^#3$K1!M2onw8#`s1w5!OlL z*EbBAdakyd;(rB6GpaD!zIfHWDD0~jvb?rWJHOA*s6PGhd052)_2|`yd>B4iFIdiY zjzO+X&XJ>w<7dk+TEpY(bD_tE(B`@@_x&}VJXO-{Zga?g9B1QWd1{)o%{!sk{jUAJd5+m|f3XwNK;u-9 z*j8neWz(HqolV^-_-yQ$w&Ur{?oNdOOc-x%^1riTIhvpAUOBUyF}Yxl>cmC@Hdbj$IX{ z$>;y3fUA+UIRK&80Ki28@aODY*8q4R2f#WC0QD>YII%D9bQu5usW#TrMFda(GbM;! zlHl`X7=tNpTN_& zMv%QW&8NKoRt6U@ahXnJOF@Yv53CM(mpl(^RrKPGd^+EgF}1-9XK}&miRE>ICc7zH z)Q^lxLsSwte>casdhb4PJWxTQw8>QUFAiT&TAC3BP&z~$PWK!LgyI6#Unm*=Lc_%( z_m{th|IantHZI34-Nuz6dq+p}T6C z8i$Sz?iu|y(-KfY5&q{!;%jn;YiN?-_)4ah;aY89J4N1LeICiCS!I5X;fBzgB(~VJ zoaBfeHN!;H%E7@SGPyZ2;9HjW3kh|bs9C4h**zZGye!;8{K*9X&dw-6u#k_Vt96gh PdC$OD-$JhnhI;xxEdc0x diff --git a/src/data/dialogue.ts b/src/data/dialogue.ts index 9dec8d4fc..e9a11dbf3 100644 --- a/src/data/dialogue.ts +++ b/src/data/dialogue.ts @@ -337,7 +337,7 @@ export const trainerTypeDialogue = { $@c{serious_mopen_fists}Don't hold back, I want you to give me everything you've got!` ], victory: [ - `@c{shock}Wow… You actually cleaned me out.\nAre you actually a beginner? + `@c{shock}Wow… You cleaned me out.\nAre you actually a beginner? $@c{smile}Maybe it was a bit of luck but…\nWho knows you might just be able to go all the way. $By the way, the professor asked me to give you these items. They look pretty cool. $@c{serious_smile_fists}Good luck out there!` diff --git a/src/data/move.ts b/src/data/move.ts index e3fbc1291..adf35c17d 100644 --- a/src/data/move.ts +++ b/src/data/move.ts @@ -17,6 +17,7 @@ import { PokemonHeldItemModifier } from "../modifier/modifier"; import { BattlerIndex } from "../battle"; import { Stat } from "./pokemon-stat"; import { TerrainType } from "./terrain"; +import { SpeciesFormChangeActiveTrigger } from "./pokemon-forms"; export enum MoveCategory { PHYSICAL, @@ -2103,6 +2104,7 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { switchOutTarget.hideInfo(); switchOutTarget.setVisible(false); switchOutTarget.scene.field.remove(switchOutTarget); + user.scene.triggerPokemonFormChange(switchOutTarget, SpeciesFormChangeActiveTrigger, true); if (switchOutTarget.hp) user.scene.unshiftPhase(new SwitchSummonPhase(user.scene, switchOutTarget.getFieldIndex(), user.scene.currentBattle.trainer.getNextSummonIndex((switchOutTarget as EnemyPokemon).trainerSlot), false, this.batonPass, false)); diff --git a/src/data/weather.ts b/src/data/weather.ts index 802e6cf53..aeb07a7db 100644 --- a/src/data/weather.ts +++ b/src/data/weather.ts @@ -243,6 +243,7 @@ export function getRandomWeatherType(arena: any /* Importing from arena causes a break; case Biome.TALL_GRASS: weatherPool = [ + { weatherType: WeatherType.NONE, weight: 8 }, { weatherType: WeatherType.RAIN, weight: 5 }, { weatherType: WeatherType.FOG, weight: 2 } ]; diff --git a/src/tutorial.ts b/src/tutorial.ts index 303c4aaba..b8509df6f 100644 --- a/src/tutorial.ts +++ b/src/tutorial.ts @@ -16,7 +16,8 @@ const tutorialHandlers = { return new Promise(resolve => { scene.ui.showText(`Welcome to PokéRogue! This is a battle-focused Pokémon fangame with roguelite elements. $This game is not monetized and we claim no ownership of Pokémon nor of the copyrighted assets used. - $The game is a work in progress, but fully playable.\nFor bug reports, please use the Discord community.`, null, () => resolve(), null, true); + $The game is a work in progress, but fully playable.\nFor bug reports, please use the Discord community. + $If the game runs slowly, please ensure 'Hardware Acceleration' is turned on in your browser settings.`, null, () => resolve(), null, true); }); }, [Tutorial.Access_Menu]: (scene: BattleScene) => {