Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Smarter SwitchAI Mon Choices | HasBadOdds Switch Check #3253

Merged
merged 52 commits into from
Nov 11, 2023
Merged

Smarter SwitchAI Mon Choices | HasBadOdds Switch Check #3253

merged 52 commits into from
Nov 11, 2023

Commits on Aug 25, 2023

  1. SwitchAI makes much smarter mon choices

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    9f39074 View commit details
    Browse the repository at this point in the history

  2. Add HasHadOdds check to ShouldSwitch decision

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    e07bbed View commit details
    Browse the repository at this point in the history

  3. Remove early return

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    f00a741 View commit details
    Browse the repository at this point in the history

  4. Rework Baton Pass check as per discussion with Alex

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5ca7d39 View commit details
    Browse the repository at this point in the history

  5. Forgot to adjust a comment

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    4fb99b4 View commit details
    Browse the repository at this point in the history

  6. Don't program before breakfast lol (if / else if fix)

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    0afce4c View commit details
    Browse the repository at this point in the history

  7. Switch AI_CalcDamage for AI_DATA->simulatedDmg in HasBadOdds 

    Thanks Alex! :D
    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    5f838b4 View commit details
    Browse the repository at this point in the history

  8. Typo in a hitToKO comparison

    @Pawkkie
    Pawkkie committed Aug 25, 2023
    Configuration menu
    Copy the full SHA
    838f1ba View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2023

  1. Remove and replace AI_CalcPartyMonBestMoveDamage and IsAiPartyMonOHKO… 

    …By from rh-hideout#3146

See https://discord.com/channels/419213663107416084/1144447521960251472 for details
    @Pawkkie
    Pawkkie committed Aug 26, 2023
    Configuration menu
    Copy the full SHA
    ebb8c7a View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Major refactor, new struct, switchin considers damage / healing from … 

    …hazards / status / held item / weather
    @Pawkkie
    Pawkkie committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    3414c8f View commit details
    Browse the repository at this point in the history

  2. Forgot Snow exists and heals Ice Body, haven't played Switch games lol

    @Pawkkie
    Pawkkie committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    c33ab70 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2023

  1. Merge remote-tracking branch 'upstream/master' into release

    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    8487482 View commit details
    Browse the repository at this point in the history

  2. (rh-hideout@766a1a2) Compatibility, use new struct field instead of f… 

    …unction call
    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    3b4785a View commit details
    Browse the repository at this point in the history

  3. Fixing oversight from previous upstream merge

    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    cc7312e View commit details
    Browse the repository at this point in the history

  4. Improve TSpikes handling to make GetSwitchinHazardDamage more applicable 

    Small fixes:
- EFFECT_EXPLOSION typo (!= to ==)
- Order of if statements near bestResistEffective
- Spacing of terms in big HasBadOdds if statements
    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    1dd6df2 View commit details
    Browse the repository at this point in the history

  5. Forgot to uncomment blocks disabled for debugging what turned out to … 

    …be vanilla behaviour lol
    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    13c7cb8 View commit details
    Browse the repository at this point in the history

  6. Remove another holdover from debugging, sorry :/

    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    eb310ab View commit details
    Browse the repository at this point in the history

  7. Lastly, undoing my debug trainer

    @Pawkkie
    Pawkkie committed Aug 29, 2023
    Configuration menu
    Copy the full SHA
    8b30988 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Type matchup based on species type rather than current type 

    Suggested by BLourenco on Discord, the idea is that a mon that's had its type affected by a move like Soak will still have moves as though it was its regular typing, and so prioritizing the temporary typing wouldn't be ideal.
https://discord.com/channels/419213663107416084/1144447521960251472/1146644578141736970
    @Pawkkie
    Pawkkie committed Aug 31, 2023
    Configuration menu
    Copy the full SHA
    b4a8348 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2023

  1. Merge remote-tracking branch 'upstream/master' into switchAI-smart-mo… 

    …n-choices
    @Pawkkie
    Pawkkie committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    675ead3 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Sep 1, 2023
    Configuration menu
    Copy the full SHA
    9cc05a9 View commit details
    Browse the repository at this point in the history

Commits on Sep 4, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    3afad86 View commit details
    Browse the repository at this point in the history

  2. gActiveBattler upcoming merge fixes

    @Pawkkie
    Pawkkie committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    7d3c2ff View commit details
    Browse the repository at this point in the history

  3. Egg changes part 1

    @Pawkkie
    Pawkkie committed Sep 4, 2023
    Configuration menu
    Copy the full SHA
    f18ce21 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2023

  1. Egg changes part 2, just need to address EWRAM still

    @Pawkkie
    Pawkkie committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    b3f0271 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Sep 8, 2023
    Configuration menu
    Copy the full SHA
    5ac6057 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2023

  1. Move SwitchinCandidate struct to AiLogicData

    @Pawkkie
    Pawkkie committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    a901e75 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    6f27811 View commit details
    Browse the repository at this point in the history

  3. Consider Steel type when checking TSpikes

    @Pawkkie
    Pawkkie committed Sep 10, 2023
    Configuration menu
    Copy the full SHA
    403b523 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    9e91950 View commit details
    Browse the repository at this point in the history

  2. Comment about CanBePoisoned compatibility

    @Pawkkie
    Pawkkie committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    9b37a68 View commit details
    Browse the repository at this point in the history

  3. Changes for Egg's 2nd review

    @Pawkkie
    Pawkkie committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    a93a9cd View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2023

  1. Put period back in comment, whoops lol

    @Pawkkie
    Pawkkie committed Sep 12, 2023
    Configuration menu
    Copy the full SHA
    7c20d15 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    743b604 View commit details
    Browse the repository at this point in the history

  2. Latest upcoming merge fixes

    @Pawkkie
    Pawkkie committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    07de6ce View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2023

  1. Missed a few u32 updates

    @Pawkkie
    Pawkkie committed Sep 27, 2023
    Configuration menu
    Copy the full SHA
    cf0151a View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 1, 2023
    Configuration menu
    Copy the full SHA
    3587fa7 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 3, 2023
    Configuration menu
    Copy the full SHA
    bedb1f4 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2023

  1. Combine GetBestMonIntegrate functions / flags, some modularization

    @Pawkkie
    Pawkkie committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    27c057f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 5, 2023
    Configuration menu
    Copy the full SHA
    2d749a7 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    d4cdd2f View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    2946db9 View commit details
    Browse the repository at this point in the history

  3. Fix merge error

    @Pawkkie
    Pawkkie committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    1d9ba79 View commit details
    Browse the repository at this point in the history

  4. Make modern fixes

    @Pawkkie
    Pawkkie committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    9053285 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    9dceb91 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    8c458fc View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2023

  1. Two tests done, two to go

    @Pawkkie
    Pawkkie committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    cfb92ba View commit details
    Browse the repository at this point in the history

  2. Accidentally pushed reference test, removing it

    @Pawkkie
    Pawkkie committed Oct 29, 2023
    Configuration menu
    Copy the full SHA
    2fda5ab View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. Type matchup switching tests

    @Pawkkie
    Pawkkie committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    1c0c28e View commit details
    Browse the repository at this point in the history

  2. Tests for defensive vs offense switches

    @Pawkkie
    Pawkkie committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    9178f7b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/upcoming' into switchAI-smart-… 

    …mon-choices
    @Pawkkie
    Pawkkie committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    864f057 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2023

  1. Merge branch 'upcoming' into switchAI-smart-mon-choices

    @DizzyEggg
    DizzyEggg authored Nov 11, 2023
    Configuration menu
    Copy the full SHA
    7e07985 View commit details
    Browse the repository at this point in the history