From 7e3cde77be02ee6935efcd79a3d4589872df47fe Mon Sep 17 00:00:00 2001 From: Flashfyre Date: Wed, 29 Mar 2023 22:56:43 -0400 Subject: [PATCH] Add luxury ball and golden egg sprite --- public/images/items.json | 207 ++++++++++++++------------ public/images/items.png | Bin 14408 -> 14874 bytes public/images/items/golden_egg.png | Bin 0 -> 390 bytes public/images/pb.json | 109 +++++++++++--- public/images/pb.png | Bin 680 -> 946 bytes public/images/pokeball/lb.png | Bin 0 -> 289 bytes public/images/pokeball/lb_open.png | Bin 0 -> 319 bytes public/images/pokeball/lb_opening.png | Bin 0 -> 310 bytes src/battle-phase.ts | 6 +- src/pokeball.ts | 12 +- src/pokemon.ts | 3 +- 11 files changed, 216 insertions(+), 121 deletions(-) create mode 100644 public/images/items/golden_egg.png create mode 100644 public/images/pokeball/lb.png create mode 100644 public/images/pokeball/lb_open.png create mode 100644 public/images/pokeball/lb_opening.png diff --git a/public/images/items.json b/public/images/items.json index 995c7cd5e8d..7c2740d5f47 100644 --- a/public/images/items.json +++ b/public/images/items.json @@ -4,8 +4,8 @@ "image": "items.png", "format": "RGBA8888", "size": { - "w": 879, - "h": 24 + "w": 988, + "h": 26 }, "scale": 1, "frames": [ @@ -24,8 +24,8 @@ "h": 24 }, "frame": { - "x": 0, - "y": 0, + "x": 1, + "y": 1, "w": 24, "h": 24 } @@ -45,8 +45,8 @@ "h": 24 }, "frame": { - "x": 24, - "y": 0, + "x": 27, + "y": 1, "w": 23, "h": 24 } @@ -66,8 +66,8 @@ "h": 24 }, "frame": { - "x": 47, - "y": 0, + "x": 52, + "y": 1, "w": 23, "h": 24 } @@ -87,8 +87,8 @@ "h": 24 }, "frame": { - "x": 70, - "y": 0, + "x": 77, + "y": 1, "w": 22, "h": 24 } @@ -108,8 +108,8 @@ "h": 24 }, "frame": { - "x": 92, - "y": 0, + "x": 101, + "y": 1, "w": 21, "h": 24 } @@ -129,8 +129,8 @@ "h": 24 }, "frame": { - "x": 113, - "y": 0, + "x": 124, + "y": 1, "w": 18, "h": 24 } @@ -150,8 +150,8 @@ "h": 24 }, "frame": { - "x": 131, - "y": 0, + "x": 144, + "y": 1, "w": 18, "h": 24 } @@ -171,8 +171,8 @@ "h": 24 }, "frame": { - "x": 149, - "y": 0, + "x": 164, + "y": 1, "w": 18, "h": 24 } @@ -192,8 +192,8 @@ "h": 24 }, "frame": { - "x": 167, - "y": 0, + "x": 184, + "y": 1, "w": 18, "h": 24 } @@ -213,8 +213,8 @@ "h": 24 }, "frame": { - "x": 185, - "y": 0, + "x": 204, + "y": 1, "w": 18, "h": 24 } @@ -234,8 +234,8 @@ "h": 24 }, "frame": { - "x": 203, - "y": 0, + "x": 224, + "y": 1, "w": 18, "h": 24 } @@ -255,8 +255,8 @@ "h": 24 }, "frame": { - "x": 221, - "y": 0, + "x": 244, + "y": 1, "w": 16, "h": 24 } @@ -276,8 +276,8 @@ "h": 24 }, "frame": { - "x": 237, - "y": 0, + "x": 262, + "y": 1, "w": 16, "h": 24 } @@ -297,8 +297,8 @@ "h": 24 }, "frame": { - "x": 253, - "y": 0, + "x": 280, + "y": 1, "w": 16, "h": 24 } @@ -318,8 +318,8 @@ "h": 24 }, "frame": { - "x": 269, - "y": 0, + "x": 298, + "y": 1, "w": 16, "h": 24 } @@ -339,8 +339,8 @@ "h": 24 }, "frame": { - "x": 285, - "y": 0, + "x": 316, + "y": 1, "w": 16, "h": 24 } @@ -360,8 +360,8 @@ "h": 24 }, "frame": { - "x": 301, - "y": 0, + "x": 334, + "y": 1, "w": 16, "h": 24 } @@ -381,8 +381,8 @@ "h": 24 }, "frame": { - "x": 317, - "y": 0, + "x": 352, + "y": 1, "w": 16, "h": 24 } @@ -402,8 +402,8 @@ "h": 24 }, "frame": { - "x": 333, - "y": 0, + "x": 370, + "y": 1, "w": 16, "h": 24 } @@ -423,8 +423,8 @@ "h": 23 }, "frame": { - "x": 349, - "y": 0, + "x": 388, + "y": 1, "w": 24, "h": 23 } @@ -444,8 +444,8 @@ "h": 23 }, "frame": { - "x": 373, - "y": 0, + "x": 414, + "y": 1, "w": 24, "h": 23 } @@ -465,8 +465,8 @@ "h": 23 }, "frame": { - "x": 397, - "y": 0, + "x": 440, + "y": 1, "w": 23, "h": 23 } @@ -486,8 +486,8 @@ "h": 23 }, "frame": { - "x": 420, - "y": 0, + "x": 465, + "y": 1, "w": 22, "h": 23 } @@ -507,8 +507,8 @@ "h": 23 }, "frame": { - "x": 442, - "y": 0, + "x": 489, + "y": 1, "w": 22, "h": 23 } @@ -528,8 +528,8 @@ "h": 23 }, "frame": { - "x": 464, - "y": 0, + "x": 513, + "y": 1, "w": 21, "h": 23 } @@ -549,8 +549,8 @@ "h": 23 }, "frame": { - "x": 485, - "y": 0, + "x": 536, + "y": 1, "w": 17, "h": 23 } @@ -570,8 +570,8 @@ "h": 23 }, "frame": { - "x": 502, - "y": 0, + "x": 555, + "y": 1, "w": 17, "h": 23 } @@ -591,8 +591,8 @@ "h": 23 }, "frame": { - "x": 519, - "y": 0, + "x": 574, + "y": 1, "w": 17, "h": 23 } @@ -612,8 +612,8 @@ "h": 23 }, "frame": { - "x": 536, - "y": 0, + "x": 593, + "y": 1, "w": 15, "h": 23 } @@ -633,8 +633,8 @@ "h": 22 }, "frame": { - "x": 551, - "y": 0, + "x": 610, + "y": 1, "w": 24, "h": 22 } @@ -654,8 +654,8 @@ "h": 22 }, "frame": { - "x": 575, - "y": 0, + "x": 636, + "y": 1, "w": 22, "h": 22 } @@ -675,8 +675,8 @@ "h": 22 }, "frame": { - "x": 597, - "y": 0, + "x": 660, + "y": 1, "w": 22, "h": 22 } @@ -696,8 +696,8 @@ "h": 22 }, "frame": { - "x": 619, - "y": 0, + "x": 684, + "y": 1, "w": 22, "h": 22 } @@ -717,8 +717,8 @@ "h": 21 }, "frame": { - "x": 641, - "y": 0, + "x": 708, + "y": 1, "w": 23, "h": 21 } @@ -738,8 +738,8 @@ "h": 21 }, "frame": { - "x": 664, - "y": 0, + "x": 733, + "y": 1, "w": 21, "h": 21 } @@ -759,8 +759,8 @@ "h": 21 }, "frame": { - "x": 685, - "y": 0, + "x": 756, + "y": 1, "w": 21, "h": 21 } @@ -780,8 +780,8 @@ "h": 21 }, "frame": { - "x": 706, - "y": 0, + "x": 779, + "y": 1, "w": 21, "h": 21 } @@ -801,8 +801,8 @@ "h": 20 }, "frame": { - "x": 727, - "y": 0, + "x": 802, + "y": 1, "w": 23, "h": 20 } @@ -822,8 +822,8 @@ "h": 20 }, "frame": { - "x": 750, - "y": 0, + "x": 827, + "y": 1, "w": 20, "h": 20 } @@ -843,8 +843,8 @@ "h": 20 }, "frame": { - "x": 770, - "y": 0, + "x": 849, + "y": 1, "w": 20, "h": 20 } @@ -864,8 +864,8 @@ "h": 20 }, "frame": { - "x": 790, - "y": 0, + "x": 871, + "y": 1, "w": 20, "h": 20 } @@ -885,12 +885,33 @@ "h": 20 }, "frame": { - "x": 810, - "y": 0, + "x": 893, + "y": 1, "w": 20, "h": 20 } }, + { + "filename": "golden_egg", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 32, + "h": 32 + }, + "spriteSourceSize": { + "x": 7, + "y": 6, + "w": 17, + "h": 20 + }, + "frame": { + "x": 915, + "y": 1, + "w": 17, + "h": 20 + } + }, { "filename": "lucky_egg", "rotated": false, @@ -906,8 +927,8 @@ "h": 20 }, "frame": { - "x": 830, - "y": 0, + "x": 934, + "y": 1, "w": 17, "h": 20 } @@ -927,8 +948,8 @@ "h": 17 }, "frame": { - "x": 847, - "y": 0, + "x": 953, + "y": 1, "w": 20, "h": 17 } @@ -948,8 +969,8 @@ "h": 17 }, "frame": { - "x": 867, - "y": 0, + "x": 975, + "y": 1, "w": 12, "h": 17 } @@ -960,6 +981,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:28964995da555870b032480ab159e529:b855123c041dc7a085e186676ad39aba:110e074689c9edd2c54833ce2e4d9270$" + "smartupdate": "$TexturePacker:SmartUpdate:0fbe989299ea54627b5b7d5b405f8567:5048493cee296d650568a53c265436a0:110e074689c9edd2c54833ce2e4d9270$" } } diff --git a/public/images/items.png b/public/images/items.png index 862501ed71d94053025f2e6efd04ac2573611b2f..dd55607b7851f0daa76a9a9bdbf3638823d12cee 100644 GIT binary patch literal 14874 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ⅇ7&rS+ZO_X=yY>aKrOvEj>UP_Nh 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 literal 0 HcmV?d00001 diff --git a/public/images/pb.json b/public/images/pb.json index e796d18ad30..2b2b8cf9b64 100644 --- a/public/images/pb.json +++ b/public/images/pb.json @@ -4,8 +4,8 @@ "image": "pb.png", "format": "RGBA8888", "size": { - "w": 12, - "h": 172 + "w": 14, + "h": 245 }, "scale": 1, "frames": [ @@ -24,10 +24,31 @@ "h": 16 }, "frame": { + "x": 1, + "y": 1, + "w": 12, + "h": 16 + } + }, + { + "filename": "lb_open", + "rotated": false, + "trimmed": false, + "sourceSize": { + "w": 12, + "h": 16 + }, + "spriteSourceSize": { "x": 0, "y": 0, "w": 12, "h": 16 + }, + "frame": { + "x": 1, + "y": 19, + "w": 12, + "h": 16 } }, { @@ -45,8 +66,8 @@ "h": 16 }, "frame": { - "x": 0, - "y": 16, + "x": 1, + "y": 37, "w": 12, "h": 16 } @@ -66,8 +87,8 @@ "h": 16 }, "frame": { - "x": 0, - "y": 32, + "x": 1, + "y": 55, "w": 12, "h": 16 } @@ -87,8 +108,8 @@ "h": 16 }, "frame": { - "x": 0, - "y": 48, + "x": 1, + "y": 73, "w": 12, "h": 16 } @@ -108,8 +129,29 @@ "h": 14 }, "frame": { + "x": 1, + "y": 91, + "w": 12, + "h": 14 + } + }, + { + "filename": "lb_opening", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 12, + "h": 16 + }, + "spriteSourceSize": { "x": 0, - "y": 64, + "y": 2, + "w": 12, + "h": 14 + }, + "frame": { + "x": 1, + "y": 107, "w": 12, "h": 14 } @@ -129,8 +171,8 @@ "h": 14 }, "frame": { - "x": 0, - "y": 78, + "x": 1, + "y": 123, "w": 12, "h": 14 } @@ -150,8 +192,8 @@ "h": 14 }, "frame": { - "x": 0, - "y": 92, + "x": 1, + "y": 139, "w": 12, "h": 14 } @@ -171,8 +213,8 @@ "h": 14 }, "frame": { - "x": 0, - "y": 106, + "x": 1, + "y": 155, "w": 12, "h": 14 } @@ -192,8 +234,29 @@ "h": 13 }, "frame": { + "x": 1, + "y": 171, + "w": 12, + "h": 13 + } + }, + { + "filename": "lb", + "rotated": false, + "trimmed": true, + "sourceSize": { + "w": 12, + "h": 16 + }, + "spriteSourceSize": { "x": 0, - "y": 120, + "y": 3, + "w": 12, + "h": 13 + }, + "frame": { + "x": 1, + "y": 186, "w": 12, "h": 13 } @@ -213,8 +276,8 @@ "h": 13 }, "frame": { - "x": 0, - "y": 133, + "x": 1, + "y": 201, "w": 12, "h": 13 } @@ -234,8 +297,8 @@ "h": 13 }, "frame": { - "x": 0, - "y": 146, + "x": 1, + "y": 216, "w": 12, "h": 13 } @@ -255,8 +318,8 @@ "h": 13 }, "frame": { - "x": 0, - "y": 159, + "x": 1, + "y": 231, "w": 12, "h": 13 } @@ -267,6 +330,6 @@ "meta": { "app": "https://www.codeandweb.com/texturepacker", "version": "3.0", - "smartupdate": "$TexturePacker:SmartUpdate:13f4d2fa28369d7d5c9bdcf1be38616f:d8e299ca449efacc07bf1284c7d20b01:8bcd206ed4f9371dcc2f2cbe354ed6ed$" + "smartupdate": "$TexturePacker:SmartUpdate:c08fee07b4a02d4a278d0b9e81cafea9:8bb540e5126337d0b85e58b6cfcef619:8bcd206ed4f9371dcc2f2cbe354ed6ed$" } } diff --git a/public/images/pb.png b/public/images/pb.png index f549f13e1b406f8a54002929a395c341030686d2..b65be2646a9e9b5a15d2ea5f86dd47650c00f5f9 100644 GIT binary patch delta 925 zcmV;O17iHB1+oW!iBL{Q4GJ0x0000DNk~Le0000E0002>2m=5B09V5_IRF3vX;4g5 zMF0Q*7#J8aF)2YoL0Vc;VvDqM5S)9Q-h%)DgM)jEDXf%~l$5mIq(Qx`006W~7_^HJ zw5+7G&E~x+TD@A$&8#5RDJkATbLL7I=FKtxVvGNjtpA)B2>+aW|Ghc?#nu1bYX9y* z|Ns9ZY|L(vdnA7X;z>k7R7l6omg{b#Fc5`n4+V;Wrfnb%btvoif5<&^v6E<()&9vg zBN6!<#)FR?9r@{r;~nvIjw|eYLiD{6(K7-GK> z+}S9QM37QSM49OlleS8dz^~0s93hm>0g*dP;sXA_x3_<)x`i(<5s?!wTYN($PL(xl=O6!XoDjEg zp1F9Qjfj6*1QOb(wIHc%OQ0T=qr%vVgmx4j1!e9ya;mIZJOB7@IK(YH9=Z5}R&53qjl^F5u|{)`yrc^qvS7>cK<1P0dIs@Kgjz>~dB1+@>ZH-vM7c1O0p z$sB(Prss&J;082~aWr5Y#m&9|NC;6$7+)tw z7{O_P1tAqESQ7#-7~8$NiANJ6e^ty*^(~4l$wH2rLd00RMZmjBp0sHmK&2_sNlDzS z10Y$@RiG?&ClY^*!RY`CLTaF3%`osnP2kG<#-Ya1YT`ZG{NdDmt=H7+iop)+o$9{s z1!`UIFoJ&^2+j4#MF{#X@cY6nfgb|})t^v<7A5*$LHWLZjq?8BBx{tP&mRS9-**`M zo;c+lEfjF}2fgt5;b73AyFMsi#5L%Y4-Rkd(|eSojxr27ZW$+BWfV{hI`!8FY5QoG@B2(A6%B{G$%t2C7*)=z} z``){GZx8-|C65hNwfNpNO)^PPRjZ%cN!87_48$aW`~DLVAwhL=dbYt>(p@V;bCPR00000NkvXXu0mjfn&Epe literal 0 HcmV?d00001 diff --git a/public/images/pokeball/lb_open.png b/public/images/pokeball/lb_open.png new file mode 100644 index 0000000000000000000000000000000000000000..fd2b9c71953196e02f9a00ef206d757d7f8dff44 GIT binary patch literal 319 zcmV-F0l@x=P) znq+tTXLq8A@c#Dd0cvXjsB5c2el3gL?!g0OeF;F83X}WLxEArYI6?bDV=reDtNdd! z*0og%z<=HO=HAA)BN@MYAj^AHIVkm?IE2o7RsjZm}V$HLW)D&`WhDacG%BcUa7j zRvVmiYI;k>v!<#($*ynCzv~VZ?d`ZZohO8$w7#0xdi)VO=hVy)8wDa1d;`59bBTMn R7&rg`002ovPDHLkV1j0&iYx#C literal 0 HcmV?d00001 diff --git a/public/images/pokeball/lb_opening.png b/public/images/pokeball/lb_opening.png new file mode 100644 index 0000000000000000000000000000000000000000..e62517bd67a175391b0b49a81bbda3b6bbaeae68 GIT binary patch literal 310 zcmV-60m=S}P)sfMamAs6%pb;96Nn9N?(LEuu~7(ZURl zomsKTd&$0i3;!F~>LWR@#~%{-7&r8NNdqV4J;3?v00&*x$@&sFk1 z+s5VVf~p9pvk#@5bF#^wxWCgAppBY(lGcV!bb9csS+*aA&pKCwWe3W&fXQHvj+t07*qo IM6N<$f(1v9zW@LL literal 0 HcmV?d00001 diff --git a/src/battle-phase.ts b/src/battle-phase.ts index 91737c2c29d..3663d525400 100644 --- a/src/battle-phase.ts +++ b/src/battle-phase.ts @@ -6,7 +6,7 @@ import { Mode } from './ui/ui'; import { Command } from "./ui/command-ui-handler"; import { interp } from "./temp_interpreter"; import { Stat } from "./pokemon-stat"; -import { ExpBoosterModifier, getNewModifierType, PokemonBaseStatModifier, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier"; +import { ExpBoosterModifier, getNewModifierType, ModifierType, PokemonBaseStatModifier, PokemonModifierType, regenerateModifierPoolThresholds } from "./modifier"; import PartyUiHandler from "./ui/party-ui-handler"; import { doPokeballBounceAnim, getPokeballAtlasKey, getPokeballCatchMultiplier, getTintColor as getPokeballTintColor, PokeballType } from "./pokeball"; import { pokemonLevelMoves } from "./pokemon-level-moves"; @@ -757,7 +757,9 @@ export class SelectModifierPhase extends BattlePhase { super.start(); regenerateModifierPoolThresholds(this.scene.getParty()); - const types = [ getNewModifierType(), getNewModifierType(), getNewModifierType() ]; + const types: Array = []; + for (let mt = 0; mt < 3; mt++) + types.push(getNewModifierType(this.scene.waveIndex)); this.scene.ui.setMode(Mode.MODIFIER_SELECT, types, (cursor: integer) => { if (cursor < 0) { diff --git a/src/pokeball.ts b/src/pokeball.ts index 1635c800db3..da6052d62fb 100644 --- a/src/pokeball.ts +++ b/src/pokeball.ts @@ -5,7 +5,8 @@ export enum PokeballType { POKEBALL, GREAT_BALL, ULTRA_BALL, - MASTER_BALL + MASTER_BALL, + LUXURY_BALL }; export function getPokeballAtlasKey(type: PokeballType): string { @@ -18,6 +19,8 @@ export function getPokeballAtlasKey(type: PokeballType): string { return 'ub'; case PokeballType.MASTER_BALL: return 'mb'; + case PokeballType.LUXURY_BALL: + return 'lb'; } } @@ -36,6 +39,9 @@ export function getPokeballName(type: PokeballType): string { case PokeballType.MASTER_BALL: ret = 'Master Ball'; break; + case PokeballType.LUXURY_BALL: + ret = 'Luxury Ball'; + break; } return toPokemonUpperCase(ret); } @@ -50,6 +56,8 @@ export function getPokeballCatchMultiplier(type: PokeballType): number { return 2; case PokeballType.MASTER_BALL: return -1; + case PokeballType.LUXURY_BALL: + return 1; } } @@ -63,6 +71,8 @@ export function getTintColor(type: PokeballType): number { return 0xe6cd31; case PokeballType.MASTER_BALL: return 0xa441bd; + case PokeballType.LUXURY_BALL: + return 0xffde6a; } } diff --git a/src/pokemon.ts b/src/pokemon.ts index 9df267b3a0d..73b81a3110f 100644 --- a/src/pokemon.ts +++ b/src/pokemon.ts @@ -454,8 +454,7 @@ export default abstract class Pokemon extends Phaser.GameObjects.Container { // Gen 1-4 formula // return ((this.pokemon.baseExp * this.level) / 7) * (1 / 1) // TODO: Update for exp share - const constantMultiplier = 4; - return Math.floor(((this.species.baseExp * this.level) / 5) * (1 / 1) * constantMultiplier * ((Math.round(Math.sqrt(2 * this.level + 10)) * Math.pow(2 * this.level + 10, 2)) / (Math.round(Math.sqrt(this.level + victorLevel + 10)) * Math.pow(this.level + victorLevel + 10, 2)))) + 1; + return Math.floor(((this.species.baseExp * this.level) / 5) * (1 / 1) * ((Math.round(Math.sqrt(2 * this.level + 10)) * Math.pow(2 * this.level + 10, 2)) / (Math.round(Math.sqrt(this.level + victorLevel + 10)) * Math.pow(this.level + victorLevel + 10, 2)))) + 1; } tint(color: number, alpha?: number, duration?: integer, ease?: string) {