Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-26 11:01:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26 from Yazawazi/main

Browse Source 
unlockAvatarConstellation fix
This commit is contained in:
Melledy 2022-04-19 09:18:42 -07:00 committed by GitHub
commit c72891ff97
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/emu/grasscutter/game/managers/InventoryManager.java
View File

@ -471,7 +471,7 @@ public class InventoryManager {
} }
// Consume weapon // Consume weapon
player.getInventory().removeItem(feed); player.getInventory().removeItem(feed, 1);
// Get // Get
weapon.setRefinement(targetRefineLevel); weapon.setRefinement(targetRefineLevel);
@ -804,6 +804,12 @@ public class InventoryManager {
// Get talent // Get talent
int currentTalentLevel = avatar.getCoreProudSkillLevel(); int currentTalentLevel = avatar.getCoreProudSkillLevel();
int nextTalentId = ((avatar.getAvatarId() % 10000000) * 10) + currentTalentLevel + 1; int nextTalentId = ((avatar.getAvatarId() % 10000000) * 10) + currentTalentLevel + 1;
if (avatar.getAvatarId() == 10000006) {
// Lisa is special in that her talentId starts with 4 instead of 6.
nextTalentId = 40 + currentTalentLevel + 1;
}
AvatarTalentData talentData = GenshinData.getAvatarTalentDataMap().get(nextTalentId); AvatarTalentData talentData = GenshinData.getAvatarTalentDataMap().get(nextTalentId);
if (talentData == null) { if (talentData == null) {