Grasscutters/Grasscutter
3
0
Fork 0
mirror of https://github.com/Melledy/Grasscutter.git synced 2024-11-30 15:08:43 +00:00
Code Issues 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 8d6019fe8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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 WeaponBaseExp;
private int StoryId; private int StoryId;
private int AvatarPromoteId; private int AvatarPromoteId;
private int AwakenMaterial;
private int[] AwakenCosts; private int[] AwakenCosts;
private int[] SkillAffix; private int[] SkillAffix;
private WeaponProperty[] WeaponProp; private WeaponProperty[] WeaponProp;
@ -160,6 +161,10 @@ public class ItemData extends GenshinResource {
return WeaponBaseExp; return WeaponBaseExp;
} }
public int getAwakenMaterial() {
return AwakenMaterial;
}
public int[] getAwakenCosts() { public int[] getAwakenCosts() {
return AwakenCosts; return AwakenCosts;
} }

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

@ -438,9 +438,15 @@ public class InventoryManager {
return; return;
} }
if (weapon.getItemData().getAwakenMaterial() == 0) {
if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) { if (weapon.getItemType() != ItemType.ITEM_WEAPON || weapon.getItemId() != feed.getItemId()) {
return; 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) { if (weapon.getRefinement() >= 4 || weapon.getAffixes() == null || weapon.getAffixes().size() == 0) {
return; return;