mirror of
https://github.com/Melledy/Nebula.git
synced 2026-09-19 17:19:58 +02:00
Update to support game version 1.12.0.*
This commit is contained in:
@@ -7,7 +7,7 @@ import emu.nebula.game.inventory.ItemParamMap;
|
||||
import emu.nebula.util.WeightedList;
|
||||
|
||||
public class GameConstants {
|
||||
public static final String VERSION = "1.11.0";
|
||||
public static final String VERSION = "1.12.0";
|
||||
public static int DATA_VERSION = 0;
|
||||
|
||||
public static final ZoneId UTC_ZONE = ZoneId.of("UTC");
|
||||
@@ -45,7 +45,7 @@ public class GameConstants {
|
||||
public static final int MAX_BUILDS = 100;
|
||||
public static final int MAX_PRESETS = 50;
|
||||
|
||||
public static final int BATTLE_PASS_ID = 7;
|
||||
public static final int BATTLE_PASS_ID = 9;
|
||||
|
||||
public static final int MAX_FRIENDSHIPS = 50;
|
||||
public static final int MAX_PENDING_FRIENDSHIPS = 30;
|
||||
|
||||
@@ -8,7 +8,6 @@ import emu.nebula.Nebula;
|
||||
import emu.nebula.game.inventory.ItemParamMap;
|
||||
import emu.nebula.game.player.Player;
|
||||
import emu.nebula.util.JsonUtils;
|
||||
import emu.nebula.util.ResetCycle;
|
||||
import emu.nebula.util.Utils;
|
||||
import lombok.Getter;
|
||||
|
||||
|
||||
@@ -60,9 +60,14 @@ public class ActivityModule extends GameContextModule {
|
||||
//this.activities.add(1010704);
|
||||
|
||||
// Heartbeat! Neo-Inspired Rhapsody
|
||||
this.activities.add(1010801);
|
||||
this.activities.add(1010803);
|
||||
this.activities.add(1010804);
|
||||
//this.activities.add(1010801);
|
||||
//this.activities.add(1010803);
|
||||
//this.activities.add(1010804);
|
||||
|
||||
// A Sandstorm of Gunfire
|
||||
this.activities.add(1010901);
|
||||
this.activities.add(1010903);
|
||||
this.activities.add(1010904);
|
||||
|
||||
// ===== Joint Drills (Finale Echoing) =====
|
||||
//this.activities.add(510003); // Causes soft lock in event screen
|
||||
@@ -70,8 +75,8 @@ public class ActivityModule extends GameContextModule {
|
||||
// ===== Etc Events =====
|
||||
|
||||
// Trial activities
|
||||
this.activities.add(700117);
|
||||
this.activities.add(700118);
|
||||
this.activities.add(700123);
|
||||
this.activities.add(700124);
|
||||
|
||||
// Tower defense activity
|
||||
this.activities.add(102002); // Broken
|
||||
@@ -79,8 +84,8 @@ public class ActivityModule extends GameContextModule {
|
||||
// Login events
|
||||
//this.activities.add(301011); // Christmas 2025
|
||||
//this.activities.add(301012); // Christmas 2025
|
||||
this.activities.add(301031); // Stellar Prelude
|
||||
this.activities.add(301033); // Price of the Star
|
||||
//this.activities.add(301031); // Stellar Prelude
|
||||
//this.activities.add(301033); // Price of the Star
|
||||
|
||||
// Fatebound Stellar Deck
|
||||
//this.activities.add(800001); // Causes soft lock in event screen
|
||||
|
||||
@@ -5,29 +5,32 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
|
||||
import lombok.Getter;
|
||||
|
||||
public enum ActivityType {
|
||||
None (0),
|
||||
PeriodicQuest (1),
|
||||
LoginReward (2),
|
||||
Mining (3),
|
||||
Cookie (4),
|
||||
TowerDefense (5),
|
||||
Trial (6),
|
||||
JointDrill (7),
|
||||
CG (8),
|
||||
Levels (9),
|
||||
Avg (10),
|
||||
Task (11),
|
||||
Shop (12),
|
||||
Advertise (13),
|
||||
BDConvert (14),
|
||||
Breakout (15),
|
||||
TrekkerVersus (16),
|
||||
Story (17),
|
||||
PenguinCard (18),
|
||||
ThrowGift (19),
|
||||
GoldenSpy (20),
|
||||
Double (21),
|
||||
HistoryStory (22);
|
||||
None (0),
|
||||
PeriodicQuest (1),
|
||||
LoginReward (2),
|
||||
Mining (3),
|
||||
Cookie (4),
|
||||
TowerDefense (5),
|
||||
Trial (6),
|
||||
JointDrill (7),
|
||||
CG (8),
|
||||
Levels (9),
|
||||
Avg (10),
|
||||
Task (11),
|
||||
Shop (12),
|
||||
Advertise (13),
|
||||
BDConvert (14),
|
||||
Breakout (15),
|
||||
TrekkerVersus (16),
|
||||
Story (17),
|
||||
PenguinCard (18),
|
||||
ThrowGift (19),
|
||||
GoldenSpy (20),
|
||||
Double (21),
|
||||
HistoryStory (22),
|
||||
IceCream (23),
|
||||
FollowSocialMedia (24),
|
||||
Soldier (25);
|
||||
|
||||
@Getter
|
||||
private final int value;
|
||||
|
||||
@@ -18,7 +18,9 @@ public enum ItemType {
|
||||
Title (12),
|
||||
Honor (13),
|
||||
HeadItem (14),
|
||||
LevelHonor (15);
|
||||
LevelHonor (15),
|
||||
TraceRequest (16),
|
||||
HuntPermit (17);
|
||||
|
||||
@Getter
|
||||
private final int value;
|
||||
|
||||
@@ -700,6 +700,9 @@ public class NetMsgId {
|
||||
public static final int activity_penguin_card_quest_reward_receive_req = 8404;
|
||||
public static final int activity_penguin_card_quest_reward_receive_succeed_ack = 8405;
|
||||
public static final int activity_penguin_card_quest_reward_receive_failed_ack = 8406;
|
||||
public static final int activity_double_quest_reward_receive_req = 8407;
|
||||
public static final int activity_double_quest_reward_receive_succeed_ack = 8408;
|
||||
public static final int activity_double_quest_reward_receive_failed_ack = 8409;
|
||||
public static final int mail_list_req = 9001;
|
||||
public static final int mail_list_succeed_ack = 9002;
|
||||
public static final int mail_list_failed_ack = 9003;
|
||||
@@ -882,6 +885,7 @@ public class NetMsgId {
|
||||
public static final int activity_end_item_change_notify = 10053;
|
||||
public static final int item_expired_change_notify = 10054;
|
||||
public static final int milkout_character_unlock_notify = 10055;
|
||||
public static final int activity_double_reward_times_notify = 10056;
|
||||
public static final int activity_mining_apply_req = 11001;
|
||||
public static final int activity_mining_apply_succeed_ack = 11002;
|
||||
public static final int activity_mining_apply_failed_ack = 11003;
|
||||
|
||||
@@ -7,7 +7,6 @@ import emu.nebula.net.HandlerId;
|
||||
import emu.nebula.net.NetHandler;
|
||||
import emu.nebula.net.NetMsgId;
|
||||
import emu.nebula.proto.BattlePassOrder.BattlePassOrderReq;
|
||||
import emu.nebula.proto.MallGemOrder.OrderInfo;
|
||||
|
||||
@HandlerId(NetMsgId.battle_pass_order_req)
|
||||
public class HandlerBattlePassOrderReq extends NetHandler {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"global": 117,
|
||||
"kr": 121,
|
||||
"jp": 121,
|
||||
"tw": 127,
|
||||
"cn": 117
|
||||
"global": 120,
|
||||
"kr": 124,
|
||||
"jp": 124,
|
||||
"tw": 130,
|
||||
"cn": 120
|
||||
}
|
||||
Reference in New Issue
Block a user