implements Cloneable {
private static final long serialVersionUID = 0L;
+ /**
+ * optional uint32 aeon_enhance_buff_num = 7;
+ */
+ private int aeonEnhanceBuffNum;
+
/**
* optional uint32 aeon_id = 10;
*/
private int aeonId;
/**
- *
- * uint32 aeon_id = 7;
- *
- *
- * optional bool is_unlock_enhance_buff = 12;
+ * optional bool is_unlock_aeon = 12;
*/
- private boolean isUnlockEnhanceBuff;
+ private boolean isUnlockAeon;
private RogueAeon() {
}
@@ -42,12 +43,49 @@ public final class RogueAeonOuterClass {
return new RogueAeon();
}
+ /**
+ * optional uint32 aeon_enhance_buff_num = 7;
+ * @return whether the aeonEnhanceBuffNum field is set
+ */
+ public boolean hasAeonEnhanceBuffNum() {
+ return (bitField0_ & 0x00000001) != 0;
+ }
+
+ /**
+ * optional uint32 aeon_enhance_buff_num = 7;
+ * @return this
+ */
+ public RogueAeon clearAeonEnhanceBuffNum() {
+ bitField0_ &= ~0x00000001;
+ aeonEnhanceBuffNum = 0;
+ return this;
+ }
+
+ /**
+ * optional uint32 aeon_enhance_buff_num = 7;
+ * @return the aeonEnhanceBuffNum
+ */
+ public int getAeonEnhanceBuffNum() {
+ return aeonEnhanceBuffNum;
+ }
+
+ /**
+ * optional uint32 aeon_enhance_buff_num = 7;
+ * @param value the aeonEnhanceBuffNum to set
+ * @return this
+ */
+ public RogueAeon setAeonEnhanceBuffNum(final int value) {
+ bitField0_ |= 0x00000001;
+ aeonEnhanceBuffNum = value;
+ return this;
+ }
+
/**
* optional uint32 aeon_id = 10;
* @return whether the aeonId field is set
*/
public boolean hasAeonId() {
- return (bitField0_ & 0x00000001) != 0;
+ return (bitField0_ & 0x00000002) != 0;
}
/**
@@ -55,7 +93,7 @@ public final class RogueAeonOuterClass {
* @return this
*/
public RogueAeon clearAeonId() {
- bitField0_ &= ~0x00000001;
+ bitField0_ &= ~0x00000002;
aeonId = 0;
return this;
}
@@ -74,61 +112,45 @@ public final class RogueAeonOuterClass {
* @return this
*/
public RogueAeon setAeonId(final int value) {
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
aeonId = value;
return this;
}
/**
- *
- * uint32 aeon_id = 7;
- *
- *
- * optional bool is_unlock_enhance_buff = 12;
- * @return whether the isUnlockEnhanceBuff field is set
+ * optional bool is_unlock_aeon = 12;
+ * @return whether the isUnlockAeon field is set
*/
- public boolean hasIsUnlockEnhanceBuff() {
- return (bitField0_ & 0x00000002) != 0;
+ public boolean hasIsUnlockAeon() {
+ return (bitField0_ & 0x00000004) != 0;
}
/**
- *
- * uint32 aeon_id = 7;
- *
- *
- * optional bool is_unlock_enhance_buff = 12;
+ * optional bool is_unlock_aeon = 12;
* @return this
*/
- public RogueAeon clearIsUnlockEnhanceBuff() {
- bitField0_ &= ~0x00000002;
- isUnlockEnhanceBuff = false;
+ public RogueAeon clearIsUnlockAeon() {
+ bitField0_ &= ~0x00000004;
+ isUnlockAeon = false;
return this;
}
/**
- *
- * uint32 aeon_id = 7;
- *
- *
- * optional bool is_unlock_enhance_buff = 12;
- * @return the isUnlockEnhanceBuff
+ * optional bool is_unlock_aeon = 12;
+ * @return the isUnlockAeon
*/
- public boolean getIsUnlockEnhanceBuff() {
- return isUnlockEnhanceBuff;
+ public boolean getIsUnlockAeon() {
+ return isUnlockAeon;
}
/**
- *
- * uint32 aeon_id = 7;
- *
- *
- * optional bool is_unlock_enhance_buff = 12;
- * @param value the isUnlockEnhanceBuff to set
+ * optional bool is_unlock_aeon = 12;
+ * @param value the isUnlockAeon to set
* @return this
*/
- public RogueAeon setIsUnlockEnhanceBuff(final boolean value) {
- bitField0_ |= 0x00000002;
- isUnlockEnhanceBuff = value;
+ public RogueAeon setIsUnlockAeon(final boolean value) {
+ bitField0_ |= 0x00000004;
+ isUnlockAeon = value;
return this;
}
@@ -137,8 +159,9 @@ public final class RogueAeonOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
+ aeonEnhanceBuffNum = other.aeonEnhanceBuffNum;
aeonId = other.aeonId;
- isUnlockEnhanceBuff = other.isUnlockEnhanceBuff;
+ isUnlockAeon = other.isUnlockAeon;
}
return this;
}
@@ -149,11 +172,14 @@ public final class RogueAeonOuterClass {
return this;
}
cachedSize = -1;
+ if (other.hasAeonEnhanceBuffNum()) {
+ setAeonEnhanceBuffNum(other.aeonEnhanceBuffNum);
+ }
if (other.hasAeonId()) {
setAeonId(other.aeonId);
}
- if (other.hasIsUnlockEnhanceBuff()) {
- setIsUnlockEnhanceBuff(other.isUnlockEnhanceBuff);
+ if (other.hasIsUnlockAeon()) {
+ setIsUnlockAeon(other.isUnlockAeon);
}
return this;
}
@@ -165,8 +191,9 @@ public final class RogueAeonOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
+ aeonEnhanceBuffNum = 0;
aeonId = 0;
- isUnlockEnhanceBuff = false;
+ isUnlockAeon = false;
return this;
}
@@ -190,19 +217,24 @@ public final class RogueAeonOuterClass {
}
RogueAeon other = (RogueAeon) o;
return bitField0_ == other.bitField0_
+ && (!hasAeonEnhanceBuffNum() || aeonEnhanceBuffNum == other.aeonEnhanceBuffNum)
&& (!hasAeonId() || aeonId == other.aeonId)
- && (!hasIsUnlockEnhanceBuff() || isUnlockEnhanceBuff == other.isUnlockEnhanceBuff);
+ && (!hasIsUnlockAeon() || isUnlockAeon == other.isUnlockAeon);
}
@Override
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
+ output.writeRawByte((byte) 56);
+ output.writeUInt32NoTag(aeonEnhanceBuffNum);
+ }
+ if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 80);
output.writeUInt32NoTag(aeonId);
}
- if ((bitField0_ & 0x00000002) != 0) {
+ if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 96);
- output.writeBoolNoTag(isUnlockEnhanceBuff);
+ output.writeBoolNoTag(isUnlockAeon);
}
}
@@ -210,9 +242,12 @@ public final class RogueAeonOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonEnhanceBuffNum);
}
if ((bitField0_ & 0x00000002) != 0) {
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
size += 2;
}
return size;
@@ -225,19 +260,28 @@ public final class RogueAeonOuterClass {
int tag = input.readTag();
while (true) {
switch (tag) {
+ case 56: {
+ // aeonEnhanceBuffNum
+ aeonEnhanceBuffNum = input.readUInt32();
+ bitField0_ |= 0x00000001;
+ tag = input.readTag();
+ if (tag != 80) {
+ break;
+ }
+ }
case 80: {
// aeonId
aeonId = input.readUInt32();
- bitField0_ |= 0x00000001;
+ bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 96) {
break;
}
}
case 96: {
- // isUnlockEnhanceBuff
- isUnlockEnhanceBuff = input.readBool();
- bitField0_ |= 0x00000002;
+ // isUnlockAeon
+ isUnlockAeon = input.readBool();
+ bitField0_ |= 0x00000004;
tag = input.readTag();
if (tag != 0) {
break;
@@ -261,10 +305,13 @@ public final class RogueAeonOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.aeonId, aeonId);
+ output.writeUInt32(FieldNames.aeonEnhanceBuffNum, aeonEnhanceBuffNum);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeBool(FieldNames.isUnlockEnhanceBuff, isUnlockEnhanceBuff);
+ output.writeUInt32(FieldNames.aeonId, aeonId);
+ }
+ if ((bitField0_ & 0x00000004) != 0) {
+ output.writeBool(FieldNames.isUnlockAeon, isUnlockAeon);
}
output.endObject();
}
@@ -276,11 +323,11 @@ public final class RogueAeonOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1421249154:
- case -1109029417: {
- if (input.isAtField(FieldNames.aeonId)) {
+ case 1533321096:
+ case 1717887943: {
+ if (input.isAtField(FieldNames.aeonEnhanceBuffNum)) {
if (!input.trySkipNullValue()) {
- aeonId = input.readUInt32();
+ aeonEnhanceBuffNum = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -288,11 +335,11 @@ public final class RogueAeonOuterClass {
}
break;
}
- case -1006386637:
- case -118645302: {
- if (input.isAtField(FieldNames.isUnlockEnhanceBuff)) {
+ case -1421249154:
+ case -1109029417: {
+ if (input.isAtField(FieldNames.aeonId)) {
if (!input.trySkipNullValue()) {
- isUnlockEnhanceBuff = input.readBool();
+ aeonId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -300,6 +347,18 @@ public final class RogueAeonOuterClass {
}
break;
}
+ case 1311289137:
+ case 1885168009: {
+ if (input.isAtField(FieldNames.isUnlockAeon)) {
+ if (!input.trySkipNullValue()) {
+ isUnlockAeon = input.readBool();
+ bitField0_ |= 0x00000004;
+ }
+ } else {
+ input.skipUnknownField();
+ }
+ break;
+ }
default: {
input.skipUnknownField();
break;
@@ -352,9 +411,11 @@ public final class RogueAeonOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
+ static final FieldName aeonEnhanceBuffNum = FieldName.forField("aeonEnhanceBuffNum", "aeon_enhance_buff_num");
+
static final FieldName aeonId = FieldName.forField("aeonId", "aeon_id");
- static final FieldName isUnlockEnhanceBuff = FieldName.forField("isUnlockEnhanceBuff", "is_unlock_enhance_buff");
+ static final FieldName isUnlockAeon = FieldName.forField("isUnlockAeon", "is_unlock_aeon");
}
}
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java
index c0d9548..e43b36f 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueCommonPendingActionOuterClass.java
@@ -19,13 +19,9 @@ public final class RogueCommonPendingActionOuterClass {
private static final long serialVersionUID = 0L;
/**
- *
- * idk
- *
- *
- * optional uint32 GLFDHAJPJDF = 3;
+ * optional uint32 action_unique_id = 3;
*/
- private int gLFDHAJPJDF;
+ private int actionUniqueId;
/**
* optional .RogueAction rogue_action = 7;
@@ -43,55 +39,39 @@ public final class RogueCommonPendingActionOuterClass {
}
/**
- *
- * idk
- *
- *
- * optional uint32 GLFDHAJPJDF = 3;
- * @return whether the gLFDHAJPJDF field is set
+ * optional uint32 action_unique_id = 3;
+ * @return whether the actionUniqueId field is set
*/
- public boolean hasGLFDHAJPJDF() {
+ public boolean hasActionUniqueId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- *
- * idk
- *
- *
- * optional uint32 GLFDHAJPJDF = 3;
+ * optional uint32 action_unique_id = 3;
* @return this
*/
- public RogueCommonPendingAction clearGLFDHAJPJDF() {
+ public RogueCommonPendingAction clearActionUniqueId() {
bitField0_ &= ~0x00000001;
- gLFDHAJPJDF = 0;
+ actionUniqueId = 0;
return this;
}
/**
- *
- * idk
- *
- *
- * optional uint32 GLFDHAJPJDF = 3;
- * @return the gLFDHAJPJDF
+ * optional uint32 action_unique_id = 3;
+ * @return the actionUniqueId
*/
- public int getGLFDHAJPJDF() {
- return gLFDHAJPJDF;
+ public int getActionUniqueId() {
+ return actionUniqueId;
}
/**
- *
- * idk
- *
- *
- * optional uint32 GLFDHAJPJDF = 3;
- * @param value the gLFDHAJPJDF to set
+ * optional uint32 action_unique_id = 3;
+ * @param value the actionUniqueId to set
* @return this
*/
- public RogueCommonPendingAction setGLFDHAJPJDF(final int value) {
+ public RogueCommonPendingAction setActionUniqueId(final int value) {
bitField0_ |= 0x00000001;
- gLFDHAJPJDF = value;
+ actionUniqueId = value;
return this;
}
@@ -157,7 +137,7 @@ public final class RogueCommonPendingActionOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- gLFDHAJPJDF = other.gLFDHAJPJDF;
+ actionUniqueId = other.actionUniqueId;
rogueAction.copyFrom(other.rogueAction);
}
return this;
@@ -169,8 +149,8 @@ public final class RogueCommonPendingActionOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasGLFDHAJPJDF()) {
- setGLFDHAJPJDF(other.gLFDHAJPJDF);
+ if (other.hasActionUniqueId()) {
+ setActionUniqueId(other.actionUniqueId);
}
if (other.hasRogueAction()) {
getMutableRogueAction().mergeFrom(other.rogueAction);
@@ -185,7 +165,7 @@ public final class RogueCommonPendingActionOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- gLFDHAJPJDF = 0;
+ actionUniqueId = 0;
rogueAction.clear();
return this;
}
@@ -211,7 +191,7 @@ public final class RogueCommonPendingActionOuterClass {
}
RogueCommonPendingAction other = (RogueCommonPendingAction) o;
return bitField0_ == other.bitField0_
- && (!hasGLFDHAJPJDF() || gLFDHAJPJDF == other.gLFDHAJPJDF)
+ && (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId)
&& (!hasRogueAction() || rogueAction.equals(other.rogueAction));
}
@@ -219,7 +199,7 @@ public final class RogueCommonPendingActionOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 24);
- output.writeUInt32NoTag(gLFDHAJPJDF);
+ output.writeUInt32NoTag(actionUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 58);
@@ -231,7 +211,7 @@ public final class RogueCommonPendingActionOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gLFDHAJPJDF);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAction);
@@ -247,8 +227,8 @@ public final class RogueCommonPendingActionOuterClass {
while (true) {
switch (tag) {
case 24: {
- // gLFDHAJPJDF
- gLFDHAJPJDF = input.readUInt32();
+ // actionUniqueId
+ actionUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 58) {
@@ -282,7 +262,7 @@ public final class RogueCommonPendingActionOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.gLFDHAJPJDF, gLFDHAJPJDF);
+ output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.rogueAction, rogueAction);
@@ -297,10 +277,11 @@ public final class RogueCommonPendingActionOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case 1202020394: {
- if (input.isAtField(FieldNames.gLFDHAJPJDF)) {
+ case -208785118:
+ case 1003664768: {
+ if (input.isAtField(FieldNames.actionUniqueId)) {
if (!input.trySkipNullValue()) {
- gLFDHAJPJDF = input.readUInt32();
+ actionUniqueId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -373,7 +354,7 @@ public final class RogueCommonPendingActionOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName gLFDHAJPJDF = FieldName.forField("GLFDHAJPJDF");
+ static final FieldName actionUniqueId = FieldName.forField("actionUniqueId", "action_unique_id");
static final FieldName rogueAction = FieldName.forField("rogueAction", "rogue_action");
}
diff --git a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java
index 7685a4d..4843188 100644
--- a/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/RogueDialogueEventOuterClass.java
@@ -26,9 +26,9 @@ public final class RogueDialogueEventOuterClass {
private int npcId;
/**
- * optional uint32 GBMDBBBMBEJ = 6;
+ * optional uint32 event_unique_id = 6;
*/
- private int gBMDBBBMBEJ;
+ private int eventUniqueId;
/**
* optional uint32 INJPFALMDHJ = 7;
@@ -98,39 +98,39 @@ public final class RogueDialogueEventOuterClass {
}
/**
- * optional uint32 GBMDBBBMBEJ = 6;
- * @return whether the gBMDBBBMBEJ field is set
+ * optional uint32 event_unique_id = 6;
+ * @return whether the eventUniqueId field is set
*/
- public boolean hasGBMDBBBMBEJ() {
+ public boolean hasEventUniqueId() {
return (bitField0_ & 0x00000002) != 0;
}
/**
- * optional uint32 GBMDBBBMBEJ = 6;
+ * optional uint32 event_unique_id = 6;
* @return this
*/
- public RogueDialogueEvent clearGBMDBBBMBEJ() {
+ public RogueDialogueEvent clearEventUniqueId() {
bitField0_ &= ~0x00000002;
- gBMDBBBMBEJ = 0;
+ eventUniqueId = 0;
return this;
}
/**
- * optional uint32 GBMDBBBMBEJ = 6;
- * @return the gBMDBBBMBEJ
+ * optional uint32 event_unique_id = 6;
+ * @return the eventUniqueId
*/
- public int getGBMDBBBMBEJ() {
- return gBMDBBBMBEJ;
+ public int getEventUniqueId() {
+ return eventUniqueId;
}
/**
- * optional uint32 GBMDBBBMBEJ = 6;
- * @param value the gBMDBBBMBEJ to set
+ * optional uint32 event_unique_id = 6;
+ * @param value the eventUniqueId to set
* @return this
*/
- public RogueDialogueEvent setGBMDBBBMBEJ(final int value) {
+ public RogueDialogueEvent setEventUniqueId(final int value) {
bitField0_ |= 0x00000002;
- gBMDBBBMBEJ = value;
+ eventUniqueId = value;
return this;
}
@@ -354,7 +354,7 @@ public final class RogueDialogueEventOuterClass {
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
npcId = other.npcId;
- gBMDBBBMBEJ = other.gBMDBBBMBEJ;
+ eventUniqueId = other.eventUniqueId;
iNJPFALMDHJ = other.iNJPFALMDHJ;
gameModeType = other.gameModeType;
selectEventId.copyFrom(other.selectEventId);
@@ -372,8 +372,8 @@ public final class RogueDialogueEventOuterClass {
if (other.hasNpcId()) {
setNpcId(other.npcId);
}
- if (other.hasGBMDBBBMBEJ()) {
- setGBMDBBBMBEJ(other.gBMDBBBMBEJ);
+ if (other.hasEventUniqueId()) {
+ setEventUniqueId(other.eventUniqueId);
}
if (other.hasINJPFALMDHJ()) {
setINJPFALMDHJ(other.iNJPFALMDHJ);
@@ -398,7 +398,7 @@ public final class RogueDialogueEventOuterClass {
cachedSize = -1;
bitField0_ = 0;
npcId = 0;
- gBMDBBBMBEJ = 0;
+ eventUniqueId = 0;
iNJPFALMDHJ = 0;
gameModeType = 0;
selectEventId.clear();
@@ -429,7 +429,7 @@ public final class RogueDialogueEventOuterClass {
RogueDialogueEvent other = (RogueDialogueEvent) o;
return bitField0_ == other.bitField0_
&& (!hasNpcId() || npcId == other.npcId)
- && (!hasGBMDBBBMBEJ() || gBMDBBBMBEJ == other.gBMDBBBMBEJ)
+ && (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId)
&& (!hasINJPFALMDHJ() || iNJPFALMDHJ == other.iNJPFALMDHJ)
&& (!hasGameModeType() || gameModeType == other.gameModeType)
&& (!hasSelectEventId() || selectEventId.equals(other.selectEventId))
@@ -444,7 +444,7 @@ public final class RogueDialogueEventOuterClass {
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 48);
- output.writeUInt32NoTag(gBMDBBBMBEJ);
+ output.writeUInt32NoTag(eventUniqueId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeRawByte((byte) 56);
@@ -475,7 +475,7 @@ public final class RogueDialogueEventOuterClass {
size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(gBMDBBBMBEJ);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId);
}
if ((bitField0_ & 0x00000004) != 0) {
size += 1 + ProtoSink.computeUInt32SizeNoTag(iNJPFALMDHJ);
@@ -509,8 +509,8 @@ public final class RogueDialogueEventOuterClass {
}
}
case 48: {
- // gBMDBBBMBEJ
- gBMDBBBMBEJ = input.readUInt32();
+ // eventUniqueId
+ eventUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
tag = input.readTag();
if (tag != 56) {
@@ -579,7 +579,7 @@ public final class RogueDialogueEventOuterClass {
output.writeUInt32(FieldNames.npcId, npcId);
}
if ((bitField0_ & 0x00000002) != 0) {
- output.writeUInt32(FieldNames.gBMDBBBMBEJ, gBMDBBBMBEJ);
+ output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId);
}
if ((bitField0_ & 0x00000004) != 0) {
output.writeUInt32(FieldNames.iNJPFALMDHJ, iNJPFALMDHJ);
@@ -615,10 +615,11 @@ public final class RogueDialogueEventOuterClass {
}
break;
}
- case -1904002038: {
- if (input.isAtField(FieldNames.gBMDBBBMBEJ)) {
+ case 2091680134:
+ case -157385500: {
+ if (input.isAtField(FieldNames.eventUniqueId)) {
if (!input.trySkipNullValue()) {
- gBMDBBBMBEJ = input.readUInt32();
+ eventUniqueId = input.readUInt32();
bitField0_ |= 0x00000002;
}
} else {
@@ -728,7 +729,7 @@ public final class RogueDialogueEventOuterClass {
static class FieldNames {
static final FieldName npcId = FieldName.forField("npcId", "npc_id");
- static final FieldName gBMDBBBMBEJ = FieldName.forField("GBMDBBBMBEJ");
+ static final FieldName eventUniqueId = FieldName.forField("eventUniqueId", "event_unique_id");
static final FieldName iNJPFALMDHJ = FieldName.forField("INJPFALMDHJ");
diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java
index 88fd98b..45d66eb 100644
--- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonActionResultScNotifyOuterClass.java
@@ -20,12 +20,12 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
/**
*
- * PBCHNCIJKNA MDBPDPDDHBC = 12;
+ * 101 for common rogue
*
*
- * optional uint32 OCPBNBPAMEN = 5;
+ * optional uint32 rogue_version_id = 5;
*/
- private int oCPBNBPAMEN;
+ private int rogueVersionId;
/**
* optional .RogueActionResult action = 11;
@@ -44,54 +44,54 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
/**
*
- * PBCHNCIJKNA MDBPDPDDHBC = 12;
+ * 101 for common rogue
*
*
- * optional uint32 OCPBNBPAMEN = 5;
- * @return whether the oCPBNBPAMEN field is set
+ * optional uint32 rogue_version_id = 5;
+ * @return whether the rogueVersionId field is set
*/
- public boolean hasOCPBNBPAMEN() {
+ public boolean hasRogueVersionId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
*
- * PBCHNCIJKNA MDBPDPDDHBC = 12;
+ * 101 for common rogue
*
*
- * optional uint32 OCPBNBPAMEN = 5;
+ * optional uint32 rogue_version_id = 5;
* @return this
*/
- public SyncRogueCommonActionResultScNotify clearOCPBNBPAMEN() {
+ public SyncRogueCommonActionResultScNotify clearRogueVersionId() {
bitField0_ &= ~0x00000001;
- oCPBNBPAMEN = 0;
+ rogueVersionId = 0;
return this;
}
/**
*
- * PBCHNCIJKNA MDBPDPDDHBC = 12;
+ * 101 for common rogue
*
*
- * optional uint32 OCPBNBPAMEN = 5;
- * @return the oCPBNBPAMEN
+ * optional uint32 rogue_version_id = 5;
+ * @return the rogueVersionId
*/
- public int getOCPBNBPAMEN() {
- return oCPBNBPAMEN;
+ public int getRogueVersionId() {
+ return rogueVersionId;
}
/**
*
- * PBCHNCIJKNA MDBPDPDDHBC = 12;
+ * 101 for common rogue
*
*
- * optional uint32 OCPBNBPAMEN = 5;
- * @param value the oCPBNBPAMEN to set
+ * optional uint32 rogue_version_id = 5;
+ * @param value the rogueVersionId to set
* @return this
*/
- public SyncRogueCommonActionResultScNotify setOCPBNBPAMEN(final int value) {
+ public SyncRogueCommonActionResultScNotify setRogueVersionId(final int value) {
bitField0_ |= 0x00000001;
- oCPBNBPAMEN = value;
+ rogueVersionId = value;
return this;
}
@@ -159,7 +159,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- oCPBNBPAMEN = other.oCPBNBPAMEN;
+ rogueVersionId = other.rogueVersionId;
action.copyFrom(other.action);
}
return this;
@@ -172,8 +172,8 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasOCPBNBPAMEN()) {
- setOCPBNBPAMEN(other.oCPBNBPAMEN);
+ if (other.hasRogueVersionId()) {
+ setRogueVersionId(other.rogueVersionId);
}
if (other.hasAction()) {
getMutableAction().mergeFrom(other.action);
@@ -188,7 +188,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- oCPBNBPAMEN = 0;
+ rogueVersionId = 0;
action.clear();
return this;
}
@@ -214,7 +214,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
}
SyncRogueCommonActionResultScNotify other = (SyncRogueCommonActionResultScNotify) o;
return bitField0_ == other.bitField0_
- && (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN)
+ && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId)
&& (!hasAction() || action.equals(other.action));
}
@@ -222,7 +222,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 40);
- output.writeUInt32NoTag(oCPBNBPAMEN);
+ output.writeUInt32NoTag(rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 90);
@@ -234,7 +234,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(action);
@@ -251,8 +251,8 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
while (true) {
switch (tag) {
case 40: {
- // oCPBNBPAMEN
- oCPBNBPAMEN = input.readUInt32();
+ // rogueVersionId
+ rogueVersionId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 90) {
@@ -286,7 +286,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN);
+ output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.action, action);
@@ -302,10 +302,11 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1836582037: {
- if (input.isAtField(FieldNames.oCPBNBPAMEN)) {
+ case -1457526951:
+ case 1832096103: {
+ if (input.isAtField(FieldNames.rogueVersionId)) {
if (!input.trySkipNullValue()) {
- oCPBNBPAMEN = input.readUInt32();
+ rogueVersionId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -379,7 +380,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName oCPBNBPAMEN = FieldName.forField("OCPBNBPAMEN");
+ static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id");
static final FieldName action = FieldName.forField("action");
}
diff --git a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java
index 1f8f50d..55da03a 100644
--- a/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java
+++ b/src/generated/main/emu/lunarcore/proto/SyncRogueCommonPendingActionScNotifyOuterClass.java
@@ -19,9 +19,13 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
private static final long serialVersionUID = 0L;
/**
- * optional uint32 OCPBNBPAMEN = 9;
+ *
+ * 101 for common rogue
+ *
+ *
+ * optional uint32 rogue_version_id = 9;
*/
- private int oCPBNBPAMEN;
+ private int rogueVersionId;
/**
* optional .RogueCommonPendingAction rogue_common_pending_action = 4;
@@ -39,39 +43,55 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
}
/**
- * optional uint32 OCPBNBPAMEN = 9;
- * @return whether the oCPBNBPAMEN field is set
+ *
+ * 101 for common rogue
+ *
+ *
+ * optional uint32 rogue_version_id = 9;
+ * @return whether the rogueVersionId field is set
*/
- public boolean hasOCPBNBPAMEN() {
+ public boolean hasRogueVersionId() {
return (bitField0_ & 0x00000001) != 0;
}
/**
- * optional uint32 OCPBNBPAMEN = 9;
+ *
+ * 101 for common rogue
+ *
+ *
+ * optional uint32 rogue_version_id = 9;
* @return this
*/
- public SyncRogueCommonPendingActionScNotify clearOCPBNBPAMEN() {
+ public SyncRogueCommonPendingActionScNotify clearRogueVersionId() {
bitField0_ &= ~0x00000001;
- oCPBNBPAMEN = 0;
+ rogueVersionId = 0;
return this;
}
/**
- * optional uint32 OCPBNBPAMEN = 9;
- * @return the oCPBNBPAMEN
+ *
+ * 101 for common rogue
+ *
+ *
+ * optional uint32 rogue_version_id = 9;
+ * @return the rogueVersionId
*/
- public int getOCPBNBPAMEN() {
- return oCPBNBPAMEN;
+ public int getRogueVersionId() {
+ return rogueVersionId;
}
/**
- * optional uint32 OCPBNBPAMEN = 9;
- * @param value the oCPBNBPAMEN to set
+ *
+ * 101 for common rogue
+ *
+ *
+ * optional uint32 rogue_version_id = 9;
+ * @param value the rogueVersionId to set
* @return this
*/
- public SyncRogueCommonPendingActionScNotify setOCPBNBPAMEN(final int value) {
+ public SyncRogueCommonPendingActionScNotify setRogueVersionId(final int value) {
bitField0_ |= 0x00000001;
- oCPBNBPAMEN = value;
+ rogueVersionId = value;
return this;
}
@@ -141,7 +161,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
cachedSize = other.cachedSize;
if ((bitField0_ | other.bitField0_) != 0) {
bitField0_ = other.bitField0_;
- oCPBNBPAMEN = other.oCPBNBPAMEN;
+ rogueVersionId = other.rogueVersionId;
rogueCommonPendingAction.copyFrom(other.rogueCommonPendingAction);
}
return this;
@@ -154,8 +174,8 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
return this;
}
cachedSize = -1;
- if (other.hasOCPBNBPAMEN()) {
- setOCPBNBPAMEN(other.oCPBNBPAMEN);
+ if (other.hasRogueVersionId()) {
+ setRogueVersionId(other.rogueVersionId);
}
if (other.hasRogueCommonPendingAction()) {
getMutableRogueCommonPendingAction().mergeFrom(other.rogueCommonPendingAction);
@@ -170,7 +190,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
}
cachedSize = -1;
bitField0_ = 0;
- oCPBNBPAMEN = 0;
+ rogueVersionId = 0;
rogueCommonPendingAction.clear();
return this;
}
@@ -196,7 +216,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
}
SyncRogueCommonPendingActionScNotify other = (SyncRogueCommonPendingActionScNotify) o;
return bitField0_ == other.bitField0_
- && (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN)
+ && (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId)
&& (!hasRogueCommonPendingAction() || rogueCommonPendingAction.equals(other.rogueCommonPendingAction));
}
@@ -204,7 +224,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
public void writeTo(final ProtoSink output) throws IOException {
if ((bitField0_ & 0x00000001) != 0) {
output.writeRawByte((byte) 72);
- output.writeUInt32NoTag(oCPBNBPAMEN);
+ output.writeUInt32NoTag(rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeRawByte((byte) 34);
@@ -216,7 +236,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
protected int computeSerializedSize() {
int size = 0;
if ((bitField0_ & 0x00000001) != 0) {
- size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN);
+ size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueCommonPendingAction);
@@ -233,8 +253,8 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
while (true) {
switch (tag) {
case 72: {
- // oCPBNBPAMEN
- oCPBNBPAMEN = input.readUInt32();
+ // rogueVersionId
+ rogueVersionId = input.readUInt32();
bitField0_ |= 0x00000001;
tag = input.readTag();
if (tag != 34) {
@@ -268,7 +288,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
public void writeTo(final JsonSink output) throws IOException {
output.beginObject();
if ((bitField0_ & 0x00000001) != 0) {
- output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN);
+ output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId);
}
if ((bitField0_ & 0x00000002) != 0) {
output.writeMessage(FieldNames.rogueCommonPendingAction, rogueCommonPendingAction);
@@ -284,10 +304,11 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
}
while (!input.isAtEnd()) {
switch (input.readFieldHash()) {
- case -1836582037: {
- if (input.isAtField(FieldNames.oCPBNBPAMEN)) {
+ case -1457526951:
+ case 1832096103: {
+ if (input.isAtField(FieldNames.rogueVersionId)) {
if (!input.trySkipNullValue()) {
- oCPBNBPAMEN = input.readUInt32();
+ rogueVersionId = input.readUInt32();
bitField0_ |= 0x00000001;
}
} else {
@@ -362,7 +383,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
* Contains name constants used for serializing JSON
*/
static class FieldNames {
- static final FieldName oCPBNBPAMEN = FieldName.forField("OCPBNBPAMEN");
+ static final FieldName rogueVersionId = FieldName.forField("rogueVersionId", "rogue_version_id");
static final FieldName rogueCommonPendingAction = FieldName.forField("rogueCommonPendingAction", "rogue_common_pending_action");
}
diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java b/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java
index 298e61a..06f2e87 100644
--- a/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java
+++ b/src/main/java/emu/lunarcore/game/rogue/RogueEntityLoader.java
@@ -142,11 +142,10 @@ public class RogueEntityLoader extends SceneEntityLoader {
} while (instance.setDialogueParams(npcId) == null);
instance.getEventManager().setNowPercentage(0);
- instance.getEventManager().setBuffType(0);
npc.setRogueNpcId(npcId);
- npc.setEventId(++instance.eventId);
+ npc.setEventId(++instance.eventUniqueId);
scene.getPlayer().sendPacket(new PacketSyncRogueDialogueEventDataScNotify(npcId, instance.curDialogueParams.get(npcId),
- instance.eventId));
+ instance.eventUniqueId));
}
return npc;
diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java
index f1010a3..4bdd0c5 100644
--- a/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java
+++ b/src/main/java/emu/lunarcore/game/rogue/RogueEventManager.java
@@ -16,7 +16,6 @@ public class RogueEventManager {
private RogueInstance rogueInstance;
private Player player;
@Setter private int nowPercentage = 0;
- @Setter private int buffType = 0;
public RogueEventManager(RogueInstance rogueInstance) {
this.rogueInstance = rogueInstance;
@@ -93,28 +92,27 @@ public class RogueEventManager {
var increasePercent = param.get(2);
if (this.nowPercentage != 0)
this.nowPercentage = initialPercent;
- else
- this.nowPercentage += increasePercent;
var weightList = new WeightedList();
- for (int i = 4; i < param.size(); i += 2) {
+ for (int i = 3; i < param.size(); i += 2) {
weightList.add(param.get(i + 1), param.get(i));
}
int randomNum = Utils.randomRange(0, 100);
if (randomNum <= this.nowPercentage) {
handleCost(eventId);
- this.handleEvent(failEventId, npcId);
+ //this.handleEvent(failEventId, npcId);
this.getRogueInstance().getCurDialogueParams().get(npcId).add(RogueDialogueEventParam.newInstance()
.setDialogueEventId(failEventId)
.setIsValid(true));
return 0;
} else {
+ this.nowPercentage += increasePercent;
handleCost(eventId);
int nextEventId = weightList.next();
this.handleEvent(nextEventId, npcId);
this.getRogueInstance().getCurDialogueParams().get(npcId).add(RogueDialogueEventParam.newInstance()
.setDialogueEventId(nextEventId)
.setIsValid(true)
- .setRatio(this.nowPercentage / 100f));
+ .setRatio(this.nowPercentage)); // not working
return 0;
}
}
diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java
index c7532a7..30723cc 100644
--- a/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java
+++ b/src/main/java/emu/lunarcore/game/rogue/RogueInstance.java
@@ -68,8 +68,8 @@ public class RogueInstance {
private int aeonBuffType;
private int maxAeonBuffs;
private int money; // universal debris
- public int id = 2; // idk what this is for, but it's needed for the packet
- public int eventId = 690;
+ public int actionUniqueId = 0;
+ public int eventUniqueId = 690;
public Int2ObjectMap> curDialogueParams = new Int2ObjectOpenHashMap<>();
private final Set normalBuff = GameData.getRogueBuffGroupExcelMap().get(100005).getRogueBuffList();
private final Set uncommonBuff = GameData.getRogueBuffGroupExcelMap().get(100003).getRogueBuffList();
@@ -224,8 +224,8 @@ public class RogueInstance {
}
if (this.getBuffSelect() != null) {
- var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.id);
- this.id += 2;
+ var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.actionUniqueId);
+ this.actionUniqueId += 2;
this.pendingAction = proto.toProto();
this.getPlayer().sendPacket(proto);
}
@@ -240,14 +240,14 @@ public class RogueInstance {
if (getBuffSelect() != null && getBuffSelect().hasRerolls() && money >= 30) {
this.getBuffSelect().reroll();
this.setMoney(money - 30);
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.getBuffSelect().toProto(), this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.getBuffSelect().toProto(), this.actionUniqueId - 2));
- var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.id);
- this.id += 2;
+ var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.actionUniqueId);
+ this.actionUniqueId += 2;
pendingAction = proto.toProto();
return this.getBuffSelect();
} else {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
}
return null;
@@ -256,7 +256,7 @@ public class RogueInstance {
public synchronized RogueBuffData selectBuff(int buffId) {
// Sanity
if (this.getBuffSelect() == null) {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
return null;
}
@@ -268,7 +268,7 @@ public class RogueInstance {
.orElse(null);
if (buff == null) {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
return null;
}
@@ -283,7 +283,7 @@ public class RogueInstance {
var data = HandleRogueCommonPendingActionScRsp.newInstance();
data.getMutableRogueBuffSelect();
- data.setTimes(this.id - 2);
+ data.setTimes(this.actionUniqueId - 2);
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
return buff;
}
@@ -329,8 +329,8 @@ public class RogueInstance {
if (this.pendingMiracleSelects > 0 && this.getMiracleSelect() == null) {
this.miracleSelect = new RogueMiracleSelectMenu(this);
this.pendingMiracleSelects--;
- var proto = new PacketSyncRogueCommonPendingActionScNotify(this.miracleSelect.toProto(), this.id);
- this.id += 2;
+ var proto = new PacketSyncRogueCommonPendingActionScNotify(this.miracleSelect.toProto(), this.actionUniqueId);
+ this.actionUniqueId += 2;
this.pendingAction = proto.toProto();
this.getPlayer().sendPacket(proto);
return this.miracleSelect;
@@ -341,7 +341,7 @@ public class RogueInstance {
public synchronized RogueMiracleData selectMiracle(int miracleId) {
if (this.getMiracleSelect() == null) {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
return null;
}
@@ -352,7 +352,7 @@ public class RogueInstance {
.orElse(null);
if (miracle == null) {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
return null;
}
@@ -365,7 +365,7 @@ public class RogueInstance {
var data = HandleRogueCommonPendingActionScRsp.newInstance();
data.getMutableMiracleSelect();
- data.setTimes(this.id - 2);
+ data.setTimes(this.actionUniqueId - 2);
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
return miracle;
}
@@ -380,8 +380,8 @@ public class RogueInstance {
if (this.pendingBonusSelects > 0 && this.getBonusSelect() == null) {
this.bonusSelect = new RogueBonusSelectMenu(this);
this.pendingBonusSelects--;
- var proto = new PacketSyncRogueCommonPendingActionScNotify(this.bonusSelect.toProto(), this.id);
- this.id += 2;
+ var proto = new PacketSyncRogueCommonPendingActionScNotify(this.bonusSelect.toProto(), this.actionUniqueId);
+ this.actionUniqueId += 2;
this.pendingAction = proto.toProto();
this.getPlayer().sendPacket(proto);
return this.bonusSelect;
@@ -392,7 +392,7 @@ public class RogueInstance {
public synchronized RogueBonusData selectBonus(int bonusId) {
if (this.getBonusSelect() == null) {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
return null;
}
@@ -403,7 +403,7 @@ public class RogueInstance {
.orElse(null);
if (bonus == null) {
- this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
+ this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
return null;
}
@@ -413,7 +413,7 @@ public class RogueInstance {
// TODO: add event
var data = HandleRogueCommonPendingActionScRsp.newInstance();
data.getMutableBonusSelect();
- data.setTimes(this.id - 2);
+ data.setTimes(this.actionUniqueId - 2);
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
try {
this.onSelectDialogue(bonus.getEventId(), 0);
@@ -489,7 +489,6 @@ public class RogueInstance {
if (argMap.containsKey(v) && argMap.get(v).equals("RelateToBuff")) {
param.setArgId(this.getAeonId());
- this.getEventManager().setBuffType(this.getAeonBuffType());
}
params.add(param);
@@ -691,7 +690,9 @@ public class RogueInstance {
public RogueAeon toAeonProto() {
var proto = RogueAeon.newInstance()
- .setAeonId(this.getAeonId());
+ .setAeonId(this.getAeonId())
+ .setAeonEnhanceBuffNum(3)
+ .setIsUnlockAeon(true);
return proto;
}
diff --git a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java
index 1e7ac10..9beca46 100644
--- a/src/main/java/emu/lunarcore/game/rogue/RogueManager.java
+++ b/src/main/java/emu/lunarcore/game/rogue/RogueManager.java
@@ -200,7 +200,7 @@ public class RogueManager extends BasePlayerManager {
aeonInfo.addAeonIdList(aeonExcel.getAeonID());
}
aeonInfo.setIsUnlocked(true);
- aeonInfo.setJPEBPGIEGPO(3); // guess
+ aeonInfo.setUnlockAeonEnhanceNum(3); // guess
}
var data = RogueInfoData.newInstance()
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java
index a72c00b..3233265 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSelectRogueDialogueEventScRsp.java
@@ -27,7 +27,7 @@ public class PacketSelectRogueDialogueEventScRsp extends BasePacket {
.setNpcId(npc.getRogueNpcId())
.setGameModeType(5)
.addSelectEventId(dialogueEventId)
- .setGBMDBBBMBEJ(instance.getEventId())
+ .setEventUniqueId(instance.getEventUniqueId())
.addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new));
var l = DialogueResult.newInstance();
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java
index 48023c2..56e5697 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonActionResultScNotify.java
@@ -15,7 +15,7 @@ public class PacketSyncRogueCommonActionResultScNotify extends BasePacket {
super(CmdId.SyncRogueCommonActionResultScNotify);
var proto = SyncRogueCommonActionResultScNotify.newInstance()
- .setOCPBNBPAMEN(101);
+ .setRogueVersionId(101);
proto.setAction(action);
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java
index fabb0a9..f5a4afa 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueCommonPendingActionScNotify.java
@@ -16,14 +16,14 @@ public class PacketSyncRogueCommonPendingActionScNotify extends BasePacket {
var proto = SyncRogueCommonPendingActionScNotify.newInstance();
proto.setRogueCommonPendingAction(action)
- .setOCPBNBPAMEN(101); // common rogue
+ .setRogueVersionId(101); // common rogue
this.setData(proto);
}
public PacketSyncRogueCommonPendingActionScNotify(RogueAction action, int id) {
this(RogueCommonPendingAction.newInstance()
- .setGLFDHAJPJDF(id)
+ .setActionUniqueId(id)
.setRogueAction(action));
}
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java
index b4197be..133a8a7 100644
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java
+++ b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueDialogueEventDataScNotify.java
@@ -23,7 +23,7 @@ public class PacketSyncRogueDialogueEventDataScNotify extends BasePacket {
this(RogueDialogueEvent.newInstance()
.setGameModeType(5) // rogue explore
.setNpcId(rogueNpcId)
- .setGBMDBBBMBEJ(eventId)
+ .setEventUniqueId(eventId)
.addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new)));
}
}
diff --git a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMiracleSelectInfoScNotify.java b/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMiracleSelectInfoScNotify.java
deleted file mode 100644
index 3609162..0000000
--- a/src/main/java/emu/lunarcore/server/packet/send/PacketSyncRogueMiracleSelectInfoScNotify.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package emu.lunarcore.server.packet.send;
-
-import emu.lunarcore.game.rogue.RogueMiracleSelectMenu;
-import emu.lunarcore.proto.SyncRogueMiracleSelectInfoScNotifyOuterClass.SyncRogueMiracleSelectInfoScNotify;
-import emu.lunarcore.server.packet.BasePacket;
-import emu.lunarcore.server.packet.CmdId;
-
-public class PacketSyncRogueMiracleSelectInfoScNotify extends BasePacket {
-
- public PacketSyncRogueMiracleSelectInfoScNotify(RogueMiracleSelectMenu miracleSelect) {
- super(CmdId.NONE); // TODO update
-
- var data = SyncRogueMiracleSelectInfoScNotify.newInstance()
- .setMiracleSelectInfo(miracleSelect.toProto());
-
- this.setData(data);
- }
-}