Commit Graph

3269 Commits

Author SHA1 Message Date
Felix Staud
c589689a6c migrate dark-deal encounter to new dialogue setup 2024-07-11 13:26:21 -07:00
Felix Staud
37248f1885 Merge remote-tracking branch 'Mystery-Events/mystery-battle-events' into mystery-events/dialogue-refactoring 2024-07-11 13:26:00 -07:00
Felix Staud
74125ef1cf WIP: add option to use dialogues in builder 2024-07-11 12:56:15 -07:00
ImperialSympathizer
c0a900cd02
Merge pull request #42 from AsdarDevelops/field-trip
Field Trip encounter and misc Improvements
2024-07-11 15:33:58 -04:00
ImperialSympathizer
390b2e93f9 remove fake out from stealing move group 2024-07-11 15:03:57 -04:00
ImperialSympathizer
c72bed0ee7 small cleanup of changes 2024-07-11 14:58:44 -04:00
ImperialSympathizer
b6ef210584 remove unnecessary styling override on fight or flight option 2024-07-11 14:43:57 -04:00
ImperialSympathizer
f128b47db5 update encounter biome mapping and option coloring/disablement with requirements 2024-07-11 14:37:29 -04:00
ImperialSympathizer
810c50cda2 new Field Trip encounter and add EXP gains to other encounters 2024-07-11 11:40:07 -04:00
ImperialSympathizer
253447136a some more small cleanup 2024-07-10 16:32:24 -04:00
ImperialSympathizer
e47eba0e31 undo accidental beta branch change 2024-07-10 15:58:16 -04:00
ImperialSympathizer
ce55c13c12 resolve conflicts, import issues, and cleanup from rebase 2024-07-10 15:31:03 -04:00
flx-sta
8907073b6e Update mystery_event.yml
- make event name required
- change title to `[Event] ` (from ~~`[Event Proposal]: `~~)
2024-07-10 15:07:21 -04:00
ImperialSympathizer
7bbebb32e2 undo broken load changes 2024-07-10 15:07:18 -04:00
flx-sta
ca443708e0 Update mystery_event.yml
add more separators
2024-07-10 15:06:18 -04:00
flx-sta
3842d9c8fa Update mystery_event.yml
See if separators work
2024-07-10 15:06:18 -04:00
flx-sta
94ccb91174 Update mystery_event.yml
fix options value being inside options textarea
2024-07-10 15:06:17 -04:00
flx-sta
2a76e9e1f4 mystery_event.yml: fix options placeholder
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-07-10 15:06:17 -04:00
flx-sta
b194f55d57 mystery_event.yml: fix typo
Co-authored-by: Asdar <asdargmng@gmail.com>
2024-07-10 15:06:17 -04:00
Felix Staud
a62811fb66 clean up mystery_event.yml 2024-07-10 15:06:17 -04:00
Felix Staud
faca81e690 add default label + project to mystery_event.yml 2024-07-10 15:06:16 -04:00
Felix Staud
f1b074755e add MysteryEncounterOptionBuilder.withSceneMoneyRequirement() 2024-07-10 15:06:16 -04:00
Felix Staud
434104f9ee add 2 new MysteryEncounterBuilder methods:
- `.withPrimaryPokemonStatusEffectRequirement()`
- `.withPrimaryPokemonHealthRatioRequirement`
2024-07-10 15:06:16 -04:00
Felix Staud
a8be171305 add MysterEncounterBuilder.withOptionPhase() 2024-07-10 15:06:16 -04:00
Felix Staud
adf52bf604 add MysteryEncounterBuilder.withScenePartySizeRequirement 2024-07-10 15:06:15 -04:00
Felix Staud
25d0bd39ee add MysteryEncounterBuilder.withSceneWaveRangeRequirement() 2024-07-10 15:06:15 -04:00
Felix Staud
5a5806185f make MysteryEncounterBuilder.withEncounterType() static 2024-07-10 15:06:15 -04:00
InnocentGameDev
1e39a89af5 Modified Event Proposal Issue template again to adjust for Project migration 2024-07-10 15:06:15 -04:00
ImperialSympathizer
efb00553c9 styling and text coloring fixes 2024-07-10 15:06:12 -04:00
InnocentGameDev
fc25c3b55e Modified Event Proposal Issue template 2024-07-10 15:04:52 -04:00
Felix Staud
7c318fdfbd exampel commit 2024-07-10 15:04:52 -04:00
Felix Staud
2229d4df3f remove typo in mystery_event.yml 2024-07-10 15:04:52 -04:00
Felix Staud
521788a7fb add mystery_event.yml issue form 2024-07-10 15:04:52 -04:00
InnocentGameDev
e7c101dda1 Big Roadmap update, leading to Projects migration. Refactors in the Readme. 2024-07-10 15:04:51 -04:00
ImperialSympathizer
deb1e95e34 add encounter exp utility and small cleanups/refactors 2024-07-10 15:04:48 -04:00
ImperialSympathizer
cf43589260 fix unit tests 2024-07-10 15:04:18 -04:00
ImperialSympathizer
7b35efe95e adds 2 new encounters and colorable text options 2024-07-10 15:03:36 -04:00
ImperialSympathizer
872242c44f remove commented code 2024-07-10 15:03:35 -04:00
ImperialSympathizer
f803de6b23 start adding unit tests 2024-07-10 15:03:33 -04:00
ImperialSympathizer
07ffe1ca64 re-enable dialogue tokens 2024-07-10 15:01:29 -04:00
ImperialSympathizer
7fb1506a97 clean up data token logic 2024-07-10 15:01:29 -04:00
ImperialSympathizer
8e84e40e35 beta bug fixes 2024-07-10 15:01:29 -04:00
ImperialSympathizer
2318d86cb1 Mystery Encounters (#2824)
* squash commits to clean up PR

* add chest sprites

* bug fixes, cleanup, and tests

* small fixes

---------

Co-authored-by: ImperialSympathizer <imperialsympathizer@gmail.com>
2024-07-10 15:01:23 -04:00
Frederico Santos
7fc8d103e4 chore: Update deploy-beta.yml to include beta branch in SSH setup and deployment 2024-07-10 14:52:39 -04:00
Frederico Santos
1e1c67cd40 chore: Update deploy-beta.yml to include beta branch in SSH setup and deployment 2024-07-10 14:52:38 -04:00
ImperialSympathizer
1d0109a386 small fixes 2024-07-10 14:52:38 -04:00
ImperialSympathizer
b3aa562bc6 small fixes 2024-07-10 14:52:38 -04:00
ImperialSympathizer
666ec135ba bug fixes, cleanup, and tests 2024-07-10 14:52:27 -04:00
ImperialSympathizer
69f574b908 add chest sprites 2024-07-10 14:51:38 -04:00
ImperialSympathizer
860e875587 rebase encounters branch with pokerogue/main 2024-07-10 14:51:06 -04:00