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

Implement character bonuses for combined features #2286

Open
wants to merge 8 commits into
base: development
Choose a base branch
from
Open

Implement character bonuses for combined features #2286

wants to merge 8 commits into from

Commits on Aug 6, 2023

  1. implement feature character bonuses for combine & fix num result comb… 

    …ine the wrong
    @Phong940253
    Phong940253 committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    37c0818 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. change regionToId to constant

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

  2. fix double extra item bonus

    @Phong940253
    Phong940253 committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    7e87fd2 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2023

  1. Apply suggestions from code review (clean code CombineResult) 

    Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
    @Phong940253 @KingRainbow44
    Phong940253 and KingRainbow44 committed Aug 11, 2023
    Configuration menu
    Copy the full SHA
    75a6d2d View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2023

  1. Update src/main/java/emu/grasscutter/game/combine/CombineResult.java

    @KingRainbow44
    KingRainbow44 committed Aug 12, 2023
    Configuration menu
    Copy the full SHA
    af1da93 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2024

  1. Chore: Remove CombineBonusData class and update GameData (CombineBonu… 

    …sData not found in 4.0 resource), instead, load from CombineBonus.json in the data folder
    @Phong940253
    Phong940253 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    d248ddd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into combine-patch

    @Phong940253
    Phong940253 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    8cdf7a2 View commit details
    Browse the repository at this point in the history

  3. refactor: Replace HashMap with Map in GameConstants & CombineManager

    @Phong940253
    Phong940253 committed Jul 25, 2024
    Configuration menu
    Copy the full SHA
    0b8f9ad View commit details
    Browse the repository at this point in the history