Merge remote-tracking branch 'upstream/master'

Supamiu · Nov 12, 2024 · 5831a45 · 5831a45
2 parents bee4173 + 60fd76d
commit 5831a45
Show file tree

Hide file tree

Showing 9 changed files with 861 additions and 866 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.57";
+        public const string Version = "7.01";
 
         public static Dictionary<string, object> Constants = new Dictionary<string, object>
         {
-            { "InventoryOperationBaseValue", 0x0073 },
+            { "InventoryOperationBaseValue", 0x0208 },
         };
     }
 }
diff --git a/FFXIVConstants/KR.cs b/FFXIVConstants/KR.cs
@@ -6,7 +6,7 @@ static class KR
     {
         public static Dictionary<string, object> Constants = new Dictionary<string, object>
         {
-            { "InventoryOperationBaseValue", 0x007E },
+            { "InventoryOperationBaseValue", 0x02C2+7 },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_cn.cs b/FFXIVOpcodes/Ipcs_cn.cs
@@ -14,97 +14,96 @@ public enum ClientLobbyIpcType : ushort
 
     public enum ServerZoneIpcType : ushort
     {
-        ActorCast = 0x02C5,
-        ActorControl = 0x019B,
-        ActorControlSelf = 0x033F,
-        ActorControlTarget = 0x01EF,
-        ActorGauge = 0x0207,
-        ActorMove = 0x03E5,
-        ActorSetPos = 0x006D,
-        AirshipExplorationResult = 0x0208,
-        AirshipStatus = 0x0342,
-        AirshipStatusList = 0x01F6,
-        AirshipTimers = 0x0398,
-        AoeEffect16 = 0x01AB,
-        AoeEffect24 = 0x0338,
-        AoeEffect32 = 0x00F1,
-        AoeEffect8 = 0x0255,
-        BattleTalk2 = 0x02F9,
-        BossStatusEffectList = 0x0299,
-        CEDirector = 0x00AF,
-        CFNotify = 0x02C7,
-        CFPreferredRole = 0x02F1,
-        ContainerInfo = 0x00AD,
-        Countdown = 0x01CF,
-        CountdownCancel = 0x010A,
-        CurrencyCrystalInfo = 0x036C,
-        DesynthResult = 0x01df,
-        Effect = 0x011A,
-        EffectResult = 0x0298,
-        EnvironmentControl = 0x00E7,
-        EventFinish = 0x01D2,
-        EventPlay = 0x0230,
-        EventPlay32 = 0x031c,
-        EventPlay4 = 0x02fb,
-        EventStart = 0x01C8,
-        Examine = 0x0233,
-        ExamineSearchInfo = 0x0227,
-        FateInfo = 0x01B9,
-        FreeCompanyDialog = 0x02DF,
-        FreeCompanyInfo = 0x013F,
-        HousingWardInfo = 0x0389,
-        InitZone = 0x00E1,
-        InventoryActionAck = 0x0080,
-        InventoryTransaction = 0x02B9,
-        InventoryTransactionFinish = 0x01F7,
-        IslandWorkshopSupplyDemand = 0x014E,
-        ItemInfo = 0x037f,
-        ItemMarketBoardInfo = 0x02E3,
-        Logout = 0x03D6,
-        MarketBoardItemListing = 0x0079,
-        MarketBoardItemListingCount = 0x032E,
-        MarketBoardItemListingHistory = 0x012C,
-        MarketBoardPurchase = 0x0104,
-        MarketBoardSearchResult = 0x023D,
-        MiniCactpotInit = 0x01b0,
-        NpcSpawn = 0x0261,
-        NpcSpawn2 = 0x0326,
-        NpcYell = 0x00F0,
-        ObjectSpawn = 0x0253,
-        PlaceFieldMarker = 0x01C9,
-        PlaceFieldMarkerPreset = 0x0270,
-        PlayerSetup = 0x01F3,
-        PlayerSpawn = 0x0301,
-        PlayerStats = 0x0303,
-        Playtime = 0x0193,
-        PrepareZoning = 0x0346,
-        ResultDialog = 0x033d,
-        RetainerInformation = 0x039F,
-        RSV = 0x02C4,
-        StatusEffectList = 0x0248,
-        StatusEffectList2 = 0x017E,
-        StatusEffectList3 = 0x03E3,
-        SubmarineExplorationResult = 0x00AC,
-        SubmarineProgressionStatus = 0x0197,
-        SubmarineStatusList = 0x01BE,
-        SubmarineTimers = 0x0377,
-        SystemLogMessage = 0x03B5,
-        UpdateClassInfo = 0x00C6,
-        UpdateHpMpTp = 0x0137,
-        UpdateInventorySlot = 0x0187,
-        UpdateSearchInfo = 0x02DA,
-        WeatherChange = 0x0344,
+        ActorCast = 0x0247,
+        ActorControl = 0x0311,
+        ActorControlSelf = 0x01A9,
+        ActorControlTarget = 0x030E,
+        ActorGauge = 0x024C,
+        ActorMove = 0x02BB,
+        ActorSetPos = 0x0232,
+        AirshipExplorationResult = 0x0156,
+        AirshipStatus = 0x00BD,
+        AirshipStatusList = 0x033A,
+        AirshipTimers = 0x018B,
+        AoeEffect16 = 0x02BE,
+        AoeEffect24 = 0x00C5,
+        AoeEffect32 = 0x0372,
+        AoeEffect8 = 0x0301,
+        BossStatusEffectList = 0x0103,
+        CEDirector = 0x02C9,
+        CFNotify = 0x00BF,
+        CFPreferredRole = 0x023C,
+        ContainerInfo = 0x00D4,
+        Countdown = 0x0146,
+        CountdownCancel = 0x00B2,
+        CurrencyCrystalInfo = 0x01db,
+        DesynthResult = 0x035e,
+        Effect = 0x029E,
+        EffectResult = 0x0179,
+        EnvironmentControl = 0x0191,
+        EventFinish = 0x02D0,
+        EventPlay = 0x039a,
+        EventPlay32 = 0x03cf,
+        EventPlay4 = 0x01a2,
+        EventStart = 0x01E5,
+        Examine = 0x02DD,
+        ExamineSearchInfo = 0x0184,
+        FateInfo = 0x00A3,
+        FreeCompanyDialog = 0x01F8,
+        FreeCompanyInfo = 0x016C,
+        HousingWardInfo = 0x024A,
+        InitZone = 0x025D,
+        InventoryActionAck = 0x03AC,
+        InventoryTransaction = 0x0356,
+        InventoryTransactionFinish = 0x027A,
+        IslandWorkshopSupplyDemand = 0x03BB,
+        ItemInfo = 0x0110,
+        ItemMarketBoardInfo = 0x0074,
+        Logout = 0x00E0,
+        MarketBoardItemListing = 0x0171,
+        MarketBoardItemListingCount = 0x03c6,
+        MarketBoardItemListingHistory = 0x0382,
+        MarketBoardPurchase = 0x00C6,
+        MarketBoardSearchResult = 0x0335,
+        MiniCactpotInit = 0x0089,
+        NpcSpawn = 0x021A,
+        NpcSpawn2 = 0x024B,
+        NpcYell = 0x00E4,
+        ObjectSpawn = 0x012B,
+        PlaceFieldMarker = 0x0374,
+        PlaceFieldMarkerPreset = 0x0213,
+        PlayerSetup = 0x0212,
+        PlayerSpawn = 0x0134,
+        PlayerStats = 0x03E6,
+        Playtime = 0x0298,
+        PrepareZoning = 0x0313,
+        RetainerInformation = 0x0260,
+        RSV = 0x016D,
+        StatusEffectList = 0x0080,
+        StatusEffectList2 = 0x01F1,
+        StatusEffectList3 = 0x00A4,
+        SubmarineExplorationResult = 0x00EB,
+        SubmarineProgressionStatus = 0x0079,
+        SubmarineStatusList = 0x031C,
+        SubmarineTimers = 0x0371,
+        SystemLogMessage = 0x0087,
+        UpdateClassInfo = 0x038e,
+        UpdateHpMpTp = 0x00DE,
+        UpdateInventorySlot = 0x03A8,
+        UpdateSearchInfo = 0x03A3,
+        WeatherChange = 0x018a,
     };
 
     public enum ClientZoneIpcType : ushort
     {
-        ChatHandler = 0x03A6,
-        ClientTrigger = 0x03E0,
-        InventoryModifyHandler = 0x006C,
-        MarketBoardPurchaseHandler = 0x0146,
-        SetSearchInfoHandler = 0x00BB,
-        UpdatePositionHandler = 0x0126,
-        UpdatePositionInstance = 0x0246,
+        ChatHandler = 0x00C7,
+        ClientTrigger = 0x01F8,
+        InventoryModifyHandler = 0x0201,
+        MarketBoardPurchaseHandler = 0x016D,
+        MarketBoardRequestItemListingInfo = 0x0142,
+        SetSearchInfoHandler = 0x03CA,
+        UpdatePositionHandler = 0x02F0,
+        UpdatePositionInstance = 0x021A,
     };
 
     public enum ServerChatIpcType : ushort