Mirror/Grasscutter
1
0
Fork 0
mirror of https://github.com/Grasscutters/Grasscutter.git synced 2025-12-18 09:54:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Name Card Done!!!!!!!!!!!

Browse Source
This commit is contained in:
Yazawazi
2022-04-23 23:48:06 +08:00
committed by GitHub
parent ad1c3f9a3b
commit 3baef42aac
5 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java
View File

@@ -94,6 +94,7 @@ public class GenshinAvatar {
private int fetterExp;
private int nameCardRewardId;
private int nameCardId;
public GenshinAvatar() {
// Morhpia only!
@@ -113,6 +114,7 @@ public class GenshinAvatar {
this();
this.avatarId = data.getId();
this.nameCardRewardId = data.getNameCardRewardId();
this.nameCardId = data.getNameCardId();
this.data = data;
this.bornTime = (int) (System.currentTimeMillis() / 1000);
this.flyCloak = 140001;
@@ -311,6 +313,14 @@ public class GenshinAvatar {
this.fetterExp = fetterExp;
}
public int getNameCardId() {
return nameCardId;
}
public void setNameCardId(int nameCardId) {
this.nameCardId = nameCardId;
}
public float getCurrentHp() {
return currentHp;
}
@@ -434,6 +444,7 @@ public class GenshinAvatar {
// Fetters
this.setFetterList(data.getFetters());
this.setNameCardRewardId(data.getNameCardRewardId());
this.setNameCardId(data.getNameCardId());
// Get hp percent, set to 100% if none
float hpPercent = this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP) <= 0 ? 1f : this.getFightProperty(FightProperty.FIGHT_PROP_CUR_HP) / this.getFightProperty(FightProperty.FIGHT_PROP_MAX_HP);
@@ -746,6 +757,13 @@ public class GenshinAvatar {
}
}
int rewardId = this.getNameCardRewardId();
int cardId = this.getNameCardId();
if (this.getPlayer().getNameCardList().contains(cardId)) {
avatarFetter.addRewardedFetterLevelList(rewardId);
}
AvatarInfo.Builder avatarInfo = AvatarInfo.newBuilder()
.setAvatarId(this.getAvatarId())
.setGuid(this.getGuid())