Commit Graph

  • 88082c0e5b
    Adjusted Rich and Rich Kid $$$ multipliers damocleas 2025-03-14 22:33:16 -0400
  • b399ca8201
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-14 21:50:28 +0100
  • 9256dfbfa4 Add more trainer types to biomes Madmadness65 2025-03-14 15:37:18 -0500
  • de50ba561f Move signature species to separate file AJ Fontaine 2025-03-14 13:28:26 -0400
  • 828d74ab42
    Merge branch 'beta' into damo-sheerforcedfixes damocleas 2025-03-13 17:54:12 -0400
  • 6b879a9459 removed order up sheer force interaction mention and test - updated comments damocleas 2025-03-13 17:53:54 -0400
  • e7864cf022 Fix OPP_FORM_OVERRIDES so that form index 0 is selectable NightKev 2025-03-13 08:32:54 -0700
  • 9c524b7273 Remove now-unused eslint directives in overrides.ts NightKev 2025-03-12 02:33:07 -0700
  • f0c33e5416
    Merge branch 'beta' into fix-challenge-filters-again Wlowscha 2025-03-13 22:33:14 +0100
  • b24e57f49d sheer force #, sheer force and burning jealousy test fix, and move chance fixes damocleas 2025-03-13 17:24:33 -0400
  • 6995c8c0c0 Move application to applyPostSummonAbAttrs and stop assuming no other phases in queue Dean 2025-03-13 13:23:13 -0700
  • 4c1caa107b Merge conflicts Christopher Schmidt 2025-03-12 21:46:56 -0400
  • dd8e501dcc
    Merge branch 'beta' into ability_display Dean 2025-03-12 18:30:54 -0700
  • 9008e3754b Minor changes Dean 2025-03-12 18:20:01 -0700
  • ca05b94dbe Update import Dean 2025-03-12 13:48:18 -0700
  • ba8375b1e4 Merge branch 'activation-order' of https://github.com/emdeann/pokerogue into activation-order Dean 2025-03-12 13:35:43 -0700
  • f8764e31af Rename phase file Dean 2025-03-12 13:35:37 -0700
  • 398993a2ed
    Merge branch 'pagefaultgames:beta' into activation-order Dean 2025-03-12 12:55:44 -0700
  • 5f4daa2ef4 Move sorting to BattleScene Dean 2025-03-12 12:47:51 -0700
  • 68f0de1f50
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-12 16:02:52 +0100
  • 5a67860181
    Revert "[Enhancement] Add form changes for Solgaleo, Lunala, & Marshadow cosm…" NightKev 2025-03-12 04:57:10 -0700
  • 80ac3d964c Add ability priorities to constructors Dean 2025-03-12 01:42:41 -0700
  • 78882d4be2 Update to use priority numbers instead of a boolean Dean 2025-03-12 01:33:05 -0700
  • 8faf163333
    Apply suggestions from code review Wlowscha 2025-03-12 08:33:53 +0100
  • d36f2105f1 Add test for priority Dean 2025-03-12 00:10:58 -0700
  • 877f330cbb Ensure priority abilities are still activated on switch in Dean 2025-03-12 00:06:13 -0700
  • 4ee5e6c9a0 Support priority ability activations Dean 2025-03-11 23:59:43 -0700
  • 3ba5f1b14b
    Merge branch 'beta' into fix-normalize NightKev 2025-03-11 23:59:37 -0700
  • b2403db913
    Merge branch 'beta' into fix-normalize NightKev 2025-03-11 23:33:56 -0700
  • 4ba000118f
    Merge branch 'beta' into fix-lock-reroll NightKev 2025-03-11 23:30:58 -0700
  • 5fd41344a5 Add and update tests Dean 2025-03-11 23:03:20 -0700
  • 20c1e05c41 Pivot to using sort strategy instead Dean 2025-03-11 22:13:18 -0700
  • d0362e4fc6 Add test base Dean 2025-03-11 21:39:34 -0700
  • 2e2864c0f1 Move logic to PostSummonPhase Dean 2025-03-11 21:39:06 -0700
  • 773762690a
    Merge branch 'beta' into cosmetic-forms damocleas 2025-03-11 21:46:50 -0400
  • 3ab6f15e49 Add prependToPhaseWithCondition and use it in SummonPhase to determine speed order Dean 2025-03-11 17:46:46 -0700
  • 145adaf6d8
    Clean-up Wlowscha 2025-03-12 00:59:31 +0100
  • a29747fcc7
    Filtering correctly when combining gen and monotype challenges Wlowscha 2025-03-12 00:59:20 +0100
  • 97767c9875
    Reverting unwanted changes Wlowscha 2025-03-12 00:47:28 +0100
  • c0ffb84c73
    Reverting unwanted changes Wlowscha 2025-03-12 00:46:39 +0100
  • d430ef5023
    Reverting unwanted changes Wlowscha 2025-03-12 00:45:36 +0100
  • 200c62c961
    Merge branch 'fix-challenge-filters' of https://github.com/Wlowscha/pokerogue into fix-challenge-filters Wlowscha 2025-03-12 00:37:10 +0100
  • 5e5adf3f64
    Make sure that pokemon with forms are not filtered out Wlowscha 2025-03-12 00:01:16 +0100
  • c34b7b1deb
    Fixed logic to allow mons with no forms Wlowscha 2025-03-11 23:43:58 +0100
  • 82fab3502b
    Moving challenge filter logic to challenge.ts Wlowscha 2025-03-11 23:32:35 +0100
  • 0a224ee0c6
    Cleaning up comments Wlowscha 2025-03-11 22:54:48 +0100
  • 3f3c76f248
    Removed unnecessary else statement Wlowscha 2025-03-11 22:43:23 +0100
  • b09e978a02
    Make sure that pokemon with forms are not filtered out Wlowscha 2025-03-12 00:01:16 +0100
  • aceb922073
    Fixed logic to allow mons with no forms Wlowscha 2025-03-11 23:43:58 +0100
  • a9ed02d45d
    Moving challenge filter logic to challenge.ts Wlowscha 2025-03-11 23:32:35 +0100
  • 6eda64b270
    Cleaning up comments Wlowscha 2025-03-11 22:54:48 +0100
  • e05082167e
    Removed unnecessary else statement Wlowscha 2025-03-11 22:43:23 +0100
  • 2c360b30c9
    Merge remote-tracking branch 'origin/beta' into fix-challenge-filters Wlowscha 2025-03-11 22:20:50 +0100
  • 6bfe72abad
    Merge remote-tracking branch 'origin/beta' into fix-challenge-filters Wlowscha 2025-03-11 21:56:35 +0100
  • 02391dac58 Add message to onOverlap Dean 2025-03-11 13:32:19 -0700
  • 63005359a8 Merge branch 'beta' into ability_display Dean 2025-03-11 12:24:52 -0700
  • 41536b7ee1 Update PostSummonAddArenaTagAbAttr Dean 2025-03-11 12:21:36 -0700
  • 8e107e7748 Further changes AJ Fontaine 2025-03-11 14:30:10 -0400
  • 333832bcd1 Deletion of pointless Icons Unicornpowerstar 2025-03-11 18:13:54 +0100
  • b4a778f3c7 Linting and extra beauty mons AJ Fontaine 2025-03-11 13:09:10 -0400
  • 19bb162aad Changes to Biker, Baker, Beauty, Cyclist, Parasol Lady, Hex Maniac AJ Fontaine 2025-03-11 12:06:01 -0400
  • b5808def8b
    Exempt Struggle from Adaptability Scooom 2025-03-11 06:02:33 -0500
  • 9065a36430
    Add Multi Attack, Revelation Dance, and Terrain Pulse to Normalize Exceptions Scooom 2025-03-11 05:48:05 -0500
  • 5e4555fa96
    Correctly check if locked upgrade odds is less than 4, rather than if false. Scooom 2025-03-11 05:20:05 -0500
  • 552c603da9
    Fix Locked Reroll not using Luck Score Scooom 2025-03-11 04:52:12 -0500
  • 4c587a8dcb
    Merge branch 'beta' into ng-onfield damocleas 2025-03-10 23:16:03 -0400
  • bbe52bd9fa
    Remove latent checkFlag call in move-effect-phase Sirz Benjie 2025-03-10 22:13:53 -0500
  • c3910127f9
    Merge branch 'beta' into redirect-type Sirz Benjie 2025-03-10 21:59:14 -0500
  • 7e49304d0c Update PostDefendTypeChangeAbAttr to use PokemonType Dean 2025-03-10 17:29:30 -0700
  • 2fdc7d3f49 Merge branch 'beta' into ability_display Dean 2025-03-10 17:28:31 -0700
  • 2cde70d3db
    Merge branch 'beta' into pr-illusion Lylian BALL 2025-03-10 13:42:59 +0100
  • f4c0ac6575 merge Lylian 2025-03-10 13:39:47 +0100
  • 15fbd9a54f merge Lylian 2025-03-10 12:42:35 +0100
  • b3ccf8d9b6 merge up-to-date Lylian 2025-03-10 12:31:57 +0100
  • 6198a66c1f Fix docs Dean 2025-03-02 00:34:51 -0800
  • a421a3a08d Add case where move becomes the redirect type to tests Dean 2025-03-02 00:30:59 -0800
  • ceb2684e93 Add tests Dean 2025-03-01 01:46:51 -0800
  • 85780e1472 Add proper type checking to RedirectMoveAbAttr Dean 2025-03-01 01:26:52 -0800
  • 82c80b1e11 Fix not passing overrideStatus to canSetStatus Dean 2025-03-09 23:13:13 -0700
  • 40edac9d0a Merge branch 'beta' into status-ab-activate Dean 2025-03-09 22:25:17 -0700
  • 9ce5a9e7ad Merge branch 'beta' into doubles-blessing Dean 2025-03-09 19:25:05 -0700
  • 22b4e00ce6
    Merge branch 'beta' into ng-onfield Dean 2025-03-09 19:08:32 -0700
  • 5acfdede63
    Merge branch 'beta' into flee Dean 2025-03-09 19:06:22 -0700
  • 1ab2dd8626
    Fix Type enum not updating Madmadness65 2025-03-09 17:35:05 -0500
  • 95f0422369
    Merge branch 'beta' into cosmetic-forms Madmadness65 2025-03-09 17:29:58 -0500
  • 1a28780e95
    Merge branch 'beta' into beta damocleas 2025-03-09 18:24:34 -0400
  • e351647033
    Merge branch 'beta' into deep-sea-items Madmadness65 2025-03-09 17:23:42 -0500
  • 4d21b7ece0
    Merge branch 'beta' into update-issue-template NightKev 2025-03-09 15:11:44 -0700
  • de79446bdd
    Merge branch 'beta' into wild-ghost-goo Madmadness65 2025-03-09 17:03:59 -0500
  • d2beb200fa
    Merge branch 'beta' into romanian-workspace Lugiad 2025-03-09 22:35:50 +0100
  • db950d1255
    Merge branch 'beta' into danish-workspace Lugiad 2025-03-09 22:35:00 +0100
  • 8719e8d0ed
    Merge branch 'beta' into turikish-workspace Lugiad 2025-03-09 22:34:05 +0100
  • f090768750
    Merge branch 'beta' into hebrew-pr Lugiad 2025-03-09 22:32:52 +0100
  • 7c22eddec8
    Merge branch 'beta' into ditch-eslint-for-biome Wlowscha 2025-03-09 09:22:27 +0100
  • 813d0495df
    Restore overrides.ts Sirz Benjie 2025-03-08 23:31:40 -0600
  • 124c29f06d
    re-add the reload to src/game-data using window.location.reload() Sirz Benjie 2025-03-08 10:58:02 -0600
  • a7875856de
    Add type to issue templates Sirz Benjie 2025-03-08 09:39:33 -0600
  • 00671d57d9
    Add Wlowscha and SirzBenjie to credits Sirz Benjie 2025-03-08 09:17:50 -0600
  • 1749c483cb
    Update README: replace eslint with biome Sirz Benjie 2025-03-08 08:57:13 -0600
  • 6e3c95ccf8
    Add path filters to avoid unnecessarily re-running tests Sirz Benjie 2025-03-08 08:51:47 -0600