Merge pull request #161 from Ra-Workspace/master

KR 6.35 update
karashiiro · Aug 30, 2023 · 63a9969 · 63a9969
2 parents 7582fe9 + 72e011c
commit 63a9969
Show file tree

Hide file tree

Showing 7 changed files with 227 additions and 231 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", 0x02E7 },
+            { "InventoryOperationBaseValue", 0x01AC },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_kr.cs b/FFXIVOpcodes/Ipcs_kr.cs
@@ -35,97 +35,97 @@ enum ClientLobbyIpcType : ushort
     */
     enum ServerZoneIpcType : ushort
     {
-        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
+        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
     };
 
     /**
     * Client IPC Zone Type Codes.
     */
     enum ClientZoneIpcType : ushort
     {
-        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
+        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
     };
 
     ////////////////////////////////////////////////////////////////////////////////

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

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