Merge remote-tracking branch 'upstream/master'

Supamiu · Jan 16, 2024 · 46b2590 · 46b2590
2 parents cf53984 + f12695b
commit 46b2590
Show file tree

Hide file tree

Showing 7 changed files with 225 additions and 225 deletions.
diff --git a/FFXIVConstants/CN.cs b/FFXIVConstants/CN.cs
@@ -5,11 +5,11 @@ namespace FFXIVConstants
 {
     public static class CN
     {
-        public const string Version = "6.40";
+        public const string Version = "6.45a";
 
         public static Dictionary<string, object> Constants = new Dictionary<string, object>
         {
-            { "InventoryOperationBaseValue", 0x03ab },
+            { "InventoryOperationBaseValue", 0x03e5 },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_cn.cs b/FFXIVOpcodes/Ipcs_cn.cs
@@ -14,91 +14,91 @@ public enum ClientLobbyIpcType : ushort
 
     public enum ServerZoneIpcType : ushort
     {
-        ActorCast = 0x0358,
-        ActorControl = 0x007A,
-        ActorControlSelf = 0x0139,
-        ActorControlTarget = 0x0103,
-        ActorGauge = 0x01AA,
-        ActorMove = 0x011A,
-        ActorSetPos = 0x0099,
-        AirshipExplorationResult = 0x023E,
-        AirshipStatus = 0x0240,
-        AirshipStatusList = 0x0389,
-        AirshipTimers = 0x03A5,
-        AoeEffect16 = 0x03C1,
-        AoeEffect24 = 0x0138,
-        AoeEffect32 = 0x014C,
-        AoeEffect8 = 0x00F4,
-        BossStatusEffectList = 0x0124,
-        CEDirector = 0x034F,
-        CFNotify = 0x00EC,
-        CFPreferredRole = 0x03BF,
-        ContainerInfo = 0x00DF,
-        CurrencyCrystalInfo = 0x0182,
-        DesynthResult = 0x03D6,
-        Effect = 0x0385,
-        EffectResult = 0x01FB,
-        EnvironmentControl = 0x011E,
-        EventFinish = 0x0183,
-        EventPlay = 0x00A0,
-        EventPlay4 = 0x00B4,
-        EventStart = 0x0327,
-        Examine = 0x00F6,
-        ExamineSearchInfo = 0x02CC,
-        FateInfo = 0x020E,
-        FreeCompanyDialog = 0x0113,
-        FreeCompanyInfo = 0x017D,
-        HousingWardInfo = 0x0080,
-        InitZone = 0x024D,
-        InventoryActionAck = 0x00E9,
-        InventoryTransaction = 0x0111,
-        InventoryTransactionFinish = 0x0271,
-        IslandWorkshopSupplyDemand = 0x033C,
-        ItemInfo = 0x0214,
-        ItemMarketBoardInfo = 0x017B,
-        Logout = 0x012B,
-        MarketBoardItemListing = 0x0188,
-        MarketBoardItemListingCount = 0x02BA,
-        MarketBoardItemListingHistory = 0x02E4,
-        MarketBoardPurchase = 0x03A7,
-        MarketBoardSearchResult = 0x0174,
-        MiniCactpotInit = 0x0377,
-        NpcSpawn = 0x00D8,
-        NpcSpawn2 = 0x03C7,
-        ObjectSpawn = 0x0161,
-        PlaceFieldMarker = 0x02AE,
-        PlaceFieldMarkerPreset = 0x00FB,
-        PlayerSetup = 0x028D,
-        PlayerSpawn = 0x00C0,
-        PlayerStats = 0x006C,
-        Playtime = 0x02D0,
-        PrepareZoning = 0x0311,
-        ResultDialog = 0x010F,
-        RetainerInformation = 0x02A6,
-        RSV = 0x016C,
-        StatusEffectList = 0x0223,
-        StatusEffectList2 = 0x0289,
-        StatusEffectList3 = 0x02C4,
-        SubmarineExplorationResult = 0x0179,
-        SubmarineProgressionStatus = 0x0242,
-        SubmarineStatusList = 0x0395,
-        SubmarineTimers = 0x0274,
-        SystemLogMessage = 0x010D,
-        UpdateClassInfo = 0x006A,
-        UpdateHpMpTp = 0x0227,
-        UpdateInventorySlot = 0x0216,
-        UpdateSearchInfo = 0x00CF,
+        ActorCast = 0x017F,
+        ActorControl = 0x02C3,
+        ActorControlSelf = 0x0302,
+        ActorControlTarget = 0x03E2,
+        ActorGauge = 0x032E,
+        ActorMove = 0x0103,
+        ActorSetPos = 0x029F,
+        AirshipExplorationResult = 0x0294,
+        AirshipStatus = 0x0251,
+        AirshipStatusList = 0x03D4,
+        AirshipTimers = 0x0269,
+        AoeEffect16 = 0x02B1,
+        AoeEffect24 = 0x00B4,
+        AoeEffect32 = 0x0208,
+        AoeEffect8 = 0x032B,
+        BossStatusEffectList = 0x016B,
+        CEDirector = 0x0362,
+        CFNotify = 0x01A5,
+        CFPreferredRole = 0x0181,
+        ContainerInfo = 0x0277,
+        CurrencyCrystalInfo = 0x01D5,
+        DesynthResult = 0x02AD,
+        Effect = 0x00FF,
+        EffectResult = 0x0174,
+        EnvironmentControl = 0x0378,
+        EventFinish = 0x0326,
+        EventPlay = 0x00DC,
+        EventPlay4 = 0x02ED,
+        EventStart = 0x0183,
+        Examine = 0x0192,
+        ExamineSearchInfo = 0x013F,
+        FateInfo = 0x00AF,
+        FreeCompanyDialog = 0x03E4,
+        FreeCompanyInfo = 0x03C5,
+        HousingWardInfo = 0x028D,
+        InitZone = 0x018D,
+        InventoryActionAck = 0x01BE,
+        InventoryTransaction = 0x03CA,
+        InventoryTransactionFinish = 0x00C5,
+        IslandWorkshopSupplyDemand = 0x02A9,
+        ItemInfo = 0x01DD,
+        ItemMarketBoardInfo = 0x0091,
+        Logout = 0x01CC,
+        MarketBoardItemListing = 0x0337,
+        MarketBoardItemListingCount = 0x02D9,
+        MarketBoardItemListingHistory = 0x01BD,
+        MarketBoardPurchase = 0x016A,
+        MarketBoardSearchResult = 0x0140,
+        MiniCactpotInit = 0x00C2,
+        NpcSpawn = 0x0393,
+        NpcSpawn2 = 0x01C1,
+        ObjectSpawn = 0x02FD,
+        PlaceFieldMarker = 0x0138,
+        PlaceFieldMarkerPreset = 0x02C2,
+        PlayerSetup = 0x0283,
+        PlayerSpawn = 0x039B,
+        PlayerStats = 0x00F2,
+        Playtime = 0x0164,
+        PrepareZoning = 0x0084,
+        ResultDialog = 0x03A9,
+        RetainerInformation = 0x02E3,
+        RSV = 0x0246,
+        StatusEffectList = 0x03E0,
+        StatusEffectList2 = 0x0390,
+        StatusEffectList3 = 0x02B2,
+        SubmarineExplorationResult = 0x02FE,
+        SubmarineProgressionStatus = 0x01E5,
+        SubmarineStatusList = 0x02D5,
+        SubmarineTimers = 0x038E,
+        SystemLogMessage = 0x0200,
+        UpdateClassInfo = 0x01EC,
+        UpdateHpMpTp = 0x03D5,
+        UpdateInventorySlot = 0x011D,
+        UpdateSearchInfo = 0x01F9,
     };
 
     public enum ClientZoneIpcType : ushort
     {
-        ChatHandler = 0x0325,
-        ClientTrigger = 0x039D,
-        InventoryModifyHandler = 0x03A4,
-        MarketBoardPurchaseHandler = 0x02D8,
-        SetSearchInfoHandler = 0x0078,
-        UpdatePositionHandler = 0x03D2,
-        UpdatePositionInstance = 0x0112,
+        ChatHandler = 0x00D0,
+        ClientTrigger = 0x020F,
+        InventoryModifyHandler = 0x03DE,
+        MarketBoardPurchaseHandler = 0x0352,
+        SetSearchInfoHandler = 0x01C8,
+        UpdatePositionHandler = 0x0245,
+        UpdatePositionInstance = 0x02C1,
     };
 
     public enum ServerChatIpcType : ushort

diff --git a/FFXIVOpcodes/Ipcs_kr.cs b/FFXIVOpcodes/Ipcs_kr.cs
@@ -135,7 +135,7 @@ enum ServerZoneIpcType : ushort
         InventoryActionAck = 0x02F7, // 6.401
         InventoryTransaction = 0x0216, // 6.401
         InventoryTransactionFinish = 0x0116, // 6.401
-        IslandWorkshopSupplyDemand = 0x01D2, // 6.401
+        IslandWorkshopSupplyDemand = 0x01DC, // 6.401
         ItemInfo = 0x010C, // 6.401
         ItemMarketBoardInfo = 0x0336, // 6.401
         LandAvailability = 0x038E, // 6.401

diff --git a/constants.json b/constants.json
@@ -3,7 +3,7 @@
     "InventoryOperationBaseValue": 265
   },
   "CN": {
-    "InventoryOperationBaseValue": 939
+    "InventoryOperationBaseValue": 997
   },
   "KR": {
     "InventoryOperationBaseValue": 800

diff --git a/constants.min.json b/constants.min.json
@@ -1 +1 @@
-{"Global":{"InventoryOperationBaseValue":265},"CN":{"InventoryOperationBaseValue":939},"KR":{"InventoryOperationBaseValue":800}}
+{"Global":{"InventoryOperationBaseValue":265},"CN":{"InventoryOperationBaseValue":997},"KR":{"InventoryOperationBaseValue":800}}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Global":{"InventoryOperationBaseValue":265},"CN":{"InventoryOperationBaseValue":939},"KR":{"InventoryOperationBaseValue":800}}
		{"Global":{"InventoryOperationBaseValue":265},"CN":{"InventoryOperationBaseValue":997},"KR":{"InventoryOperationBaseValue":800}}