Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
scheibo committed Jun 11, 2024
1 parent d39172a commit cf85fbe
Show file tree
Hide file tree
Showing 33 changed files with 602 additions and 49 deletions.
4 changes: 2 additions & 2 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
"build"
],
"dependencies": {
"@pkmn/data": "^0.9.5",
"@pkmn/data": "^0.9.6",
"@pkmn/protocol": "^0.6.25"
},
"devDependencies": {
"@pkmn/dex": "^0.9.5"
"@pkmn/dex": "^0.9.6"
},
"scripts": {
"lint": "eslint --cache src --ext ts",
Expand Down
10 changes: 5 additions & 5 deletions data/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pkmn/data",
"version": "0.9.5",
"version": "0.9.6",
"description": "A forked implementation of the Pokémon Showdown client's data layer",
"repository": "github:pkmn/ps",
"license": "MIT",
Expand All @@ -16,12 +16,12 @@
"build"
],
"dependencies": {
"@pkmn/dex-types": "^0.9.5"
"@pkmn/dex-types": "^0.9.6"
},
"devDependencies": {
"@pkmn/dex": "^0.9.5",
"@pkmn/mods": "^0.9.5",
"@pkmn/sim": "^0.9.5",
"@pkmn/dex": "^0.9.6",
"@pkmn/mods": "^0.9.6",
"@pkmn/sim": "^0.9.6",
"@smogon/calc": "^0.10.0"
},
"scripts": {
Expand Down
1 change: 1 addition & 0 deletions dex/data/abilities.json
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@
"inherit": true,
"desc": "There is a 30% chance a Pokemon making contact with this Pokemon will become infatuated if it is of the opposite gender. This effect does not happen if this Pokemon did not lose HP from the attack."
},
"download": {"inherit": true},
"effectspore": {
"inherit": true,
"desc": "30% chance a Pokemon making contact with this Pokemon will be poisoned, paralyzed, or fall asleep. This effect does not happen if this Pokemon did not lose HP from the attack."
Expand Down
7 changes: 4 additions & 3 deletions dex/data/aliases.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"hc": "[Gen 9] Hackmons Cup",
"monorandom": "[Gen 8] Monotype Random Battle",
"bf": "[Gen 7] Battle Factory",
"bssf": "[Gen 8] BSS Factory",
"bssf": "[Gen 9] BSS Factory",
"ssb": "[Gen 9] Super Staff Bros Ultimate",
"ssbu": "[Gen 9] Super Staff Bros Ultimate",
"lgrandom": "[Gen 7] Let's Go Random Battle",
Expand All @@ -71,6 +71,7 @@
"gen7ag": "[Gen 7] Anything Goes",
"gen7bss": "[Gen 7] Battle Spot Singles",
"gen7bssf": "[Gen 7] BSS Factory",
"gen8bssf": "[Gen 8] BSS Factory",
"lgpeou": "[Gen 7 Let's Go] OU",
"lgou": "[Gen 7 Let's Go] Let's Go OU",
"lgdou": "[Gen 7 Let's Go] Doubles OU",
Expand All @@ -84,8 +85,8 @@
"gen6ag": "[Gen 6] Anything Goes",
"crossevo": "[Gen 9] Cross Evolution",
"mayhem": "[Gen 9] Random Battle Mayhem",
"omotm": "[Gen 9] Pokebilities",
"lcotm": "[Gen 9] The Loser's Game",
"omotm": "[Gen 9] Fervent Impersonation",
"lcotm": "[Gen 9] 350 Cup",
"fabio": "Ampharos-Mega",
"maero": "Aerodactyl-Mega",
"megabunny": "Lopunny-Mega",
Expand Down
2 changes: 1 addition & 1 deletion dex/data/formats-data.json
Original file line number Diff line number Diff line change
Expand Up @@ -5345,7 +5345,7 @@
"cleffa": {"tier": "LC"},
"clefairy": {"tier": "NFE", "doublesTier": "DUU"},
"clefable": {"tier": "OU", "doublesTier": "(DUU)"},
"vulpix": {"tier": "NFE"},
"vulpix": {"tier": "ZUBL", "doublesTier": "NFE"},
"vulpixalola": {"tier": "NFE"},
"ninetales": {"tier": "NU", "doublesTier": "DUU"},
"ninetalesalola": {"tier": "UU", "doublesTier": "DOU"},
Expand Down
4 changes: 2 additions & 2 deletions dex/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pkmn/dex",
"version": "0.9.5",
"version": "0.9.6",
"description": "A unification of Pokémon Showdown's client's and server's data layers",
"repository": "github:pkmn/ps",
"license": "MIT",
Expand All @@ -16,7 +16,7 @@
"build"
],
"dependencies": {
"@pkmn/dex-types": "^0.9.5"
"@pkmn/dex-types": "^0.9.6"
},
"scripts": {
"lint": "eslint --cache *.ts",
Expand Down
2 changes: 1 addition & 1 deletion dex/types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pkmn/dex-types",
"version": "0.9.5",
"version": "0.9.6",
"types": "index.d.ts",
"description": "Common Pokémon Showdown Dex types shared by @pkmn/dex and @pkmn/sim",
"repository": "github:pkmn/ps",
Expand Down
2 changes: 1 addition & 1 deletion import
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ const RANDOMS_IMPORTS = {
[[
'PlayerOptions', 'PRNG', 'PRNGSeed', 'PokemonSet', 'StatsTable', 'StatID',
'Format', 'Species', 'RandomTeamsTypes', 'toID', 'ModdedDex', 'Move', 'BasicEffect',
'RuleTable', 'Tags', 'Item', 'Ability', 'Nature',
'RuleTable', 'Tags', 'Item', 'Ability', 'Nature', 'AnyObject',
], '@pkmn/sim'],
],
'data/random-battles/gen8/teams.ts': [
Expand Down
8 changes: 4 additions & 4 deletions mods/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pkmn/mods",
"version": "0.9.5",
"version": "0.9.6",
"description": "Support for non-standard mods to @pkmn/sim and @pkmn/dex",
"repository": "github:pkmn/ps",
"author": "Guangcong Luo <guangcongluo@gmail.com> (http://guangcongluo.com)",
Expand Down Expand Up @@ -114,11 +114,11 @@
"build"
],
"dependencies": {
"@pkmn/dex-types": "^0.9.5"
"@pkmn/dex-types": "^0.9.6"
},
"devDependencies": {
"@pkmn/dex": "^0.9.5",
"@pkmn/sim": "^0.9.5"
"@pkmn/dex": "^0.9.6",
"@pkmn/sim": "^0.9.6"
},
"scripts": {
"lint": "eslint --cache src --ext ts",
Expand Down
4 changes: 2 additions & 2 deletions protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"@pkmn/types": "^4.0.0"
},
"devDependencies": {
"@pkmn/dex": "^0.9.5",
"@pkmn/data": "^0.9.5"
"@pkmn/dex": "^0.9.6",
"@pkmn/data": "^0.9.6"
},
"scripts": {
"lint": "eslint --cache src --ext ts",
Expand Down
4 changes: 2 additions & 2 deletions randoms/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@pkmn/randoms",
"version": "0.9.5",
"version": "0.9.6",
"description": "Random team generation logic for Pokémon Showdown's Random Battle formats",
"repository": "github:pkmn/ps",
"license": "MIT",
Expand All @@ -15,7 +15,7 @@
"build"
],
"dependencies": {
"@pkmn/sim": "^0.9.5"
"@pkmn/sim": "^0.9.6"
},
"scripts": {
"lint": "eslint --cache src --ext ts",
Expand Down
4 changes: 0 additions & 4 deletions randoms/src/gen8.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,6 @@ export class MoveCounter extends Utils.Multiset<string> {
this.damagingMoves = new Set();
this.setupType = '';
}

get(key: string): number {
return super.get(key) || 0;
}
}

type MoveEnforcementChecker = (
Expand Down
Loading

0 comments on commit cf85fbe

Please sign in to comment.