Add support for game version 3.6 (#2110)

* Update to game version `3.6.0` (pt. 1)

not complete!

* Update to game version `3.6.0` (pt. 2)

not complete!

* Update compiled definitions

src/generated/main/java/emu/grasscutter/net/proto/TakeCityReputationParentQuestRspOuterClass.java

@@ -19,62 +19,62 @@ public final class TakeCityReputationParentQuestRspOuterClass {
       com.google.protobuf.MessageOrBuilder {
 
     /**
-     * <code>repeated uint32 parent_quest_list = 4;</code>
+     * <code>repeated uint32 parent_quest_list = 14;</code>
      * @return A list containing the parentQuestList.
      */
     java.util.List<java.lang.Integer> getParentQuestListList();
     /**
-     * <code>repeated uint32 parent_quest_list = 4;</code>
+     * <code>repeated uint32 parent_quest_list = 14;</code>
      * @return The count of parentQuestList.
      */
     int getParentQuestListCount();
     /**
-     * <code>repeated uint32 parent_quest_list = 4;</code>
+     * <code>repeated uint32 parent_quest_list = 14;</code>
      * @param index The index of the element to return.
      * @return The parentQuestList at the given index.
      */
     int getParentQuestList(int index);
 
     /**
-     * <code>uint32 city_id = 9;</code>
-     * @return The cityId.
-     */
-    int getCityId();
-
-    /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     int getRetcode();
 
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> 
         getItemListList();
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index);
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     int getItemListCount();
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
         getItemListOrBuilderList();
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
         int index);
+
+    /**
+     * <code>uint32 city_id = 11;</code>
+     * @return The cityId.
+     */
+    int getCityId();
   }
   /**
    * <pre>
-   * Name: FOOGLNHHBCK
-   * CmdId: 2872
+   * CmdId: 2841
+   * Name: LEIJECOECHD
    * </pre>
    *
    * Protobuf type {@code TakeCityReputationParentQuestRsp}
@@ -124,7 +124,26 @@ public final class TakeCityReputationParentQuestRspOuterClass {
             case 0:
               done = true;
               break;
-            case 32: {
+            case 58: {
+              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
+                itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
+                mutable_bitField0_ |= 0x00000002;
+              }
+              itemList_.add(
+                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
+              break;
+            }
+            case 88: {
+
+              cityId_ = input.readUInt32();
+              break;
+            }
+            case 96: {
+
+              retcode_ = input.readInt32();
+              break;
+            }
+            case 112: {
               if (!((mutable_bitField0_ & 0x00000001) != 0)) {
                 parentQuestList_ = newIntList();
                 mutable_bitField0_ |= 0x00000001;
@@ -132,7 +151,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
               parentQuestList_.addInt(input.readUInt32());
               break;
             }
-            case 34: {
+            case 114: {
               int length = input.readRawVarint32();
               int limit = input.pushLimit(length);
               if (!((mutable_bitField0_ & 0x00000001) != 0) && input.getBytesUntilLimit() > 0) {
@@ -145,25 +164,6 @@ public final class TakeCityReputationParentQuestRspOuterClass {
               input.popLimit(limit);
               break;
             }
-            case 40: {
-
-              retcode_ = input.readInt32();
-              break;
-            }
-            case 72: {
-
-              cityId_ = input.readUInt32();
-              break;
-            }
-            case 106: {
-              if (!((mutable_bitField0_ & 0x00000002) != 0)) {
-                itemList_ = new java.util.ArrayList<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam>();
-                mutable_bitField0_ |= 0x00000002;
-              }
-              itemList_.add(
-                  input.readMessage(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.parser(), extensionRegistry));
-              break;
-            }
             default: {
               if (!parseUnknownField(
                   input, unknownFields, extensionRegistry, tag)) {
@@ -179,12 +179,12 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         throw new com.google.protobuf.InvalidProtocolBufferException(
             e).setUnfinishedMessage(this);
       } finally {
-        if (((mutable_bitField0_ & 0x00000001) != 0)) {
-          parentQuestList_.makeImmutable(); // C
-        }
         if (((mutable_bitField0_ & 0x00000002) != 0)) {
           itemList_ = java.util.Collections.unmodifiableList(itemList_);
         }
+        if (((mutable_bitField0_ & 0x00000001) != 0)) {
+          parentQuestList_.makeImmutable(); // C
+        }
         this.unknownFields = unknownFields.build();
         makeExtensionsImmutable();
       }
@@ -202,10 +202,10 @@ public final class TakeCityReputationParentQuestRspOuterClass {
               emu.grasscutter.net.proto.TakeCityReputationParentQuestRspOuterClass.TakeCityReputationParentQuestRsp.class, emu.grasscutter.net.proto.TakeCityReputationParentQuestRspOuterClass.TakeCityReputationParentQuestRsp.Builder.class);
     }
 
-    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 4;
+    public static final int PARENT_QUEST_LIST_FIELD_NUMBER = 14;
     private com.google.protobuf.Internal.IntList parentQuestList_;
     /**
-     * <code>repeated uint32 parent_quest_list = 4;</code>
+     * <code>repeated uint32 parent_quest_list = 14;</code>
      * @return A list containing the parentQuestList.
      */
     @java.lang.Override
@@ -214,14 +214,14 @@ public final class TakeCityReputationParentQuestRspOuterClass {
       return parentQuestList_;
     }
     /**
-     * <code>repeated uint32 parent_quest_list = 4;</code>
+     * <code>repeated uint32 parent_quest_list = 14;</code>
      * @return The count of parentQuestList.
      */
     public int getParentQuestListCount() {
       return parentQuestList_.size();
     }
     /**
-     * <code>repeated uint32 parent_quest_list = 4;</code>
+     * <code>repeated uint32 parent_quest_list = 14;</code>
      * @param index The index of the element to return.
      * @return The parentQuestList at the given index.
      */
@@ -230,21 +230,10 @@ public final class TakeCityReputationParentQuestRspOuterClass {
     }
     private int parentQuestListMemoizedSerializedSize = -1;
 
-    public static final int CITY_ID_FIELD_NUMBER = 9;
-    private int cityId_;
-    /**
-     * <code>uint32 city_id = 9;</code>
-     * @return The cityId.
-     */
-    @java.lang.Override
-    public int getCityId() {
-      return cityId_;
-    }
-
-    public static final int RETCODE_FIELD_NUMBER = 5;
+    public static final int RETCODE_FIELD_NUMBER = 12;
     private int retcode_;
     /**
-     * <code>int32 retcode = 5;</code>
+     * <code>int32 retcode = 12;</code>
      * @return The retcode.
      */
     @java.lang.Override
@@ -252,17 +241,17 @@ public final class TakeCityReputationParentQuestRspOuterClass {
       return retcode_;
     }
 
-    public static final int ITEM_LIST_FIELD_NUMBER = 13;
+    public static final int ITEM_LIST_FIELD_NUMBER = 7;
     private java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> itemList_;
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
       return itemList_;
     }
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     @java.lang.Override
     public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
@@ -270,21 +259,21 @@ public final class TakeCityReputationParentQuestRspOuterClass {
       return itemList_;
     }
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     @java.lang.Override
     public int getItemListCount() {
       return itemList_.size();
     }
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
       return itemList_.get(index);
     }
     /**
-     * <code>repeated .ItemParam item_list = 13;</code>
+     * <code>repeated .ItemParam item_list = 7;</code>
      */
     @java.lang.Override
     public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
@@ -292,6 +281,17 @@ public final class TakeCityReputationParentQuestRspOuterClass {
       return itemList_.get(index);
     }
 
+    public static final int CITY_ID_FIELD_NUMBER = 11;
+    private int cityId_;
+    /**
+     * <code>uint32 city_id = 11;</code>
+     * @return The cityId.
+     */
+    @java.lang.Override
+    public int getCityId() {
+      return cityId_;
+    }
+
     private byte memoizedIsInitialized = -1;
     @java.lang.Override
     public final boolean isInitialized() {
@@ -307,22 +307,22 @@ public final class TakeCityReputationParentQuestRspOuterClass {
     public void writeTo(com.google.protobuf.CodedOutputStream output)
                         throws java.io.IOException {
       getSerializedSize();
+      for (int i = 0; i < itemList_.size(); i++) {
+        output.writeMessage(7, itemList_.get(i));
+      }
+      if (cityId_ != 0) {
+        output.writeUInt32(11, cityId_);
+      }
+      if (retcode_ != 0) {
+        output.writeInt32(12, retcode_);
+      }
       if (getParentQuestListList().size() > 0) {
-        output.writeUInt32NoTag(34);
+        output.writeUInt32NoTag(114);
         output.writeUInt32NoTag(parentQuestListMemoizedSerializedSize);
       }
       for (int i = 0; i < parentQuestList_.size(); i++) {
         output.writeUInt32NoTag(parentQuestList_.getInt(i));
       }
-      if (retcode_ != 0) {
-        output.writeInt32(5, retcode_);
-      }
-      if (cityId_ != 0) {
-        output.writeUInt32(9, cityId_);
-      }
-      for (int i = 0; i < itemList_.size(); i++) {
-        output.writeMessage(13, itemList_.get(i));
-      }
       unknownFields.writeTo(output);
     }
 
@@ -332,6 +332,18 @@ public final class TakeCityReputationParentQuestRspOuterClass {
       if (size != -1) return size;
 
       size = 0;
+      for (int i = 0; i < itemList_.size(); i++) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeMessageSize(7, itemList_.get(i));
+      }
+      if (cityId_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeUInt32Size(11, cityId_);
+      }
+      if (retcode_ != 0) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeInt32Size(12, retcode_);
+      }
       {
         int dataSize = 0;
         for (int i = 0; i < parentQuestList_.size(); i++) {
@@ -346,18 +358,6 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
         parentQuestListMemoizedSerializedSize = dataSize;
       }
-      if (retcode_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeInt32Size(5, retcode_);
-      }
-      if (cityId_ != 0) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(9, cityId_);
-      }
-      for (int i = 0; i < itemList_.size(); i++) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeMessageSize(13, itemList_.get(i));
-      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -375,12 +375,12 @@ public final class TakeCityReputationParentQuestRspOuterClass {
 
       if (!getParentQuestListList()
           .equals(other.getParentQuestListList())) return false;
-      if (getCityId()
-          != other.getCityId()) return false;
       if (getRetcode()
           != other.getRetcode()) return false;
       if (!getItemListList()
           .equals(other.getItemListList())) return false;
+      if (getCityId()
+          != other.getCityId()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -396,14 +396,14 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         hash = (37 * hash) + PARENT_QUEST_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getParentQuestListList().hashCode();
       }
-      hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
-      hash = (53 * hash) + getCityId();
       hash = (37 * hash) + RETCODE_FIELD_NUMBER;
       hash = (53 * hash) + getRetcode();
       if (getItemListCount() > 0) {
         hash = (37 * hash) + ITEM_LIST_FIELD_NUMBER;
         hash = (53 * hash) + getItemListList().hashCode();
       }
+      hash = (37 * hash) + CITY_ID_FIELD_NUMBER;
+      hash = (53 * hash) + getCityId();
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -501,8 +501,8 @@ public final class TakeCityReputationParentQuestRspOuterClass {
     }
     /**
      * <pre>
-     * Name: FOOGLNHHBCK
-     * CmdId: 2872
+     * CmdId: 2841
+     * Name: LEIJECOECHD
      * </pre>
      *
      * Protobuf type {@code TakeCityReputationParentQuestRsp}
@@ -545,8 +545,6 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         super.clear();
         parentQuestList_ = emptyIntList();
         bitField0_ = (bitField0_ & ~0x00000001);
-        cityId_ = 0;
-
         retcode_ = 0;
 
         if (itemListBuilder_ == null) {
@@ -555,6 +553,8 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         } else {
           itemListBuilder_.clear();
         }
+        cityId_ = 0;
+
         return this;
       }
 
@@ -587,7 +587,6 @@ public final class TakeCityReputationParentQuestRspOuterClass {
           bitField0_ = (bitField0_ & ~0x00000001);
         }
         result.parentQuestList_ = parentQuestList_;
-        result.cityId_ = cityId_;
         result.retcode_ = retcode_;
         if (itemListBuilder_ == null) {
           if (((bitField0_ & 0x00000002) != 0)) {
@@ -598,6 +597,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         } else {
           result.itemList_ = itemListBuilder_.build();
         }
+        result.cityId_ = cityId_;
         onBuilt();
         return result;
       }
@@ -656,9 +656,6 @@ public final class TakeCityReputationParentQuestRspOuterClass {
           }
           onChanged();
         }
-        if (other.getCityId() != 0) {
-          setCityId(other.getCityId());
-        }
         if (other.getRetcode() != 0) {
           setRetcode(other.getRetcode());
         }
@@ -688,6 +685,9 @@ public final class TakeCityReputationParentQuestRspOuterClass {
             }
           }
         }
+        if (other.getCityId() != 0) {
+          setCityId(other.getCityId());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -726,7 +726,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
          }
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @return A list containing the parentQuestList.
        */
       public java.util.List<java.lang.Integer>
@@ -735,14 +735,14 @@ public final class TakeCityReputationParentQuestRspOuterClass {
                  java.util.Collections.unmodifiableList(parentQuestList_) : parentQuestList_;
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @return The count of parentQuestList.
        */
       public int getParentQuestListCount() {
         return parentQuestList_.size();
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @param index The index of the element to return.
        * @return The parentQuestList at the given index.
        */
@@ -750,7 +750,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return parentQuestList_.getInt(index);
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @param index The index to set the value at.
        * @param value The parentQuestList to set.
        * @return This builder for chaining.
@@ -763,7 +763,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @param value The parentQuestList to add.
        * @return This builder for chaining.
        */
@@ -774,7 +774,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @param values The parentQuestList to add.
        * @return This builder for chaining.
        */
@@ -787,7 +787,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated uint32 parent_quest_list = 4;</code>
+       * <code>repeated uint32 parent_quest_list = 14;</code>
        * @return This builder for chaining.
        */
       public Builder clearParentQuestList() {
@@ -797,40 +797,9 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
 
-      private int cityId_ ;
-      /**
-       * <code>uint32 city_id = 9;</code>
-       * @return The cityId.
-       */
-      @java.lang.Override
-      public int getCityId() {
-        return cityId_;
-      }
-      /**
-       * <code>uint32 city_id = 9;</code>
-       * @param value The cityId to set.
-       * @return This builder for chaining.
-       */
-      public Builder setCityId(int value) {
-        
-        cityId_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>uint32 city_id = 9;</code>
-       * @return This builder for chaining.
-       */
-      public Builder clearCityId() {
-        
-        cityId_ = 0;
-        onChanged();
-        return this;
-      }
-
       private int retcode_ ;
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 12;</code>
        * @return The retcode.
        */
       @java.lang.Override
@@ -838,7 +807,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return retcode_;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 12;</code>
        * @param value The retcode to set.
        * @return This builder for chaining.
        */
@@ -849,7 +818,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>int32 retcode = 5;</code>
+       * <code>int32 retcode = 12;</code>
        * @return This builder for chaining.
        */
       public Builder clearRetcode() {
@@ -872,7 +841,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> itemListBuilder_;
 
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> getItemListList() {
         if (itemListBuilder_ == null) {
@@ -882,7 +851,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public int getItemListCount() {
         if (itemListBuilder_ == null) {
@@ -892,7 +861,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam getItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -902,7 +871,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -919,7 +888,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder setItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -933,7 +902,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder addItemList(emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
         if (itemListBuilder_ == null) {
@@ -949,7 +918,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam value) {
@@ -966,7 +935,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder addItemList(
           emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -980,7 +949,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder addItemList(
           int index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder builderForValue) {
@@ -994,7 +963,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder addAllItemList(
           java.lang.Iterable<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam> values) {
@@ -1009,7 +978,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder clearItemList() {
         if (itemListBuilder_ == null) {
@@ -1022,7 +991,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public Builder removeItemList(int index) {
         if (itemListBuilder_ == null) {
@@ -1035,14 +1004,14 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         return this;
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder getItemListBuilder(
           int index) {
         return getItemListFieldBuilder().getBuilder(index);
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder getItemListOrBuilder(
           int index) {
@@ -1052,7 +1021,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public java.util.List<? extends emu.grasscutter.net.proto.ItemParamOuterClass.ItemParamOrBuilder> 
            getItemListOrBuilderList() {
@@ -1063,14 +1032,14 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder() {
         return getItemListFieldBuilder().addBuilder(
             emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder addItemListBuilder(
           int index) {
@@ -1078,7 +1047,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
             index, emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.getDefaultInstance());
       }
       /**
-       * <code>repeated .ItemParam item_list = 13;</code>
+       * <code>repeated .ItemParam item_list = 7;</code>
        */
       public java.util.List<emu.grasscutter.net.proto.ItemParamOuterClass.ItemParam.Builder> 
            getItemListBuilderList() {
@@ -1098,6 +1067,37 @@ public final class TakeCityReputationParentQuestRspOuterClass {
         }
         return itemListBuilder_;
       }
+
+      private int cityId_ ;
+      /**
+       * <code>uint32 city_id = 11;</code>
+       * @return The cityId.
+       */
+      @java.lang.Override
+      public int getCityId() {
+        return cityId_;
+      }
+      /**
+       * <code>uint32 city_id = 11;</code>
+       * @param value The cityId to set.
+       * @return This builder for chaining.
+       */
+      public Builder setCityId(int value) {
+        
+        cityId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>uint32 city_id = 11;</code>
+       * @return This builder for chaining.
+       */
+      public Builder clearCityId() {
+        
+        cityId_ = 0;
+        onChanged();
+        return this;
+      }
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -1167,9 +1167,9 @@ public final class TakeCityReputationParentQuestRspOuterClass {
     java.lang.String[] descriptorData = {
       "\n&TakeCityReputationParentQuestRsp.proto" +
       "\032\017ItemParam.proto\"~\n TakeCityReputationP" +
-      "arentQuestRsp\022\031\n\021parent_quest_list\030\004 \003(\r" +
-      "\022\017\n\007city_id\030\t \001(\r\022\017\n\007retcode\030\005 \001(\005\022\035\n\tit" +
-      "em_list\030\r \003(\0132\n.ItemParamB\033\n\031emu.grasscu" +
+      "arentQuestRsp\022\031\n\021parent_quest_list\030\016 \003(\r" +
+      "\022\017\n\007retcode\030\014 \001(\005\022\035\n\titem_list\030\007 \003(\0132\n.I" +
+      "temParam\022\017\n\007city_id\030\013 \001(\rB\033\n\031emu.grasscu" +
       "tter.net.protob\006proto3"
     };
     descriptor = com.google.protobuf.Descriptors.FileDescriptor
@@ -1182,7 +1182,7 @@ public final class TakeCityReputationParentQuestRspOuterClass {
     internal_static_TakeCityReputationParentQuestRsp_fieldAccessorTable = new
       com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
         internal_static_TakeCityReputationParentQuestRsp_descriptor,
-        new java.lang.String[] { "ParentQuestList", "CityId", "Retcode", "ItemList", });
+        new java.lang.String[] { "ParentQuestList", "Retcode", "ItemList", "CityId", });
     emu.grasscutter.net.proto.ItemParamOuterClass.getDescriptor();
   }