mirror of
https://github.com/Melledy/LunarCore.git
synced 2025-12-16 15:24:44 +01:00
fix some events (most events are available) prepare for rogue DLC
This commit is contained in:
@@ -20,7 +20,7 @@ public final class MECNPEEJJDEOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* idk
|
* LJABGHIILFI DHJPHJOBLLB = 7;
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
||||||
@@ -39,7 +39,7 @@ public final class MECNPEEJJDEOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* idk
|
* LJABGHIILFI DHJPHJOBLLB = 7;
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
||||||
@@ -51,7 +51,7 @@ public final class MECNPEEJJDEOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* idk
|
* LJABGHIILFI DHJPHJOBLLB = 7;
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
||||||
@@ -65,7 +65,7 @@ public final class MECNPEEJJDEOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* idk
|
* LJABGHIILFI DHJPHJOBLLB = 7;
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
||||||
@@ -77,7 +77,7 @@ public final class MECNPEEJJDEOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* idk
|
* LJABGHIILFI DHJPHJOBLLB = 7;
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
||||||
|
|||||||
@@ -20,28 +20,16 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
private static final long serialVersionUID = 0L;
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 unlock_aeon_enhance_num = 14;</code>
|
||||||
* 3
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 JPEBPGIEGPO = 14;</code>
|
|
||||||
*/
|
*/
|
||||||
private int jPEBPGIEGPO;
|
private int unlockAeonEnhanceNum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* 9
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
||||||
*/
|
*/
|
||||||
private int unlockAeonNum;
|
private int unlockAeonNum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* guess
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlocked = 1;</code>
|
* <code>optional bool is_unlocked = 1;</code>
|
||||||
*/
|
*/
|
||||||
private boolean isUnlocked;
|
private boolean isUnlocked;
|
||||||
@@ -62,63 +50,43 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 unlock_aeon_enhance_num = 14;</code>
|
||||||
* 3
|
* @return whether the unlockAeonEnhanceNum field is set
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 JPEBPGIEGPO = 14;</code>
|
|
||||||
* @return whether the jPEBPGIEGPO field is set
|
|
||||||
*/
|
*/
|
||||||
public boolean hasJPEBPGIEGPO() {
|
public boolean hasUnlockAeonEnhanceNum() {
|
||||||
return (bitField0_ & 0x00000001) != 0;
|
return (bitField0_ & 0x00000001) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 unlock_aeon_enhance_num = 14;</code>
|
||||||
* 3
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 JPEBPGIEGPO = 14;</code>
|
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueAeonInfo clearJPEBPGIEGPO() {
|
public RogueAeonInfo clearUnlockAeonEnhanceNum() {
|
||||||
bitField0_ &= ~0x00000001;
|
bitField0_ &= ~0x00000001;
|
||||||
jPEBPGIEGPO = 0;
|
unlockAeonEnhanceNum = 0;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 unlock_aeon_enhance_num = 14;</code>
|
||||||
* 3
|
* @return the unlockAeonEnhanceNum
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 JPEBPGIEGPO = 14;</code>
|
|
||||||
* @return the jPEBPGIEGPO
|
|
||||||
*/
|
*/
|
||||||
public int getJPEBPGIEGPO() {
|
public int getUnlockAeonEnhanceNum() {
|
||||||
return jPEBPGIEGPO;
|
return unlockAeonEnhanceNum;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 unlock_aeon_enhance_num = 14;</code>
|
||||||
* 3
|
* @param value the unlockAeonEnhanceNum to set
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 JPEBPGIEGPO = 14;</code>
|
|
||||||
* @param value the jPEBPGIEGPO to set
|
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueAeonInfo setJPEBPGIEGPO(final int value) {
|
public RogueAeonInfo setUnlockAeonEnhanceNum(final int value) {
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
jPEBPGIEGPO = value;
|
unlockAeonEnhanceNum = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* 9
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
||||||
* @return whether the unlockAeonNum field is set
|
* @return whether the unlockAeonNum field is set
|
||||||
*/
|
*/
|
||||||
@@ -127,10 +95,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* 9
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
@@ -141,10 +105,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* 9
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
||||||
* @return the unlockAeonNum
|
* @return the unlockAeonNum
|
||||||
*/
|
*/
|
||||||
@@ -153,10 +113,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* 9
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
* <code>optional uint32 unlock_aeon_num = 15;</code>
|
||||||
* @param value the unlockAeonNum to set
|
* @param value the unlockAeonNum to set
|
||||||
* @return this
|
* @return this
|
||||||
@@ -168,10 +124,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* guess
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlocked = 1;</code>
|
* <code>optional bool is_unlocked = 1;</code>
|
||||||
* @return whether the isUnlocked field is set
|
* @return whether the isUnlocked field is set
|
||||||
*/
|
*/
|
||||||
@@ -180,10 +132,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* guess
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlocked = 1;</code>
|
* <code>optional bool is_unlocked = 1;</code>
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
@@ -194,10 +142,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* guess
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlocked = 1;</code>
|
* <code>optional bool is_unlocked = 1;</code>
|
||||||
* @return the isUnlocked
|
* @return the isUnlocked
|
||||||
*/
|
*/
|
||||||
@@ -206,10 +150,6 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
|
||||||
* guess
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlocked = 1;</code>
|
* <code>optional bool is_unlocked = 1;</code>
|
||||||
* @param value the isUnlocked to set
|
* @param value the isUnlocked to set
|
||||||
* @return this
|
* @return this
|
||||||
@@ -293,7 +233,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
cachedSize = other.cachedSize;
|
cachedSize = other.cachedSize;
|
||||||
if ((bitField0_ | other.bitField0_) != 0) {
|
if ((bitField0_ | other.bitField0_) != 0) {
|
||||||
bitField0_ = other.bitField0_;
|
bitField0_ = other.bitField0_;
|
||||||
jPEBPGIEGPO = other.jPEBPGIEGPO;
|
unlockAeonEnhanceNum = other.unlockAeonEnhanceNum;
|
||||||
unlockAeonNum = other.unlockAeonNum;
|
unlockAeonNum = other.unlockAeonNum;
|
||||||
isUnlocked = other.isUnlocked;
|
isUnlocked = other.isUnlocked;
|
||||||
aeonIdList.copyFrom(other.aeonIdList);
|
aeonIdList.copyFrom(other.aeonIdList);
|
||||||
@@ -307,8 +247,8 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
if (other.hasJPEBPGIEGPO()) {
|
if (other.hasUnlockAeonEnhanceNum()) {
|
||||||
setJPEBPGIEGPO(other.jPEBPGIEGPO);
|
setUnlockAeonEnhanceNum(other.unlockAeonEnhanceNum);
|
||||||
}
|
}
|
||||||
if (other.hasUnlockAeonNum()) {
|
if (other.hasUnlockAeonNum()) {
|
||||||
setUnlockAeonNum(other.unlockAeonNum);
|
setUnlockAeonNum(other.unlockAeonNum);
|
||||||
@@ -329,7 +269,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
bitField0_ = 0;
|
bitField0_ = 0;
|
||||||
jPEBPGIEGPO = 0;
|
unlockAeonEnhanceNum = 0;
|
||||||
unlockAeonNum = 0;
|
unlockAeonNum = 0;
|
||||||
isUnlocked = false;
|
isUnlocked = false;
|
||||||
aeonIdList.clear();
|
aeonIdList.clear();
|
||||||
@@ -357,7 +297,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
RogueAeonInfo other = (RogueAeonInfo) o;
|
RogueAeonInfo other = (RogueAeonInfo) o;
|
||||||
return bitField0_ == other.bitField0_
|
return bitField0_ == other.bitField0_
|
||||||
&& (!hasJPEBPGIEGPO() || jPEBPGIEGPO == other.jPEBPGIEGPO)
|
&& (!hasUnlockAeonEnhanceNum() || unlockAeonEnhanceNum == other.unlockAeonEnhanceNum)
|
||||||
&& (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum)
|
&& (!hasUnlockAeonNum() || unlockAeonNum == other.unlockAeonNum)
|
||||||
&& (!hasIsUnlocked() || isUnlocked == other.isUnlocked)
|
&& (!hasIsUnlocked() || isUnlocked == other.isUnlocked)
|
||||||
&& (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList));
|
&& (!hasAeonIdList() || aeonIdList.equals(other.aeonIdList));
|
||||||
@@ -367,7 +307,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
public void writeTo(final ProtoSink output) throws IOException {
|
public void writeTo(final ProtoSink output) throws IOException {
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeRawByte((byte) 112);
|
output.writeRawByte((byte) 112);
|
||||||
output.writeUInt32NoTag(jPEBPGIEGPO);
|
output.writeUInt32NoTag(unlockAeonEnhanceNum);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeRawByte((byte) 120);
|
output.writeRawByte((byte) 120);
|
||||||
@@ -389,7 +329,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
protected int computeSerializedSize() {
|
protected int computeSerializedSize() {
|
||||||
int size = 0;
|
int size = 0;
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(jPEBPGIEGPO);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonEnhanceNum);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(unlockAeonNum);
|
||||||
@@ -411,8 +351,8 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
while (true) {
|
while (true) {
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case 112: {
|
case 112: {
|
||||||
// jPEBPGIEGPO
|
// unlockAeonEnhanceNum
|
||||||
jPEBPGIEGPO = input.readUInt32();
|
unlockAeonEnhanceNum = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 120) {
|
if (tag != 120) {
|
||||||
@@ -470,7 +410,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
public void writeTo(final JsonSink output) throws IOException {
|
public void writeTo(final JsonSink output) throws IOException {
|
||||||
output.beginObject();
|
output.beginObject();
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeUInt32(FieldNames.jPEBPGIEGPO, jPEBPGIEGPO);
|
output.writeUInt32(FieldNames.unlockAeonEnhanceNum, unlockAeonEnhanceNum);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum);
|
output.writeUInt32(FieldNames.unlockAeonNum, unlockAeonNum);
|
||||||
@@ -491,10 +431,11 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
}
|
}
|
||||||
while (!input.isAtEnd()) {
|
while (!input.isAtEnd()) {
|
||||||
switch (input.readFieldHash()) {
|
switch (input.readFieldHash()) {
|
||||||
case 617496720: {
|
case 1040991167:
|
||||||
if (input.isAtField(FieldNames.jPEBPGIEGPO)) {
|
case 7773396: {
|
||||||
|
if (input.isAtField(FieldNames.unlockAeonEnhanceNum)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
jPEBPGIEGPO = input.readUInt32();
|
unlockAeonEnhanceNum = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -590,7 +531,7 @@ public final class RogueAeonInfoOuterClass {
|
|||||||
* Contains name constants used for serializing JSON
|
* Contains name constants used for serializing JSON
|
||||||
*/
|
*/
|
||||||
static class FieldNames {
|
static class FieldNames {
|
||||||
static final FieldName jPEBPGIEGPO = FieldName.forField("JPEBPGIEGPO");
|
static final FieldName unlockAeonEnhanceNum = FieldName.forField("unlockAeonEnhanceNum", "unlock_aeon_enhance_num");
|
||||||
|
|
||||||
static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num");
|
static final FieldName unlockAeonNum = FieldName.forField("unlockAeonNum", "unlock_aeon_num");
|
||||||
|
|
||||||
|
|||||||
@@ -18,19 +18,20 @@ public final class RogueAeonOuterClass {
|
|||||||
public static final class RogueAeon extends ProtoMessage<RogueAeon> implements Cloneable {
|
public static final class RogueAeon extends ProtoMessage<RogueAeon> implements Cloneable {
|
||||||
private static final long serialVersionUID = 0L;
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <code>optional uint32 aeon_enhance_buff_num = 7;</code>
|
||||||
|
*/
|
||||||
|
private int aeonEnhanceBuffNum;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 aeon_id = 10;</code>
|
* <code>optional uint32 aeon_id = 10;</code>
|
||||||
*/
|
*/
|
||||||
private int aeonId;
|
private int aeonId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional bool is_unlock_aeon = 12;</code>
|
||||||
* uint32 aeon_id = 7;
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlock_enhance_buff = 12;</code>
|
|
||||||
*/
|
*/
|
||||||
private boolean isUnlockEnhanceBuff;
|
private boolean isUnlockAeon;
|
||||||
|
|
||||||
private RogueAeon() {
|
private RogueAeon() {
|
||||||
}
|
}
|
||||||
@@ -42,12 +43,49 @@ public final class RogueAeonOuterClass {
|
|||||||
return new RogueAeon();
|
return new RogueAeon();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <code>optional uint32 aeon_enhance_buff_num = 7;</code>
|
||||||
|
* @return whether the aeonEnhanceBuffNum field is set
|
||||||
|
*/
|
||||||
|
public boolean hasAeonEnhanceBuffNum() {
|
||||||
|
return (bitField0_ & 0x00000001) != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <code>optional uint32 aeon_enhance_buff_num = 7;</code>
|
||||||
|
* @return this
|
||||||
|
*/
|
||||||
|
public RogueAeon clearAeonEnhanceBuffNum() {
|
||||||
|
bitField0_ &= ~0x00000001;
|
||||||
|
aeonEnhanceBuffNum = 0;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <code>optional uint32 aeon_enhance_buff_num = 7;</code>
|
||||||
|
* @return the aeonEnhanceBuffNum
|
||||||
|
*/
|
||||||
|
public int getAeonEnhanceBuffNum() {
|
||||||
|
return aeonEnhanceBuffNum;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <code>optional uint32 aeon_enhance_buff_num = 7;</code>
|
||||||
|
* @param value the aeonEnhanceBuffNum to set
|
||||||
|
* @return this
|
||||||
|
*/
|
||||||
|
public RogueAeon setAeonEnhanceBuffNum(final int value) {
|
||||||
|
bitField0_ |= 0x00000001;
|
||||||
|
aeonEnhanceBuffNum = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 aeon_id = 10;</code>
|
* <code>optional uint32 aeon_id = 10;</code>
|
||||||
* @return whether the aeonId field is set
|
* @return whether the aeonId field is set
|
||||||
*/
|
*/
|
||||||
public boolean hasAeonId() {
|
public boolean hasAeonId() {
|
||||||
return (bitField0_ & 0x00000001) != 0;
|
return (bitField0_ & 0x00000002) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -55,7 +93,7 @@ public final class RogueAeonOuterClass {
|
|||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueAeon clearAeonId() {
|
public RogueAeon clearAeonId() {
|
||||||
bitField0_ &= ~0x00000001;
|
bitField0_ &= ~0x00000002;
|
||||||
aeonId = 0;
|
aeonId = 0;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -74,61 +112,45 @@ public final class RogueAeonOuterClass {
|
|||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueAeon setAeonId(final int value) {
|
public RogueAeon setAeonId(final int value) {
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000002;
|
||||||
aeonId = value;
|
aeonId = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional bool is_unlock_aeon = 12;</code>
|
||||||
* uint32 aeon_id = 7;
|
* @return whether the isUnlockAeon field is set
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlock_enhance_buff = 12;</code>
|
|
||||||
* @return whether the isUnlockEnhanceBuff field is set
|
|
||||||
*/
|
*/
|
||||||
public boolean hasIsUnlockEnhanceBuff() {
|
public boolean hasIsUnlockAeon() {
|
||||||
return (bitField0_ & 0x00000002) != 0;
|
return (bitField0_ & 0x00000004) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional bool is_unlock_aeon = 12;</code>
|
||||||
* uint32 aeon_id = 7;
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlock_enhance_buff = 12;</code>
|
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueAeon clearIsUnlockEnhanceBuff() {
|
public RogueAeon clearIsUnlockAeon() {
|
||||||
bitField0_ &= ~0x00000002;
|
bitField0_ &= ~0x00000004;
|
||||||
isUnlockEnhanceBuff = false;
|
isUnlockAeon = false;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional bool is_unlock_aeon = 12;</code>
|
||||||
* uint32 aeon_id = 7;
|
* @return the isUnlockAeon
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlock_enhance_buff = 12;</code>
|
|
||||||
* @return the isUnlockEnhanceBuff
|
|
||||||
*/
|
*/
|
||||||
public boolean getIsUnlockEnhanceBuff() {
|
public boolean getIsUnlockAeon() {
|
||||||
return isUnlockEnhanceBuff;
|
return isUnlockAeon;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional bool is_unlock_aeon = 12;</code>
|
||||||
* uint32 aeon_id = 7;
|
* @param value the isUnlockAeon to set
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional bool is_unlock_enhance_buff = 12;</code>
|
|
||||||
* @param value the isUnlockEnhanceBuff to set
|
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueAeon setIsUnlockEnhanceBuff(final boolean value) {
|
public RogueAeon setIsUnlockAeon(final boolean value) {
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000004;
|
||||||
isUnlockEnhanceBuff = value;
|
isUnlockAeon = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,8 +159,9 @@ public final class RogueAeonOuterClass {
|
|||||||
cachedSize = other.cachedSize;
|
cachedSize = other.cachedSize;
|
||||||
if ((bitField0_ | other.bitField0_) != 0) {
|
if ((bitField0_ | other.bitField0_) != 0) {
|
||||||
bitField0_ = other.bitField0_;
|
bitField0_ = other.bitField0_;
|
||||||
|
aeonEnhanceBuffNum = other.aeonEnhanceBuffNum;
|
||||||
aeonId = other.aeonId;
|
aeonId = other.aeonId;
|
||||||
isUnlockEnhanceBuff = other.isUnlockEnhanceBuff;
|
isUnlockAeon = other.isUnlockAeon;
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -149,11 +172,14 @@ public final class RogueAeonOuterClass {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
|
if (other.hasAeonEnhanceBuffNum()) {
|
||||||
|
setAeonEnhanceBuffNum(other.aeonEnhanceBuffNum);
|
||||||
|
}
|
||||||
if (other.hasAeonId()) {
|
if (other.hasAeonId()) {
|
||||||
setAeonId(other.aeonId);
|
setAeonId(other.aeonId);
|
||||||
}
|
}
|
||||||
if (other.hasIsUnlockEnhanceBuff()) {
|
if (other.hasIsUnlockAeon()) {
|
||||||
setIsUnlockEnhanceBuff(other.isUnlockEnhanceBuff);
|
setIsUnlockAeon(other.isUnlockAeon);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -165,8 +191,9 @@ public final class RogueAeonOuterClass {
|
|||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
bitField0_ = 0;
|
bitField0_ = 0;
|
||||||
|
aeonEnhanceBuffNum = 0;
|
||||||
aeonId = 0;
|
aeonId = 0;
|
||||||
isUnlockEnhanceBuff = false;
|
isUnlockAeon = false;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,19 +217,24 @@ public final class RogueAeonOuterClass {
|
|||||||
}
|
}
|
||||||
RogueAeon other = (RogueAeon) o;
|
RogueAeon other = (RogueAeon) o;
|
||||||
return bitField0_ == other.bitField0_
|
return bitField0_ == other.bitField0_
|
||||||
|
&& (!hasAeonEnhanceBuffNum() || aeonEnhanceBuffNum == other.aeonEnhanceBuffNum)
|
||||||
&& (!hasAeonId() || aeonId == other.aeonId)
|
&& (!hasAeonId() || aeonId == other.aeonId)
|
||||||
&& (!hasIsUnlockEnhanceBuff() || isUnlockEnhanceBuff == other.isUnlockEnhanceBuff);
|
&& (!hasIsUnlockAeon() || isUnlockAeon == other.isUnlockAeon);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void writeTo(final ProtoSink output) throws IOException {
|
public void writeTo(final ProtoSink output) throws IOException {
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
|
output.writeRawByte((byte) 56);
|
||||||
|
output.writeUInt32NoTag(aeonEnhanceBuffNum);
|
||||||
|
}
|
||||||
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeRawByte((byte) 80);
|
output.writeRawByte((byte) 80);
|
||||||
output.writeUInt32NoTag(aeonId);
|
output.writeUInt32NoTag(aeonId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000004) != 0) {
|
||||||
output.writeRawByte((byte) 96);
|
output.writeRawByte((byte) 96);
|
||||||
output.writeBoolNoTag(isUnlockEnhanceBuff);
|
output.writeBoolNoTag(isUnlockAeon);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -210,9 +242,12 @@ public final class RogueAeonOuterClass {
|
|||||||
protected int computeSerializedSize() {
|
protected int computeSerializedSize() {
|
||||||
int size = 0;
|
int size = 0;
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonEnhanceBuffNum);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(aeonId);
|
||||||
|
}
|
||||||
|
if ((bitField0_ & 0x00000004) != 0) {
|
||||||
size += 2;
|
size += 2;
|
||||||
}
|
}
|
||||||
return size;
|
return size;
|
||||||
@@ -225,19 +260,28 @@ public final class RogueAeonOuterClass {
|
|||||||
int tag = input.readTag();
|
int tag = input.readTag();
|
||||||
while (true) {
|
while (true) {
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
|
case 56: {
|
||||||
|
// aeonEnhanceBuffNum
|
||||||
|
aeonEnhanceBuffNum = input.readUInt32();
|
||||||
|
bitField0_ |= 0x00000001;
|
||||||
|
tag = input.readTag();
|
||||||
|
if (tag != 80) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
case 80: {
|
case 80: {
|
||||||
// aeonId
|
// aeonId
|
||||||
aeonId = input.readUInt32();
|
aeonId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000002;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 96) {
|
if (tag != 96) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case 96: {
|
case 96: {
|
||||||
// isUnlockEnhanceBuff
|
// isUnlockAeon
|
||||||
isUnlockEnhanceBuff = input.readBool();
|
isUnlockAeon = input.readBool();
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000004;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 0) {
|
if (tag != 0) {
|
||||||
break;
|
break;
|
||||||
@@ -261,10 +305,13 @@ public final class RogueAeonOuterClass {
|
|||||||
public void writeTo(final JsonSink output) throws IOException {
|
public void writeTo(final JsonSink output) throws IOException {
|
||||||
output.beginObject();
|
output.beginObject();
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeUInt32(FieldNames.aeonId, aeonId);
|
output.writeUInt32(FieldNames.aeonEnhanceBuffNum, aeonEnhanceBuffNum);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
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();
|
output.endObject();
|
||||||
}
|
}
|
||||||
@@ -276,11 +323,11 @@ public final class RogueAeonOuterClass {
|
|||||||
}
|
}
|
||||||
while (!input.isAtEnd()) {
|
while (!input.isAtEnd()) {
|
||||||
switch (input.readFieldHash()) {
|
switch (input.readFieldHash()) {
|
||||||
case -1421249154:
|
case 1533321096:
|
||||||
case -1109029417: {
|
case 1717887943: {
|
||||||
if (input.isAtField(FieldNames.aeonId)) {
|
if (input.isAtField(FieldNames.aeonEnhanceBuffNum)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
aeonId = input.readUInt32();
|
aeonEnhanceBuffNum = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -288,11 +335,11 @@ public final class RogueAeonOuterClass {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case -1006386637:
|
case -1421249154:
|
||||||
case -118645302: {
|
case -1109029417: {
|
||||||
if (input.isAtField(FieldNames.isUnlockEnhanceBuff)) {
|
if (input.isAtField(FieldNames.aeonId)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
isUnlockEnhanceBuff = input.readBool();
|
aeonId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000002;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -300,6 +347,18 @@ public final class RogueAeonOuterClass {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case 1311289137:
|
||||||
|
case 1885168009: {
|
||||||
|
if (input.isAtField(FieldNames.isUnlockAeon)) {
|
||||||
|
if (!input.trySkipNullValue()) {
|
||||||
|
isUnlockAeon = input.readBool();
|
||||||
|
bitField0_ |= 0x00000004;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
input.skipUnknownField();
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
input.skipUnknownField();
|
input.skipUnknownField();
|
||||||
break;
|
break;
|
||||||
@@ -352,9 +411,11 @@ public final class RogueAeonOuterClass {
|
|||||||
* Contains name constants used for serializing JSON
|
* Contains name constants used for serializing JSON
|
||||||
*/
|
*/
|
||||||
static class FieldNames {
|
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 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");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,13 +19,9 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
private static final long serialVersionUID = 0L;
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 action_unique_id = 3;</code>
|
||||||
* idk
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
|
||||||
*/
|
*/
|
||||||
private int gLFDHAJPJDF;
|
private int actionUniqueId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional .RogueAction rogue_action = 7;</code>
|
* <code>optional .RogueAction rogue_action = 7;</code>
|
||||||
@@ -43,55 +39,39 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 action_unique_id = 3;</code>
|
||||||
* idk
|
* @return whether the actionUniqueId field is set
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
|
||||||
* @return whether the gLFDHAJPJDF field is set
|
|
||||||
*/
|
*/
|
||||||
public boolean hasGLFDHAJPJDF() {
|
public boolean hasActionUniqueId() {
|
||||||
return (bitField0_ & 0x00000001) != 0;
|
return (bitField0_ & 0x00000001) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 action_unique_id = 3;</code>
|
||||||
* idk
|
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueCommonPendingAction clearGLFDHAJPJDF() {
|
public RogueCommonPendingAction clearActionUniqueId() {
|
||||||
bitField0_ &= ~0x00000001;
|
bitField0_ &= ~0x00000001;
|
||||||
gLFDHAJPJDF = 0;
|
actionUniqueId = 0;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 action_unique_id = 3;</code>
|
||||||
* idk
|
* @return the actionUniqueId
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
|
||||||
* @return the gLFDHAJPJDF
|
|
||||||
*/
|
*/
|
||||||
public int getGLFDHAJPJDF() {
|
public int getActionUniqueId() {
|
||||||
return gLFDHAJPJDF;
|
return actionUniqueId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <code>optional uint32 action_unique_id = 3;</code>
|
||||||
* idk
|
* @param value the actionUniqueId to set
|
||||||
* </pre>
|
|
||||||
*
|
|
||||||
* <code>optional uint32 GLFDHAJPJDF = 3;</code>
|
|
||||||
* @param value the gLFDHAJPJDF to set
|
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueCommonPendingAction setGLFDHAJPJDF(final int value) {
|
public RogueCommonPendingAction setActionUniqueId(final int value) {
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
gLFDHAJPJDF = value;
|
actionUniqueId = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -157,7 +137,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
cachedSize = other.cachedSize;
|
cachedSize = other.cachedSize;
|
||||||
if ((bitField0_ | other.bitField0_) != 0) {
|
if ((bitField0_ | other.bitField0_) != 0) {
|
||||||
bitField0_ = other.bitField0_;
|
bitField0_ = other.bitField0_;
|
||||||
gLFDHAJPJDF = other.gLFDHAJPJDF;
|
actionUniqueId = other.actionUniqueId;
|
||||||
rogueAction.copyFrom(other.rogueAction);
|
rogueAction.copyFrom(other.rogueAction);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
@@ -169,8 +149,8 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
if (other.hasGLFDHAJPJDF()) {
|
if (other.hasActionUniqueId()) {
|
||||||
setGLFDHAJPJDF(other.gLFDHAJPJDF);
|
setActionUniqueId(other.actionUniqueId);
|
||||||
}
|
}
|
||||||
if (other.hasRogueAction()) {
|
if (other.hasRogueAction()) {
|
||||||
getMutableRogueAction().mergeFrom(other.rogueAction);
|
getMutableRogueAction().mergeFrom(other.rogueAction);
|
||||||
@@ -185,7 +165,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
bitField0_ = 0;
|
bitField0_ = 0;
|
||||||
gLFDHAJPJDF = 0;
|
actionUniqueId = 0;
|
||||||
rogueAction.clear();
|
rogueAction.clear();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -211,7 +191,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
}
|
}
|
||||||
RogueCommonPendingAction other = (RogueCommonPendingAction) o;
|
RogueCommonPendingAction other = (RogueCommonPendingAction) o;
|
||||||
return bitField0_ == other.bitField0_
|
return bitField0_ == other.bitField0_
|
||||||
&& (!hasGLFDHAJPJDF() || gLFDHAJPJDF == other.gLFDHAJPJDF)
|
&& (!hasActionUniqueId() || actionUniqueId == other.actionUniqueId)
|
||||||
&& (!hasRogueAction() || rogueAction.equals(other.rogueAction));
|
&& (!hasRogueAction() || rogueAction.equals(other.rogueAction));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +199,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
public void writeTo(final ProtoSink output) throws IOException {
|
public void writeTo(final ProtoSink output) throws IOException {
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeRawByte((byte) 24);
|
output.writeRawByte((byte) 24);
|
||||||
output.writeUInt32NoTag(gLFDHAJPJDF);
|
output.writeUInt32NoTag(actionUniqueId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeRawByte((byte) 58);
|
output.writeRawByte((byte) 58);
|
||||||
@@ -231,7 +211,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
protected int computeSerializedSize() {
|
protected int computeSerializedSize() {
|
||||||
int size = 0;
|
int size = 0;
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(gLFDHAJPJDF);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(actionUniqueId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAction);
|
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueAction);
|
||||||
@@ -247,8 +227,8 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
while (true) {
|
while (true) {
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case 24: {
|
case 24: {
|
||||||
// gLFDHAJPJDF
|
// actionUniqueId
|
||||||
gLFDHAJPJDF = input.readUInt32();
|
actionUniqueId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 58) {
|
if (tag != 58) {
|
||||||
@@ -282,7 +262,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
public void writeTo(final JsonSink output) throws IOException {
|
public void writeTo(final JsonSink output) throws IOException {
|
||||||
output.beginObject();
|
output.beginObject();
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeUInt32(FieldNames.gLFDHAJPJDF, gLFDHAJPJDF);
|
output.writeUInt32(FieldNames.actionUniqueId, actionUniqueId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeMessage(FieldNames.rogueAction, rogueAction);
|
output.writeMessage(FieldNames.rogueAction, rogueAction);
|
||||||
@@ -297,10 +277,11 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
}
|
}
|
||||||
while (!input.isAtEnd()) {
|
while (!input.isAtEnd()) {
|
||||||
switch (input.readFieldHash()) {
|
switch (input.readFieldHash()) {
|
||||||
case 1202020394: {
|
case -208785118:
|
||||||
if (input.isAtField(FieldNames.gLFDHAJPJDF)) {
|
case 1003664768: {
|
||||||
|
if (input.isAtField(FieldNames.actionUniqueId)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
gLFDHAJPJDF = input.readUInt32();
|
actionUniqueId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -373,7 +354,7 @@ public final class RogueCommonPendingActionOuterClass {
|
|||||||
* Contains name constants used for serializing JSON
|
* Contains name constants used for serializing JSON
|
||||||
*/
|
*/
|
||||||
static class FieldNames {
|
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");
|
static final FieldName rogueAction = FieldName.forField("rogueAction", "rogue_action");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,9 +26,9 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
private int npcId;
|
private int npcId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 GBMDBBBMBEJ = 6;</code>
|
* <code>optional uint32 event_unique_id = 6;</code>
|
||||||
*/
|
*/
|
||||||
private int gBMDBBBMBEJ;
|
private int eventUniqueId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 INJPFALMDHJ = 7;</code>
|
* <code>optional uint32 INJPFALMDHJ = 7;</code>
|
||||||
@@ -98,39 +98,39 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 GBMDBBBMBEJ = 6;</code>
|
* <code>optional uint32 event_unique_id = 6;</code>
|
||||||
* @return whether the gBMDBBBMBEJ field is set
|
* @return whether the eventUniqueId field is set
|
||||||
*/
|
*/
|
||||||
public boolean hasGBMDBBBMBEJ() {
|
public boolean hasEventUniqueId() {
|
||||||
return (bitField0_ & 0x00000002) != 0;
|
return (bitField0_ & 0x00000002) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 GBMDBBBMBEJ = 6;</code>
|
* <code>optional uint32 event_unique_id = 6;</code>
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueDialogueEvent clearGBMDBBBMBEJ() {
|
public RogueDialogueEvent clearEventUniqueId() {
|
||||||
bitField0_ &= ~0x00000002;
|
bitField0_ &= ~0x00000002;
|
||||||
gBMDBBBMBEJ = 0;
|
eventUniqueId = 0;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 GBMDBBBMBEJ = 6;</code>
|
* <code>optional uint32 event_unique_id = 6;</code>
|
||||||
* @return the gBMDBBBMBEJ
|
* @return the eventUniqueId
|
||||||
*/
|
*/
|
||||||
public int getGBMDBBBMBEJ() {
|
public int getEventUniqueId() {
|
||||||
return gBMDBBBMBEJ;
|
return eventUniqueId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 GBMDBBBMBEJ = 6;</code>
|
* <code>optional uint32 event_unique_id = 6;</code>
|
||||||
* @param value the gBMDBBBMBEJ to set
|
* @param value the eventUniqueId to set
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public RogueDialogueEvent setGBMDBBBMBEJ(final int value) {
|
public RogueDialogueEvent setEventUniqueId(final int value) {
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000002;
|
||||||
gBMDBBBMBEJ = value;
|
eventUniqueId = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -354,7 +354,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
if ((bitField0_ | other.bitField0_) != 0) {
|
if ((bitField0_ | other.bitField0_) != 0) {
|
||||||
bitField0_ = other.bitField0_;
|
bitField0_ = other.bitField0_;
|
||||||
npcId = other.npcId;
|
npcId = other.npcId;
|
||||||
gBMDBBBMBEJ = other.gBMDBBBMBEJ;
|
eventUniqueId = other.eventUniqueId;
|
||||||
iNJPFALMDHJ = other.iNJPFALMDHJ;
|
iNJPFALMDHJ = other.iNJPFALMDHJ;
|
||||||
gameModeType = other.gameModeType;
|
gameModeType = other.gameModeType;
|
||||||
selectEventId.copyFrom(other.selectEventId);
|
selectEventId.copyFrom(other.selectEventId);
|
||||||
@@ -372,8 +372,8 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
if (other.hasNpcId()) {
|
if (other.hasNpcId()) {
|
||||||
setNpcId(other.npcId);
|
setNpcId(other.npcId);
|
||||||
}
|
}
|
||||||
if (other.hasGBMDBBBMBEJ()) {
|
if (other.hasEventUniqueId()) {
|
||||||
setGBMDBBBMBEJ(other.gBMDBBBMBEJ);
|
setEventUniqueId(other.eventUniqueId);
|
||||||
}
|
}
|
||||||
if (other.hasINJPFALMDHJ()) {
|
if (other.hasINJPFALMDHJ()) {
|
||||||
setINJPFALMDHJ(other.iNJPFALMDHJ);
|
setINJPFALMDHJ(other.iNJPFALMDHJ);
|
||||||
@@ -398,7 +398,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
bitField0_ = 0;
|
bitField0_ = 0;
|
||||||
npcId = 0;
|
npcId = 0;
|
||||||
gBMDBBBMBEJ = 0;
|
eventUniqueId = 0;
|
||||||
iNJPFALMDHJ = 0;
|
iNJPFALMDHJ = 0;
|
||||||
gameModeType = 0;
|
gameModeType = 0;
|
||||||
selectEventId.clear();
|
selectEventId.clear();
|
||||||
@@ -429,7 +429,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
RogueDialogueEvent other = (RogueDialogueEvent) o;
|
RogueDialogueEvent other = (RogueDialogueEvent) o;
|
||||||
return bitField0_ == other.bitField0_
|
return bitField0_ == other.bitField0_
|
||||||
&& (!hasNpcId() || npcId == other.npcId)
|
&& (!hasNpcId() || npcId == other.npcId)
|
||||||
&& (!hasGBMDBBBMBEJ() || gBMDBBBMBEJ == other.gBMDBBBMBEJ)
|
&& (!hasEventUniqueId() || eventUniqueId == other.eventUniqueId)
|
||||||
&& (!hasINJPFALMDHJ() || iNJPFALMDHJ == other.iNJPFALMDHJ)
|
&& (!hasINJPFALMDHJ() || iNJPFALMDHJ == other.iNJPFALMDHJ)
|
||||||
&& (!hasGameModeType() || gameModeType == other.gameModeType)
|
&& (!hasGameModeType() || gameModeType == other.gameModeType)
|
||||||
&& (!hasSelectEventId() || selectEventId.equals(other.selectEventId))
|
&& (!hasSelectEventId() || selectEventId.equals(other.selectEventId))
|
||||||
@@ -444,7 +444,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeRawByte((byte) 48);
|
output.writeRawByte((byte) 48);
|
||||||
output.writeUInt32NoTag(gBMDBBBMBEJ);
|
output.writeUInt32NoTag(eventUniqueId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000004) != 0) {
|
if ((bitField0_ & 0x00000004) != 0) {
|
||||||
output.writeRawByte((byte) 56);
|
output.writeRawByte((byte) 56);
|
||||||
@@ -475,7 +475,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(npcId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(gBMDBBBMBEJ);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(eventUniqueId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000004) != 0) {
|
if ((bitField0_ & 0x00000004) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(iNJPFALMDHJ);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(iNJPFALMDHJ);
|
||||||
@@ -509,8 +509,8 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
case 48: {
|
case 48: {
|
||||||
// gBMDBBBMBEJ
|
// eventUniqueId
|
||||||
gBMDBBBMBEJ = input.readUInt32();
|
eventUniqueId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000002;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 56) {
|
if (tag != 56) {
|
||||||
@@ -579,7 +579,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
output.writeUInt32(FieldNames.npcId, npcId);
|
output.writeUInt32(FieldNames.npcId, npcId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeUInt32(FieldNames.gBMDBBBMBEJ, gBMDBBBMBEJ);
|
output.writeUInt32(FieldNames.eventUniqueId, eventUniqueId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000004) != 0) {
|
if ((bitField0_ & 0x00000004) != 0) {
|
||||||
output.writeUInt32(FieldNames.iNJPFALMDHJ, iNJPFALMDHJ);
|
output.writeUInt32(FieldNames.iNJPFALMDHJ, iNJPFALMDHJ);
|
||||||
@@ -615,10 +615,11 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case -1904002038: {
|
case 2091680134:
|
||||||
if (input.isAtField(FieldNames.gBMDBBBMBEJ)) {
|
case -157385500: {
|
||||||
|
if (input.isAtField(FieldNames.eventUniqueId)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
gBMDBBBMBEJ = input.readUInt32();
|
eventUniqueId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000002;
|
bitField0_ |= 0x00000002;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -728,7 +729,7 @@ public final class RogueDialogueEventOuterClass {
|
|||||||
static class FieldNames {
|
static class FieldNames {
|
||||||
static final FieldName npcId = FieldName.forField("npcId", "npc_id");
|
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");
|
static final FieldName iNJPFALMDHJ = FieldName.forField("INJPFALMDHJ");
|
||||||
|
|
||||||
|
|||||||
@@ -20,12 +20,12 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* PBCHNCIJKNA MDBPDPDDHBC = 12;
|
* 101 for common rogue
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 5;</code>
|
* <code>optional uint32 rogue_version_id = 5;</code>
|
||||||
*/
|
*/
|
||||||
private int oCPBNBPAMEN;
|
private int rogueVersionId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional .RogueActionResult action = 11;</code>
|
* <code>optional .RogueActionResult action = 11;</code>
|
||||||
@@ -44,54 +44,54 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* PBCHNCIJKNA MDBPDPDDHBC = 12;
|
* 101 for common rogue
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 5;</code>
|
* <code>optional uint32 rogue_version_id = 5;</code>
|
||||||
* @return whether the oCPBNBPAMEN field is set
|
* @return whether the rogueVersionId field is set
|
||||||
*/
|
*/
|
||||||
public boolean hasOCPBNBPAMEN() {
|
public boolean hasRogueVersionId() {
|
||||||
return (bitField0_ & 0x00000001) != 0;
|
return (bitField0_ & 0x00000001) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* PBCHNCIJKNA MDBPDPDDHBC = 12;
|
* 101 for common rogue
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 5;</code>
|
* <code>optional uint32 rogue_version_id = 5;</code>
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public SyncRogueCommonActionResultScNotify clearOCPBNBPAMEN() {
|
public SyncRogueCommonActionResultScNotify clearRogueVersionId() {
|
||||||
bitField0_ &= ~0x00000001;
|
bitField0_ &= ~0x00000001;
|
||||||
oCPBNBPAMEN = 0;
|
rogueVersionId = 0;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* PBCHNCIJKNA MDBPDPDDHBC = 12;
|
* 101 for common rogue
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 5;</code>
|
* <code>optional uint32 rogue_version_id = 5;</code>
|
||||||
* @return the oCPBNBPAMEN
|
* @return the rogueVersionId
|
||||||
*/
|
*/
|
||||||
public int getOCPBNBPAMEN() {
|
public int getRogueVersionId() {
|
||||||
return oCPBNBPAMEN;
|
return rogueVersionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <pre>
|
* <pre>
|
||||||
* PBCHNCIJKNA MDBPDPDDHBC = 12;
|
* 101 for common rogue
|
||||||
* </pre>
|
* </pre>
|
||||||
*
|
*
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 5;</code>
|
* <code>optional uint32 rogue_version_id = 5;</code>
|
||||||
* @param value the oCPBNBPAMEN to set
|
* @param value the rogueVersionId to set
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public SyncRogueCommonActionResultScNotify setOCPBNBPAMEN(final int value) {
|
public SyncRogueCommonActionResultScNotify setRogueVersionId(final int value) {
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
oCPBNBPAMEN = value;
|
rogueVersionId = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,7 +159,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
cachedSize = other.cachedSize;
|
cachedSize = other.cachedSize;
|
||||||
if ((bitField0_ | other.bitField0_) != 0) {
|
if ((bitField0_ | other.bitField0_) != 0) {
|
||||||
bitField0_ = other.bitField0_;
|
bitField0_ = other.bitField0_;
|
||||||
oCPBNBPAMEN = other.oCPBNBPAMEN;
|
rogueVersionId = other.rogueVersionId;
|
||||||
action.copyFrom(other.action);
|
action.copyFrom(other.action);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
@@ -172,8 +172,8 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
if (other.hasOCPBNBPAMEN()) {
|
if (other.hasRogueVersionId()) {
|
||||||
setOCPBNBPAMEN(other.oCPBNBPAMEN);
|
setRogueVersionId(other.rogueVersionId);
|
||||||
}
|
}
|
||||||
if (other.hasAction()) {
|
if (other.hasAction()) {
|
||||||
getMutableAction().mergeFrom(other.action);
|
getMutableAction().mergeFrom(other.action);
|
||||||
@@ -188,7 +188,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
bitField0_ = 0;
|
bitField0_ = 0;
|
||||||
oCPBNBPAMEN = 0;
|
rogueVersionId = 0;
|
||||||
action.clear();
|
action.clear();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -214,7 +214,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
SyncRogueCommonActionResultScNotify other = (SyncRogueCommonActionResultScNotify) o;
|
SyncRogueCommonActionResultScNotify other = (SyncRogueCommonActionResultScNotify) o;
|
||||||
return bitField0_ == other.bitField0_
|
return bitField0_ == other.bitField0_
|
||||||
&& (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN)
|
&& (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId)
|
||||||
&& (!hasAction() || action.equals(other.action));
|
&& (!hasAction() || action.equals(other.action));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,7 +222,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
public void writeTo(final ProtoSink output) throws IOException {
|
public void writeTo(final ProtoSink output) throws IOException {
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeRawByte((byte) 40);
|
output.writeRawByte((byte) 40);
|
||||||
output.writeUInt32NoTag(oCPBNBPAMEN);
|
output.writeUInt32NoTag(rogueVersionId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeRawByte((byte) 90);
|
output.writeRawByte((byte) 90);
|
||||||
@@ -234,7 +234,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
protected int computeSerializedSize() {
|
protected int computeSerializedSize() {
|
||||||
int size = 0;
|
int size = 0;
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
size += 1 + ProtoSink.computeMessageSizeNoTag(action);
|
size += 1 + ProtoSink.computeMessageSizeNoTag(action);
|
||||||
@@ -251,8 +251,8 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
while (true) {
|
while (true) {
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case 40: {
|
case 40: {
|
||||||
// oCPBNBPAMEN
|
// rogueVersionId
|
||||||
oCPBNBPAMEN = input.readUInt32();
|
rogueVersionId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 90) {
|
if (tag != 90) {
|
||||||
@@ -286,7 +286,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
public void writeTo(final JsonSink output) throws IOException {
|
public void writeTo(final JsonSink output) throws IOException {
|
||||||
output.beginObject();
|
output.beginObject();
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN);
|
output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeMessage(FieldNames.action, action);
|
output.writeMessage(FieldNames.action, action);
|
||||||
@@ -302,10 +302,11 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
while (!input.isAtEnd()) {
|
while (!input.isAtEnd()) {
|
||||||
switch (input.readFieldHash()) {
|
switch (input.readFieldHash()) {
|
||||||
case -1836582037: {
|
case -1457526951:
|
||||||
if (input.isAtField(FieldNames.oCPBNBPAMEN)) {
|
case 1832096103: {
|
||||||
|
if (input.isAtField(FieldNames.rogueVersionId)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
oCPBNBPAMEN = input.readUInt32();
|
rogueVersionId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -379,7 +380,7 @@ public final class SyncRogueCommonActionResultScNotifyOuterClass {
|
|||||||
* Contains name constants used for serializing JSON
|
* Contains name constants used for serializing JSON
|
||||||
*/
|
*/
|
||||||
static class FieldNames {
|
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");
|
static final FieldName action = FieldName.forField("action");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,9 +19,13 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
private static final long serialVersionUID = 0L;
|
private static final long serialVersionUID = 0L;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 9;</code>
|
* <pre>
|
||||||
|
* 101 for common rogue
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
* <code>optional uint32 rogue_version_id = 9;</code>
|
||||||
*/
|
*/
|
||||||
private int oCPBNBPAMEN;
|
private int rogueVersionId;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional .RogueCommonPendingAction rogue_common_pending_action = 4;</code>
|
* <code>optional .RogueCommonPendingAction rogue_common_pending_action = 4;</code>
|
||||||
@@ -39,39 +43,55 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 9;</code>
|
* <pre>
|
||||||
* @return whether the oCPBNBPAMEN field is set
|
* 101 for common rogue
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
* <code>optional uint32 rogue_version_id = 9;</code>
|
||||||
|
* @return whether the rogueVersionId field is set
|
||||||
*/
|
*/
|
||||||
public boolean hasOCPBNBPAMEN() {
|
public boolean hasRogueVersionId() {
|
||||||
return (bitField0_ & 0x00000001) != 0;
|
return (bitField0_ & 0x00000001) != 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 9;</code>
|
* <pre>
|
||||||
|
* 101 for common rogue
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
* <code>optional uint32 rogue_version_id = 9;</code>
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public SyncRogueCommonPendingActionScNotify clearOCPBNBPAMEN() {
|
public SyncRogueCommonPendingActionScNotify clearRogueVersionId() {
|
||||||
bitField0_ &= ~0x00000001;
|
bitField0_ &= ~0x00000001;
|
||||||
oCPBNBPAMEN = 0;
|
rogueVersionId = 0;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 9;</code>
|
* <pre>
|
||||||
* @return the oCPBNBPAMEN
|
* 101 for common rogue
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
* <code>optional uint32 rogue_version_id = 9;</code>
|
||||||
|
* @return the rogueVersionId
|
||||||
*/
|
*/
|
||||||
public int getOCPBNBPAMEN() {
|
public int getRogueVersionId() {
|
||||||
return oCPBNBPAMEN;
|
return rogueVersionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <code>optional uint32 OCPBNBPAMEN = 9;</code>
|
* <pre>
|
||||||
* @param value the oCPBNBPAMEN to set
|
* 101 for common rogue
|
||||||
|
* </pre>
|
||||||
|
*
|
||||||
|
* <code>optional uint32 rogue_version_id = 9;</code>
|
||||||
|
* @param value the rogueVersionId to set
|
||||||
* @return this
|
* @return this
|
||||||
*/
|
*/
|
||||||
public SyncRogueCommonPendingActionScNotify setOCPBNBPAMEN(final int value) {
|
public SyncRogueCommonPendingActionScNotify setRogueVersionId(final int value) {
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
oCPBNBPAMEN = value;
|
rogueVersionId = value;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -141,7 +161,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
cachedSize = other.cachedSize;
|
cachedSize = other.cachedSize;
|
||||||
if ((bitField0_ | other.bitField0_) != 0) {
|
if ((bitField0_ | other.bitField0_) != 0) {
|
||||||
bitField0_ = other.bitField0_;
|
bitField0_ = other.bitField0_;
|
||||||
oCPBNBPAMEN = other.oCPBNBPAMEN;
|
rogueVersionId = other.rogueVersionId;
|
||||||
rogueCommonPendingAction.copyFrom(other.rogueCommonPendingAction);
|
rogueCommonPendingAction.copyFrom(other.rogueCommonPendingAction);
|
||||||
}
|
}
|
||||||
return this;
|
return this;
|
||||||
@@ -154,8 +174,8 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
if (other.hasOCPBNBPAMEN()) {
|
if (other.hasRogueVersionId()) {
|
||||||
setOCPBNBPAMEN(other.oCPBNBPAMEN);
|
setRogueVersionId(other.rogueVersionId);
|
||||||
}
|
}
|
||||||
if (other.hasRogueCommonPendingAction()) {
|
if (other.hasRogueCommonPendingAction()) {
|
||||||
getMutableRogueCommonPendingAction().mergeFrom(other.rogueCommonPendingAction);
|
getMutableRogueCommonPendingAction().mergeFrom(other.rogueCommonPendingAction);
|
||||||
@@ -170,7 +190,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
cachedSize = -1;
|
cachedSize = -1;
|
||||||
bitField0_ = 0;
|
bitField0_ = 0;
|
||||||
oCPBNBPAMEN = 0;
|
rogueVersionId = 0;
|
||||||
rogueCommonPendingAction.clear();
|
rogueCommonPendingAction.clear();
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
@@ -196,7 +216,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
SyncRogueCommonPendingActionScNotify other = (SyncRogueCommonPendingActionScNotify) o;
|
SyncRogueCommonPendingActionScNotify other = (SyncRogueCommonPendingActionScNotify) o;
|
||||||
return bitField0_ == other.bitField0_
|
return bitField0_ == other.bitField0_
|
||||||
&& (!hasOCPBNBPAMEN() || oCPBNBPAMEN == other.oCPBNBPAMEN)
|
&& (!hasRogueVersionId() || rogueVersionId == other.rogueVersionId)
|
||||||
&& (!hasRogueCommonPendingAction() || rogueCommonPendingAction.equals(other.rogueCommonPendingAction));
|
&& (!hasRogueCommonPendingAction() || rogueCommonPendingAction.equals(other.rogueCommonPendingAction));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -204,7 +224,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
public void writeTo(final ProtoSink output) throws IOException {
|
public void writeTo(final ProtoSink output) throws IOException {
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeRawByte((byte) 72);
|
output.writeRawByte((byte) 72);
|
||||||
output.writeUInt32NoTag(oCPBNBPAMEN);
|
output.writeUInt32NoTag(rogueVersionId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeRawByte((byte) 34);
|
output.writeRawByte((byte) 34);
|
||||||
@@ -216,7 +236,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
protected int computeSerializedSize() {
|
protected int computeSerializedSize() {
|
||||||
int size = 0;
|
int size = 0;
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
size += 1 + ProtoSink.computeUInt32SizeNoTag(oCPBNBPAMEN);
|
size += 1 + ProtoSink.computeUInt32SizeNoTag(rogueVersionId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueCommonPendingAction);
|
size += 1 + ProtoSink.computeMessageSizeNoTag(rogueCommonPendingAction);
|
||||||
@@ -233,8 +253,8 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
while (true) {
|
while (true) {
|
||||||
switch (tag) {
|
switch (tag) {
|
||||||
case 72: {
|
case 72: {
|
||||||
// oCPBNBPAMEN
|
// rogueVersionId
|
||||||
oCPBNBPAMEN = input.readUInt32();
|
rogueVersionId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
tag = input.readTag();
|
tag = input.readTag();
|
||||||
if (tag != 34) {
|
if (tag != 34) {
|
||||||
@@ -268,7 +288,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
public void writeTo(final JsonSink output) throws IOException {
|
public void writeTo(final JsonSink output) throws IOException {
|
||||||
output.beginObject();
|
output.beginObject();
|
||||||
if ((bitField0_ & 0x00000001) != 0) {
|
if ((bitField0_ & 0x00000001) != 0) {
|
||||||
output.writeUInt32(FieldNames.oCPBNBPAMEN, oCPBNBPAMEN);
|
output.writeUInt32(FieldNames.rogueVersionId, rogueVersionId);
|
||||||
}
|
}
|
||||||
if ((bitField0_ & 0x00000002) != 0) {
|
if ((bitField0_ & 0x00000002) != 0) {
|
||||||
output.writeMessage(FieldNames.rogueCommonPendingAction, rogueCommonPendingAction);
|
output.writeMessage(FieldNames.rogueCommonPendingAction, rogueCommonPendingAction);
|
||||||
@@ -284,10 +304,11 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
}
|
}
|
||||||
while (!input.isAtEnd()) {
|
while (!input.isAtEnd()) {
|
||||||
switch (input.readFieldHash()) {
|
switch (input.readFieldHash()) {
|
||||||
case -1836582037: {
|
case -1457526951:
|
||||||
if (input.isAtField(FieldNames.oCPBNBPAMEN)) {
|
case 1832096103: {
|
||||||
|
if (input.isAtField(FieldNames.rogueVersionId)) {
|
||||||
if (!input.trySkipNullValue()) {
|
if (!input.trySkipNullValue()) {
|
||||||
oCPBNBPAMEN = input.readUInt32();
|
rogueVersionId = input.readUInt32();
|
||||||
bitField0_ |= 0x00000001;
|
bitField0_ |= 0x00000001;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -362,7 +383,7 @@ public final class SyncRogueCommonPendingActionScNotifyOuterClass {
|
|||||||
* Contains name constants used for serializing JSON
|
* Contains name constants used for serializing JSON
|
||||||
*/
|
*/
|
||||||
static class FieldNames {
|
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");
|
static final FieldName rogueCommonPendingAction = FieldName.forField("rogueCommonPendingAction", "rogue_common_pending_action");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -142,11 +142,10 @@ public class RogueEntityLoader extends SceneEntityLoader {
|
|||||||
} while (instance.setDialogueParams(npcId) == null);
|
} while (instance.setDialogueParams(npcId) == null);
|
||||||
|
|
||||||
instance.getEventManager().setNowPercentage(0);
|
instance.getEventManager().setNowPercentage(0);
|
||||||
instance.getEventManager().setBuffType(0);
|
|
||||||
npc.setRogueNpcId(npcId);
|
npc.setRogueNpcId(npcId);
|
||||||
npc.setEventId(++instance.eventId);
|
npc.setEventId(++instance.eventUniqueId);
|
||||||
scene.getPlayer().sendPacket(new PacketSyncRogueDialogueEventDataScNotify(npcId, instance.curDialogueParams.get(npcId),
|
scene.getPlayer().sendPacket(new PacketSyncRogueDialogueEventDataScNotify(npcId, instance.curDialogueParams.get(npcId),
|
||||||
instance.eventId));
|
instance.eventUniqueId));
|
||||||
}
|
}
|
||||||
|
|
||||||
return npc;
|
return npc;
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ public class RogueEventManager {
|
|||||||
private RogueInstance rogueInstance;
|
private RogueInstance rogueInstance;
|
||||||
private Player player;
|
private Player player;
|
||||||
@Setter private int nowPercentage = 0;
|
@Setter private int nowPercentage = 0;
|
||||||
@Setter private int buffType = 0;
|
|
||||||
|
|
||||||
public RogueEventManager(RogueInstance rogueInstance) {
|
public RogueEventManager(RogueInstance rogueInstance) {
|
||||||
this.rogueInstance = rogueInstance;
|
this.rogueInstance = rogueInstance;
|
||||||
@@ -93,28 +92,27 @@ public class RogueEventManager {
|
|||||||
var increasePercent = param.get(2);
|
var increasePercent = param.get(2);
|
||||||
if (this.nowPercentage != 0)
|
if (this.nowPercentage != 0)
|
||||||
this.nowPercentage = initialPercent;
|
this.nowPercentage = initialPercent;
|
||||||
else
|
|
||||||
this.nowPercentage += increasePercent;
|
|
||||||
var weightList = new WeightedList<Integer>();
|
var weightList = new WeightedList<Integer>();
|
||||||
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));
|
weightList.add(param.get(i + 1), param.get(i));
|
||||||
}
|
}
|
||||||
int randomNum = Utils.randomRange(0, 100);
|
int randomNum = Utils.randomRange(0, 100);
|
||||||
if (randomNum <= this.nowPercentage) {
|
if (randomNum <= this.nowPercentage) {
|
||||||
handleCost(eventId);
|
handleCost(eventId);
|
||||||
this.handleEvent(failEventId, npcId);
|
//this.handleEvent(failEventId, npcId);
|
||||||
this.getRogueInstance().getCurDialogueParams().get(npcId).add(RogueDialogueEventParam.newInstance()
|
this.getRogueInstance().getCurDialogueParams().get(npcId).add(RogueDialogueEventParam.newInstance()
|
||||||
.setDialogueEventId(failEventId)
|
.setDialogueEventId(failEventId)
|
||||||
.setIsValid(true));
|
.setIsValid(true));
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
|
this.nowPercentage += increasePercent;
|
||||||
handleCost(eventId);
|
handleCost(eventId);
|
||||||
int nextEventId = weightList.next();
|
int nextEventId = weightList.next();
|
||||||
this.handleEvent(nextEventId, npcId);
|
this.handleEvent(nextEventId, npcId);
|
||||||
this.getRogueInstance().getCurDialogueParams().get(npcId).add(RogueDialogueEventParam.newInstance()
|
this.getRogueInstance().getCurDialogueParams().get(npcId).add(RogueDialogueEventParam.newInstance()
|
||||||
.setDialogueEventId(nextEventId)
|
.setDialogueEventId(nextEventId)
|
||||||
.setIsValid(true)
|
.setIsValid(true)
|
||||||
.setRatio(this.nowPercentage / 100f));
|
.setRatio(this.nowPercentage)); // not working
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -68,8 +68,8 @@ public class RogueInstance {
|
|||||||
private int aeonBuffType;
|
private int aeonBuffType;
|
||||||
private int maxAeonBuffs;
|
private int maxAeonBuffs;
|
||||||
private int money; // universal debris
|
private int money; // universal debris
|
||||||
public int id = 2; // idk what this is for, but it's needed for the packet
|
public int actionUniqueId = 0;
|
||||||
public int eventId = 690;
|
public int eventUniqueId = 690;
|
||||||
public Int2ObjectMap<List<RogueDialogueEventParam>> curDialogueParams = new Int2ObjectOpenHashMap<>();
|
public Int2ObjectMap<List<RogueDialogueEventParam>> curDialogueParams = new Int2ObjectOpenHashMap<>();
|
||||||
private final Set<RogueBuffData> normalBuff = GameData.getRogueBuffGroupExcelMap().get(100005).getRogueBuffList();
|
private final Set<RogueBuffData> normalBuff = GameData.getRogueBuffGroupExcelMap().get(100005).getRogueBuffList();
|
||||||
private final Set<RogueBuffData> uncommonBuff = GameData.getRogueBuffGroupExcelMap().get(100003).getRogueBuffList();
|
private final Set<RogueBuffData> uncommonBuff = GameData.getRogueBuffGroupExcelMap().get(100003).getRogueBuffList();
|
||||||
@@ -224,8 +224,8 @@ public class RogueInstance {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (this.getBuffSelect() != null) {
|
if (this.getBuffSelect() != null) {
|
||||||
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.id);
|
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.actionUniqueId);
|
||||||
this.id += 2;
|
this.actionUniqueId += 2;
|
||||||
this.pendingAction = proto.toProto();
|
this.pendingAction = proto.toProto();
|
||||||
this.getPlayer().sendPacket(proto);
|
this.getPlayer().sendPacket(proto);
|
||||||
}
|
}
|
||||||
@@ -240,14 +240,14 @@ public class RogueInstance {
|
|||||||
if (getBuffSelect() != null && getBuffSelect().hasRerolls() && money >= 30) {
|
if (getBuffSelect() != null && getBuffSelect().hasRerolls() && money >= 30) {
|
||||||
this.getBuffSelect().reroll();
|
this.getBuffSelect().reroll();
|
||||||
this.setMoney(money - 30);
|
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);
|
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.buffSelect.toProto(), this.actionUniqueId);
|
||||||
this.id += 2;
|
this.actionUniqueId += 2;
|
||||||
pendingAction = proto.toProto();
|
pendingAction = proto.toProto();
|
||||||
return this.getBuffSelect();
|
return this.getBuffSelect();
|
||||||
} else {
|
} else {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
@@ -256,7 +256,7 @@ public class RogueInstance {
|
|||||||
public synchronized RogueBuffData selectBuff(int buffId) {
|
public synchronized RogueBuffData selectBuff(int buffId) {
|
||||||
// Sanity
|
// Sanity
|
||||||
if (this.getBuffSelect() == null) {
|
if (this.getBuffSelect() == null) {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -268,7 +268,7 @@ public class RogueInstance {
|
|||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
||||||
if (buff == null) {
|
if (buff == null) {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -283,7 +283,7 @@ public class RogueInstance {
|
|||||||
|
|
||||||
var data = HandleRogueCommonPendingActionScRsp.newInstance();
|
var data = HandleRogueCommonPendingActionScRsp.newInstance();
|
||||||
data.getMutableRogueBuffSelect();
|
data.getMutableRogueBuffSelect();
|
||||||
data.setTimes(this.id - 2);
|
data.setTimes(this.actionUniqueId - 2);
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
|
||||||
return buff;
|
return buff;
|
||||||
}
|
}
|
||||||
@@ -329,8 +329,8 @@ public class RogueInstance {
|
|||||||
if (this.pendingMiracleSelects > 0 && this.getMiracleSelect() == null) {
|
if (this.pendingMiracleSelects > 0 && this.getMiracleSelect() == null) {
|
||||||
this.miracleSelect = new RogueMiracleSelectMenu(this);
|
this.miracleSelect = new RogueMiracleSelectMenu(this);
|
||||||
this.pendingMiracleSelects--;
|
this.pendingMiracleSelects--;
|
||||||
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.miracleSelect.toProto(), this.id);
|
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.miracleSelect.toProto(), this.actionUniqueId);
|
||||||
this.id += 2;
|
this.actionUniqueId += 2;
|
||||||
this.pendingAction = proto.toProto();
|
this.pendingAction = proto.toProto();
|
||||||
this.getPlayer().sendPacket(proto);
|
this.getPlayer().sendPacket(proto);
|
||||||
return this.miracleSelect;
|
return this.miracleSelect;
|
||||||
@@ -341,7 +341,7 @@ public class RogueInstance {
|
|||||||
|
|
||||||
public synchronized RogueMiracleData selectMiracle(int miracleId) {
|
public synchronized RogueMiracleData selectMiracle(int miracleId) {
|
||||||
if (this.getMiracleSelect() == null) {
|
if (this.getMiracleSelect() == null) {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -352,7 +352,7 @@ public class RogueInstance {
|
|||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
||||||
if (miracle == null) {
|
if (miracle == null) {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -365,7 +365,7 @@ public class RogueInstance {
|
|||||||
|
|
||||||
var data = HandleRogueCommonPendingActionScRsp.newInstance();
|
var data = HandleRogueCommonPendingActionScRsp.newInstance();
|
||||||
data.getMutableMiracleSelect();
|
data.getMutableMiracleSelect();
|
||||||
data.setTimes(this.id - 2);
|
data.setTimes(this.actionUniqueId - 2);
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
|
||||||
return miracle;
|
return miracle;
|
||||||
}
|
}
|
||||||
@@ -380,8 +380,8 @@ public class RogueInstance {
|
|||||||
if (this.pendingBonusSelects > 0 && this.getBonusSelect() == null) {
|
if (this.pendingBonusSelects > 0 && this.getBonusSelect() == null) {
|
||||||
this.bonusSelect = new RogueBonusSelectMenu(this);
|
this.bonusSelect = new RogueBonusSelectMenu(this);
|
||||||
this.pendingBonusSelects--;
|
this.pendingBonusSelects--;
|
||||||
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.bonusSelect.toProto(), this.id);
|
var proto = new PacketSyncRogueCommonPendingActionScNotify(this.bonusSelect.toProto(), this.actionUniqueId);
|
||||||
this.id += 2;
|
this.actionUniqueId += 2;
|
||||||
this.pendingAction = proto.toProto();
|
this.pendingAction = proto.toProto();
|
||||||
this.getPlayer().sendPacket(proto);
|
this.getPlayer().sendPacket(proto);
|
||||||
return this.bonusSelect;
|
return this.bonusSelect;
|
||||||
@@ -392,7 +392,7 @@ public class RogueInstance {
|
|||||||
|
|
||||||
public synchronized RogueBonusData selectBonus(int bonusId) {
|
public synchronized RogueBonusData selectBonus(int bonusId) {
|
||||||
if (this.getBonusSelect() == null) {
|
if (this.getBonusSelect() == null) {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -403,7 +403,7 @@ public class RogueInstance {
|
|||||||
.orElse(null);
|
.orElse(null);
|
||||||
|
|
||||||
if (bonus == null) {
|
if (bonus == null) {
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.id - 2));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(this.actionUniqueId - 2));
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -413,7 +413,7 @@ public class RogueInstance {
|
|||||||
// TODO: add event
|
// TODO: add event
|
||||||
var data = HandleRogueCommonPendingActionScRsp.newInstance();
|
var data = HandleRogueCommonPendingActionScRsp.newInstance();
|
||||||
data.getMutableBonusSelect();
|
data.getMutableBonusSelect();
|
||||||
data.setTimes(this.id - 2);
|
data.setTimes(this.actionUniqueId - 2);
|
||||||
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
|
this.getPlayer().sendPacket(new PacketHandleRogueCommonPendingActionScRsp(data));
|
||||||
try {
|
try {
|
||||||
this.onSelectDialogue(bonus.getEventId(), 0);
|
this.onSelectDialogue(bonus.getEventId(), 0);
|
||||||
@@ -489,7 +489,6 @@ public class RogueInstance {
|
|||||||
|
|
||||||
if (argMap.containsKey(v) && argMap.get(v).equals("RelateToBuff")) {
|
if (argMap.containsKey(v) && argMap.get(v).equals("RelateToBuff")) {
|
||||||
param.setArgId(this.getAeonId());
|
param.setArgId(this.getAeonId());
|
||||||
this.getEventManager().setBuffType(this.getAeonBuffType());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
params.add(param);
|
params.add(param);
|
||||||
@@ -691,7 +690,9 @@ public class RogueInstance {
|
|||||||
|
|
||||||
public RogueAeon toAeonProto() {
|
public RogueAeon toAeonProto() {
|
||||||
var proto = RogueAeon.newInstance()
|
var proto = RogueAeon.newInstance()
|
||||||
.setAeonId(this.getAeonId());
|
.setAeonId(this.getAeonId())
|
||||||
|
.setAeonEnhanceBuffNum(3)
|
||||||
|
.setIsUnlockAeon(true);
|
||||||
|
|
||||||
return proto;
|
return proto;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -200,7 +200,7 @@ public class RogueManager extends BasePlayerManager {
|
|||||||
aeonInfo.addAeonIdList(aeonExcel.getAeonID());
|
aeonInfo.addAeonIdList(aeonExcel.getAeonID());
|
||||||
}
|
}
|
||||||
aeonInfo.setIsUnlocked(true);
|
aeonInfo.setIsUnlocked(true);
|
||||||
aeonInfo.setJPEBPGIEGPO(3); // guess
|
aeonInfo.setUnlockAeonEnhanceNum(3); // guess
|
||||||
}
|
}
|
||||||
|
|
||||||
var data = RogueInfoData.newInstance()
|
var data = RogueInfoData.newInstance()
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ public class PacketSelectRogueDialogueEventScRsp extends BasePacket {
|
|||||||
.setNpcId(npc.getRogueNpcId())
|
.setNpcId(npc.getRogueNpcId())
|
||||||
.setGameModeType(5)
|
.setGameModeType(5)
|
||||||
.addSelectEventId(dialogueEventId)
|
.addSelectEventId(dialogueEventId)
|
||||||
.setGBMDBBBMBEJ(instance.getEventId())
|
.setEventUniqueId(instance.getEventUniqueId())
|
||||||
.addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new));
|
.addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new));
|
||||||
|
|
||||||
var l = DialogueResult.newInstance();
|
var l = DialogueResult.newInstance();
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ public class PacketSyncRogueCommonActionResultScNotify extends BasePacket {
|
|||||||
super(CmdId.SyncRogueCommonActionResultScNotify);
|
super(CmdId.SyncRogueCommonActionResultScNotify);
|
||||||
|
|
||||||
var proto = SyncRogueCommonActionResultScNotify.newInstance()
|
var proto = SyncRogueCommonActionResultScNotify.newInstance()
|
||||||
.setOCPBNBPAMEN(101);
|
.setRogueVersionId(101);
|
||||||
|
|
||||||
proto.setAction(action);
|
proto.setAction(action);
|
||||||
|
|
||||||
|
|||||||
@@ -16,14 +16,14 @@ public class PacketSyncRogueCommonPendingActionScNotify extends BasePacket {
|
|||||||
var proto = SyncRogueCommonPendingActionScNotify.newInstance();
|
var proto = SyncRogueCommonPendingActionScNotify.newInstance();
|
||||||
|
|
||||||
proto.setRogueCommonPendingAction(action)
|
proto.setRogueCommonPendingAction(action)
|
||||||
.setOCPBNBPAMEN(101); // common rogue
|
.setRogueVersionId(101); // common rogue
|
||||||
|
|
||||||
this.setData(proto);
|
this.setData(proto);
|
||||||
}
|
}
|
||||||
|
|
||||||
public PacketSyncRogueCommonPendingActionScNotify(RogueAction action, int id) {
|
public PacketSyncRogueCommonPendingActionScNotify(RogueAction action, int id) {
|
||||||
this(RogueCommonPendingAction.newInstance()
|
this(RogueCommonPendingAction.newInstance()
|
||||||
.setGLFDHAJPJDF(id)
|
.setActionUniqueId(id)
|
||||||
.setRogueAction(action));
|
.setRogueAction(action));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ public class PacketSyncRogueDialogueEventDataScNotify extends BasePacket {
|
|||||||
this(RogueDialogueEvent.newInstance()
|
this(RogueDialogueEvent.newInstance()
|
||||||
.setGameModeType(5) // rogue explore
|
.setGameModeType(5) // rogue explore
|
||||||
.setNpcId(rogueNpcId)
|
.setNpcId(rogueNpcId)
|
||||||
.setGBMDBBBMBEJ(eventId)
|
.setEventUniqueId(eventId)
|
||||||
.addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new)));
|
.addAllRogueDialogueEventParam(params.toArray(RogueDialogueEventParam[]::new)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user