Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2026-02-06 18:17:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix gacha avatars (fixes #1870)

Browse Source
This commit is contained in:
AnimeGitB
2022-10-18 15:11:10 +10:30
parent 85f44ebdf3
commit aacf013c06
5 changed files with 49 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/emu/grasscutter/data/excels/AvatarSkillDepotData.java
View File

@@ -1,6 +1,7 @@
package emu.grasscutter.data.excels;
import java.util.List;
import java.util.Optional;
import java.util.stream.IntStream;
import emu.grasscutter.data.GameData;
@@ -36,6 +37,7 @@ public class AvatarSkillDepotData extends GameResource {
@Getter private AvatarSkillData energySkillData;
@Getter private ElementType elementType;
@Getter private IntList abilities;
@Getter private int talentCostItemId;
@Override
public int getId() {
@@ -66,6 +68,13 @@ public class AvatarSkillDepotData extends GameResource {
this.setAbilities(new AbilityEmbryoEntry(getSkillDepotAbilityGroup(), config.abilities.stream().map(Object::toString).toArray(String[]::new)));
}
}
// Get constellation item from GameData
Optional.ofNullable(this.talents)
.map(talents -> talents.get(0))
.map(i -> GameData.getAvatarTalentDataMap().get((int) i))
.map(talentData -> talentData.getMainCostItemId())
.ifPresent(itemId -> this.talentCostItemId = itemId);
}
public static class InherentProudSkillOpens {

2
src/main/java/emu/grasscutter/data/excels/ItemData.java
View File

@@ -2,6 +2,7 @@ package emu.grasscutter.data.excels;
import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import com.google.gson.annotations.SerializedName;
import emu.grasscutter.data.GameResource;
@@ -133,6 +134,7 @@ public class ItemData extends GameResource {
this.itemUseActions = this.itemUse.stream()
.filter(x -> x.getUseOp() != ItemUseOp.ITEM_USE_NONE)
.map(ItemUseAction::fromItemUseData)
.filter(Objects::nonNull)
.toList();
}
}