Battle System Update: Introduce Battle strategies, support Double and Safari battles #366
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a9d86f8 to
e213f59
Compare
39a96ea to
db597e9
Compare
db597e9 to
8e1e75f
Compare
8e1e75f to
c68d2d4
Compare
… Safari battles This updates the battle system to separate the menu-handling logic from the decision-making logic. It introduces a new concept called 'BattleStrategy' that are objects with a set of functions that can make decisions given a certain battle state. For example, the battle strategy's `decide_turn(battle_state)` method is called for each round of a battle to determine the next action (fight, item, run, ...) Likewise, there are methods for deciding whether an evolution should be allowed or aborted, which existing move should be replaced if a new one is about to be learned, what to do after the lead Pokémon faints, etc. Bot modes can specify their preferred battle strategy in the `on_battle_started()` method. That way, a bot mode can have much greater control over how the battle system behaves without the user having to modify the config files all the time. (And, for example the Nugget Bridge mode could have its own 'try to lose' battle strategy.) So far, I have mostly just aimed for feature parity and not introduced any other battle strategies. As part of the battle system overhaul double battles are now supported, as are Safari encounters (in principle, the battle strategies still only switch to manual.)
c68d2d4 to
0796f8a
Compare
0796f8a to
f21744f
Compare
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This updates the battle system to separate the menu-handling logic from the decision-making logic.
It introduces a new concept called 'BattleStrategy' that are objects with a set of functions that can make decisions given a certain battle state. (Here's the base class with all methods documented)
For example, the battle strategy's
decide_turn(battle_state)method is called for each round of a battle to determine the next action (fight, item, run, ...)Likewise, there are methods for deciding whether an evolution should be allowed or aborted, which existing move should be replaced if a new one is about to be learned, what to do after the lead Pokémon faints, etc.
Bot modes can specify their preferred battle strategy in the
on_battle_started()method. That way, a bot mode can have much greater control over how the battle system behaves without the user having to modify the config files all the time. (And, for example the Nugget Bridge mode could have its own 'try to lose' battle strategy.)As part of the battle system overhaul double battles are now supported, as are Safari encounters (in principle, the battle strategies still only switch to manual.)
Changes
modules/battle_strategies/contains available Battle Strategies and their interfaces.modules/battle_strategies/_interface.pycontains the baseBattleStrategyclass which is heavily commented.modules/battle_state.pycontains a data class and helper functions to retrieve consolidated information about the current state of the battle, such as active Pokémon/opponents and various Pokémon-specific and arena-specific status conditions.battle_withinmodules/contain the menuing logic, so that's mostly just what the oldbattle.pydid with some enhancements and split up into several files.modules/data/...andmodules/items.pyrelate to a new property ofItemobjects that indicate if and how an item can be used within battles.Notes
So far, I have mostly just aimed for feature parity and not introduced any other battle strategies. So this PR does not make full use of the potential capabilities of the new battle system.
Checklist
--line-length 120argument