Grasscutters/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2024-11-23 12:29:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24 from Yazawazi/main

Browse Source 
Fix weapon refine
This commit is contained in:
Melledy 2022-04-19 04:14:17 -07:00 committed by GitHub
commit 2572d55c00
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/emu/grasscutter/data/def/ItemData.java
View File

@ -48,6 +48,7 @@ public class ItemData extends GenshinResource {
private int WeaponBaseExp;
private int StoryId;
private int AvatarPromoteId;
private int AwakenMaterial;
private int[] AwakenCosts;
private int[] SkillAffix;
private WeaponProperty[] WeaponProp;
@ -160,6 +161,10 @@ public class ItemData extends GenshinResource {
return WeaponBaseExp;
}
public int getAwakenMaterial() {
return AwakenMaterial;
}
public int[] getAwakenCosts() {
return AwakenCosts;
}
@ -250,4 +255,4 @@ public class ItemData extends GenshinResource {
}
}
}
}

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

@ -438,8 +438,14 @@ public class InventoryManager {
return;
}
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
return;
if (weapon.getItemData().getAwakenMaterial() == 0) {
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
return;
}
} else {
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemData().getAwakenMaterial() != feed.getItemId()) {
return;
}
}
if (weapon.getRefinement() >= 4 || weapon.getAffixes() == null || weapon.getAffixes().size() == 0) {