From 2dd3c273abc215409fa9be9a33683c9bbd26bd46 Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Tue, 30 May 2023 09:46:42 -0400 Subject: [PATCH] Add new mountain background --- public/images/arenas/mountain_a.png | Bin 485 -> 1072 bytes public/images/arenas/mountain_b.png | Bin 780 -> 1309 bytes public/images/arenas/mountain_b_1.png | Bin 0 -> 1393 bytes public/images/arenas/mountain_b_2.png | Bin 0 -> 982 bytes public/images/arenas/mountain_b_3.png | Bin 0 -> 1556 bytes public/images/arenas/mountain_bg.png | Bin 602 -> 636 bytes src/arena.ts | 1 + src/battle-phases.ts | 2 +- src/battle-scene.ts | 2 +- 9 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 public/images/arenas/mountain_b_1.png create mode 100644 public/images/arenas/mountain_b_2.png create mode 100644 public/images/arenas/mountain_b_3.png diff --git a/public/images/arenas/mountain_a.png b/public/images/arenas/mountain_a.png index 3403e362caa2ed2c8c9b615cfecdaa99dd5f198c..f3896fb409fdafbae67c223961bc949a5c02f043 100644 GIT binary patch delta 912 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 literal 0 HcmV?d00001 diff --git a/public/images/arenas/mountain_b_2.png b/public/images/arenas/mountain_b_2.png new file mode 100644 index 0000000000000000000000000000000000000000..377c3b16b23306cd6097f743171a12be4a48a5b6 GIT binary patch literal 982 zcmeAS@N?(olHy`uVBq!ia0y~yU~~YoTR7N&5jgR z3=A9lx&I`xGB7ZwdAc};RK&f#yEj`jQsThFNJle9=P;ECL0cxS)rs+(=;XLI>1A2> z*`&0IpmVG zNJeC@65|rhy}W*BU19m>$7#8L>f&Ngo`3M-kIK?;!F{_P%#Dve`|R2C zP4eQ;zppdDX1>Y({T<`{%$80UeK*edh#0$_b`zcd;OoQFYf5M<-fcWRJZN?x9S-@5^G--eVy*Y;6FF^-1={#%%O2d zuO8Ljw@s_cmC3?~ttafO;DL^dGr7}0t=75yt2+Dr45d)fExXnh|9q{yA=P)i#mhFw z#i6nJjr?8lH~wvzoSU0dx4kviV&jDQsW)ef=W8kND0_YVe^^hFxh;>%+Sk7nJ+79S zJ`z`I;P$ppEneRDK309P%Y>K76JEN63$D2}ukEt-^G};=1rPhLw|^3Tf77YiylgYi zeJQjz@Z@((`YImurzLNjWQ|p*_`wTl9Lh}_g+%Oygd5_%2p%e8IL%V{O`@R6)Qh9L zp6~Vlu6Bj|`RnS150u0k*a~=l=Wi`2lgLmzl&Hv~*_Jp*L2N#Q_|o5vPt^~VzGpFt zU z^OJwc_k+nv%RRcM|FPauo^i`9d|nCA0KU`+&op0O1}z|)18U%<;K?ACr>mdKI;Vst E01$fJRD5K|9wu(0uJD<&(uO4Frk0VYfKGGloc*zXyMNsKz31M0?m73K^Wg;^BW^ab zF#-T!Gs&M21OOl(oz8?B>incY)vgO5W)Kk%hz1a|x&$2U8{i87&H0p6 zl2gvi%K{QCP9QobLBp0c)fi}Io9Wh5a8hO&T+Y4KvSe%O&8HJFgsoP=23Kl^;X}ag zJt&o>J^1U|_SmM4S;YS2@z=q$BxT>CW05D5GHxNh;l@ zhNTl?jpIOtn3`Lb3*hs4W2f4al`-7N#OycPT>f;3`8M4+kH@2QfBe{@f}cJ>v&Q-X z!Yo3u0x2uWoFDM~%_rzxx zdq$_Dpq^41C{ti29jQB+Pz+-sG#_M*hZk+XIQ3!o~o5(v6A1tH? zQOl!~UDGQM6-pJ=BMfk0GyTvW7z~-!nh;irnnBtvad*CiXe2Eju4!Erk4F+hc}yJJ zUNpsR9PPIf^Iqpj({1Te8GIW$-?0PP`}XbGg*o+nx1i#n?P90I*z}S_N|C3CZ3dd+ z=L?%nG#^}hVYjK0+25ZQbsz7|x2huw8qS1<0CK+3o9u!DRW!9dQOLrH4jDzPrlkvT z6v3f2(e^%YKOiLDz^==zMiYZ!HTzM7nBWpcspLYceb5@dPpycqmp2Kq&j)iqcEiNV zd&f0a#12m~JDu_DsP6Vz1n@iJa`kg9x&H8-D2B_`)U{vBkL0L#VJ?$a%Ux1ZwTk^K z(){UO)pdW}nj4_4(?B#qfSjd>AQekV8X+57{Q)+u#uwZhsC6T*7r zc(E+6;ePm`Of5F41CuvK+s9%gF0Ak6*sHhq>BHSR7oPsLt*7y3bhQ3G%>AcHE4^rCdl~9_v7Y((;klV8CWK~)xm&>ruSLY_* z|2XS#PWJLxnEz{LcS$Hj{Ha6vH{B5Gx||-xZvF+I9adBZ!f)!g z5OYIWZ(U0s$1q>4Zu@3cyI7ga(4j%vXDMcFY8d+zPBo&Nl|1nTWm@vux~>_^5K?{k z!aH^JUcOBS0T4Q=G5jgR z3=A9lx&I`xGB7alc)B=-RK&f#yO5X3k-_y~bd>7BKnA(?$nF0`xICTMHKLfD#q*C{ zIC%Q}+q*{d-k&dL=CJxx&sfAFa6-sI!JDB`hmmCyI!9{y&KfRumB$bxsW9QGsf5C5CYDVyO$?D@3KLX;N*S0UnZR-cIge|scJT{%Y=YPx)5)I# zvdUQiY$A$dj_q3(oS<+LXwk72*MXr0w+b0&qZ7vT=Y7O$Rz37%ng_dPu~zuz_`TUw{Q4HnWKg zJQQWg@t5TnGkc0D2yD%@XX^6&+{bh912CQNrABzB`T8>Md)Z`nBKh)Scz_t6{ 10) { - for (let m = 0; m < Math.floor(startingWave / 10); m++) + for (let m = 0; m < Math.min(Math.floor(startingWave / 10), 99); m++) this.scene.addModifier(getPlayerModifierTypeOptionsForWave((m + 1) * 10, 1, this.scene.getParty())[0].type.newModifier()); } diff --git a/src/battle-scene.ts b/src/battle-scene.ts index 9c2d7a62555..088022ddaae 100644 --- a/src/battle-scene.ts +++ b/src/battle-scene.ts @@ -2,7 +2,7 @@ import Phaser from 'phaser'; import { Biome } from './data/biome'; import UI from './ui/ui'; import { EncounterPhase, SummonPhase, NextEncounterPhase, NewBiomeEncounterPhase, SelectBiomePhase, MessagePhase, CheckLoadPhase, TurnInitPhase, ReturnPhase, ToggleDoublePositionPhase, CheckSwitchPhase } from './battle-phases'; -import Pokemon, { PlayerPokemon, EnemyPokemon, FieldPosition } from './pokemon'; +import Pokemon, { PlayerPokemon, EnemyPokemon } from './pokemon'; import PokemonSpecies, { allSpecies, getPokemonSpecies, initSpecies } from './data/pokemon-species'; import * as Utils from './utils'; import { Modifier, ModifierBar, ConsumablePokemonModifier, ConsumableModifier, PokemonHpRestoreModifier, HealingBoosterModifier, PersistentModifier, PokemonHeldItemModifier, ModifierPredicate } from './modifier/modifier';