Mirror/LunarCore
1
0
Fork 0
mirror of https://github.com/Melledy/LunarCore.git synced 2025-12-14 06:14:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement first met timestamp for avatars

Browse Source
This commit is contained in:
Melledy
2023-10-16 04:44:37 -07:00
parent a8c4b22261
commit 331605b67e
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/emu/lunarcore/game/avatar/GameAvatar.java
View File

@@ -5,10 +5,10 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import org.bson.types.ObjectId; import org.bson.types.ObjectId;
import dev.morphia.annotations.Entity; import dev.morphia.annotations.Entity;
import dev.morphia.annotations.Id; import dev.morphia.annotations.Id;
import dev.morphia.annotations.Indexed; import dev.morphia.annotations.Indexed;
import emu.lunarcore.GameConstants; import emu.lunarcore.GameConstants;
import emu.lunarcore.LunarRail; import emu.lunarcore.LunarRail;
import emu.lunarcore.data.GameData; import emu.lunarcore.data.GameData;
@@ -30,9 +30,9 @@ import emu.lunarcore.proto.MotionInfoOuterClass.MotionInfo;
import emu.lunarcore.proto.SceneActorInfoOuterClass.SceneActorInfo; import emu.lunarcore.proto.SceneActorInfoOuterClass.SceneActorInfo;
import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo; import emu.lunarcore.proto.SceneEntityInfoOuterClass.SceneEntityInfo;
import emu.lunarcore.proto.SpBarInfoOuterClass.SpBarInfo; import emu.lunarcore.proto.SpBarInfoOuterClass.SpBarInfo;
import emu.lunarcore.proto.VectorOuterClass.Vector;
import emu.lunarcore.server.packet.send.PacketPlayerSyncScNotify; import emu.lunarcore.server.packet.send.PacketPlayerSyncScNotify;
import emu.lunarcore.util.Position; import emu.lunarcore.util.Position;
import it.unimi.dsi.fastutil.ints.*; import it.unimi.dsi.fastutil.ints.*;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -55,6 +55,7 @@ public class GameAvatar implements GameEntity {
private int currentHp; private int currentHp;
private int currentSp; private int currentSp;
private Set<Integer> takenRewards; private Set<Integer> takenRewards;
private long timestamp;
private transient int entityId; private transient int entityId;
private transient Int2ObjectMap<GameItem> equips; private transient Int2ObjectMap<GameItem> equips;
@@ -69,8 +70,7 @@ public class GameAvatar implements GameEntity {
this.currentHp = 10000; this.currentHp = 10000;
this.currentSp = 0; this.currentSp = 0;
} }
// On creation
public GameAvatar(int avatarId) { public GameAvatar(int avatarId) {
this(GameData.getAvatarExcelMap().get(avatarId)); this(GameData.getAvatarExcelMap().get(avatarId));
} }
@@ -78,13 +78,14 @@ public class GameAvatar implements GameEntity {
public GameAvatar(AvatarExcel excel) { public GameAvatar(AvatarExcel excel) {
this(); this();
this.avatarId = excel.getId(); this.avatarId = excel.getId();
this.takenRewards = new HashSet<>(); this.timestamp = System.currentTimeMillis() / 1000;
this.setExcel(excel); this.setExcel(excel);
} }
public GameAvatar(HeroPath path) { public GameAvatar(HeroPath path) {
this(); this();
this.avatarId = GameConstants.TRAILBLAZER_AVATAR_ID; this.avatarId = GameConstants.TRAILBLAZER_AVATAR_ID;
this.timestamp = System.currentTimeMillis() / 1000;
this.setHeroPath(path); this.setHeroPath(path);
} }
@@ -244,7 +245,8 @@ public class GameAvatar implements GameEntity {
.setLevel(this.getLevel()) .setLevel(this.getLevel())
.setExp(this.getExp()) .setExp(this.getExp())
.setPromotion(this.getPromotion()) .setPromotion(this.getPromotion())
.setRank(this.getRank()); .setRank(this.getRank())
.setFirstMetTimestamp(this.getTimestamp());
for (var equip : this.getEquips().values()) { for (var equip : this.getEquips().values()) {
if (equip.getItemMainType() == ItemMainType.Relic) { if (equip.getItemMainType() == ItemMainType.Relic) {
@@ -258,10 +260,12 @@ public class GameAvatar implements GameEntity {
proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue())); proto.addSkilltreeList(AvatarSkillTree.newInstance().setPointId(skill.getKey()).setLevel(skill.getValue()));
} }
for (int i : this.getTakenRewards()) { if (this.takenRewards != null) {
proto.addAllTakenRewards(i); for (int i : this.takenRewards) {
proto.addAllTakenRewards(i);
}
} }
return proto; return proto;
} }