Merge pull request #157 from Ra-Workspace/master

KR 6.31 update
karashiiro · Jul 18, 2023 · 2645df9 · 2645df9
2 parents 06af782 + e9c1de1
commit 2645df9
Show file tree

Hide file tree

Showing 7 changed files with 237 additions and 232 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", 0x0289 },
+            { "InventoryOperationBaseValue", 0x02E7 },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_kr.cs b/FFXIVOpcodes/Ipcs_kr.cs
@@ -35,96 +35,97 @@ enum ClientLobbyIpcType : ushort
     */
     enum ServerZoneIpcType : ushort
     {
-        ActorCast = 0x0231, // 6.3
-        ActorControl = 0x02BE, // 6.3
-        ActorControlSelf = 0x02ED, // 6.3
-        ActorControlTarget = 0x0210, // 6.3
-        ActorGauge = 0x0335, // 6.3
-        ActorMove = 0x0365, // 6.3
-        ActorSetPos = 0x030C, // 6.3
-        AirshipExplorationResult = 0x0103, // 6.3
-        AirshipStatus = 0x03B7, // 6.3
-        AirshipStatusList = 0x0068, // 6.3
-        AirshipTimers = 0x032D, // 6.3
-        AoeEffect16 = 0x01C6, // 6.3
-        AoeEffect24 = 0x0091, // 6.3
-        AoeEffect32 = 0x039D, // 6.3
-        AoeEffect8 = 0x0371, // 6.3
-        CEDirector = 0x0309, // 6.3
-        CFNotify = 0x006F, // 6.3
-        CFPreferredRole = 0x01E9, // 6.3
-        ContainerInfo = 0x02C5, // 6.3
-        CurrencyCrystalInfo = 0x036D,
-        DesynthResult = 0x03A8, // 6.3
-        Effect = 0x00E8, // 6.3
-        EffectResult = 0x01EC, // 6.3
-        EffectResultBasic = 0x0222, // 6.3
-        EventFinish = 0x02F6, // 6.3
-        EventPlay = 0x0277, // 6.3
-        EventPlay32 = 0x0392, // 6.3
-        EventPlay4 = 0x025B, // 6.3
-        EventStart = 0x008B, // 6.3
-        Examine = 0x01C3, // 6.3
-        ExamineFreeCompanyInfo = 0x0133, // 6.3
-        ExamineSearchInfo = 0x0226, // 6.3
-        FreeCompanyDialog = 0x02B1, // 6.3
-        FreeCompanyInfo = 0x01A4, // 6.3
-        HousingWardInfo = 0x01FB, // 6.3
-        InitZone = 0x01DF, // 6.3
-        InventoryActionAck = 0x033D, // 6.3
-        InventoryTransaction = 0x0393, // 6.3
-        InventoryTransactionFinish = 0x02E5, // 6.3
-        IslandWorkshopSupplyDemand = 0x00B0, // 6.3
-        ItemInfo = 0x0123, // 6.3
-        ItemMarketBoardInfo = 0x00EA, // 6.3
-        Logout = 0x038D, // 6.3
-        MapEffect = 0x0275, // 6.3
-        MarketBoardItemListing = 0x022A, // 6.3
-        MarketBoardItemListingCount = 0x0117, // 6.3
-        MarketBoardItemListingHistory = 0x0134, // 6.3
-        MarketBoardPurchase = 0x0105, // 6.3
-        MarketBoardSearchResult = 0x020B, // 6.3
-        MiniCactpotInit = 0x01EB, // 6.3
-        NpcSpawn = 0x022B, // 6.3
-        ObjectSpawn = 0x02CB, // 6.3
-        PlaceFieldMarker = 0x0223, // 6.3
-        PlaceFieldMarkerPreset = 0x01A2, // 6.3
-        PlayerSetup = 0x026E, // 6.3
-        PlayerSpawn = 0x031E, // 6.3
-        PlayerStats = 0x0341, // 6.3
-        Playtime = 0x031F, // 6.3
-        PrepareZoning = 0x034F, // 6.3
-        ResultDialog = 0x00C6, // 6.3
-        RetainerInformation = 0x010F, // 6.3
-        SocialList = 0x009A, // 6.3
-        StatusEffectList = 0x0067, // 6.3
-        StatusEffectList2 = 0x3B0, // 6.3
-        StatusEffectList3 = 0xDA, // 6.3
-        SubmarineExplorationResult = 0x0191, // 6.3
-        SubmarineProgressionStatus = 0x017E, // 6.3
-        SubmarineStatusList = 0x0122, // 6.3
-        SubmarineTimers = 0x019C, // 6.3
-        SystemLogMessage = 0x03E0, // 6.3
-        UpdateClassInfo = 0x03B6, // 6.3
-        UpdateHpMpTp = 0x0166, // 6.3
-        UpdateInventorySlot = 0x039C, // 6.3
-        UpdateSearchInfo = 0x03BE, // 6.3
-        WeatherChange = 0x0358, // 6.3
+        ActorCast = 0x03BE, // 6.31
+        ActorControl = 0x0353, // 6.31
+        ActorControlSelf = 0x00CD, // 6.31
+        ActorControlTarget = 0x0148, // 6.31
+        ActorGauge = 0x01CD, // 6.31
+        ActorMove = 0x02D4, // 6.31
+        ActorSetPos = 0x0268, // 6.31
+        AirshipExplorationResult = 0x0305, // 6.31
+        AirshipStatus = 0x00B8, // 6.31
+        AirshipStatusList = 0x01D2, // 6.31
+        AirshipTimers = 0x016E, // 6.31
+        AoeEffect16 = 0x0231, // 6.31
+        AoeEffect24 = 0x0339, // 6.31
+        AoeEffect32 = 0x0079, // 6.31
+        AoeEffect8 = 0x0191, // 6.31
+        CEDirector = 0x0187, // 6.31
+        CFNotify = 0x0394, // 6.31
+        CFPreferredRole = 0x03AB, // 6.31
+        ContainerInfo = 0x00BA, // 6.31
+        CurrencyCrystalInfo = 0x03CF, // 6.31
+        DesynthResult = 0x00B2, // 6.31
+        Effect = 0x031B, // 6.31
+        EffectResult = 0x017E, // 6.31
+        EffectResultBasic = 0x01BD, // 6.31
+        EventFinish = 0x0354, // 6.31
+        EventPlay = 0x02AD, // 6.31
+        EventPlay32 = 0x026F, // 6.31
+        EventPlay4 = 0x02EE, // 6.31
+        EventStart = 0x039E, // 6.31
+        Examine = 0x01B3, // 6.31
+        ExamineFreeCompanyInfo = 0x01BA, // 6.31
+        ExamineSearchInfo = 0x019C, // 6.31
+        FreeCompanyDialog = 0x0277, // 6.31
+        FreeCompanyInfo = 0x0188, // 6.31
+        HousingWardInfo = 0x009E, // 6.31
+        InitZone = 0x0065, // 6.31
+        InventoryActionAck = 0x02B2, // 6.31
+        InventoryTransaction = 0x0151, // 6.31
+        InventoryTransactionFinish = 0x038B, // 6.31
+        IslandWorkshopSupplyDemand = 0x03E5, // 6.31
+        ItemInfo = 0x0361, // 6.31
+        ItemMarketBoardInfo = 0x00AE, // 6.31
+        Logout = 0x03AF, // 6.31
+        MapEffect = 0x02B9, // 6.31
+        MarketBoardItemListing = 0x0375, // 6.31
+        MarketBoardItemListingCount = 0x030A, // 6.31
+        MarketBoardItemListingHistory = 0x00D5, // 6.31
+        MarketBoardPurchase = 0x02F3, // 6.31
+        MarketBoardSearchResult = 0x02AC, // 6.31
+        MiniCactpotInit = 0x03C8, // 6.31
+        NpcSpawn = 0x03DC, // 6.31
+        ObjectSpawn = 0x01EF, // 6.31
+        PlaceFieldMarker = 0x024B, // 6.31
+        PlaceFieldMarkerPreset = 0x03CB, // 6.31
+        PlayerSetup = 0x034A, // 6.31
+        PlayerSpawn = 0x0139, // 6.31
+        PlayerStats = 0x0257, // 6.31
+        Playtime = 0x006F, // 6.31
+        PrepareZoning = 0x0071, // 6.31
+        ResultDialog = 0x00EC, // 6.31
+        RetainerInformation = 0x026D, // 6.31
+        RSVData = 0x0169, // 6.31
+        SocialList = 0x01F7, // 6.31
+        StatusEffectList = 0x0090, // 6.31
+        StatusEffectList2 = 0x007F, // 6.31
+        StatusEffectList3 = 0x01B0, // 6.31
+        SubmarineExplorationResult = 0x01D0, // 6.31
+        SubmarineProgressionStatus = 0x02E7, // 6.31
+        SubmarineStatusList = 0x033C, // 6.31
+        SubmarineTimers = 0x039D, // 6.31
+        SystemLogMessage = 0x01E2, // 6.31
+        UpdateClassInfo = 0x01A4, // 6.31
+        UpdateHpMpTp = 0x01A6, // 6.31
+        UpdateInventorySlot = 0x035B, // 6.31
+        UpdateSearchInfo = 0x02C0, // 6.31
+        WeatherChange = 0x03D8, // 6.31
     };
 
     /**
     * Client IPC Zone Type Codes.
     */
     enum ClientZoneIpcType : ushort
     {
-        ChatHandler = 0x0125, // 6.3
-        ClientTrigger = 0x0390, // 6.3
-        InventoryModifyHandler = 0x0282, // 6.3 (Base offset: 0x0289)
-        LogoutHandler = 0x0273, // 6.3
-        MarketBoardPurchaseHandler = 0x0258, // 6.3
-        SetSearchInfoHandler = 0x0307, // 6.3
-        UpdatePositionHandler = 0x0074, // 6.3
-        UpdatePositionInstance = 0x0248, // 6.3
+        ChatHandler = 0x00D3, // 6.31
+        ClientTrigger = 0x0210, // 6.31
+        InventoryModifyHandler = 0x02E0,// 6.31 (Base offset: 0x02E7)
+        LogoutHandler = 0x013A, // 6.31
+        MarketBoardPurchaseHandler = 0x018B, // 6.31
+        SetSearchInfoHandler = 0x03B8,// 6.31
+        UpdatePositionHandler = 0x01DB,// 6.31
+        UpdatePositionInstance = 0x012D,// 6.31
     };
 
     ////////////////////////////////////////////////////////////////////////////////

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.3" },
+                new RegionSet { Region = "KR", Version = "6.31" },
             };
 
             Type[][] enums = {

diff --git a/constants.json b/constants.json
@@ -6,6 +6,6 @@
     "InventoryOperationBaseValue": 673
   },
   "KR": {
-    "InventoryOperationBaseValue": 649
+    "InventoryOperationBaseValue": 743
   }
 }
diff --git a/constants.min.json b/constants.min.json
@@ -1 +1 @@
-{"Global":{"InventoryOperationBaseValue":327},"CN":{"InventoryOperationBaseValue":673},"KR":{"InventoryOperationBaseValue":649}}
+{"Global":{"InventoryOperationBaseValue":327},"CN":{"InventoryOperationBaseValue":673},"KR":{"InventoryOperationBaseValue":743}}