diff --git a/src/main/java/emu/nebula/game/activity/ActivityManager.java b/src/main/java/emu/nebula/game/activity/ActivityManager.java index 3ba906b..72d6398 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityManager.java +++ b/src/main/java/emu/nebula/game/activity/ActivityManager.java @@ -116,6 +116,7 @@ public class ActivityManager extends PlayerManager implements GameDatabaseObject case Levels -> new LevelsActivity(this, data); case Task -> new TaskActivity(this, data); case Shop -> new ShopActivity(this, data); + case TrekkerVersus -> new TrekkerVersusActivity(this, data); default -> null; }; diff --git a/src/main/java/emu/nebula/game/activity/ActivityModule.java b/src/main/java/emu/nebula/game/activity/ActivityModule.java index 2952611..77e029f 100644 --- a/src/main/java/emu/nebula/game/activity/ActivityModule.java +++ b/src/main/java/emu/nebula/game/activity/ActivityModule.java @@ -34,6 +34,9 @@ public class ActivityModule extends GameContextModule { this.activities.add(2010101); this.activities.add(2010103); this.activities.add(2010104); + + // Trekker versus + this.activities.add(600001); } } diff --git a/src/main/java/emu/nebula/game/activity/type/TrekkerVersusActivity.java b/src/main/java/emu/nebula/game/activity/type/TrekkerVersusActivity.java new file mode 100644 index 0000000..a4a6039 --- /dev/null +++ b/src/main/java/emu/nebula/game/activity/type/TrekkerVersusActivity.java @@ -0,0 +1,95 @@ +package emu.nebula.game.activity.type; + +import dev.morphia.annotations.Entity; +import emu.nebula.data.resources.ActivityDef; +import emu.nebula.game.activity.ActivityManager; +import emu.nebula.game.activity.GameActivity; +import emu.nebula.game.tower.StarTowerBuild; +import emu.nebula.proto.ActivityDetail.ActivityMsg; +import emu.nebula.proto.Public.TrekkerVersusShow; +import lombok.Getter; +import us.hebi.quickbuf.RepeatedInt; + +@Getter +@Entity +public class TrekkerVersusActivity extends GameActivity { + private int[] charIds; + private int[] affixIds; + private int buildScore; + private int time; + + // Apply + private transient StarTowerBuild build; + private transient int[] affixList; + + @Deprecated // Morphia only + public TrekkerVersusActivity() { + + } + + public TrekkerVersusActivity(ActivityManager manager, ActivityDef data) { + super(manager, data); + } + + public boolean apply(long buildId, RepeatedInt affixes) { + // Get build + var build = this.getPlayer().getStarTowerManager().getBuildById(buildId); + + if (build == null) { + return false; + } + + // Set + this.build = build; + this.affixList = affixes.toArray(); + + // Success + return true; + } + + public void settle(boolean passed, int time) { + // Sanity check + if (this.build == null || this.affixList == null) { + return; + } + + // Check if victory + if (passed) { + // Save characters/affixes + this.charIds = this.build.getCharIds().clone(); + this.affixIds = this.affixList; + this.time = time; + this.buildScore = this.build.getScore(); + + // Save to database + this.save(); + } + + // Clear + this.build = null; + this.affixList = null; + } + + // Proto + + @Override + public void encodeActivityMsg(ActivityMsg msg) { + msg.getMutableTrekkerVersus() + .setShow(this.getShowProto()); + } + + public TrekkerVersusShow getShowProto() { + var show = TrekkerVersusShow.newInstance(); + + if (this.getCharIds() != null) { + show.addAllCharIds(this.getCharIds()); + show.setBuildScore(this.getBuildScore()); + } + + if (this.getAffixIds() != null) { + show.addAllAffixIds(this.getAffixIds()); + } + + return show; + } +} diff --git a/src/main/java/emu/nebula/server/handlers/HandlerActivityTrekkerVersusApplyReq.java b/src/main/java/emu/nebula/server/handlers/HandlerActivityTrekkerVersusApplyReq.java new file mode 100644 index 0000000..fb8b60f --- /dev/null +++ b/src/main/java/emu/nebula/server/handlers/HandlerActivityTrekkerVersusApplyReq.java @@ -0,0 +1,36 @@ +package emu.nebula.server.handlers; + +import emu.nebula.net.NetHandler; +import emu.nebula.net.NetMsgId; +import emu.nebula.proto.ActivityTrekkerVersusApply.ActivityTrekkerVersusApplyReq; +import emu.nebula.net.HandlerId; +import emu.nebula.game.activity.type.TrekkerVersusActivity; +import emu.nebula.net.GameSession; + +@HandlerId(NetMsgId.activity_trekker_versus_apply_req) +public class HandlerActivityTrekkerVersusApplyReq extends NetHandler { + + @Override + public byte[] handle(GameSession session, byte[] message) throws Exception { + // Parse request + var req = ActivityTrekkerVersusApplyReq.parseFrom(message); + + // Get activity + var activity = session.getPlayer().getActivityManager().getActivity(TrekkerVersusActivity.class, req.getActivityId()); + + if (activity == null) { + return session.encodeMsg(NetMsgId.activity_trekker_versus_apply_failed_ack); + } + + // Apply + boolean result = activity.apply(req.getBuildId(), req.getAffixIds()); + + if (result == false) { + return session.encodeMsg(NetMsgId.activity_trekker_versus_apply_failed_ack); + } + + // Encode and send + return session.encodeMsg(NetMsgId.activity_trekker_versus_apply_succeed_ack); + } + +} diff --git a/src/main/java/emu/nebula/server/handlers/HandlerActivityTrekkerVersusSettleReq.java b/src/main/java/emu/nebula/server/handlers/HandlerActivityTrekkerVersusSettleReq.java new file mode 100644 index 0000000..88b888f --- /dev/null +++ b/src/main/java/emu/nebula/server/handlers/HandlerActivityTrekkerVersusSettleReq.java @@ -0,0 +1,40 @@ +package emu.nebula.server.handlers; + +import emu.nebula.net.NetHandler; +import emu.nebula.net.NetMsgId; +import emu.nebula.proto.ActivityTrekkerVersusSettle.ActivityTrekkerVersusSettleReq; +import emu.nebula.proto.ActivityTrekkerVersusSettle.ActivityTrekkerVersusSettleResp; +import emu.nebula.net.HandlerId; +import emu.nebula.game.activity.type.TrekkerVersusActivity; +import emu.nebula.net.GameSession; + +@HandlerId(NetMsgId.activity_trekker_versus_settle_req) +public class HandlerActivityTrekkerVersusSettleReq extends NetHandler { + + @Override + public byte[] handle(GameSession session, byte[] message) throws Exception { + // Parse request + var req = ActivityTrekkerVersusSettleReq.parseFrom(message); + + // Get activity + var activity = session.getPlayer().getActivityManager().getActivity(TrekkerVersusActivity.class, req.getActivityId()); + + if (activity == null) { + return session.encodeMsg(NetMsgId.activity_trekker_versus_settle_failed_ack); + } + + // Settle + activity.settle(req.getPassed(), req.getTime()); + + // Handle client events for achievements + session.getPlayer().getAchievementManager().handleClientEvents(req.getEvents()); + + // Build response + var rsp = ActivityTrekkerVersusSettleResp.newInstance() + .setShow(activity.getShowProto()); + + // Encode and send + return session.encodeMsg(NetMsgId.activity_trekker_versus_settle_succeed_ack, rsp); + } + +}