Commit Graph

3458 Commits

Author SHA1 Message Date
Asdar
9e3af91a7d
Merge pull request #90 from AsdarDevelops/yml-review
Update mystery_event.yml
2024-07-15 20:32:58 +02:00
Asdar
5b9cc1eb8d
Update mystery_event.yml
Referring to the guide
2024-07-15 20:32:21 +02:00
Asdar
c61f718b85
Merge pull request #89 from AsdarDevelops/Asdar
testing form changes
2024-07-15 20:27:19 +02:00
InnocentGameDev
dc299275ac testing form changes 2024-07-15 20:26:15 +02: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
Felix Staud
f2031c78e9 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-15 10:31:43 -07: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
Felix Staud
e2c431b913 polish lost at sea encounter
- fix guide pokemon not receiving exp
2024-07-14 21:32:22 -07:00
Felix Staud
9208fd226b RESET OVERRIDES.TS!! 2024-07-14 21:31:43 -07: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
Felix Staud
7b55811b84 apply surf & fly condition (not water & flying) 2024-07-12 14:55:52 -07:00
Felix Staud
0cb4e53861 undo some MysterEncounterOptionBuilder changes 2024-07-12 14:50:32 -07:00
Felix Staud
b23664cb9e extend MysteryEncounterOptionBuilder 2024-07-12 14:40:47 -07:00
Felix Staud
c4e3a28585 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-12 14:38:40 -07: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
Felix Staud
0a212b3f81 minor changes to CanLearnMoveRequirement 2024-07-12 14:24:37 -07:00
Felix Staud
53f178fde2 replace @ec with i18n variables 2024-07-12 14:10:19 -07:00
Felix Staud
b95e9cbfa4 Merge branch 'mystery-battle-events' into event/getting-lost-at-the-sea 2024-07-12 14:08:52 -07:00
Felix Staud
c9cbdd7d44 lost-at-sea encounter - further progress 2024-07-12 14:07:33 -07:00
Felix Staud
7164b0afe4 add CanLearnMoveRequirement 2024-07-12 13:23:48 -07: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
Felix Staud
72c76c4d39 add Pokemon.isAllowed()
to check if pokemon is allowed even if it's fainted
2024-07-12 13:10:53 -07: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
Felix Staud
d8fce8b245 add Pokemon.getEggMoves() 2024-07-12 12:56:51 -07: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
Felix Staud
28d14ae45a minor refactor of abstract EncounterPokemonRequirement 2024-07-12 11:37:58 -07:00
Felix Staud
58d533fb34 migrate lost at sea encounter to new dialogue pattern 2024-07-12 11:17:01 -07:00