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

Extend give command "skill level" & shortening /talent all #1865

Merged
merged 15 commits into from
Oct 18, 2022
Merged

Extend give command "skill level" & shortening /talent all #1865

merged 15 commits into from
Oct 18, 2022

Commits on Oct 16, 2022

  1. Extend give command "talent"

    @natsurepo
    natsurepo committed Oct 16, 2022
    Configuration menu
    Copy the full SHA
    0b253cf View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/development' into development

    @natsurepo
    natsurepo committed Oct 16, 2022
    Configuration menu
    Copy the full SHA
    be0148e View commit details
    Browse the repository at this point in the history

  3. Update src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData… 

    ….java


Shorten IntStream for getCombatSkills

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
    @natsurepo @Birdulon
    natsurepo and Birdulon committed Oct 16, 2022
    Configuration menu
    Copy the full SHA
    83c70b3 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2022

  1. Fix setSkillLevel to work during avatar construction 

    Shortening getCombatSkills
    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    735f090 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/development' into development

    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    58943f0 View commit details
    Browse the repository at this point in the history

  3. changeSkillLevel now acts as intermediate operation to fetch skillIds

    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    24f0d79 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'development' into development

    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    9a91ca5 View commit details
    Browse the repository at this point in the history

  5. setSkillLevel changes to allow out of range levels to be normalized

    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    04d9486 View commit details
    Browse the repository at this point in the history

  6. Update src/main/java/emu/grasscutter/command/commands/GiveCommand.java 

    Removing recalcStats since it's redundant

Co-authored-by: Luke H-W <Birdulon@users.noreply.github.com>
    @natsurepo @Birdulon
    natsurepo and Birdulon committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    2faee0b View commit details
    Browse the repository at this point in the history

  7. Major changes and cleanup: 

    - AvatarSkillDepotData: removed getCombatSkills since it's unused
- TalentCommand: shortened /talent all using getSkillsAndEnergySkill
- GiveCommand: changed changeSkillLevel to setSkillLevel
- Avatar: delete changeSkillLevel and moved the operation inside setSkillLevel,updated skillId to Integer to catch special cases from GiveCommand
    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    497847d View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/development' into development

    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    bbd71cb View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Grasscutters:development' into development

    @natsurepo
    natsurepo committed Oct 17, 2022
    Configuration menu
    Copy the full SHA
    3d49a6d View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2022

  1. Small cleanup: 

    - GiveCommand: changed null to -1
- Avatar: changed null to -1 and revert skillId from Integer back to int
    @natsurepo
    natsurepo committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    da2a692 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/development' into development

    @natsurepo
    natsurepo committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    2c1e6fb View commit details
    Browse the repository at this point in the history

  3. Small cleanup: 

    Removed the special case from Avatar to be handled inside of GiveCommand
    @natsurepo
    natsurepo committed Oct 18, 2022
    Configuration menu
    Copy the full SHA
    ea55f48 View commit details
    Browse the repository at this point in the history