Code

Encounters beta#1

Code

Merged

ben-lear merged 56 commits intomainben-lear/pokerogue:mainfrom encounters-betaben-lear/pokerogue:encounters-betaCopy head branch name to clipboardJun 10, 2024

+4,280-369

Commits

Commits on May 28, 2024

• add scaffolding for mystery encounters

  

  ImperialSympathizer

  committed
  8c12a4e

  Copy full SHA for 8c12a4e

Commits on May 30, 2024

• stashing recent changes

  

  ImperialSympathizer

  committed
  e2bb1f3

  Copy full SHA for e2bb1f3

• Merge branch 'main' of https://github.com/InnocentGameDev/PokeRogue-Events into mystery-battle-events

  

  ImperialSympathizer

  committed
  13dc33d

  Copy full SHA for 13dc33d

• updates to mystery encounter logic

  

  ImperialSympathizer

  committed
  78983ef

  Copy full SHA for 78983ef

• changes for prototype mystery encounters

  

  ImperialSympathizer

  committed
  c3a5448

  Copy full SHA for c3a5448

Commits on May 31, 2024

• started working on locale/en, still lots left

  AsdarDevelops

  committed
  e47e772

  Copy full SHA for e47e772

• updated readme with things each ME needs (WIP)

  AsdarDevelops

  committed
  cb9ef61

  Copy full SHA for cb9ef61

• Update MEs-README.md

  Show description for 40731a1
  AsdarDevelops

  authored
  40731a1

  Copy full SHA for 40731a1

• finalized readme with to-do and higher level logic non-code logic

  AsdarDevelops

  committed
  3611edc

  Copy full SHA for 3611edc

Commits on Jun 1, 2024

• functional updates to battle type encounter

  

  ImperialSympathizer

  committed
  b20e53e

  Copy full SHA for b20e53e

• pull latest from main

  

  ImperialSympathizer

  committed
  fe445a4

  Copy full SHA for fe445a4

• 3 placeholder MEs text in mystery-encounter.ts locale, updated ReadMe with more building blocks

  AsdarDevelops

  committed
  1598539

  Copy full SHA for 1598539

Commits on Jun 2, 2024

• updates to phase logic for mystery encounters

  

  ImperialSympathizer

  committed
  7960fc5

  Copy full SHA for 7960fc5

• Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into mystery-battle-events

  

  ImperialSympathizer

  committed
  590b052

  Copy full SHA for 590b052

• pull latest from main

  

  ImperialSympathizer

  committed
  4d0c9f3

  Copy full SHA for 4d0c9f3

• updates to phase logic and switch outs with encounters

  

  ImperialSympathizer

  committed
  368c52f

  Copy full SHA for 368c52f

• push latest changes to encounter options and rewards

  

  ImperialSympathizer

  committed
  e776ae0

  Copy full SHA for e776ae0

• update ME readme

  

  ImperialSympathizer

  committed
  cb5dc3d

  Copy full SHA for cb5dc3d

• fix encounter indexing bug

  

  ImperialSympathizer

  committed
  66d008d

  Copy full SHA for 66d008d

• update option function signature

  

  ImperialSympathizer

  committed
  20c0514

  Copy full SHA for 20c0514

• up-and-coming to-do list in readme

  AsdarDevelops

  committed
  83f3f3f

  Copy full SHA for 83f3f3f

• Update MEs-README.md

  Show description for 64ad4be
  AsdarDevelops

  authored
  64ad4be

  Copy full SHA for 64ad4be

Commits on Jun 4, 2024

• updates to session flags, readme, and game data

  

  ImperialSympathizer

  committed
  7229e6e

  Copy full SHA for 7229e6e

• pull main and update readme

  

  ImperialSympathizer

  committed
  88db815

  Copy full SHA for 88db815

• added formatting and fixed wordiness in the readme

  AsdarDevelops

  committed
  3a0974f

  Copy full SHA for 3a0974f

• added more formatting in the readme

  AsdarDevelops

  committed
  cd41509

  Copy full SHA for cd41509

Commits on Jun 5, 2024

• commit before I break something with builder classes

  

  ImperialSympathizer

  committed
  5e5b98c

  Copy full SHA for 5e5b98c

• Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into mystery-battle-events

  

  ImperialSympathizer

  committed
  10cc6bf

  Copy full SHA for 10cc6bf

Commits on Jun 6, 2024

• update with builder pattern

  

  ImperialSympathizer

  committed
  8037261

  Copy full SHA for 8037261

• adds scrolling to description UI and pokeball for rarity

  

  ImperialSympathizer

  committed
  1f73c06

  Copy full SHA for 1f73c06

• add scrolling text to encounter dialogues

  

  ImperialSympathizer

  committed
  fc317ab

  Copy full SHA for fc317ab

• push latest UI and readme updates

  

  ImperialSympathizer

  committed
  923b8c6

  Copy full SHA for 923b8c6

• resync with main

  

  ImperialSympathizer

  committed
  9575ba2

  Copy full SHA for 9575ba2

• ReadMe update on roadmap/todo

  AsdarDevelops

  committed
  5418771

  Copy full SHA for 5418771

• re-arranged locale file for easier navegation, pending some MEs additions

  AsdarDevelops

  committed
  8692c6d

  Copy full SHA for 8692c6d

Commits on Jun 7, 2024

• ReadMe renamed to Roadmap/Documentation. Big changes. Tweak to Mysterious Challenger text

  AsdarDevelops

  committed
  37a5ff7

  Copy full SHA for 37a5ff7

• rework phase and combat ordering

  

  ImperialSympathizer

  committed
  5702f18

  Copy full SHA for 5702f18

• resolve conflicts

  

  ImperialSympathizer

  committed
  cec7942

  Copy full SHA for cec7942

• critical path bug fixes, can test now

  

  ImperialSympathizer

  committed
  734eec0

  Copy full SHA for 734eec0

• Roadmap updates

  AsdarDevelops

  committed
  b3a919e

  Copy full SHA for b3a919e

• pull latest from main (and break all da tests)

  

  ImperialSympathizer

  committed
  f6d4bcb

  Copy full SHA for f6d4bcb

Commits on Jun 8, 2024

• updates to item shop phase to allow custom items

  

  ImperialSympathizer

  committed
  0cdc072

  Copy full SHA for 0cdc072

• updates to shop phase for custom tier and item overrides

  

  ImperialSympathizer

  committed
  9ae0b7f

  Copy full SHA for 9ae0b7f

• Merge branch 'main' of https://github.com/InnocentGameDev/PokeRogue-Events into shop-phase-enhancements

  

  ImperialSympathizer

  committed
  77a4987

  Copy full SHA for 77a4987

• adds unit tests for SelectModifierPhase

  

  ImperialSympathizer

  committed
  db7cdd8

  Copy full SHA for db7cdd8

• Merge branch 'main' of https://github.com/InnocentGameDev/PokeRogue-Events into shop-phase-enhancements

  

  ImperialSympathizer

  committed
  41c2c5d

  Copy full SHA for 41c2c5d

Commits on Jun 9, 2024

• pull latest from main

  

  ImperialSympathizer

  committed
  1b420da

  Copy full SHA for 1b420da

• split SelectModifierPhase into separate phase file

  

  ImperialSympathizer

  committed
  32178c9

  Copy full SHA for 32178c9

• small bug fixes and new encounters

  

  ImperialSympathizer

  committed
  2385eb8

  Copy full SHA for 2385eb8

• pull shop changes

  

  ImperialSympathizer

  committed
  e1efee1

  Copy full SHA for e1efee1

• Merge branch 'main' of https://github.com/InnocentGameDev/PokeRogue-Events into mystery-battle-events

  

  ImperialSympathizer

  committed
  e6d8c3b

  Copy full SHA for e6d8c3b

Commits on Jun 10, 2024

• updates to modifier phase for other modifier types

  

  ImperialSympathizer

  committed
  14823b9

  Copy full SHA for 14823b9

• update to ME documentation

  

  ImperialSympathizer

  committed
  04cfa28

  Copy full SHA for 04cfa28

• resync with main

  

  ImperialSympathizer

  committed
  e181920

  Copy full SHA for e181920

• minor re-organization and bug fixes

  

  ImperialSympathizer

  committed
  8c39c40

  Copy full SHA for 8c39c40

• disable login

  

  ImperialSympathizer

  committed
  2422698

  Copy full SHA for 2422698