Commit Graph

21 Commits

Author SHA1 Message Date
pyuk-bot
1dfb40558b
Challenge Cup: Fix inheriting from prevo movepools (#9904)
* Challenge Cup: Fix prevo movepool inheritance

* Fix indentation

* Simplify learnsetSpecies id reference
2023-11-20 12:39:58 -07:00
ACakeWearingAHat
1ce14c8f5b
Randomized format set updates (#9860)
* Ranodmized format set updates

* oopsie rolenames

* Update data/random-teams.ts

Co-authored-by: livid washed <115855253+livid-washed@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: livid washed <115855253+livid-washed@users.noreply.github.com>

* Update random-teams.ts

* Update random-teams.ts

* more changes

* fix

* more changes while we wait

---------

Co-authored-by: livid washed <115855253+livid-washed@users.noreply.github.com>
2023-10-31 10:13:45 -06:00
livid washed
cb3935aabc
Revamp [Gen 5] Random Battle (#9822)
* Preserve Gen 4 rands

* Set up move arrays

* Create framework for new system

* Remove some gen 6 stuff

* Implement Spinner role code

* make Priority Pokemon work

* Fix castform level

* Remove random-data.json

* Remove more gen 6 abilities

* Treat Nature Power like eq

* More gen 6 removing

* knockoff nostab

* Prioritise non-speed setup moves on setup roles

* Enforce recovery on Spinner

* Bisharp blackglasses

* Add comment re. Nature Power

* Remove duplicate comment

* Update tests for gen 5

* Add tests

* fix some things in json file

* formatting

* fill out random-teams

* adjustments

* remove roost raptor

* pt psychic celebi set 1

* lint

* nostab chatter

* Expert Belt conditions

* Fix some incompatibilities

* Item generation

* Formatting

* fix Unaware Clefable

* Refactor some items

* Remove unnecessary code

* Prevent tinted lens night shade noctowl

* Thundurus

* reun

* Pressure tomb

* remove gen 6 setup moves

---------

Co-authored-by: ACakeWearingAHat <45981036+ACakeWearingAHat@users.noreply.github.com>
2023-10-06 19:58:51 -06:00
adrivrie
51913fb51a
Gen 8 BSS Factory: Remove type limits in monotype (#9757) 2023-09-10 20:37:28 -05:00
adrivrie
30c61a8905
Gen 8 BSS Factory: Implement proper sampling (#9754) 2023-09-08 18:37:13 -05:00
livid washed
9813dd5509
Past Gens Random Battles: Fix appearance rate of Pokemon with multiple formes (#9708) 2023-08-13 21:54:00 -05:00
ACakeWearingAHat
118d114bd1
Revamp [Gen 7] Random Battle (#9692)
* Create framework for Gen 7 rands revamp

* Shuffle moves and deal with Z-Conversion Porygon-Z

* Add isDoubles as a input for STAB enforcement

* Undo previous

* Move gen 7 doubles code to a separate file

* fill out moves

* revamp abilities

* minor moveset updates

* prevent technician alolan persian

* mostly linting

* Revamp setup moves

* Male Greninja

* Further clean up Setup lists

* More Z-move stuff

* Tweak move and ability incompatibilities

* enforce shadow sneak on kecleon

* Add Geomancy to setup and prevent evasion abilities by default

* items

* more minor set updates

* linting

* add more z-move users

* soundproof kommonium clanger

* rockium kabutops

* Weak Armor adjustments + some syntax

* refactor and fix /setodds and /randbats and /randdubs

* improve item generation code

* Allow plot sucker houndoom

* Allow Power Construct on Zygarde and homogenize gen 6 ability generation code

* Don't apply new noSTAB list to gen 7 doubles

* Fix -ate abilities

* comment

* Rework shed skin a bit

* Abilities tweaking/simplifying

* simplify Magnet Pull, since Probopass always has earth power

* Enforce U-turn on some Bug types

* Rework specific ability rejections into enforcements

* Prevent Oblivious on Pokemon with no Status moves, since infatuation doesn't exist

* Remove unnecessary item generation code

* Remove Petaya Berry from HP EVs adjustments

* prevent scarf lanturn

* scarf physical changes

diggersby/medicham

* Give Genesect-Douse its level

* Bug fixes and minor set changes

* Split raichu-alola

* Remove unnecessary preferred types

* Don't enforce HP flying on flying types

* make 4 atks jirachi av

* Actually give Jirachi AV and prevent swift swim kingdra with focus energy

* remove another unnecessary ptype

* Drain Punch/CC incompatibility

* Enforce recovery on support Mew

* Prevent Life Orb with Sturdy

* add preferred type(s) to /randbats for gen7

* lint

* forgot semicolon oops

* Remove kangaskhan PT

* Fix u-turn enforcement

* Enforce recovery on Volbeat

* Don't give Honchkrow Black Glasses

* Setup Solgaleo should get Weakness Policy

* Add Bulk Up to guts hariyama

* make Kingler setup sweeper

* Stoutland set update

* Prevent Sash Mismagius and double fire move Volcarona

* Prevent Choice Scarf on Wallbreaker

* Enforce recovery on Ledian

* Remove Ice Beam from Absol-Mega

* Adjust Seviper PTs

* PT normal Heliolisk

* Add PUP to nostab

* Future-proof Nihilego's SpD EVs in case of level changes/Hidden Power IVs

* Change Shaymin PT to Flying

* Prevent lead Focus Sash with Defog or Regenerator

* Remove unnecessary condition for sash

* Move pivotingMoves to the top

* Support Max Move Count tests for gens 7 and 9

* Move general incompatibilites to incompatiblePairs array

* Create a type for roles

* Make Gen 7 no longer inherit from Gen 7 doubles

* Remove unnecessary hardcode

* Remove now unnecessary code (after doubles/singles separation)

* Move hardcodes into incompatiblePairs array

* Split ability enforcement into species and non/species conditions, and fix up some minor things

* Convert ability enforcements that only apply to one Pokemon to species-based

* Update server/chat-plugins/randombattles/index.ts

Co-authored-by: Mia <49593536+mia-pi-git@users.noreply.github.com>

* Update server/chat-plugins/randombattles/index.ts

Co-authored-by: Mia <49593536+mia-pi-git@users.noreply.github.com>

* Update random-teams.ts

* make types for role and preferredType explicit in function definitions

* Update test/random-battles/gen7.js

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen6/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen6/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/mods/gen7/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* finish snake casing the gen 7 file

* snake case gen 8, hopefully

* Update random-teams.ts

* lint please

* missed a snake

* Fix an incompatibility

* Add types for randomSets

* Simplify /randbats data retrival for Gen 7 random doubles

* Further simplify gen 7 randdubs command

---------

Co-authored-by: livid washed <115855253+livid-washed@users.noreply.github.com>
Co-authored-by: adrivrie <adriaan.de.vries@hotmail.com>
Co-authored-by: Mia <49593536+mia-pi-git@users.noreply.github.com>
Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
2023-08-10 12:09:09 -06:00
livid washed
457867cb35
Monotype Random Battles: adjust type combination limit (#9656) 2023-07-17 17:59:31 -05:00
livid washed
bbc75aff35
Random Battles: Improve ability generation (#9642) 2023-07-12 19:41:01 -05:00
livid washed
0709150b3c
Gen 8/9 Random Battle: Remove tier limits (#9560)
* Gen 8 Random Battle: remove tier limits

* Gen 9 Random Battle: remove commented out tier limits
2023-05-14 15:03:22 -06:00
livid washed
b17aae9aa5
Old Gens Random Battles: allow battle only formes to generate in Monotype battles (#9490) 2023-04-10 16:58:51 -05:00
livid washed
aa103be383
Old Gens Random Battles: Move data to JSON files (#9413)
* Add random-sets.json for old gens to store randbats data

* Use random-sets.json files for generating sets

* Use levels from data files in gens 3-7

* Remove levels from BDSP file

* Remove random battles data from formats-data.ts

* Remove unnecessary levelScales

* Rename species_set to data

* Update commands

* linting and syntax stuff

* Adapt randbats tests

* Forgot to remove levels from joltemons file

* Rename random-sets to random-data

* Add newlines at end of json files

* Fix description of /randbats command: defaults to gen 9

* Fix an issue with gmax

* Remove randomDoubleBattleLevel for mons without doubles sets

* Apply suggestions from code review

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Rename randomBattleLevel to level

* Rename randomBattleMoves to moves

* Fix BDSP test

* Fix some gen 7-8 tests

* linting

* Gen 1-2: put custom levels in json file instead of customScale

* Gen 3: make Dunsparce level 88 (PUBL, it shouldn't be level 80)

* Type the JSON files

* revert a change that is no longer needed with typing

* moves should be IDs, not strings

---------

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
2023-03-07 11:50:02 -07:00
adrivrie
1031bea203
Hackmons Cup: Stop banning all natures when there are custom bans (#9440)
* Hackmons Cup: Stop banning all natures when there are custom bans

* remove logging

* linter
2023-03-05 17:06:57 -07:00
livid washed
b9251678aa
Old Gens Random Battles updates (#9383)
Gen 3:
    some set tweaks
    3 Physical attacks + Fire Blast gives Choice Band

Gen 4:
    Mismagius: add Trick, so that it can rarely generate choiced sets
    Umbreon can now get Wish + Moonlight, but not with Protect
    Ditto will get Salac Berry or Sitrus Berry
    Pidgeot, Fearow, and Farfetch'd have Heat Wave added, which will result in Life Orb sets for the first two

Gen 5:
    Pikachu: remove Thunderbolt, add Volt Tackle
    Dugtrio gets a fixed Life Orb set

Gens 6 and 7:
    Dusknoir: remove Focus Punch
    Pokemon with Rock Head/Water Absorb as possible abilities will never get Swift Swim as their ability, unless they have Rain Dance in their set
    Dustox will no longer get Quiver Dance + U-Turn (the change to gen8/random-teams.ts has no effect on any gen 8 sets)
    Slow Pokemon (< 90 base speed) will no longer get Life Orb with Volt Switch

Gen 6:
    Rework Malamar's set
    Kangaskhan-Mega will not get Seismic Toss with Power-Up Punch
    Cloyster should always get Icicle Spear with Shell Smash
    Focus Sash bulk threshold has been reduced from <= 275 to < 255
    remove Cherrim-Sunshine set, add HP Ice to Cherrim

Gen 7:
    Reshiram should always get Blue Flare
    tweak Ninetales and Ninetales-Alola's sets
2023-02-05 11:09:11 -05:00
livid washed
cac12006b0
BDSP Random Battles updates (#9358)
* Changes on the pinned list

* Implement other changes

* linting

* 3 Special attacks + U-Turn = Choice

* Toxic Orb if Quick Feet

* Tauros should get Life Orb and Sheer Force

* Add Quick Feet rejection condition

* Update data/mods/gen8bdsp/random-teams.ts

---------

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
2023-01-31 13:42:40 -07:00
livid washed
67ad24b364
Gen 2-4 Random Battles updates (#9364) 2023-01-29 19:09:30 -06:00
livid washed
cd9fd6f27d
Gen 2 and 4 Random Battles update (#9303)
* Gen 4: remove Unaware from Bibarel

* Gen 4: prevent Dragon Pulse + Draco Meteor

* Gen 2: Gligar and TTar set changes + count Screech as a physical setup move

* Gen 2: Enforce STAB Flying on Gligar (futureproofing for if its movepool is expanded)
2023-01-12 20:48:55 -05:00
Alexander B
ead7d28537
Gen 8 Random Battle: Fix lead bugs (#9274) 2023-01-03 12:12:10 -06:00
adrivrie
da9d196efb
Gen 8 Random Battle: Set a minimum level for Zoroark (#9279)
* Gen 8 Random Battle: Set a minimum level for Zoroark

* Remove double check for zoroark presence

* But properly this time
2023-01-02 13:16:01 -08:00
ACakeWearingAHat
686a020e2c
Implement Gen 9 Random Battle (#9169)
* Move gen 8 rands code to gen8 folder

* Add test data file

* Remove hidden power from random-teams

* Remove BDSP

* Remove item selection for now

* Remove ability culling for now

* Remove move culling for now

* Obtain allowed pokemon from random-sets.json

* Add tera blast counter

* linting

* Remove Dynamax from random-teams

* Remove unnecessary check

* Add role and tera type + fix data format

* remove gmax

* Disable tier for now

* movePool should have move ids not names

* linting

* Add required moves

* Create an individual function for moveset generation

* Return moves early if <= 4 moves available

* Add counter for individual STABS, including tera

* Tera Blast is tera stab

* Add some moves (help with testing)

* Remove culling moves from moveset

* Add new hazard removing moves

* Test STAB and recovery moves

* Cull movepool each time a move is added

* Black Sludge only if tera type is Poison

* teratype and role to functions

* Test some 'High Priority' items

* Move ability selection to its own function

* Fix ability sorting/selection

* No need to go through the move adding process if number of moves in set + movepool is 4

* lint

* Remove some pokemon that aren't in gen 9 randbats

* Tera STAB example

* Allow for forcing abilities

* Silvally not in gen 9

* Move level calculation to getLevel

* Tier-based levelling and doubles coverage

* Sitrus Berry default item for doubles

* Avoid hard-coding for species frequency

* Linting + replace hail with snow

* Change a comment slightly

* Fix STAB moves: need to check that they do damage

* minor thing

* Comment out tera type requirement

* comments

* Add gen 9 randbats format

* STAB counter

* Remove setupType

* Add cullMutlaExclusive()

* Remove unnecessary functions

* Move CC/HC to the bottom

* Allow movesA and movesB to be overlapping

* Initialization of fill-out

* linting

* Setup moveEnforcementCheckers

* Type/STAB counter only updates for moves that aren't in noSTAB

* Account for type changing abilities earlier

* STAB enforcement

* Setup moves array

* linting

* Revert Setup change

* More fillout

* move tweaks

* Tera STAB enforcement

* Remove rest from recovery moves

* Enforce setup

* Add Facade if Guts

* Misc enforced moves

* Enforce more moves

* Enforce STAB priority

* Setup forced on tera blast user

* check if there are moves of the desired kind before sampling

* move tweaks

* Need to check if setupMoves is empty

* fix brute bonnet

* fix scream tail

* Finish up move incompatibilities

* fix scream tail harder

* Formatting

* Fix some things

* End culling early if movepool gets too small

* Paired moves: end culling early if movepool gets too small

* Remove 'stop cull' for testing purposes

* If 2/4 moves are filled, remove single unpaired move

* Remove now unnecessary hardcodes

* Use MovePairs instead of hardcoding pairs

* addMove function for adding moves to moveset

* Move updates

* Extra check is unnecessary, moves and movePool should never have moves in common

* Mach Punch required on Breloom

* lint

* Remove Synthesis from Brute Bonnet (5 enforced moves)

* adjust oranguru tera types

* finish up moves

* Force abilities

* Update my favorite pokemon

* linting

* Add shouldCullAbility

* fix setup counter

* Move sorting abilities below hardcoding

* minor change

* Add fields

* fix sawsbuck typo

* Improve the species generation + remove Basculegion and Houndstone as possible leads

* Fix Species frequency

* Linting

* veluza can actually run sharpness

* code all ability rejections

* Update random-sets.json

* EVs/IVs tinkering change

* fix capitalization error

* Perform small fixes

* fix moves that don't exist

* linting

* Magnezone hardcode

* Items

* Update random-teams.ts

* linting

* prep for leveling

* long list for ditto

* comment out a line of text

* finish individualizing levels and also melop sucks

* add lokix thing

* revavroom

* updates from testing

* komala probably shouldn't have dark as an option

* tropius fix

* intim mence is ok

* kleavor should not get sheer force

* why did we give hydre earth power lmao

* why did we put leech seed on toed

* forgot to sitrusify cheek pouch mons

* fix enamorus

* Syntax error

* Change Zoroark lastmon condition to level >= 72

* Fix Zoroark-level constraint to allow for level forcing

* Fix singles vs doubles definition

* Use species.id as much as possible for set generation

* updates from testing

* allow flash fire heatran

* additional sash parameters

* reject stakeout if the user has zero attacks

* fixes

* update pawmot abilities

* Change iron fist counter to a number

* Force Own Tempo on Petal Dance Lilligant

* Add T-wave to SD groudon set

* Slush Rush guaranteed with Snowscape + possible if team has snow

* Rework ability sorting: find list of non-culled abilities before sorting and selecting

* Move S/V rands to The Forefront

* fix regidrago

* Small fix to choosing allowed abilities

* update aliases

* Update Arcanines

* Change from forEach to for, since index is no longer being used

* first impression is bug stab now

* set updates from the randscord

* Update /randbats to gen 9

* Add Tera Type to /randbats output

* things to do with steel

* Update data/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Update data/random-teams.ts

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* Move Battle Factory and BSS Factory to mods/gen8 folder

* Remove gen8 factory sets test

* Copy over random-sets.json when building

* add missing heatran-based incompatibility

* fix sableye not always getting Recover

* set updates

* start movin' cap 1v1

Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>

* finish movin' cap 1v1

* Update random-battles.ts

* Update random-teams.ts

* Update random-teams.ts

Co-authored-by: livid washed <liuc.kelvin9901@hotmail.com>
Co-authored-by: livid washed <115855253+livid-washed@users.noreply.github.com>
Co-authored-by: Alexander B <4866817+MathyFurret@users.noreply.github.com>
Co-authored-by: Kris Johnson <11083252+KrisXV@users.noreply.github.com>
2022-12-13 17:56:29 -07:00
Kris Johnson
d50c8c249b
Add Gen 9 (#8997) 2022-11-17 20:46:29 -05:00