61330c6967
remove overrides changes
2024-07-12 11:28:22 -04:00
fb9a4d3dd3
Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into pokemon-salesman
2024-07-12 11:27:02 -04:00
4412769cd9
small bug fixes
2024-07-11 18:31:48 -04:00
6e0751d94b
Merge pull request #46 from flx-sta/mystery-events/dialogue-refactoring
...
Mystery events/dialogue refactoring
2024-07-11 18:30:12 -04:00
96554427b5
fix myster-encounter-ui-handler duplicate
2024-07-11 15:27:33 -07:00
4d4d0e55cc
fix myster-encounter-ui-handler duplicate req. check
2024-07-11 15:24:40 -07:00
0326cb2538
reset overrides.ts
2024-07-11 15:18:59 -07:00
9256569181
minor fix in phases.ts for myst.-enc.
2024-07-11 15:18:27 -07:00
14289d2736
add `-encounter` as suffix for encounter files
2024-07-11 15:17:37 -07:00
4da5e0fb10
apply `namespace` for training session encounter
2024-07-11 15:14:03 -07:00
55805d1804
apply `namespace` for shady vitamin dealer encounter
2024-07-11 15:13:01 -07:00
e8670c4f00
rename MysteryEncounter interface to IMysteryEncounter
2024-07-11 15:01:30 -07:00
941a8e71d6
finishing touches
2024-07-11 14:58:52 -07:00
39f98222a6
migrate training session encounter
2024-07-11 14:50:19 -07:00
2d42697321
migrate sleeping snorlax encounter
2024-07-11 14:44:31 -07:00
19d96ed381
migrate shady-vitamin-dealer encounter
2024-07-11 14:39:18 -07:00
71a047a1f6
migrate mysterious-chest encounter
2024-07-11 14:10:21 -07:00
e6bf12ab8c
migrate mysterious-challengers
2024-07-11 14:02:26 -07:00
1713395091
migrate fight-or-flight encounter
2024-07-11 13:54:44 -07:00
ce73c38e33
migrate field-trip encounter
2024-07-11 13:47:10 -07:00
d9e0957d40
migrate department-store-sale encounter
2024-07-11 13:35:46 -07:00
c589689a6c
migrate dark-deal encounter to new dialogue setup
2024-07-11 13:26:21 -07:00
37248f1885
Merge remote-tracking branch 'Mystery-Events/mystery-battle-events' into mystery-events/dialogue-refactoring
2024-07-11 13:26:00 -07:00
74125ef1cf
WIP: add option to use dialogues in builder
2024-07-11 12:56:15 -07:00
c0a900cd02
Merge pull request #42 from AsdarDevelops/field-trip
...
Field Trip encounter and misc Improvements
2024-07-11 15:33:58 -04:00
390b2e93f9
remove fake out from stealing move group
2024-07-11 15:03:57 -04:00
c72bed0ee7
small cleanup of changes
2024-07-11 14:58:44 -04:00
b6ef210584
remove unnecessary styling override on fight or flight option
2024-07-11 14:43:57 -04:00
f128b47db5
update encounter biome mapping and option coloring/disablement with requirements
2024-07-11 14:37:29 -04:00
5a79b50f1d
lost at sea encounter finishing touches
2024-07-11 10:30:45 -07:00
85df834811
optimize mystery-encounter-utils.setEncounterExp()
2024-07-11 09:35:15 -07:00
47f12b665b
ME: add damage/heal application utils
2024-07-11 09:23:43 -07:00
810c50cda2
new Field Trip encounter and add EXP gains to other encounters
2024-07-11 11:40:07 -04:00
93fbb0e401
add jsdoc to lost-at-sea-encounter
2024-07-11 08:04:33 -07:00
524d4a4ca7
lost-at-sea ME: fix using DAMAGE_PERCENTAGE for damage calculation
2024-07-11 08:03:12 -07:00
b7bf22e3e5
fix typo in myster-encounter-intro
2024-07-11 08:02:01 -07:00
ef4222cbfa
Lost at sea myster encounter MVP....
...
- filled some dialogue
- add placeholders for the pokemons that can help
- rename it to `Lost at Sea` (from Getting lost at the sea
- add damage calculation for 3rd option
2024-07-11 07:57:41 -07:00
0f9c0c5d24
improve jsdocs in myster-encounter.ts
2024-07-11 07:50:58 -07:00
5ff1ae617d
add alpha config for myst-ec sprites
2024-07-10 20:54:55 -07:00
81112eeabe
myster-encounter-intro.ts improve types and documentation
2024-07-10 20:43:31 -07:00
d9ea676a92
add `KnownFileRoot` template literal
2024-07-10 20:34:28 -07:00
ec7cabc8c8
getting lost at the sea MVP (event)
2024-07-10 18:39:55 -07:00
253447136a
some more small cleanup
2024-07-10 16:32:24 -04:00
e47eba0e31
undo accidental beta branch change
2024-07-10 15:58:16 -04:00
ce55c13c12
resolve conflicts, import issues, and cleanup from rebase
2024-07-10 15:31:03 -04:00
8907073b6e
Update mystery_event.yml
...
- make event name required
- change title to `[Event] ` (from ~~`[Event Proposal]: `~~)
2024-07-10 15:07:21 -04:00
7bbebb32e2
undo broken load changes
2024-07-10 15:07:18 -04:00
ca443708e0
Update mystery_event.yml
...
add more separators
2024-07-10 15:06:18 -04:00
3842d9c8fa
Update mystery_event.yml
...
See if separators work
2024-07-10 15:06:18 -04:00
94ccb91174
Update mystery_event.yml
...
fix options value being inside options textarea
2024-07-10 15:06:17 -04:00
ImperialSympathizer
ImperialSympathizer
Felix Staud
flx-sta