Merge pull request #163 from Ra-Workspace/master

KR 6.38 update
karashiiro · Sep 26, 2023 · 80f95a0 · 80f95a0
2 parents 25a2881 + a21fc01
commit 80f95a0
Show file tree

Hide file tree

Showing 7 changed files with 260 additions and 230 deletions.
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", 0x01AC },
+            { "InventoryOperationBaseValue", 0x0166 },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_kr.cs b/FFXIVOpcodes/Ipcs_kr.cs
@@ -35,97 +35,103 @@ enum ClientLobbyIpcType : ushort
     */
     enum ServerZoneIpcType : ushort
     {
-        ActorCast = 0x0163, // 6.35
-        ActorControl = 0x0129, // 6.35
-        ActorControlSelf = 0x029D, // 6.35
-        ActorControlTarget = 0x0180, // 6.35
-        ActorGauge = 0x00CC, // 6.35
-        ActorMove = 0x0144, // 6.35
-        ActorSetPos = 0x0368, // 6.35
-        AirshipExplorationResult = 0x00E2, // 6.35
-        AirshipStatus = 0x009D, // 6.35
-        AirshipStatusList = 0x01D5, // 6.35
-        AirshipTimers = 0x0314, // 6.35
-        AoeEffect16 = 0x01C3, // 6.35
-        AoeEffect24 = 0x008C, // 6.35
-        AoeEffect32 = 0x02F7, // 6.35
-        AoeEffect8 = 0x019B, // 6.35
-        CEDirector = 0x0259, // 6.35
-        CFNotify = 0x009B, // 6.35
-        CFPreferredRole = 0x0304, // 6.35
-        ContainerInfo = 0x011B, // 6.35
-        CurrencyCrystalInfo = 0x0384, // 6.35
-        DesynthResult = 0x032F, // 6.35
-        Effect = 0x0096, // 6.35
-        EffectResult = 0x00A6, // 6.35
-        EffectResultBasic = 0x019A, // 6.35
-        EventFinish = 0x0240, // 6.35
-        EventPlay = 0x0291, // 6.35
-        EventPlay32 = 0x02D7, // 6.35
-        EventPlay4 = 0x0170, // 6.35
-        EventStart = 0x014B, // 6.35
-        Examine = 0x0331, // 6.35
-        ExamineFreeCompanyInfo = 0x00C3, // 6.35
-        ExamineSearchInfo = 0x006A, // 6.35
-        FreeCompanyDialog = 0x023E, // 6.35
-        FreeCompanyInfo = 0x01D8, // 6.35
-        HousingWardInfo = 0x029A, // 6.35
-        InitZone = 0x01C8, // 6.35
-        InventoryActionAck = 0x012B, // 6.35
-        InventoryTransaction = 0x0276, // 6.35
-        InventoryTransactionFinish = 0x02E4, // 6.35
-        IslandWorkshopSupplyDemand = 0x0396, // 6.35
-        ItemInfo = 0x0258, // 6.35
-        ItemMarketBoardInfo = 0x038C, // 6.35
-        Logout = 0x0087, // 6.35
-        MapEffect = 0x01B3, // 6.35
-        MarketBoardItemListing = 0x0380, // 6.35
-        MarketBoardItemListingCount = 0x0125, // 6.35
-        MarketBoardItemListingHistory = 0x014C, // 6.35
-        MarketBoardPurchase = 0x03BC, // 6.35
-        MarketBoardSearchResult = 0x023C, // 6.35
-        MiniCactpotInit = 0x01C1, // 6.35
-        NpcSpawn = 0x03D5, // 6.35
-        ObjectSpawn = 0x0203, // 6.35
-        PlaceFieldMarker = 0x027A, // 6.35
-        PlaceFieldMarkerPreset = 0x0206, // 6.35
-        PlayerSetup = 0x0367, // 6.35
-        PlayerSpawn = 0x006F, // 6.35
-        PlayerStats = 0x03B1, // 6.35
-        Playtime = 0x00FD, // 6.35
-        PrepareZoning = 0x01AF, // 6.35
-        ResultDialog = 0x0333, // 6.35
-        RetainerInformation = 0x00FE, // 6.35
-        // RSVData = 0x0169, // 6.31
-        SocialList = 0x013F, // 6.35
-        StatusEffectList = 0x0097, // 6.35
-        StatusEffectList2 = 0x01B2, // 6.35
-        StatusEffectList3 = 0x03B3, // 6.35
-        SubmarineExplorationResult = 0x0292, // 6.35
-        SubmarineProgressionStatus = 0x014A, // 6.35
-        SubmarineStatusList = 0x0146, // 6.35
-        SubmarineTimers = 0x0283, // 6.35
-        SystemLogMessage = 0x00AC, // 6.35
-        UpdateClassInfo = 0x02C8, // 6.35
-        UpdateHpMpTp = 0x0222, // 6.35
-        UpdateInventorySlot = 0x027D, // 6.35
-        UpdateSearchInfo = 0x0309, // 6.35
-        WeatherChange = 0x00CD, // 6.35
+        ActorCast = 0x031E, // 6.38
+        ActorControl = 0x02EE, // 6.38
+        ActorControlSelf = 0x0273, // 6.38
+        ActorControlTarget = 0x037A, // 6.38
+        ActorGauge = 0x0093, // 6.38
+        ActorMove = 0x0200, // 6.38
+        ActorSetPos = 0x01B6, // 6.38
+        AirshipExplorationResult = 0x02A6, // 6.38
+        AirshipStatus = 0x025A, // 6.38
+        AirshipStatusList = 0x00A0, // 6.38
+        AirshipTimers = 0x0192, // 6.38
+        AoeEffect16 = 0x0182, // 6.38
+        AoeEffect24 = 0x01BA, // 6.38
+        AoeEffect32 = 0x0304, // 6.38
+        AoeEffect8 = 0x03AC, // 6.38
+        CEDirector = 0x00D3, // 6.38
+        CFNotify = 0x01F8, // 6.38
+        CFPreferredRole = 0x0261, // 6.38
+        ContainerInfo = 0x0236, // 6.38
+        CurrencyCrystalInfo = 0x03A2, // 6.38
+        DesynthResult = 0x0360, // 6.38
+        Effect = 0x01A4, // 6.38
+        EffectResult = 0x0209, // 6.38
+        EffectResultBasic = 0x016A, // 6.38
+        EnvironmentControl = 0x032C, // 6.38
+        EventFinish = 0x010F, // 6.38
+        EventStart = 0x01DA, // 6.38
+        Examine = 0x01AA, // 6.38
+        ExamineFreeCompanyInfo = 0x00F3, // 6.38
+        ExamineSearchInfo = 0x0176, // 6.38
+        FreeCompanyDialog = 0x02A7, // 6.38
+        FreeCompanyInfo = 0x012D, // 6.38
+        HousingWardInfo = 0x038C, // 6.38
+        InitZone = 0x0380, // 6.38
+        InventoryActionAck = 0x039E, // 6.38
+        InventoryTransaction = 0x026D, // 6.38
+        InventoryTransactionFinish = 0x00CD, // 6.38
+        IslandWorkshopSupplyDemand = 0x03A9, // 6.38
+        ItemInfo = 0x02FD, // 6.38
+        ItemMarketBoardInfo = 0x03AD, // 6.38
+        Logout = 0x0114, // 6.38
+        MarketBoardItemListing = 0x0115, // 6.38
+        MarketBoardItemListingCount = 0x01BD, // 6.38
+        MarketBoardItemListingHistory = 0x01EB, // 6.38
+        MarketBoardPurchase = 0x00CA, // 6.38
+        MarketBoardSearchResult = 0x0283, // 6.38
+        MiniCactpotInit = 0x00A3, // 6.38
+        NpcSpawn = 0x02C0, // 6.38
+        ObjectSpawn = 0x00AE, // 6.38
+        PlaceFieldMarker = 0x0161, // 6.38
+        PlaceFieldMarkerPreset = 0x015A, // 6.38
+        PlayerSetup = 0x01C0, // 6.38
+        PlayerSpawn = 0x03B6, // 6.38
+        PlayerStats = 0x033B, // 6.38
+        Playtime = 0x019D, // 6.38
+        PrepareZoning = 0x014C, // 6.38
+        ResultDialog = 0x027C, // 6.38
+        RetainerInformation = 0x01E3, // 6.38
+        RSVData = 0x03C1, // 6.38
+        SocialList = 0x00FA, // 6.38
+        StatusEffectList = 0x0212, // 6.38
+        StatusEffectList2 = 0x018E, // 6.38
+        StatusEffectList3 = 0x0399, // 6.38
+        SubmarineExplorationResult = 0x038F, // 6.38
+        SubmarineProgressionStatus = 0x01B2, // 6.38
+        SubmarineStatusList = 0x030B, // 6.38
+        SubmarineTimers = 0x0251, // 6.38
+        SystemLogMessage = 0x0211, // 6.38
+        UpdateClassInfo = 0x03A4, // 6.38
+        UpdateHpMpTp = 0x039C, // 6.38
+        UpdateInventorySlot = 0x02BA, // 6.38
+        UpdateSearchInfo = 0x0196, // 6.38
+        WeatherChange = 0x0335, // 6.38
+
+        EventPlay = 0x01B3, // 6.38
+        EventPlay4 = 0x01BC, // 6.38
+        EventPlay8 = 0x0320, // 6.38
+        EventPlay16 = 0x00C7, // 6.38
+        EventPlay32 = 0x034B, // 6.38
+        EventPlay64 = 0x02E3, // 6.38
+        EventPlay128 = 0x01AE, // 6.38
+        EventPlay255 = 0x00DF, // 6.38
     };
 
     /**
     * Client IPC Zone Type Codes.
     */
     enum ClientZoneIpcType : ushort
     {
-        ChatHandler = 0x00C0, // 6.35
-        ClientTrigger = 0x02F6, // 6.35
-        InventoryModifyHandler = 0x01A5, // 6.35 (Base offset: 0x01AC)
-        LogoutHandler = 0x0199, // 6.35
-        MarketBoardPurchaseHandler = 0x039D, // 6.35
-        SetSearchInfoHandler = 0x0244, // 6.35
-        UpdatePositionHandler = 0x038A, // 6.35
-        UpdatePositionInstance = 0x02FB, // 6.35
+        ChatHandler = 0x020A, // 6.38
+        ClientTrigger = 0x0142, // 6.38
+        InventoryModifyHandler = 0x015F, // 6.38 (Base offset: 0x0166)
+        LogoutHandler = 0x03D7, // 6.38
+        MarketBoardPurchaseHandler = 0x03BB, // 6.38
+        SetSearchInfoHandler = 0x01D0, // 6.38
+        UpdatePositionHandler = 0x0230, // 6.38
+        UpdatePositionInstance = 0x00F2, // 6.38
     };
 
     ////////////////////////////////////////////////////////////////////////////////

diff --git a/FFXIVOpcodes/Program.cs b/FFXIVOpcodes/Program.cs
@@ -19,7 +19,7 @@ public static void Main()
             var regions = new List<RegionSet>{
                 new RegionSet { Region = "Global", Version = "6.05"},
                 new RegionSet { Region = "CN", Version = FFXIVConstants.CN.Version }, // <3
-                new RegionSet { Region = "KR", Version = "6.35" },
+                new RegionSet { Region = "KR", Version = "6.38" },
             };
 
             Type[][] enums = {

diff --git a/constants.json b/constants.json
@@ -6,6 +6,6 @@
     "InventoryOperationBaseValue": 939
   },
   "KR": {
-    "InventoryOperationBaseValue": 428
+    "InventoryOperationBaseValue": 358
   }
 }
diff --git a/constants.min.json b/constants.min.json
@@ -1 +1 @@
-{"Global":{"InventoryOperationBaseValue":737},"CN":{"InventoryOperationBaseValue":939},"KR":{"InventoryOperationBaseValue":428}}
+{"Global":{"InventoryOperationBaseValue":737},"CN":{"InventoryOperationBaseValue":939},"KR":{"InventoryOperationBaseValue":358}}