Skip to content

Implement character bonuses for combined features#2286

Open
Phong940253 wants to merge 8 commits into
Grasscutters:developmentfrom
Phong940253:combine-patch
Open

Implement character bonuses for combined features#2286
Phong940253 wants to merge 8 commits into
Grasscutters:developmentfrom
Phong940253:combine-patch

Conversation

@Phong940253
Copy link
Copy Markdown
Contributor

Description

Implement character bonuses for combined features. include 3 type bonuses with 11 characters.

Yae Miko
ảnh

Lisa
ảnh

Alhaitham
ảnh
etc...

Issues fixed by this PR

Fix display of combine result multiple times with received item.

Type of changes

  • Bug fix
  • New feature
  • Enhancement
  • Documentation

Checklist:

  • My code follows the style guidelines of this project
  • My pull request is unique and no other pull requests have been opened for these changes
  • I have read the Contributing note and Code of conduct
  • I am responsible for any copyright issues with my code if it occurs in the future.

Copy link
Copy Markdown
Member

@KingRainbow44 KingRainbow44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something like HashMap<Integer, Integer> itemToRegion should be a constant and declared as Map<Integer, Integer

Comment thread src/main/java/emu/grasscutter/game/combine/CombineResult.java Outdated
Comment thread src/main/java/emu/grasscutter/game/combine/CombineResult.java
Comment thread src/main/java/emu/grasscutter/game/combine/CombineManger.java Outdated
Comment thread src/main/java/emu/grasscutter/game/combine/CombineManger.java Outdated
Comment thread src/main/java/emu/grasscutter/data/excels/CombineBonusData.java Outdated
Co-authored-by: Magix <27646710+KingRainbow44@users.noreply.github.com>
Comment thread src/main/java/emu/grasscutter/game/combine/CombineResult.java
@KingRainbow44
Copy link
Copy Markdown
Member

please resolve the requested changes, as well as making your code build

@KingRainbow44
Copy link
Copy Markdown
Member

closing due to stale PR, feel free to reopen if you wish to complete the requested changes!

@Phong940253
Copy link
Copy Markdown
Contributor Author

Can you reopen PR for me? Before that, I forgot about this PR because I hadn't played it in a while. :)))

@KingRainbow44 KingRainbow44 reopened this Jul 24, 2024
…sData not found in 4.0 resource), instead, load from CombineBonus.json in the data folder
@Phong940253
Copy link
Copy Markdown
Contributor Author

CombineBonusExcelConfigData.json is no longer found in ExcelBinOutput of resource version 4.0 so I created CombineBonus.json in the data folder.
CombineBonus.json

image

Phong940253

This comment was marked as spam.

DataLoader.loadList("CombineBonus.json", CombineBonusData.class)
.forEach(entry -> combineBonusData.put(entry.getAvatarId(), entry));
} catch (Exception ignored) {
Grasscutter.getLogger()
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we get a thing here to load the resource and copy it to the data dir? i dont expect people to copy the file when they see this warning

@NotThorny
Copy link
Copy Markdown
Member

CombineBonusExcelConfigData.json is no longer found in ExcelBinOutput of resource version 4.0 so I created CombineBonus.json in the data folder. CombineBonus.json

The file is still located in ExcelBinOutput, as long as it is still in the game it should still be in resources.
For example, you can see the file here: https://gitlab.com/YuukiPS/GC-Resources/-/blob/4.0/Resources/ExcelBinOutput/CombineBonusExcelConfigData.json

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants