Commit Graph

3327 Commits

Author SHA1 Message Date
ImperialSympathizer
09a3167bac add fiery storm animation for fiery fallout 2024-07-16 22:51:40 -04:00
ImperialSympathizer
e10a9caddc commit changes 2024-07-15 21:45:33 -04:00
ImperialSympathizer
a40f27ff8f
Merge pull request #87 from AsdarDevelops/one-time-encounters
implement max spawns per run for individual encounters, tweak spawn rates
2024-07-15 14:03:20 -04:00
ImperialSympathizer
1a95f06795 implement max spawns per run for individual encounters, tweak spawn rates 2024-07-15 14:01:47 -04:00
ImperialSympathizer
841efe16c7
Merge pull request #86 from AsdarDevelops/art-issues-template
update forms with labels
2024-07-15 13:02:30 -04:00
ImperialSympathizer
7b9e95db40 update forms with labels 2024-07-15 13:02:10 -04:00
ImperialSympathizer
9368cec657
Merge pull request #85 from AsdarDevelops/art-issues-template
add art issues form and remove some leftover beta branch poison
2024-07-15 12:57:38 -04:00
ImperialSympathizer
23f6fb17a4 add art issues form and remove some leftover beta branch poison 2024-07-15 12:56:58 -04:00
ImperialSympathizer
930478c49b
Merge pull request #81 from AsdarDevelops/multiple-query-encounter
Safari Encounter (Multiple chained option queries) and some sprite offset positioning updates
2024-07-15 12:51:45 -04:00
ImperialSympathizer
e1bb1e2481 clean up safari code and utils 2024-07-15 12:36:10 -04:00
Asdar
b490231789
Merge pull request #68 from AsdarDevelops/Asdar
[Documentation] Event Proposal Guide

Guide seems to be liked enough
2024-07-15 00:17:35 +02:00
ImperialSympathizer
da0aea0d1e safari encounter and sprite offset positioning updates 2024-07-14 17:37:03 -04:00
ImperialSympathizer
43ebff59a4 Merge branch 'mystery-battle-events' of https://github.com/InnocentGameDev/PokeRogue-Events into multiple-query-encounter 2024-07-12 21:11:26 -04:00
InnocentGameDev
52fd9d63c6 formatting + punctuation fix 2024-07-13 00:45:11 +02:00
InnocentGameDev
e4a566785d formatting fix 2024-07-13 00:41:31 +02:00
Asdar
c56e6bdd85
Update MEs_Proposal_Guide.md
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-13 00:37:58 +02:00
Asdar
9dc69f19d1
Update MEs_Proposal_Guide.md
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-13 00:37:46 +02:00
Asdar
e28a3a94f5
Update MEs_Proposal_Guide.md
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-13 00:37:35 +02:00
Asdar
def54141ce
Update MEs_Proposal_Guide.md
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-13 00:36:51 +02:00
Asdar
b6b3bb49f2
Update MEs_Proposal_Guide.md
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-13 00:36:39 +02:00
Asdar
9b7c4f0817
Update MEs_Proposal_Guide.md
Co-authored-by: flx-sta <50131232+flx-sta@users.noreply.github.com>
2024-07-13 00:36:32 +02:00
InnocentGameDev
975f272729 CLEANING MY BRANCH 2024-07-13 00:12:09 +02:00
flx-sta
30daba0df5
Merge pull request #67 from AsdarDevelops/disabled-button
add an optional disabled button label
2024-07-12 14:38:15 -07:00
ImperialSympathizer
4097d49adc add an optional disabled button label 2024-07-12 17:36:59 -04:00
ImperialSympathizer
a72e76b6fd safari zone 2024-07-12 17:33:55 -04:00
ImperialSympathizer
5cb02df0e0
Merge pull request #66 from AsdarDevelops/money-formatter
add i18next money formatter for MEs
2024-07-12 16:22:49 -04:00
ImperialSympathizer
515020742d add i18next money formatter for MEs 2024-07-12 16:16:52 -04:00
ImperialSympathizer
c434d6e04b
Merge pull request #65 from AsdarDevelops/dialogue-tokens-rework
move dialogue token injection to i18next
2024-07-12 15:59:28 -04:00
ImperialSympathizer
39f91167c7 PR cleanup and commit suggestions 2024-07-12 15:57:12 -04:00
ImperialSympathizer
b82e8674cc add number formatting to money strings 2024-07-12 15:54:35 -04:00
ImperialSympathizer
2b855e58e3 move dialogue token injection to i18next 2024-07-12 15:44:34 -04:00
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