Merge pull request #168 from Ra-Workspace/master

karashiiro · Nov 7, 2023 · 53a7600 · 53a7600
2 parents 70eed55 + 9bb70f6
commit 53a7600
Show file tree

Hide file tree

Showing 7 changed files with 854 additions and 234 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", 0x0166 },
+            { "InventoryOperationBaseValue", 0x0320 },
         };
     }
 }
diff --git a/FFXIVOpcodes/Ipcs_kr.cs b/FFXIVOpcodes/Ipcs_kr.cs
@@ -35,103 +35,227 @@ enum ClientLobbyIpcType : ushort
     */
     enum ServerZoneIpcType : ushort
     {
-        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
+        ActionEffect = 0x0305, // 6.401
+        ActionEffect16 = 0x01DB, // 6.401
+        ActionEffect24 = 0x011C, // 6.401
+        ActionEffect32 = 0x011B, // 6.401
+        ActionEffect8 = 0x01C8, // 6.401
+        ActorCast = 0x02DE, // 6.401
+        ActorControl = 0x020D, // 6.401
+        ActorControlSelf = 0x035B, // 6.401
+        ActorControlTarget = 0x01A8, // 6.401
+        ActorGauge = 0x0102, // 6.401
+        ActorMove = 0x02AB, // 6.401
+        ActorSetPos = 0x0190, // 6.401
+        AirshipExplorationResult = 0x01FB, // 6.401
+        AirshipStatus = 0x00DC, // 6.401
+        AirshipStatusList = 0x00AC, // 6.401
+        AirshipTimers = 0x0364, // 6.401
+        ApplyIDScramble = 0x011F, // 6.401
+        BalloonTalk2 = 0x0220, // 6.401
+        BalloonTalk4 = 0x0215, // 6.401
+        BalloonTalk8 = 0x010A, // 6.401
+        BattleTalk2 = 0x032B, // 6.401
+        BattleTalk4 = 0x00AF, // 6.401
+        BattleTalk8 = 0x00C6, // 6.401
+        BlackList = 0x01E5, // 6.401
+        CEDirector = 0x0082, // 6.401
+        CeremonySetActorAppearance = 0x033D, // 6.401
+        CFCancel = 0x02CF, // 6.401
+        CFDutyInfo = 0x020C, // 6.401
+        CFNotify = 0x033C, // 6.401
+        CFPreferredRole = 0x00CF, // 6.401
+        CFRegistered = 0x013F, // 6.401
+        CharaNameReq = 0x0134, // 6.401
+        CharaVisualEffect = 0x0203, // 6.401
+        Chat = 0x01F5, // 6.401
+        ContainerInfo = 0x010B, // 6.401
+        ContentDirectorSync = 0x00D1, // 6.401
+        Countdown = 0x0358, // 6.401
+        CountdownCancel = 0x012E, // 6.401
+        CreateTreasure = 0x03B9, // 6.401
+        CrossWorldLinkshellList = 0x03B4, // 6.401
+        CurrencyCrystalInfo = 0x01A4, // 6.401
+        DailyQuestRepeatFlags = 0x00BB, // 6.401
+        DailyQuests = 0x03C7, // 6.401
+        DespawnCharacter = 0x00A9, // 6.401
+        DespawnObject = 0x036E, // 6.401
+        DesynthResult = 0x024F, // 6.401
+        DirectorVars = 0x0148, // 6.401
+        Discovery = 0x032A, // 6.401
+        EffectResult = 0x013A, // 6.401
+        EffectResult16 = 0x00A2, // 6.401
+        EffectResult4 = 0x0133, // 6.401
+        EffectResult8 = 0x02A2, // 6.401
+        EffectResultBasic = 0x03A1, // 6.401
+        EffectResultBasic16 = 0x0109, // 6.401
+        EffectResultBasic32 = 0x0340, // 6.401
+        EffectResultBasic4 = 0x02C8, // 6.401
+        EffectResultBasic64 = 0x00A8, // 6.401
+        EffectResultBasic8 = 0x0223, // 6.401
+        EnvControl = 0x00D9, // 6.401
+        EorzeaTimeOffset = 0x0251, // 6.401
+        EquipDisplayFlags = 0x03C2, // 6.401
+        EventContinue = 0x0378, // 6.401
+        EventFinish = 0x02F2, // 6.401
+        EventPlay = 0x03BA, // 6.401
+        EventPlay128 = 0x028E, // 6.401
+        EventPlay16 = 0x03B7, // 6.401
+        EventPlay255 = 0x0380, // 6.401
+        EventPlay32 = 0x008B, // 6.401
+        EventPlay4 = 0x01D3, // 6.401
+        EventPlay64 = 0x0335, // 6.401
+        EventPlay8 = 0x011A, // 6.401
+        EventStart = 0x013C, // 6.401
+        Examine = 0x0298, // 6.401
+        ExamineFreeCompanyInfo = 0x01FC, // 6.401
+        ExamineSearchComment = 0x018D, // 6.401
+        ExamineSearchInfo = 0x0121, // 6.401
+        Fall = 0x02C2, // 6.401
+        FateInfo = 0x02ED, // 6.401
+        FellowshipList = 0x016B, // 6.401
+        FirstAttack = 0x0297, // 6.401
+        FreeCompanyDialog = 0x0132, // 6.401
+        FreeCompanyInfo = 0x03AE, // 6.401
+        GCAffiliation = 0x024E, // 6.401
+        HousingEstateGreeting = 0x0292, // 6.401
+        HousingIndoorInitialize = 0x015E, // 6.401
+        HousingInternalObjectSpawn = 0x01D0, // 6.401
+        HousingLandFlags = 0x03C9, // 6.401
+        HousingObjectDye = 0x03B1, // 6.401
+        HousingObjectInitialize = 0x034F, // 6.401
+        HousingObjectMove = 0x0326, // 6.401
+        HousingShowEstateGuestAccess = 0x0230, // 6.401
+        HousingUpdateLandFlagsSlot = 0x00BF, // 6.401
+        HousingWardInfo = 0x0239, // 6.401
+        HuntingLogEntry = 0x0240, // 6.401
+        Init = 0x02C1, // 6.401
+        InitSearchInfo = 0x025B, // 6.401
+        InitZone = 0x0316, // 6.401
+        InventoryActionAck = 0x02F7, // 6.401
+        InventoryTransaction = 0x0216, // 6.401
+        InventoryTransactionFinish = 0x0116, // 6.401
+        IslandWorkshopSupplyDemand = 0x01D2, // 6.401
+        ItemInfo = 0x010C, // 6.401
+        ItemMarketBoardInfo = 0x0336, // 6.401
+        LandAvailability = 0x038E, // 6.401
+        LandInfoSign = 0x03E6, // 6.401
+        LandPriceUpdate = 0x00A1, // 6.401
+        LandRename = 0x006A, // 6.401
+        LandSetInitialize = 0x0256, // 6.401
+        LandSetMap = 0x02B2, // 6.401
+        LandUpdate = 0x0171, // 6.401
+        LandUpdateHouseName = 0x01FD, // 6.401
+        LinkshellList = 0x02A1, // 6.401
+        LogMessage = 0x012D, // 6.401
+        Logout = 0x0367, // 6.401
+        LootMessage = 0x01AE, // 6.401
+        MailDeleteRequest = 0x035F, // 6.401
+        MapUpdate = 0x025C, // 6.401
+        MapUpdate128 = 0x0130, // 6.401
+        MapUpdate16 = 0x039A, // 6.401
+        MapUpdate32 = 0x0379, // 6.401
+        MapUpdate4 = 0x03E5, // 6.401
+        MapUpdate64 = 0x00E3, // 6.401
+        MapUpdate8 = 0x02A9, // 6.401
+        MarketBoardItemListing = 0x0318, // 6.401
+        MarketBoardItemListingCount = 0x0390, // 6.401
+        MarketBoardItemListingHistory = 0x02F6, // 6.401
+        MarketBoardPurchase = 0x0127, // 6.401
+        MarketBoardSearchResult = 0x02B5, // 6.401
+        MiniCactpotInit = 0x024B, // 6.401
+        ModelEquip = 0x0272, // 6.401
+        Mount = 0x01C5, // 6.401
+        MSQTrackerComplete = 0x0267, // 6.401
+        NpcSpawn = 0x03C8, // 6.401
+        NpcSpawn2 = 0x02D1, // 6.401
+        NpcYell = 0x02BE, // 6.401
+        ObjectSpawn = 0x0128, // 6.401
+        OpenTreasure = 0x01CC, // 6.401
+        PartyMessage = 0x03DF, // 6.401
+        Ping = 0x0141, // 6.401
+        PlaceFieldMarker = 0x0271, // 6.401
+        PlaceFieldMarkerPreset = 0x03DB, // 6.401
+        PlaceMarker = 0x028D, // 6.401
+        PlayerAddedToBlacklist = 0x0147, // 6.401
+        PlayerClassInfo = 0x0322, // 6.401
+        PlayerRemovedFromBlacklist = 0x01A6, // 6.401
+        PlayerSetup = 0x0175, // 6.401
+        PlayerSpawn = 0x032F, // 6.401
+        PlayerStateFlags = 0x0225, // 6.401
+        PlayerStats = 0x00CE, // 6.401
+        PlayerTitleList = 0x02C5, // 6.401
+        PlayerUpdateLook = 0x02FA, // 6.401
+        PlayMotionSync = 0x01B6, // 6.401
+        Playtime = 0x0195, // 6.401
+        PrepareZoning = 0x017C, // 6.401
+        QuestActiveList = 0x021A, // 6.401
+        QuestCompleteList = 0x00B1, // 6.401
+        QuestFinish = 0x029C, // 6.401
+        QuestTracker = 0x0290, // 6.401
+        QuestUpdate = 0x0111, // 6.401
+        ResultDialog = 0x0229, // 6.401
+        RetainerInformation = 0x00AE, // 6.401
+        RetainerSaleHistory = 0x0270, // 6.401
+        RSFData = 0x039C, // 6.401
+        RSVData = 0x00C7, // 6.401
+        ServerNotice = 0x034D, // 6.401
+        ServerNoticeShort = 0x02C3, // 6.401
+        SetOnlineStatus = 0x013E, // 6.401
+        SharedEstateSettingsResponse = 0x020F, // 6.401
+        SocialList = 0x03C0, // 6.401
+        SocialMessage = 0x0359, // 6.401
+        SocialMessage2 = 0x031F, // 6.401
+        SocialRequestResponse = 0x02AF, // 6.401
+        StatusEffectList = 0x03AA, // 6.401
+        StatusEffectListBozja = 0x02D5, // 6.401
+        StatusEffectListDouble = 0x022A, // 6.401
+        StatusEffectListEureka = 0x0257, // 6.401
+        StatusEffectListPlayer = 0x014F, // 6.401
+        SubmarineExplorationResult = 0x01E4, // 6.401
+        SubmarineProgressionStatus = 0x00B5, // 6.401
+        SubmarineStatusList = 0x02A7, // 6.401
+        SubmarineTimers = 0x0345, // 6.401
+        SystemLogMessage = 0x03CF, // 6.401
+        SystemLogMessage16 = 0x0285, // 6.401
+        SystemLogMessage2 = 0x0194, // 6.401
+        SystemLogMessage4 = 0x01E3, // 6.401
+        SystemLogMessage8 = 0x039F, // 6.401
+        Transfer = 0x0346, // 6.401
+        TreasureFadeOut = 0x01C7, // 6.401
+        UnMount = 0x0373, // 6.401
+        UpdateAllianceNormal = 0x0086, // 6.401
+        UpdateAllianceNormalMemberPositions = 0x02FE, // 6.401
+        UpdateAllianceSmall = 0x0155, // 6.401
+        UpdateAllianceSmallMemberPositions = 0x03A8, // 6.401
+        UpdateClassInfo = 0x00A5, // 6.401
+        UpdateClassInfoBozja = 0x03C3, // 6.401
+        UpdateClassInfoEureka = 0x0294, // 6.401
+        UpdateHate = 0x0200, // 6.401
+        UpdateHater = 0x02F3, // 6.401
+        UpdateHpMpTp = 0x00FA, // 6.401
+        UpdateInventorySlot = 0x00C4, // 6.401
+        UpdateParty = 0x00EB, // 6.401
+        UpdatePartyMemberPositions = 0x0207, // 6.401
+        UpdateRecastTimes = 0x00D2, // 6.401
+        UpdateSearchInfo = 0x026C, // 6.401
+        WeatherChange = 0x023C, // 6.401
+        YardObjectSpawn = 0x03D0, // 6.401
     };
 
     /**
     * Client IPC Zone Type Codes.
     */
     enum ClientZoneIpcType : ushort
     {
-        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
+        ChatHandler = 0x028B, // 6.401
+        ClientTrigger = 0x00F3, // 6.401
+        InventoryModifyHandler = 0x0319, // 6.401
+        // LogoutHandler = 0x0199, // 6.35
+        MarketBoardPurchaseHandler = 0x0359, // 6.401
+        SetSearchInfoHandler = 0x00A3, // 6.401
+        UpdatePositionHandler = 0x0280, // 6.401
+        UpdatePositionInstance = 0x01F7, // 6.401
     };
 
     ////////////////////////////////////////////////////////////////////////////////

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

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