Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

thievul line #1626

Merged
merged 1 commit into from
Apr 6, 2024
Merged

thievul line #1626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 34 additions & 1 deletion app/models/colyseus-models/pokemon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,37 @@ export class Ribombee extends Pokemon {
additional = true
}

export class Nickit extends Pokemon {
types = new SetSchema<Synergy>([Synergy.FIELD, Synergy.DARK])
rarity = Rarity.RARE
stars = 1
evolution = Pkm.THIEVUL
hp = 75
atk = 8
def = 1
speDef = 1
maxPP = 50
range = 2
skill = Ability.THIEF
attackSprite = AttackSprite.NORMAL_MELEE
additional = true
}

export class Thievul extends Pokemon {
types = new SetSchema<Synergy>([Synergy.FIELD, Synergy.DARK])
rarity = Rarity.RARE
stars = 2
hp = 170
atk = 19
def = 2
speDef = 2
maxPP = 50
range = 2
skill = Ability.THIEF
attackSprite = AttackSprite.NORMAL_MELEE
additional = true
}

export class Swablu extends Pokemon {
types = new SetSchema<Synergy>([Synergy.FAIRY, Synergy.SOUND])
rarity = Rarity.ULTRA
Expand Down Expand Up @@ -13337,5 +13368,7 @@ export const PokemonClasses: Record<
[Pkm.CRABOMINABLE]: Crabominable,
[Pkm.CUTIEFLY]: Cutiefly,
[Pkm.RIBOMBEE]: Ribombee,
[Pkm.ZANGOOSE]: Zangoose
[Pkm.ZANGOOSE]: Zangoose,
[Pkm.NICKIT]: Nickit,
[Pkm.THIEVUL]: Thievul
}
2 changes: 1 addition & 1 deletion app/models/precomputed/credits.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/emotions-per-pokemon-index.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/models/precomputed/pokemons-data.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,6 +686,8 @@ Index,Name,Category,Tier,Additional pick,Type 1,Type 2,Type 3,Type 4,HP,Attack,D
0816,SOBBLE,ULTRA,1,false,WATER,AQUATIC,,,120,14,2,2,3,100,SNIPE_SHOT,SOBBLE,WATER,AQUATIC,,,false
0817,DRIZZILE,ULTRA,2,false,WATER,AQUATIC,,,200,23,4,4,3,100,SNIPE_SHOT,SOBBLE,WATER,AQUATIC,,,false
0818,INTELEON,ULTRA,3,false,WATER,AQUATIC,,,360,40,6,6,3,70,SNIPE_SHOT,SOBBLE,WATER,AQUATIC,,,false
0827,NICKIT,RARE,1,true,FIELD,DARK,,,75,8,1,1,2,50,THIEF,NICKIT,FIELD,DARK,,,false
0828,THIEVUL,RARE,2,true,FIELD,DARK,,,170,19,2,2,2,50,THIEF,NICKIT,FIELD,DARK,,,false
0840,APPLIN,EPIC,1,true,DRAGON,GRASS,,,130,8,5,2,1,85,APPLE_ACID,APPLIN,DRAGON,GRASS,,,false
0842,APPLETUN,EPIC,2,true,DRAGON,GRASS,,,250,22,8,6,1,85,APPLE_ACID,APPLIN,DRAGON,GRASS,,,false
0848,TOXEL,RARE,1,true,ELECTRIC,POISON,BABY,,80,8,2,2,1,90,OVERDRIVE,TOXEL,ELECTRIC,POISON,BABY,SOUND,false
Expand Down
2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-data.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-per-ability.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-per-rarity.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-per-type-and-category.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/models/precomputed/pokemons-per-type.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions app/public/dist/client/changelog/patch-5.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
- Cutiefly
- Ribombee
- Zangoose
- Nickit
- Thievul

# Changes to Pokemon & Abilities

Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/esbuild.meta.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion app/public/dist/client/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,9 @@
"CRABOMINABLE": "Crabominable",
"CUTIEFLY": "Cutiefly",
"RIBOMBEE": "Ribombee",
"ZANGOOSE": "Zangoose"
"ZANGOOSE": "Zangoose",
"NICKIT": "Nickit",
"THIEVUL": "Thievul"
},
"ability_description": {
"SOFT_BOILED": "Cures all status effects and grants [20,40,80,SP] SHIELD to every allied Pokémon",
Expand Down
2 changes: 1 addition & 1 deletion app/public/dist/client/sw.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* Change this cache name every time you want to force players
to invalidate their cache and download all assets again */

const CACHE_NAME = "CACHE v5.0.0.110"
const CACHE_NAME = "CACHE v5.0.0.111"

// Cache-first strategy
const cacheFirst = (event) => {
Expand Down
2 changes: 1 addition & 1 deletion app/public/src/assets/atlas.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions app/public/src/assets/pokemons/0827.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added app/public/src/assets/pokemons/0827.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/public/src/assets/pokemons/0828.json
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added app/public/src/assets/pokemons/0828.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/public/src/assets/pokemons/durations.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/public/src/assets/pokemons/indexList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
["0000","0897","0129","0000-0004","0132","0001","0002","0003","0004","0005","0006","0007","0008","0009","0074","0075","0076","0298","0183","0184","0041","0042","0169","0179","0180","0181","0173","0035","0036","0174","0040","0039","0010","0011","0012","0013","0014","0015","0016","0017","0018","0187","0188","0189","0273","0274","0275","0396","0397","0398","0152","0153","0154","0155","0156","0157","0158","0159","0160","0252","0253","0254","0255","0256","0257","0258","0259","0260","0387","0388","0389","0390","0391","0392","0393","0394","0395","0029","0030","0031","0032","0033","0034","0172","0025","0026","0066","0067","0068","0116","0117","0230","0328","0329","0330","0363","0364","0365","0304","0305","0306","0081","0082","0462","0111","0112","0464","0175","0176","0468","0355","0356","0477","0270","0271","0272","0403","0404","0405","0060","0061","0186","0062","0063","0064","0065","0092","0093","0094","0147","0148","0149","0246","0247","0248","0287","0288","0289","0280","0281","0282","0371","0372","0373","0374","0375","0376","0443","0444","0445","0239","0125","0466","0240","0126","0467","0446","0143","0058","0059","0095","0208","0123","0212","0447","0448","0019","0020","0021","0022","0130","0249","0487","0145","0146","0144","0483","0484","0245","0243","0244","0378","0377","0379","0382","0383","0384","0486","0133","0134","0135","0136","0196","0197","0470","0700","0307","0308","0322","0323","0491","0607","0608","0609","0079","0080","0199","0069","0070","0071","0220","0221","0473","0361","0362","0478","0459","0460","0582","0583","0471","0637","0641","0647","0640","0638","0490","0479","0442","0359","0131","0380","0381","0481","0482","0480","0150","0643","0644","0251","0494","0385","0493","0386","0492","0488","0485","0250","0142","0382-0001","0052","0053","0633","0634","0635","0551","0577","0578","0579","0384-0001","0333","0043","0044","0045","0182","0698","0699","0347","0348","0566","0567","0410","0411","0345","0346","0408","0409","0140","0141","0138","0139","0406","0315","0407","0427","0428","0428-0001","0610","0611","0612","0137","0233","0474","0309","0310","0353","0354","0354-0001","0679","0680","0681","0104","0105","0105-0001","0293","0294","0295","0535","0536","0540","0541","0542","0669","0670","0671","0782","0783","0784","0648","0334","0351","0351-0001","0351-0002","0351-0003","0341","0342","0595","0596","0649","0369","0856","0857","0858","0653","0654","0655","0296","0297","0894","0895","0799","0890","0077","0078","0290","0291","0292","0714","0715","0710","0711","0331","0332","0128","0440","0113","0242","0785","0786","0805","0806","0228","0229","0229-0001","0366","0367","0368","0238","0124","0757","0758","0048","0049","0100","0101","0218","0219","0215","0461","0453","0454","0170","0171","0261","0262","0436","0437","0425","0426","0285","0286","0072","0073","0209","0210","0336","0037","0038","0037-0001","0038-0001","0418","0419","0303","0352","0703","0719","0441","0704","0705","0706","0151","0761","0762","0763","0721","0840","0842","0501","0502","0503","0872","0873","0320","0321","0885","0886","0495","0496","0497","0813","0814","0815","0728","0729","0730","0574","0575","0576","0027","0028","0083","0201","0201-0001","0201-0002","0201-0003","0201-0004","0201-0005","0201-0006","0201-0007","0201-0008","0201-0009","0201-0010","0201-0011","0201-0012","0201-0013","0201-0014","0201-0015","0201-0016","0201-0017","0201-0018","0201-0019","0201-0020","0201-0021","0201-0022","0201-0023","0201-0024","0201-0025","0201-0027","0201-0026","0788","0787","0050","0051","0722","0723","0724","0570","0571","0570-0002","0571-0001","0656","0658","0236","0106","0107","0237","0778","0088","0089","0088-0001","0089-0001","0318","0319","0204","0205","0086","0087","0074-0001","0075-0001","0076-0001","0023","0024","0439","0122","0487-0001","0648-0001","0720","0720-0001","0773","0772","0807","0716","0717","0802","0163","0164","0438","0185","0489","0415","0416","0213","0498","0499","0500","0360","0202","0337","0338","0492-0001","0265","0266","0267","0268","0269","0957","0958","0959","0046","0047","0241","0056","0057","0191","0192","0556","0312","0311","0127","0177","0178","0207","0472","0090","0091","0161","0162","0324","0225","0636","0991","0798","0433","0358","0026-0001","0781","0109","0110","0120","0121","0476","0299","0527","0528","0692","0693","0193","0469","0694","0695","0399","0400","0327","0343","0344","0214","0509","0510","0339","0340","0559","0560","0456","0457","0434","0435","0313","0314","0800","0420","0421","0421-0001","0200","0429","0084","0085","0796","0924","0925","0925-0001","0401","0402","0449","0450","0278","0279","0793","0817","0818","0816","0357","0102","0103","0103-0001","0455","0764","0211-0001","0904","0157-0001","0506","0507","0508","0263","0264","0584","0887","0302","0882","0795","0222","0222-0001","0864","0708","0709","0999-0001","1000","0235","0848","0849","0000-0001","0967","0624","0625","0983","0774","0774-0001","0774-0005","0774-0002","0774-0004","0779","0778-0001","0323-0001","0645","0642","0383-0001","0552","0545","0349","0350","0905","0877","0877-0001","0115","0216","0217","0190","0424","0585","0586","0108","0463","0504","0505","0167","0168","0773-0009","0773-0011","0773-0013","0773-0010","0773-0002","0773-0012","0773-0014","0773-0005","0773-0008","0773-0017","0773-0001","0773-0016","0773-0003","0773-0004","0773-0007","0773-0006","0773-0015","0537","0751","0752","0744","0745","0745-0002","0745-0001","0621","0792","0791","0790","0789","0800-0003","0801","0859","0860","0861","0386-0001","0386-0002","0386-0003","0739","0740","0742","0743","0335"]
["0000","0897","0129","0000-0004","0132","0001","0002","0003","0004","0005","0006","0007","0008","0009","0074","0075","0076","0298","0183","0184","0041","0042","0169","0179","0180","0181","0173","0035","0036","0174","0040","0039","0010","0011","0012","0013","0014","0015","0016","0017","0018","0187","0188","0189","0273","0274","0275","0396","0397","0398","0152","0153","0154","0155","0156","0157","0158","0159","0160","0252","0253","0254","0255","0256","0257","0258","0259","0260","0387","0388","0389","0390","0391","0392","0393","0394","0395","0029","0030","0031","0032","0033","0034","0172","0025","0026","0066","0067","0068","0116","0117","0230","0328","0329","0330","0363","0364","0365","0304","0305","0306","0081","0082","0462","0111","0112","0464","0175","0176","0468","0355","0356","0477","0270","0271","0272","0403","0404","0405","0060","0061","0186","0062","0063","0064","0065","0092","0093","0094","0147","0148","0149","0246","0247","0248","0287","0288","0289","0280","0281","0282","0371","0372","0373","0374","0375","0376","0443","0444","0445","0239","0125","0466","0240","0126","0467","0446","0143","0058","0059","0095","0208","0123","0212","0447","0448","0019","0020","0021","0022","0130","0249","0487","0145","0146","0144","0483","0484","0245","0243","0244","0378","0377","0379","0382","0383","0384","0486","0133","0134","0135","0136","0196","0197","0470","0700","0307","0308","0322","0323","0491","0607","0608","0609","0079","0080","0199","0069","0070","0071","0220","0221","0473","0361","0362","0478","0459","0460","0582","0583","0471","0637","0641","0647","0640","0638","0490","0479","0442","0359","0131","0380","0381","0481","0482","0480","0150","0643","0644","0251","0494","0385","0493","0386","0492","0488","0485","0250","0142","0382-0001","0052","0053","0633","0634","0635","0551","0577","0578","0579","0384-0001","0333","0043","0044","0045","0182","0698","0699","0347","0348","0566","0567","0410","0411","0345","0346","0408","0409","0140","0141","0138","0139","0406","0315","0407","0427","0428","0428-0001","0610","0611","0612","0137","0233","0474","0309","0310","0353","0354","0354-0001","0679","0680","0681","0104","0105","0105-0001","0293","0294","0295","0535","0536","0540","0541","0542","0669","0670","0671","0782","0783","0784","0648","0334","0351","0351-0001","0351-0002","0351-0003","0341","0342","0595","0596","0649","0369","0856","0857","0858","0653","0654","0655","0296","0297","0894","0895","0799","0890","0077","0078","0290","0291","0292","0714","0715","0710","0711","0331","0332","0128","0440","0113","0242","0785","0786","0805","0806","0228","0229","0229-0001","0366","0367","0368","0238","0124","0757","0758","0048","0049","0100","0101","0218","0219","0215","0461","0453","0454","0170","0171","0261","0262","0436","0437","0425","0426","0285","0286","0072","0073","0209","0210","0336","0037","0038","0037-0001","0038-0001","0418","0419","0303","0352","0703","0719","0441","0704","0705","0706","0151","0761","0762","0763","0721","0840","0842","0501","0502","0503","0872","0873","0320","0321","0885","0886","0495","0496","0497","0813","0814","0815","0728","0729","0730","0574","0575","0576","0027","0028","0083","0201","0201-0001","0201-0002","0201-0003","0201-0004","0201-0005","0201-0006","0201-0007","0201-0008","0201-0009","0201-0010","0201-0011","0201-0012","0201-0013","0201-0014","0201-0015","0201-0016","0201-0017","0201-0018","0201-0019","0201-0020","0201-0021","0201-0022","0201-0023","0201-0024","0201-0025","0201-0027","0201-0026","0788","0787","0050","0051","0722","0723","0724","0570","0571","0570-0002","0571-0001","0656","0658","0236","0106","0107","0237","0778","0088","0089","0088-0001","0089-0001","0318","0319","0204","0205","0086","0087","0074-0001","0075-0001","0076-0001","0023","0024","0439","0122","0487-0001","0648-0001","0720","0720-0001","0773","0772","0807","0716","0717","0802","0163","0164","0438","0185","0489","0415","0416","0213","0498","0499","0500","0360","0202","0337","0338","0492-0001","0265","0266","0267","0268","0269","0957","0958","0959","0046","0047","0241","0056","0057","0191","0192","0556","0312","0311","0127","0177","0178","0207","0472","0090","0091","0161","0162","0324","0225","0636","0991","0798","0433","0358","0026-0001","0781","0109","0110","0120","0121","0476","0299","0527","0528","0692","0693","0193","0469","0694","0695","0399","0400","0327","0343","0344","0214","0509","0510","0339","0340","0559","0560","0456","0457","0434","0435","0313","0314","0800","0420","0421","0421-0001","0200","0429","0084","0085","0796","0924","0925","0925-0001","0401","0402","0449","0450","0278","0279","0793","0817","0818","0816","0357","0102","0103","0103-0001","0455","0764","0211-0001","0904","0157-0001","0506","0507","0508","0263","0264","0584","0887","0302","0882","0795","0222","0222-0001","0864","0708","0709","0999-0001","1000","0235","0848","0849","0000-0001","0967","0624","0625","0983","0774","0774-0001","0774-0005","0774-0002","0774-0004","0779","0778-0001","0323-0001","0645","0642","0383-0001","0552","0545","0349","0350","0905","0877","0877-0001","0115","0216","0217","0190","0424","0585","0586","0108","0463","0504","0505","0167","0168","0773-0009","0773-0011","0773-0013","0773-0010","0773-0002","0773-0012","0773-0014","0773-0005","0773-0008","0773-0017","0773-0001","0773-0016","0773-0003","0773-0004","0773-0007","0773-0006","0773-0015","0537","0751","0752","0744","0745","0745-0002","0745-0001","0621","0792","0791","0790","0789","0800-0003","0801","0859","0860","0861","0386-0001","0386-0002","0386-0003","0739","0740","0742","0743","0335","0827","0828"]
22 changes: 19 additions & 3 deletions app/types/enum/Pokemon.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,7 +748,9 @@ export enum Pkm {
CRABOMINABLE = "CRABOMINABLE",
CUTIEFLY = "CUTIEFLY",
RIBOMBEE = "RIBOMBEE",
ZANGOOSE = "ZANGOOSE"
ZANGOOSE = "ZANGOOSE",
NICKIT = "NICKIT",
THIEVUL = "THIEVUL"
}

export const PkmIndex: { [key in Pkm]: string } = {
Expand Down Expand Up @@ -1499,7 +1501,9 @@ export const PkmIndex: { [key in Pkm]: string } = {
[Pkm.CRABOMINABLE]: "0740",
[Pkm.CUTIEFLY]: "0742",
[Pkm.RIBOMBEE]: "0743",
[Pkm.ZANGOOSE]: "0335"
[Pkm.ZANGOOSE]: "0335",
[Pkm.NICKIT]: "0827",
[Pkm.THIEVUL]: "0828"
}

export const PkmFamily: { [key in Pkm]: Pkm } = {
Expand Down Expand Up @@ -2250,7 +2254,9 @@ export const PkmFamily: { [key in Pkm]: Pkm } = {
[Pkm.CRABOMINABLE]: Pkm.CRABRAWLER,
[Pkm.CUTIEFLY]: Pkm.CUTIEFLY,
[Pkm.RIBOMBEE]: Pkm.CUTIEFLY,
[Pkm.ZANGOOSE]: Pkm.ZANGOOSE
[Pkm.ZANGOOSE]: Pkm.ZANGOOSE,
[Pkm.NICKIT]: Pkm.NICKIT,
[Pkm.THIEVUL]: Pkm.NICKIT
}

export enum PkmDuo {
Expand Down Expand Up @@ -6133,5 +6139,15 @@ export const AnimationConfig: {
attack: AnimationType.MultiScratch,
ability: AnimationType.Shoot,
emote: AnimationType.Charge
},
[Pkm.NICKIT]: {
attack: AnimationType.Attack,
ability: AnimationType.Shoot,
emote: AnimationType.Charge
},
[Pkm.THIEVUL]: {
attack: AnimationType.Attack,
ability: AnimationType.Shoot,
emote: AnimationType.Charge
}
}
Loading