Commit Graph

  • 5d80d74fc1
    Merge 1dd94c45a0 into 9926a6e799 Dean 2025-07-03 02:02:41 +0000
  • 1dd94c45a0 Merge fixes Dean 2025-07-02 19:02:28 -0700
  • b35ee4f314
    Merge bf76ae063a into 9926a6e799 Sirz Benjie 2025-07-03 02:00:22 +0000
  • bf76ae063a
    Go back to && which is cross-platform Sirz Benjie 2025-07-02 20:00:13 -0600
  • fd1076a001
    Merge 32fb59e70c into 9926a6e799 AJ Fontaine 2025-07-02 21:57:38 -0400
  • 72932c7e0a
    Merge 10166daef5 into 9926a6e799 GnawOmiz 2025-07-02 21:57:18 -0400
  • 6114645208 Merge branch beta into turn-manager-no-queue-phase Dean 2025-07-02 18:57:16 -0700
  • 603dde34dd
    Merge a134a2ba13 into 9926a6e799 AJ Fontaine 2025-07-02 21:56:25 -0400
  • 64b712fafe
    Merge 6a4588ccb7 into 9926a6e799 Fuad Ali 2025-07-02 18:35:11 -0700
  • acc6d4c5b2
    Merge 3b22d29021 into 9926a6e799 Lugiad 2025-07-03 00:29:49 +0000
  • 3b22d29021
    pokemon-bw font update Lugiad 2025-07-03 02:29:46 +0200
  • a1032bf80b
    Merge branch 'pagefaultgames:beta' into japanese-edits Lugiad 2025-07-03 02:29:11 +0200
  • 24de2e7ae3
    Remove dependency-graph.json Sirz Benjie 2025-07-02 17:24:28 -0600
  • 823e4affb0
    Add pnpm-workspace.yaml to configure dependencies that are allowed to build Sirz Benjie 2025-07-02 17:23:37 -0600
  • 4434f04f79
    Merge 8f730cf207 into 9926a6e799 Sisyphos 2025-07-02 15:36:53 -0700
  • 7f576542f9
    Merge 6942f1d7cc into 9926a6e799 Inês Simões 2025-07-02 23:11:01 +0100
  • 8d2d55887d
    Merge 9dbe02de8b into 9926a6e799 Matilde Simões 2025-07-02 23:10:54 +0100
  • c801ae8676
    Merge c15dcd167e into 9926a6e799 José Serrado Marques 2025-07-02 22:34:43 +0100
  • 9c2e0c1c10
    Merge 72beb4f6ce into 9926a6e799 Tiago Rodrigues 2025-07-02 23:30:24 +0200
  • 679a3f8956
    Merge 467f91e6c1 into 9926a6e799 Jonathan Bankston 2025-07-02 23:28:58 +0200
  • 9926a6e799
    [Docs] Add links to CONTRIBUTING.md for forking/cloning (#6060) beta Bertie690 2025-07-02 23:27:13 +0200
  • 514370a1e5
    Merge 9c09d2cf4d into 2fe50cb761 Bertie690 2025-07-02 15:26:39 -0600
  • fd2764dac0
    Merge branch 'beta' into patch-4 Sirz Benjie 2025-07-02 15:25:42 -0600
  • 6b02d0b8a2
    Merge branch 'beta' into japanese-edits Lugiad 2025-07-02 21:49:45 +0200
  • 9dbe02de8b Fixed minor issue on applyAddPokemonToParty. Matilde Simões 2025-07-02 20:47:24 +0100
  • 467f91e6c1 Merge branch 'beta' into imposter-and-transform-bug-fix NightKev 2025-07-02 12:47:10 -0700
  • 2fe50cb761
    [Test] Made game.move.select fail if move not in moveset (#5998) Bertie690 2025-07-02 21:46:26 +0200
  • c4c4fdfd21 Updated No Free heal challenge to implement two other modes and applied minor adjustments on challenge.ts file Matilde Simões 2025-07-02 20:20:41 +0100
  • 68e1ee84f9 Deleted the constraints of the auto heal challenge from the Mystery Ecounters Signed-off-by: Matilde Simões <matilde.simoes@tecnico.ulisboa.pt> Co-authored-by: Fuad Ali <fuad.ali@tecnico.ulisboa.pt> mati-soda 2025-06-20 14:28:58 +0100
  • 8f6cf35beb Fixed conflicts on file imports. Signed-off-by: Matilde Simões <matilde.simoes@tecnico.ulisboa.pt> Co-authored-by: Fuad Ali <fuad.ali@tecnico.ulisboa.pt> mati-soda 2025-06-12 22:05:17 +0100
  • 289dffb8d0 Implement NuzLocke related challenges and AI changes The Nuzlocke challenges that were implemented were the following: - "No Free Heal" which consists in disabling the auto heal that occurs every 10th wave, replacing it with a normal shop phase. Changes made: - Added a new challenge "NO_AUTO_HEAL" with a challenge type "NO_HEAL_PHASE" and created a new function "applyNoHealPhase" to determine whether the Pokémon can heal if the challenge is active ("challenge.ts"). - Added a confirmation on the healing phase to check if the challenge is active or not, and if it is, it should skip the phase ("party-heal-phase.ts"). - Changed the logistic of when the shop should be displayed, so when the challenge is active the shop appears every 10th wave ("modifier-type.ts") and actually push the shop phase ("victory-phase.ts"). - "Hardcore": Challenge divided into two modes, normal and hard, where fainted Pokémon can't be revived, in addition, the hard mode deletes the fainted Pokémon so the player can't switch it's items after death. Changes made: - Added a new challenge "HARDCORE" with several challenge types with the correspondent apply functions ("challenge.ts"), each one is used as follows: - RANDOM_ITEM_BLACKLIST: filter the reward items with only the valid one's ("modifier-type.ts"). - SHOP_ITEM_BLACKLIST: filter the shop items with only the valid one's ("modifier-select-ui-handler.ts"). - MOVE_BLACKLIST: checks if the move selected is allowed and if not sends a message of no apply ("pokemon.ts"). - DELETE_POKEMON: if hard mode was selected, automatically delete the fainted Pokémon from the party ("battle-end-pahse.ts"). - SHOULD_FUSE: changed the logic of should apply function to prohibit the fusion with dead Pokémon ("modifier.ts"). - PREVENT_REVIVE: prevent the gain of hp of fainted Pokémon ("party-heal-phase.ts"). - "Limited Catch": Only the first wild Pokémon encounter of every biome can be added to the player's current party. Changes made: - Added a new challenge LIMITED_CATCH with a challenge type ADD_POKEMON_TO_PARTY and created a new function "applyAddPokemonToParty" to determine whether the Pokémon can be added to the party, which should only occur every 11th wave if it isn't a catchable mystery encounter or every 12th wave if the 11th wave was a catchable mystery encounter ("challenge.ts"). - Changed the logistic of adding a Pokémon where it can be caught so that the "pokedex" is updated but the Pokémon isn't added to the party of the player affecting specifically mystery encounters ("encounter-pokemon-utils.ts") and added the same logic to normal encounters. ("attempt-capture-phase.ts") Matilde Simões 2025-06-04 21:39:21 +0100
  • 66775f7cc9 Implement NuzLocke related challenges and AI changes The Nuzlocke challenges that were implemented were the following: - "No Free Heal" which consists in disabling the auto heal that occurs every 10th wave, replacing it with a normal shop phase. Changes made: - Added a new challenge "NO_AUTO_HEAL" with a challenge type "NO_HEAL_PHASE" and created a new function "applyNoHealPhase" to determine whether the Pokémon can heal if the challenge is active ("challenge.ts"). - Added a confirmation on the healing phase to check if the challenge is active or not, and if it is, it should skip the phase ("party-heal-phase.ts"). - Changed the logistic of when the shop should be displayed, so when the challenge is active the shop appears every 10th wave ("modifier-type.ts") and actually push the shop phase ("victory-phase.ts"). - "Hardcore": Challenge divided into two modes, normal and hard, where fainted Pokémon can't be revived, in addition, the hard mode deletes the fainted Pokémon so the player can't switch it's items after death. Changes made: - Added a new challenge "HARDCORE" with several challenge types with the correspondent apply functions ("challenge.ts"), each one is used as follows: - RANDOM_ITEM_BLACKLIST: filter the reward items with only the valid one's ("modifier-type.ts"). - SHOP_ITEM_BLACKLIST: filter the shop items with only the valid one's ("modifier-select-ui-handler.ts"). - MOVE_BLACKLIST: checks if the move selected is allowed and if not sends a message of no apply ("pokemon.ts"). - DELETE_POKEMON: if hard mode was selected, automatically delete the fainted Pokémon from the party ("battle-end-pahse.ts"). - SHOULD_FUSE: changed the logic of should apply function to prohibit the fusion with dead Pokémon ("modifier.ts"). - PREVENT_REVIVE: prevent the gain of hp of fainted Pokémon ("party-heal-phase.ts"). - "Limited Catch": Only the first wild Pokémon encounter of every biome can be added to the player's current party. Changes made: - Added a new challenge LIMITED_CATCH with a challenge type ADD_POKEMON_TO_PARTY and created a new function "applyAddPokemonToParty" to determine whether the Pokémon can be added to the party, which should only occur every 11th wave if it isn't a catchable mystery encounter or every 12th wave if the 11th wave was a catchable mystery encounter ("challenge.ts"). - Changed the logistic of adding a Pokémon where it can be caught so that the "pokedex" is updated but the Pokémon isn't added to the party of the player affecting specifically mystery encounters ("encounter-pokemon-utils.ts") and added the same logic to normal encounters. ("attempt-capture-phase.ts") Matilde Simões 2025-06-04 20:33:03 +0100
  • 66dded68a5
    [Docs] Add links to CONTRIBUTING.md for cloning repo Bertie690 2025-07-02 15:36:12 +0200
  • ee83bce885
    Merge branch 'beta' into japanese-edits Lugiad 2025-07-02 15:35:57 +0200
  • 9c09d2cf4d
    Update localization.md to remove unneeded step Bertie690 2025-07-02 15:35:29 +0200
  • d675a6a406
    Revert unneeded step in CONTRIBUTING.md Bertie690 2025-07-02 15:30:31 +0200
  • 659f669fc1
    Merge 898e819a12 into 12aaa31454 fabske0 2025-07-02 13:04:06 +0200
  • da0b07f806
    Merge 193274fd28 into 12aaa31454 fabske0 2025-07-02 13:04:06 +0200
  • df52de8a82 Merge branch 'beta' into imposter-and-transform-bug-fix NightKev 2025-07-02 04:01:21 -0700
  • b7a59a1c80 Remove redundant parentheses NightKev 2025-07-02 04:01:01 -0700
  • 539516c324
    Merge 6402692cba into 12aaa31454 NightKev 2025-07-02 10:55:54 +0000
  • 6402692cba Merge branch 'beta' into dev/enable-import-sorting NightKev 2025-07-02 03:54:41 -0700
  • cfaee73884 Add faint checks to Spikes test NightKev 2025-07-02 03:45:11 -0700
  • d3d59510a7
    Merge branch 'beta' into no-select-move-missing NightKev 2025-07-02 03:42:23 -0700
  • 7dbb649413 Update comment in spikes.test.ts NightKev 2025-07-02 03:42:09 -0700
  • 448255a93f Apply Biome NightKev 2025-07-02 03:38:46 -0700
  • 72beb4f6ce
    Merge branch 'beta' into WorkingDiscardFunction Mikhail Shueb 2025-07-02 11:31:36 +0100
  • dd332e9a9f
    Update moveHelper.ts Bertie690 2025-07-02 12:25:46 +0200
  • 3a560c60a8
    Update moveHelper.ts Bertie690 2025-07-02 12:25:39 +0200
  • aad03d3294
    Merge ed6f49e32b into 12aaa31454 Bertie690 2025-07-02 03:06:39 -0700
  • a2a4ff25dd
    Merge 2b53611f67 into 12aaa31454 Bertie690 2025-07-02 03:06:12 -0700
  • 84ecc79303
    Merge f5c0f213d2 into 12aaa31454 Bertie690 2025-07-02 03:06:10 -0700
  • d5936c03d5
    Merge branch 'beta' into localization-md NightKev 2025-07-02 02:58:59 -0700
  • 12aaa31454
    [Refactor] Minor run phase rework (#6017) Jonathan Bankston 2025-07-02 04:57:08 -0500
  • 07901b8273
    Merge branch 'beta' into minor-run-phase-rework NightKev 2025-07-02 02:42:29 -0700
  • 6a7d31d7c7
    Merge 172e818f5b into a54cd953a6 AJ Fontaine 2025-07-01 21:26:34 -0400
  • bcaca0e7af
    pokemon-bw font update Lugiad 2025-07-01 23:41:23 +0200
  • ebe8d402fa
    [Fix]improved/corrected test structure Mikhail Shueb 2025-07-01 20:44:04 +0100
  • c15dcd167e Merge branch 'beta' into sky-battle-me José Marques 2025-07-01 18:41:32 +0100
  • 620a5e3592
    pokemon-bw font update Lugiad 2025-07-01 16:17:24 +0200
  • 569a8ecbeb
    Merge 77f20dbf8f into a54cd953a6 Madmadness65 2025-06-30 18:38:47 -0500
  • 53e11bb61c
    Merge c934215426 into a54cd953a6 Bertie690 2025-06-30 18:38:47 -0500
  • da9f6eabdd
    Merge d7076febdb into a54cd953a6 Sirz Benjie 2025-06-30 18:38:47 -0500
  • c916df66a1
    Merge c54e7e935c into a54cd953a6 SmhMyHead 2025-06-30 18:38:47 -0500
  • 56c9ab1151
    Merge 5e2df13093 into a54cd953a6 SmhMyHead 2025-06-30 18:38:47 -0500
  • 0fe2587b1f
    Merge 8f8bdeeded into a54cd953a6 ShinigamiHolo 2025-06-30 18:38:47 -0500
  • 0336801b2f
    Merge 5c1bfb4110 into a54cd953a6 Bertie690 2025-06-30 18:38:47 -0500
  • da6bc496cc
    Merge 19cca2664b into a54cd953a6 Bertie690 2025-06-30 18:38:47 -0500
  • c3dbb0c5d8
    Merge 9a9804a5d9 into a54cd953a6 GnawOmiz 2025-06-30 18:38:47 -0500
  • a134a2ba13 Fix evolution phase not using new fusion name AJ Fontaine 2025-06-30 19:18:57 -0400
  • ff6d057a63
    Merge branch 'beta' into WorkingDiscardFunction Mikhail Shueb 2025-07-01 00:03:32 +0100
  • 0a2f83c433 Updated override typo for unimplemented methods jnotsknab 2025-06-30 16:11:33 -0500
  • bddd477478
    Merge branch 'beta' into imposter-and-transform-bug-fix Jonathan Bankston 2025-06-30 15:42:42 -0500
  • 303263c81d
    Merge 3e34dd513b into a54cd953a6 AJ Fontaine 2025-06-30 16:11:07 -0400
  • 3e34dd513b Move Fixed Battle Configs to own file AJ Fontaine 2025-06-30 16:08:07 -0400
  • 32fb59e70c Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into ratpack AJ Fontaine 2025-06-30 15:50:08 -0400
  • 52d89cc428
    Merge 489295f2c0 into a54cd953a6 Bertie690 2025-06-30 15:29:08 -0400
  • 1a91181655
    Merge 50f36ef8cd into a54cd953a6 Lugiad 2025-06-30 21:18:32 +0200
  • 6ab3fe11f4
    pokemon-bw font updated Lugiad 2025-06-30 18:00:46 +0200
  • 6c6b715629
    pokemon-bw font update Lugiad 2025-06-30 17:54:09 +0200
  • 6f3fa3137a Misc fixes NightKev 2025-06-30 06:19:15 -0700
  • f2541d33fa
    Merge c5eef9ba62 into a54cd953a6 NightKev 2025-06-30 12:11:41 +0000
  • 55fcd0098b
    Merge 1e99b81782 into a54cd953a6 Wlowscha 2025-06-30 04:56:05 -0700
  • c5eef9ba62 [i18n] Pokemon#getOpponentDescriptor no longer returns a pokemon name NightKev 2025-06-30 04:51:59 -0700
  • 3b92f6f438
    Merge branch 'beta' into japanese-edits Lugiad 2025-06-30 13:08:35 +0200
  • 9289183e06 Apply changes NightKev 2025-06-30 02:46:41 -0700
  • e2dafee8dc [Dev] Enable Biome import sorting NightKev 2025-06-30 02:46:26 -0700
  • 99bee030b8
    Merge 5554c491ce into a54cd953a6 David Yang 2025-06-30 14:50:27 +0800
  • 4292867b08
    Merge 6fae3cbacd into a54cd953a6 Dean 2025-06-30 06:46:29 +0000
  • f915e43307
    Merge cbeea82219 into a54cd953a6 iTunesko 2025-06-30 07:24:19 +0100
  • 144ca1aa95
    Merge 8069f9ad91 into a54cd953a6 Wlowscha 2025-06-30 08:23:56 +0200
  • d7ce95c6ed
    Merge 8679f82367 into a54cd953a6 David Mitchell Em-Yinn 2025-06-30 08:18:16 +0200
  • d52c934c87
    Merge b7635f42c5 into a54cd953a6 podar 2025-06-29 21:48:57 -0700
  • df3c174b64
    Merge 29d50f7b73 into a54cd953a6 NightKev 2025-06-30 00:26:57 -0400
  • ff28384b83
    Merge b2f1fe17c2 into a54cd953a6 Sirz Benjie 2025-06-30 00:22:46 -0400
  • a54cd953a6
    [Bug] Fix Shields Down blocking status in Core Form, unnecessarily resetting before battle (#6044) Bertie690 2025-06-30 05:19:59 +0100
  • 203e13852b Apply Biome NightKev 2025-06-29 20:25:35 -0700
  • d0fe23d5ef
    Added English language settings Lugiad 2025-06-29 22:19:48 +0200
  • b4dd556a64
    Fix ability.ts Bertie690 2025-06-29 20:16:27 +0100
  • de46aa4867
    Fix syntax error Bertie690 2025-06-29 20:05:50 +0100