random-mirrors/pokerogue
1
0
Fork 0
mirror of https://github.com/pagefaultgames/pokerogue.git synced 2024-12-13 17:16:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,296 Commits 36 Branches 8 Tags 2.6 GiB
60c26456f6
Commit Graph

3296 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ImperialSympathizer
60c26456f6 move dialogue token injection to i18next 2024-07-12 15:40:30 -04:00
flx-sta
5ff80cd8a2
Merge pull request #64 from AsdarDevelops/option-ui-enhancements 
add option mode for UI styling consistency
 2024-07-12 10:40:28 -07:00
ImperialSympathizer
bf72985c19
Update src/data/mystery-encounters/mystery-encounter-option.ts 
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
 2024-07-12 13:37:59 -04:00
ImperialSympathizer
14ec528fea remove extra space 2024-07-12 13:29:47 -04:00
ImperialSympathizer
c99a6382ca add option mode for UI styling consistency 2024-07-12 13:20:14 -04:00
flx-sta
85ba3c9b04
Merge pull request #47 from AsdarDevelops/pokemon-salesman 
small bug fixes
 2024-07-12 09:45:22 -07:00
ImperialSympathizer
61330c6967 remove overrides changes 2024-07-12 11:28:22 -04:00
ImperialSympathizer
fb9a4d3dd3 Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into pokemon-salesman 2024-07-12 11:27:02 -04:00
ImperialSympathizer
4412769cd9 small bug fixes 2024-07-11 18:31:48 -04:00
ImperialSympathizer
6e0751d94b
Merge pull request #46 from flx-sta/mystery-events/dialogue-refactoring 
Mystery events/dialogue refactoring
 2024-07-11 18:30:12 -04:00
Felix Staud
96554427b5 fix myster-encounter-ui-handler duplicate 2024-07-11 15:27:33 -07:00
Felix Staud
4d4d0e55cc fix myster-encounter-ui-handler duplicate req. check 2024-07-11 15:24:40 -07:00
Felix Staud
0326cb2538 reset overrides.ts 2024-07-11 15:18:59 -07:00
Felix Staud
9256569181 minor fix in phases.ts for myst.-enc. 2024-07-11 15:18:27 -07:00
Felix Staud
14289d2736 add -encounter as suffix for encounter files 2024-07-11 15:17:37 -07:00
Felix Staud
4da5e0fb10 apply namespace for training session encounter 2024-07-11 15:14:03 -07:00
Felix Staud
55805d1804 apply namespace for shady vitamin dealer encounter 2024-07-11 15:13:01 -07:00
Felix Staud
e8670c4f00 rename MysteryEncounter interface to IMysteryEncounter 2024-07-11 15:01:30 -07:00
Felix Staud
941a8e71d6 finishing touches 2024-07-11 14:58:52 -07:00
Felix Staud
39f98222a6 migrate training session encounter 2024-07-11 14:50:19 -07:00
Felix Staud
2d42697321 migrate sleeping snorlax encounter 2024-07-11 14:44:31 -07:00
Felix Staud
19d96ed381 migrate shady-vitamin-dealer encounter 2024-07-11 14:39:18 -07:00
Felix Staud
71a047a1f6 migrate mysterious-chest encounter 2024-07-11 14:10:21 -07:00
Felix Staud
e6bf12ab8c migrate mysterious-challengers 2024-07-11 14:02:26 -07:00
Felix Staud
1713395091 migrate fight-or-flight encounter 2024-07-11 13:54:44 -07:00
Felix Staud
ce73c38e33 migrate field-trip encounter 2024-07-11 13:47:10 -07:00
Felix Staud
d9e0957d40 migrate department-store-sale encounter 2024-07-11 13:35:46 -07:00
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