diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 551ef6fd..4e5979a5 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -20332,9 +20332,9 @@ Address,Quality,Size,Name 0x00000071002fc784,U,000092, 0x00000071002fc7e0,U,000056, 0x00000071002fc818,U,000068, -0x00000071002fc85c,O,000372,_ZN5uking2ai7Fork2AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002fc9d0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai7Fork2AIEE9isDerivedEPKNS0_9InterfaceE -0x00000071002fca5c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai6ForkAIEE9isDerivedEPKNS0_9InterfaceE +0x00000071002fc85c,O,000372,_ZN4ksys3act2ai7Fork2AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002fc9d0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN4ksys3act2ai7Fork2AIEE9isDerivedEPKNS0_9InterfaceE +0x00000071002fca5c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN4ksys3act2ai6ForkAIEE9isDerivedEPKNS0_9InterfaceE 0x00000071002fcae8,U,000148,AI_AI_AirOctaState::ctor 0x00000071002fcb7c,W,000140,_ZN5uking2ai12AirOctaStateD1Ev 0x00000071002fcc08,W,000036,_ZN5uking2ai12AirOctaStateD0Ev @@ -44670,7 +44670,7 @@ Address,Quality,Size,Name 0x00000071006c8a64,U,000056,AI_F_AI_EnemyNoticeSoundWithUI 0x00000071006c8a9c,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai27GuardianMiniTransformSelectEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c8ad4,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai13PrevASSkipSeqEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE -0x00000071006c8b0c,U,000056,AI_F_AI_DemoRootAI +0x00000071006c8b0c,M,000056,_ZN4ksys3act2ai9AiFactory4makeINS1_10DemoRootAIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c8b44,U,000056,AI_F_AI_AnchorRangeSelectTwoAction 0x00000071006c8b7c,U,000056,AI_F_AI_HorseRideShooterFindPlayer 0x00000071006c8bb4,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai11EnemyNoticeEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE @@ -44738,9 +44738,9 @@ Address,Quality,Size,Name 0x00000071006c9944,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai16StunBossReactionEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c997c,U,000056,AI_F_AI_GelEnemyReaction 0x00000071006c99b4,U,000056,AI_F_AI_GanonThrowActorRoot -0x00000071006c99ec,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai7Fork5AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE +0x00000071006c99ec,O,000056,_ZN4ksys3act2ai9AiFactory4makeINS1_7Fork5AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9a24,U,000056,AI_F_AI_OctarockReaction -0x00000071006c9a5c,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai7Fork4AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE +0x00000071006c9a5c,O,000056,_ZN4ksys3act2ai9AiFactory4makeINS1_7Fork4AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9a94,U,000056,AI_F_AI_EnemyVacuumBombSelect 0x00000071006c9acc,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai16SelfXRotSelectorEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9b04,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai18TargetLastAttackerEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE @@ -44748,7 +44748,7 @@ Address,Quality,Size,Name 0x00000071006c9b74,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai17TargetAngerSelectEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9bac,U,000056,AI_F_AI_SignalFlowchartRootAI 0x00000071006c9be4,U,000056,AI_F_AI_EnemyCutRope -0x00000071006c9c1c,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai7Fork6AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE +0x00000071006c9c1c,O,000056,_ZN4ksys3act2ai9AiFactory4makeINS1_7Fork6AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9c54,U,000056,AI_F_AI_GolfBallRoot 0x00000071006c9c8c,U,000056,AI_F_AI_TargetBeatGetDrop 0x00000071006c9cc4,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai5StoleEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE @@ -44760,11 +44760,11 @@ Address,Quality,Size,Name 0x00000071006c9e14,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai23HomePosDistanceSelectorEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9e4c,U,000056,AI_F_AI_GolemNormal 0x00000071006c9e84,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai14SwitchDistanceEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE -0x00000071006c9ebc,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai7Fork3AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE +0x00000071006c9ebc,O,000056,_ZN4ksys3act2ai9AiFactory4makeINS1_7Fork3AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9ef4,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai11SwitchTorchEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9f2c,U,000056,AI_F_AI_HorseMoveToPlayer 0x00000071006c9f64,U,000056,AI_F_AI_LastBossShootGaleArrowRoot -0x00000071006c9f9c,O,000056,_ZN4ksys3act2ai9AiFactory4makeIN5uking2ai7Fork2AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE +0x00000071006c9f9c,O,000056,_ZN4ksys3act2ai9AiFactory4makeINS1_7Fork2AIEEEPNS1_2AiERKNS1_10ActionBase7InitArgEPN4sead4HeapE 0x00000071006c9fd4,U,000056,AI_F_AI_SetTargetPosForFlyThroughMove 0x00000071006ca00c,U,000056,AI_F_AI_WarpSafeTagRoot 0x00000071006ca044,U,000056,AI_F_AI_AssassinMiddleAzitoNoMemberDemo @@ -45615,7 +45615,7 @@ Address,Quality,Size,Name 0x00000071006eb3f8,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query14CheckEquipmentEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006eb430,O,000056,_ZN4ksys3act2ai12QueryFactory4makeINS1_10DummyQueryEEEPNS1_5QueryERKNS5_7InitArgEPN4sead4HeapE 0x00000071006eb468,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query31ComparePlayerFireResistantLevelEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE -0x00000071006eb4a0,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query13IsWaitRevivalEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE +0x00000071006eb4a0,O,000056,_ZN4ksys3act2ai12QueryFactory4makeINS1_13IsWaitRevivalEEEPNS1_5QueryERKNS5_7InitArgEPN4sead4HeapE 0x00000071006eb4d8,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query18CheckAppShopSelectEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006eb510,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query22CheckSiteBossDamageAnmEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006eb548,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query28CheckDeadlyQuestEscapeTimingEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE @@ -45656,7 +45656,7 @@ Address,Quality,Size,Name 0x00000071006ebcf0,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query23CheckDistanceFromPlayerEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ebd28,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query19HasArmorAlreadyDyedEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ebd60,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query13IsHorseNumMaxEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE -0x00000071006ebd98,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query26CheckJustBeforeEventCancelEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE +0x00000071006ebd98,O,000056,_ZN4ksys3act2ai12QueryFactory4makeINS1_26CheckJustBeforeEventCancelEEEPNS1_5QueryERKNS5_7InitArgEPN4sead4HeapE 0x00000071006ebdd0,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query23CheckIsOpenItemCategoryEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ebe08,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query20CheckNumOfBuyPictureEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ebe40,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query15WhatCurrentItemEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE @@ -45713,7 +45713,7 @@ Address,Quality,Size,Name 0x00000071006ec968,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query16CheckTerrorLevelEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ec9a0,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query17IsOnInstEventFlagEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ec9d8,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query22CheckWeaponVacancyItemEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE -0x00000071006eca10,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query16CheckEventCancelEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE +0x00000071006eca10,O,000056,_ZN4ksys3act2ai12QueryFactory4makeINS1_16CheckEventCancelEEEPNS1_5QueryERKNS5_7InitArgEPN4sead4HeapE 0x00000071006eca48,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query10CheckStageEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006eca80,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query16CheckPlayerStateEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE 0x00000071006ecab8,O,000056,_ZN4ksys3act2ai12QueryFactory4makeIN5uking5query23IsCurrentMainFieldStageEEEPNS1_5QueryERKNS7_7InitArgEPN4sead4HeapE @@ -74691,27 +74691,27 @@ Address,Quality,Size,Name 0x0000007100d61b30,U,000412,VillagerMgr::x_13 0x0000007100d61ccc,U,000412,sinitXXX 0x0000007100d61e68,U,000060,AI_AI_DemoRootAI::ctor -0x0000007100d61ea4,W,000128,_ZN5uking2ai10DemoRootAID1Ev -0x0000007100d61f24,W,000136,_ZN5uking2ai10DemoRootAID0Ev +0x0000007100d61ea4,W,000128,_ZN4ksys3act2ai10DemoRootAID1Ev +0x0000007100d61f24,W,000136,_ZN4ksys3act2ai10DemoRootAID0Ev 0x0000007100d61fac,U,000020, 0x0000007100d61fc0,U,000404, 0x0000007100d62154,U,000264, 0x0000007100d6225c,U,000312, 0x0000007100d62394,U,000276, -0x0000007100d624a8,U,000240,_ZN5uking2ai10DemoRootAI14handleMessage_ERKN4ksys7MessageE +0x0000007100d624a8,U,000240,_ZN4ksys3act2ai10DemoRootAI14handleMessage_ERKNS_7MessageE 0x0000007100d62598,U,000440, 0x0000007100d62750,U,000420, -0x0000007100d628f4,W,000284,_ZN5uking2ai10DemoRootAI5init_EPN4sead4HeapE -0x0000007100d62a10,W,000052,_ZN5uking2ai10DemoRootAI6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100d62a44,U,000096,_ZN5uking2ai10DemoRootAI5calc_Ev -0x0000007100d62aa4,W,000192,_ZN5uking2ai10DemoRootAI6leave_Ev -0x0000007100d62b64,O,000004,_ZN5uking2ai10DemoRootAI11loadParams_Ev -0x0000007100d62b68,U,000144,_ZN5uking2ai10DemoRootAI10handleAck_ERKN4ksys10MessageAckE -0x0000007100d62bf8,U,000048,_ZN5uking2ai10DemoRootAI12initChildrenERKN4ksys8AIDefSetEPN4sead4HeapE -0x0000007100d62c28,U,000240,_ZNK5uking2ai10DemoRootAI14getCurrentNameEPN4sead22BufferedSafeStringBaseIcEEPS2_ +0x0000007100d628f4,W,000284,_ZN4ksys3act2ai10DemoRootAI5init_EPN4sead4HeapE +0x0000007100d62a10,W,000052,_ZN4ksys3act2ai10DemoRootAI6enter_EPNS1_15InlineParamPackE +0x0000007100d62a44,U,000096,_ZN4ksys3act2ai10DemoRootAI5calc_Ev +0x0000007100d62aa4,W,000192,_ZN4ksys3act2ai10DemoRootAI6leave_Ev +0x0000007100d62b64,O,000004,_ZN4ksys3act2ai10DemoRootAI11loadParams_Ev +0x0000007100d62b68,U,000144,_ZN4ksys3act2ai10DemoRootAI10handleAck_ERKNS_10MessageAckE +0x0000007100d62bf8,U,000048,_ZN4ksys3act2ai10DemoRootAI12initChildrenERKNS_8AIDefSetEPN4sead4HeapE +0x0000007100d62c28,U,000240,_ZNK4ksys3act2ai10DemoRootAI14getCurrentNameEPN4sead22BufferedSafeStringBaseIcEEPNS1_10ActionBaseE 0x0000007100d62d18,U,000088, -0x0000007100d62d70,O,000288,_ZNK5uking2ai10DemoRootAI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d62e90,O,000092,_ZNK5uking2ai10DemoRootAI18getRuntimeTypeInfoEv +0x0000007100d62d70,O,000288,_ZNK4ksys3act2ai10DemoRootAI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d62e90,O,000092,_ZNK4ksys3act2ai10DemoRootAI18getRuntimeTypeInfoEv 0x0000007100d62eec,U,000020,AIStruct5::ctor 0x0000007100d62f00,U,000004,nullsub_3783 0x0000007100d62f04,U,000004,j__ZdlPv_855 @@ -74721,52 +74721,52 @@ Address,Quality,Size,Name 0x0000007100d6300c,U,000160, 0x0000007100d630ac,U,000072, 0x0000007100d630f4,U,000008, -0x0000007100d630fc,O,000048,_ZN5uking2ai7Fork2AIC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100d6312c,O,000004,_ZN5uking2ai7Fork2AID1Ev -0x0000007100d63130,O,000036,_ZN5uking2ai7Fork2AID0Ev -0x0000007100d63154,O,000008,_ZNK5uking2ai7Fork2AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d6315c,O,000092,_ZNK5uking2ai7Fork2AI18getRuntimeTypeInfoEv -0x0000007100d631b8,O,000048,_ZN5uking2ai7Fork3AIC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100d631e8,O,000004,_ZN5uking2ai7Fork3AID1Ev -0x0000007100d631ec,O,000036,_ZN5uking2ai7Fork3AID0Ev -0x0000007100d63210,O,000008,_ZNK5uking2ai7Fork3AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d63218,O,000092,_ZNK5uking2ai7Fork3AI18getRuntimeTypeInfoEv -0x0000007100d63274,O,000372,_ZN5uking2ai7Fork3AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d633e8,O,000048,_ZN5uking2ai7Fork4AIC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100d63418,O,000004,_ZN5uking2ai7Fork4AID1Ev -0x0000007100d6341c,O,000036,_ZN5uking2ai7Fork4AID0Ev -0x0000007100d63440,O,000008,_ZNK5uking2ai7Fork4AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d63448,O,000092,_ZNK5uking2ai7Fork4AI18getRuntimeTypeInfoEv -0x0000007100d634a4,O,000372,_ZN5uking2ai7Fork4AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d63618,O,000048,_ZN5uking2ai7Fork5AIC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100d63648,O,000004,_ZN5uking2ai7Fork5AID1Ev -0x0000007100d6364c,O,000036,_ZN5uking2ai7Fork5AID0Ev -0x0000007100d63670,O,000008,_ZNK5uking2ai7Fork5AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d63678,O,000092,_ZNK5uking2ai7Fork5AI18getRuntimeTypeInfoEv -0x0000007100d636d4,O,000372,_ZN5uking2ai7Fork5AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d63848,O,000048,_ZN5uking2ai7Fork6AIC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100d63878,O,000004,_ZN5uking2ai7Fork6AID1Ev -0x0000007100d6387c,O,000036,_ZN5uking2ai7Fork6AID0Ev -0x0000007100d638a0,O,000008,_ZNK5uking2ai7Fork6AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d638a8,O,000092,_ZNK5uking2ai7Fork6AI18getRuntimeTypeInfoEv -0x0000007100d63904,O,000372,_ZN5uking2ai7Fork6AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d63a78,O,000048,_ZN5uking2ai6ForkAIC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100d63aa8,O,000004,_ZN5uking2ai6ForkAID1Ev -0x0000007100d63aac,O,000036,_ZN5uking2ai6ForkAID0Ev -0x0000007100d63ad0,O,000020,_ZN5uking2ai6ForkAI5init_EPN4sead4HeapE -0x0000007100d63ae4,O,000192,_ZN5uking2ai6ForkAI6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100d63ba4,O,000384,_ZN5uking2ai6ForkAI7reenterEPN4ksys3act2ai10ActionBaseERKN4sead14SafeStringBaseIcEE -0x0000007100d63d24,O,000128,_ZN5uking2ai6ForkAI4calcEv -0x0000007100d63da4,O,000088,_ZN5uking2ai6ForkAI6leave_Ev -0x0000007100d63dfc,O,000212,_ZNK5uking2ai6ForkAI8isFailedEv -0x0000007100d63ed0,O,000200,_ZNK5uking2ai6ForkAI10isFinishedEv -0x0000007100d63f98,O,000124,_ZNK5uking2ai6ForkAI12isChangeableEv -0x0000007100d64014,O,000168,_ZN5uking2ai6ForkAI14handleMessage_ERKN4ksys7MessageE -0x0000007100d640bc,O,000168,_ZN5uking2ai6ForkAI10handleAck_ERKN4ksys10MessageAckE -0x0000007100d64164,O,000200,_ZNK5uking2ai6ForkAI14getCurrentNameEPN4sead22BufferedSafeStringBaseIcEEPN4ksys3act2ai10ActionBaseE -0x0000007100d6422c,O,000316,_ZNK5uking2ai6ForkAI8getNamesEPN4sead22BufferedSafeStringBaseIcEE -0x0000007100d64368,O,000288,_ZNK5uking2ai6ForkAI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d64488,O,000092,_ZNK5uking2ai6ForkAI18getRuntimeTypeInfoEv +0x0000007100d630fc,O,000048,_ZN4ksys3act2ai7Fork2AIC1ERKNS1_10ActionBase7InitArgE +0x0000007100d6312c,O,000004,_ZN4ksys3act2ai7Fork2AID1Ev +0x0000007100d63130,O,000036,_ZN4ksys3act2ai7Fork2AID0Ev +0x0000007100d63154,O,000008,_ZNK4ksys3act2ai7Fork2AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d6315c,O,000092,_ZNK4ksys3act2ai7Fork2AI18getRuntimeTypeInfoEv +0x0000007100d631b8,O,000048,_ZN4ksys3act2ai7Fork3AIC1ERKNS1_10ActionBase7InitArgE +0x0000007100d631e8,O,000004,_ZN4ksys3act2ai7Fork3AID1Ev +0x0000007100d631ec,O,000036,_ZN4ksys3act2ai7Fork3AID0Ev +0x0000007100d63210,O,000008,_ZNK4ksys3act2ai7Fork3AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d63218,O,000092,_ZNK4ksys3act2ai7Fork3AI18getRuntimeTypeInfoEv +0x0000007100d63274,O,000372,_ZN4ksys3act2ai7Fork3AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d633e8,O,000048,_ZN4ksys3act2ai7Fork4AIC1ERKNS1_10ActionBase7InitArgE +0x0000007100d63418,O,000004,_ZN4ksys3act2ai7Fork4AID1Ev +0x0000007100d6341c,O,000036,_ZN4ksys3act2ai7Fork4AID0Ev +0x0000007100d63440,O,000008,_ZNK4ksys3act2ai7Fork4AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d63448,O,000092,_ZNK4ksys3act2ai7Fork4AI18getRuntimeTypeInfoEv +0x0000007100d634a4,O,000372,_ZN4ksys3act2ai7Fork4AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d63618,O,000048,_ZN4ksys3act2ai7Fork5AIC1ERKNS1_10ActionBase7InitArgE +0x0000007100d63648,O,000004,_ZN4ksys3act2ai7Fork5AID1Ev +0x0000007100d6364c,O,000036,_ZN4ksys3act2ai7Fork5AID0Ev +0x0000007100d63670,O,000008,_ZNK4ksys3act2ai7Fork5AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d63678,O,000092,_ZNK4ksys3act2ai7Fork5AI18getRuntimeTypeInfoEv +0x0000007100d636d4,O,000372,_ZN4ksys3act2ai7Fork5AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d63848,O,000048,_ZN4ksys3act2ai7Fork6AIC1ERKNS1_10ActionBase7InitArgE +0x0000007100d63878,O,000004,_ZN4ksys3act2ai7Fork6AID1Ev +0x0000007100d6387c,O,000036,_ZN4ksys3act2ai7Fork6AID0Ev +0x0000007100d638a0,O,000008,_ZNK4ksys3act2ai7Fork6AI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d638a8,O,000092,_ZNK4ksys3act2ai7Fork6AI18getRuntimeTypeInfoEv +0x0000007100d63904,O,000372,_ZN4ksys3act2ai7Fork6AI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d63a78,O,000048,_ZN4ksys3act2ai6ForkAIC1ERKNS1_10ActionBase7InitArgE +0x0000007100d63aa8,O,000004,_ZN4ksys3act2ai6ForkAID1Ev +0x0000007100d63aac,O,000036,_ZN4ksys3act2ai6ForkAID0Ev +0x0000007100d63ad0,O,000020,_ZN4ksys3act2ai6ForkAI5init_EPN4sead4HeapE +0x0000007100d63ae4,O,000192,_ZN4ksys3act2ai6ForkAI6enter_EPNS1_15InlineParamPackE +0x0000007100d63ba4,O,000384,_ZN4ksys3act2ai6ForkAI7reenterEPNS1_10ActionBaseERKN4sead14SafeStringBaseIcEE +0x0000007100d63d24,O,000128,_ZN4ksys3act2ai6ForkAI4calcEv +0x0000007100d63da4,O,000088,_ZN4ksys3act2ai6ForkAI6leave_Ev +0x0000007100d63dfc,O,000212,_ZNK4ksys3act2ai6ForkAI8isFailedEv +0x0000007100d63ed0,O,000200,_ZNK4ksys3act2ai6ForkAI10isFinishedEv +0x0000007100d63f98,O,000124,_ZNK4ksys3act2ai6ForkAI12isChangeableEv +0x0000007100d64014,O,000168,_ZN4ksys3act2ai6ForkAI14handleMessage_ERKNS_7MessageE +0x0000007100d640bc,O,000168,_ZN4ksys3act2ai6ForkAI10handleAck_ERKNS_10MessageAckE +0x0000007100d64164,O,000200,_ZNK4ksys3act2ai6ForkAI14getCurrentNameEPN4sead22BufferedSafeStringBaseIcEEPNS1_10ActionBaseE +0x0000007100d6422c,O,000316,_ZNK4ksys3act2ai6ForkAI8getNamesEPN4sead22BufferedSafeStringBaseIcEE +0x0000007100d64368,O,000288,_ZNK4ksys3act2ai6ForkAI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d64488,O,000092,_ZNK4ksys3act2ai6ForkAI18getRuntimeTypeInfoEv 0x0000007100d644e4,O,000152,_ZN4ksys3act2ai6RootAiC1ERKNS1_10ActionBase7InitArgE 0x0000007100d6457c,O,000188,_ZN4ksys3act2ai6RootAiD1Ev 0x0000007100d64638,O,000008,_ZThn56_N4ksys3act2ai6RootAiD1Ev @@ -74836,30 +74836,30 @@ Address,Quality,Size,Name 0x0000007100d674e8,O,000204,_ZNK4ksys3act2ai10DummyQuery27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100d675b4,O,000092,_ZNK4ksys3act2ai10DummyQuery18getRuntimeTypeInfoEv 0x0000007100d67610,O,000052,_ZN4ksys3act2ai10DummyQueryD0Ev -0x0000007100d67644,O,000048,_ZN5uking5query13IsWaitRevivalC1ERKN4ksys3act2ai5Query7InitArgE -0x0000007100d67674,O,000020,_ZN5uking5query13IsWaitRevivalD1Ev -0x0000007100d67688,O,000052,_ZN5uking5query13IsWaitRevivalD0Ev -0x0000007100d676bc,U,000028,AI_Query_IsWaitRevival::doQuery -0x0000007100d676d8,O,000004,_ZN5uking5query13IsWaitRevival10loadParamsERKN4evfl8QueryArgE -0x0000007100d676dc,O,000004,_ZN5uking5query13IsWaitRevival10loadParamsEv -0x0000007100d676e0,O,000204,_ZNK5uking5query13IsWaitRevival27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d677ac,O,000092,_ZNK5uking5query13IsWaitRevival18getRuntimeTypeInfoEv -0x0000007100d67808,O,000048,_ZN5uking5query16CheckEventCancelC1ERKN4ksys3act2ai5Query7InitArgE -0x0000007100d67838,O,000020,_ZN5uking5query16CheckEventCancelD1Ev -0x0000007100d6784c,O,000052,_ZN5uking5query16CheckEventCancelD0Ev -0x0000007100d67880,U,000036,AI_Query_CheckEventCancel::doQuery -0x0000007100d678a4,O,000004,_ZN5uking5query16CheckEventCancel10loadParamsERKN4evfl8QueryArgE -0x0000007100d678a8,O,000004,_ZN5uking5query16CheckEventCancel10loadParamsEv -0x0000007100d678ac,O,000204,_ZNK5uking5query16CheckEventCancel27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d67978,O,000092,_ZNK5uking5query16CheckEventCancel18getRuntimeTypeInfoEv -0x0000007100d679d4,O,000048,_ZN5uking5query26CheckJustBeforeEventCancelC1ERKN4ksys3act2ai5Query7InitArgE -0x0000007100d67a04,O,000020,_ZN5uking5query26CheckJustBeforeEventCancelD1Ev -0x0000007100d67a18,O,000052,_ZN5uking5query26CheckJustBeforeEventCancelD0Ev -0x0000007100d67a4c,U,000036,AI_Query_CheckJustBeforeEventCancel::doQuery -0x0000007100d67a70,O,000004,_ZN5uking5query26CheckJustBeforeEventCancel10loadParamsERKN4evfl8QueryArgE -0x0000007100d67a74,O,000004,_ZN5uking5query26CheckJustBeforeEventCancel10loadParamsEv -0x0000007100d67a78,O,000204,_ZNK5uking5query26CheckJustBeforeEventCancel27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100d67b44,O,000092,_ZNK5uking5query26CheckJustBeforeEventCancel18getRuntimeTypeInfoEv +0x0000007100d67644,O,000048,_ZN4ksys3act2ai13IsWaitRevivalC1ERKNS1_5Query7InitArgE +0x0000007100d67674,O,000020,_ZN4ksys3act2ai13IsWaitRevivalD1Ev +0x0000007100d67688,O,000052,_ZN4ksys3act2ai13IsWaitRevivalD0Ev +0x0000007100d676bc,U,000028,ksys::act::ai::IsWaitRevival::doQuery +0x0000007100d676d8,O,000004,_ZN4ksys3act2ai13IsWaitRevival10loadParamsERKN4evfl8QueryArgE +0x0000007100d676dc,O,000004,_ZN4ksys3act2ai13IsWaitRevival10loadParamsEv +0x0000007100d676e0,O,000204,_ZNK4ksys3act2ai13IsWaitRevival27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d677ac,O,000092,_ZNK4ksys3act2ai13IsWaitRevival18getRuntimeTypeInfoEv +0x0000007100d67808,O,000048,_ZN4ksys3act2ai16CheckEventCancelC1ERKNS1_5Query7InitArgE +0x0000007100d67838,O,000020,_ZN4ksys3act2ai16CheckEventCancelD1Ev +0x0000007100d6784c,O,000052,_ZN4ksys3act2ai16CheckEventCancelD0Ev +0x0000007100d67880,U,000036,ksys::act::ai::CheckEventCancel::doQuery +0x0000007100d678a4,O,000004,_ZN4ksys3act2ai16CheckEventCancel10loadParamsERKN4evfl8QueryArgE +0x0000007100d678a8,O,000004,_ZN4ksys3act2ai16CheckEventCancel10loadParamsEv +0x0000007100d678ac,O,000204,_ZNK4ksys3act2ai16CheckEventCancel27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d67978,O,000092,_ZNK4ksys3act2ai16CheckEventCancel18getRuntimeTypeInfoEv +0x0000007100d679d4,O,000048,_ZN4ksys3act2ai26CheckJustBeforeEventCancelC1ERKNS1_5Query7InitArgE +0x0000007100d67a04,O,000020,_ZN4ksys3act2ai26CheckJustBeforeEventCancelD1Ev +0x0000007100d67a18,O,000052,_ZN4ksys3act2ai26CheckJustBeforeEventCancelD0Ev +0x0000007100d67a4c,U,000036,ksys::act::ai::CheckJustBeforeEventCancel::doQuery +0x0000007100d67a70,O,000004,_ZN4ksys3act2ai26CheckJustBeforeEventCancel10loadParamsERKN4evfl8QueryArgE +0x0000007100d67a74,O,000004,_ZN4ksys3act2ai26CheckJustBeforeEventCancel10loadParamsEv +0x0000007100d67a78,O,000204,_ZNK4ksys3act2ai26CheckJustBeforeEventCancel27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100d67b44,O,000092,_ZNK4ksys3act2ai26CheckJustBeforeEventCancel18getRuntimeTypeInfoEv 0x0000007100d67ba0,U,000036, 0x0000007100d67bc4,U,000152, 0x0000007100d67c5c,U,000148, diff --git a/src/Game/Actor/AI/CMakeLists.txt b/src/Game/Actor/AI/CMakeLists.txt index 6199be55..94932cea 100644 --- a/src/Game/Actor/AI/CMakeLists.txt +++ b/src/Game/Actor/AI/CMakeLists.txt @@ -347,8 +347,6 @@ target_sources(uking PRIVATE aiDeadOrOtherState.h aiDemoRailMoveRemains.cpp aiDemoRailMoveRemains.h - aiDemoRootAI.cpp - aiDemoRootAI.h aiDgnObj_DLC_CogWheel2.cpp aiDgnObj_DLC_CogWheel2.h aiDgnObj_DLC_CogWheel_Physics_Ctr.cpp @@ -717,22 +715,10 @@ target_sources(uking PRIVATE aiForestGiantRoot.h aiForestGiantStoneShootBattle.cpp aiForestGiantStoneShootBattle.h - aiFork2AI.cpp - aiFork2AI.h aiFork2AIUpperLowerBody.cpp aiFork2AIUpperLowerBody.h - aiFork3AI.cpp - aiFork3AI.h - aiFork4AI.cpp - aiFork4AI.h - aiFork5AI.cpp - aiFork5AI.h - aiFork6AI.cpp - aiFork6AI.h aiForkActionAndJoin.cpp aiForkActionAndJoin.h - aiForkAI.cpp - aiForkAI.h aiForkBeastGanonRoot.cpp aiForkBeastGanonRoot.h aiForSaleOrNot.cpp diff --git a/src/Game/Actor/AI/aiAirOctaRoot.h b/src/Game/Actor/AI/aiAirOctaRoot.h index 40113fc5..7931dc5a 100644 --- a/src/Game/Actor/AI/aiAirOctaRoot.h +++ b/src/Game/Actor/AI/aiAirOctaRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiFork2AI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiFork2AI.h" namespace uking::ai { -class AirOctaRoot : public Fork2AI { - SEAD_RTTI_OVERRIDE(AirOctaRoot, Fork2AI) +class AirOctaRoot : public ksys::act::ai::Fork2AI { + SEAD_RTTI_OVERRIDE(AirOctaRoot, ksys::act::ai::Fork2AI) public: explicit AirOctaRoot(const InitArg& arg); ~AirOctaRoot() override; diff --git a/src/Game/Actor/AI/aiDemoRootAI.cpp b/src/Game/Actor/AI/aiDemoRootAI.cpp deleted file mode 100644 index d89fb63d..00000000 --- a/src/Game/Actor/AI/aiDemoRootAI.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/AI/aiDemoRootAI.h" - -namespace uking::ai { - -DemoRootAI::DemoRootAI(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -DemoRootAI::~DemoRootAI() = default; - -bool DemoRootAI::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void DemoRootAI::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void DemoRootAI::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void DemoRootAI::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFork2AI.cpp b/src/Game/Actor/AI/aiFork2AI.cpp deleted file mode 100644 index 9872b2b8..00000000 --- a/src/Game/Actor/AI/aiFork2AI.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Game/Actor/AI/aiFork2AI.h" - -namespace uking::ai { - -Fork2AI::Fork2AI(const InitArg& arg) : ForkAI(arg) {} - -Fork2AI::~Fork2AI() = default; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFork2AIUpperLowerBody.h b/src/Game/Actor/AI/aiFork2AIUpperLowerBody.h index 3ec4e683..c2ba38e6 100644 --- a/src/Game/Actor/AI/aiFork2AIUpperLowerBody.h +++ b/src/Game/Actor/AI/aiFork2AIUpperLowerBody.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" namespace uking::ai { -class Fork2AIUpperLowerBody : public ForkAI { - SEAD_RTTI_OVERRIDE(Fork2AIUpperLowerBody, ForkAI) +class Fork2AIUpperLowerBody : public ksys::act::ai::ForkAI { + SEAD_RTTI_OVERRIDE(Fork2AIUpperLowerBody, ksys::act::ai::ForkAI) public: explicit Fork2AIUpperLowerBody(const InitArg& arg); ~Fork2AIUpperLowerBody() override; diff --git a/src/Game/Actor/AI/aiFork3AI.cpp b/src/Game/Actor/AI/aiFork3AI.cpp deleted file mode 100644 index 94e7038f..00000000 --- a/src/Game/Actor/AI/aiFork3AI.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Game/Actor/AI/aiFork3AI.h" - -namespace uking::ai { - -Fork3AI::Fork3AI(const InitArg& arg) : ForkAI(arg) {} - -Fork3AI::~Fork3AI() = default; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFork4AI.cpp b/src/Game/Actor/AI/aiFork4AI.cpp deleted file mode 100644 index b8be623c..00000000 --- a/src/Game/Actor/AI/aiFork4AI.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Game/Actor/AI/aiFork4AI.h" - -namespace uking::ai { - -Fork4AI::Fork4AI(const InitArg& arg) : ForkAI(arg) {} - -Fork4AI::~Fork4AI() = default; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFork5AI.cpp b/src/Game/Actor/AI/aiFork5AI.cpp deleted file mode 100644 index 7f3bba0a..00000000 --- a/src/Game/Actor/AI/aiFork5AI.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Game/Actor/AI/aiFork5AI.h" - -namespace uking::ai { - -Fork5AI::Fork5AI(const InitArg& arg) : ForkAI(arg) {} - -Fork5AI::~Fork5AI() = default; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFork6AI.cpp b/src/Game/Actor/AI/aiFork6AI.cpp deleted file mode 100644 index 2b73c669..00000000 --- a/src/Game/Actor/AI/aiFork6AI.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Game/Actor/AI/aiFork6AI.h" - -namespace uking::ai { - -Fork6AI::Fork6AI(const InitArg& arg) : ForkAI(arg) {} - -Fork6AI::~Fork6AI() = default; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiForkBeastGanonRoot.h b/src/Game/Actor/AI/aiForkBeastGanonRoot.h index 17d8e237..8725e84b 100644 --- a/src/Game/Actor/AI/aiForkBeastGanonRoot.h +++ b/src/Game/Actor/AI/aiForkBeastGanonRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" namespace uking::ai { -class ForkBeastGanonRoot : public ForkAI { - SEAD_RTTI_OVERRIDE(ForkBeastGanonRoot, ForkAI) +class ForkBeastGanonRoot : public ksys::act::ai::ForkAI { + SEAD_RTTI_OVERRIDE(ForkBeastGanonRoot, ksys::act::ai::ForkAI) public: explicit ForkBeastGanonRoot(const InitArg& arg); ~ForkBeastGanonRoot() override; diff --git a/src/Game/Actor/Query/CMakeLists.txt b/src/Game/Actor/Query/CMakeLists.txt index 1eb2ea5d..cffcfa98 100644 --- a/src/Game/Actor/Query/CMakeLists.txt +++ b/src/Game/Actor/Query/CMakeLists.txt @@ -61,8 +61,6 @@ target_sources(uking PRIVATE queryCheckEquipItemType.h queryCheckEquipment.cpp queryCheckEquipment.h - queryCheckEventCancel.cpp - queryCheckEventCancel.h queryCheckExistActor.cpp queryCheckExistActor.h queryCheckExistArrow.cpp @@ -105,8 +103,6 @@ target_sources(uking PRIVATE queryCheckItemShopSelectBuy.h queryCheckItemShopSelect.cpp queryCheckItemShopSelect.h - queryCheckJustBeforeEventCancel.cpp - queryCheckJustBeforeEventCancel.h queryCheckLastDamageAttacker.cpp queryCheckLastDamageAttacker.h queryCheckManufactResult.cpp @@ -303,8 +299,6 @@ target_sources(uking PRIVATE queryIsSuccessEndLastDemoAction.h queryIsTerrorDisappeared.cpp queryIsTerrorDisappeared.h - queryIsWaitRevival.cpp - queryIsWaitRevival.h queryIsWeaponDrawn.cpp queryIsWeaponDrawn.h queryKeyInputCheck.cpp diff --git a/src/Game/Actor/aiAiFactories.cpp b/src/Game/Actor/aiAiFactories.cpp index 0546b8f5..76a3b422 100644 --- a/src/Game/Actor/aiAiFactories.cpp +++ b/src/Game/Actor/aiAiFactories.cpp @@ -160,7 +160,6 @@ #include "Game/Actor/AI/aiDeadOrOtherState.h" #include "Game/Actor/AI/aiDeadlyBlowWeaponRoot.h" #include "Game/Actor/AI/aiDemoRailMoveRemains.h" -#include "Game/Actor/AI/aiDemoRootAI.h" #include "Game/Actor/AI/aiDgnObj_DLC_CWRotDirSwitch.h" #include "Game/Actor/AI/aiDgnObj_DLC_CW_WithEntityBody00.h" #include "Game/Actor/AI/aiDgnObj_DLC_CogWheel2.h" @@ -336,12 +335,7 @@ #include "Game/Actor/AI/aiForestGiantRoam.h" #include "Game/Actor/AI/aiForestGiantRoot.h" #include "Game/Actor/AI/aiForestGiantStoneShootBattle.h" -#include "Game/Actor/AI/aiFork2AI.h" #include "Game/Actor/AI/aiFork2AIUpperLowerBody.h" -#include "Game/Actor/AI/aiFork3AI.h" -#include "Game/Actor/AI/aiFork4AI.h" -#include "Game/Actor/AI/aiFork5AI.h" -#include "Game/Actor/AI/aiFork6AI.h" #include "Game/Actor/AI/aiForkActionAndJoin.h" #include "Game/Actor/AI/aiForkBeastGanonRoot.h" #include "Game/Actor/AI/aiFreezeInWaterSelect.h" @@ -1174,6 +1168,12 @@ #include "Game/Actor/Player/AI/aiPlayerWaterFall.h" #include "Game/Actor/Player/AI/aiPlayerZoraRide.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiDemoRootAI.h" +#include "KingSystem/ActorSystem/aiFork2AI.h" +#include "KingSystem/ActorSystem/aiFork3AI.h" +#include "KingSystem/ActorSystem/aiFork4AI.h" +#include "KingSystem/ActorSystem/aiFork5AI.h" +#include "KingSystem/ActorSystem/aiFork6AI.h" #include "KingSystem/Sound/Actor/AI/aiEnvSeEmitPointRootAI.h" #include "KingSystem/Sound/Actor/AI/aiSignaledSpotBgmTrigger.h" #include "KingSystem/Sound/Actor/AI/aiSpotBgmTrigger.h" @@ -2181,7 +2181,7 @@ static Factory sAiFactories[] = { {0xd800da13, Factory::make}, {0xd855d755, Factory::make}, {0xd87ab5ee, Factory::make}, - {0xd8c46be8, Factory::make}, + {0xd8c46be8, Factory::make}, {0xd8eee460, Factory::make}, {0xd908c25c, Factory::make}, {0xd93f35ac, Factory::make}, @@ -2249,9 +2249,9 @@ static Factory sAiFactories[] = { {0xe874b318, Factory::make}, {0xe87547e4, Factory::make}, {0xe887a5b2, Factory::make}, - {0xe8e24114, Factory::make}, + {0xe8e24114, Factory::make}, {0xe8f2addd, Factory::make}, - {0xe9202b23, Factory::make}, + {0xe9202b23, Factory::make}, {0xe953a698, Factory::make}, {0xe96d0d7d, Factory::make}, {0xe97748df, Factory::make}, @@ -2259,7 +2259,7 @@ static Factory sAiFactories[] = { {0xea0994f6, Factory::make}, {0xea1c70ed, Factory::make}, {0xea7c8a41, Factory::make}, - {0xeaa4ff4d, Factory::make}, + {0xeaa4ff4d, Factory::make}, {0xeaafb8eb, Factory::make}, {0xeacf2879, Factory::make}, {0xead748ac, Factory::make}, @@ -2271,11 +2271,11 @@ static Factory sAiFactories[] = { {0xebc9ee5d, Factory::make}, {0xebcedf46, Factory::make}, {0xebfb21c4, Factory::make}, - {0xec6f3da6, Factory::make}, + {0xec6f3da6, Factory::make}, {0xec77049c, Factory::make}, {0xecbc5f90, Factory::make}, {0xed9f7612, Factory::make}, - {0xedad5791, Factory::make}, + {0xedad5791, Factory::make}, {0xedbf519f, Factory::make}, {0xedd27f4e, Factory::make}, {0xeddbc467, Factory::make}, diff --git a/src/Game/Actor/aiQueryFactories.cpp b/src/Game/Actor/aiQueryFactories.cpp index 8ee4c2bd..87689f56 100644 --- a/src/Game/Actor/aiQueryFactories.cpp +++ b/src/Game/Actor/aiQueryFactories.cpp @@ -35,7 +35,6 @@ #include "Game/Actor/Query/queryCheckEquipArmorSeriesType.h" #include "Game/Actor/Query/queryCheckEquipItemType.h" #include "Game/Actor/Query/queryCheckEquipment.h" -#include "Game/Actor/Query/queryCheckEventCancel.h" #include "Game/Actor/Query/queryCheckExistActor.h" #include "Game/Actor/Query/queryCheckExistArrow.h" #include "Game/Actor/Query/queryCheckExtraEnergyOfPlayer.h" @@ -57,7 +56,6 @@ #include "Game/Actor/Query/queryCheckItemShopPorchVacancy.h" #include "Game/Actor/Query/queryCheckItemShopSelect.h" #include "Game/Actor/Query/queryCheckItemShopSelectBuy.h" -#include "Game/Actor/Query/queryCheckJustBeforeEventCancel.h" #include "Game/Actor/Query/queryCheckLastDamageAttacker.h" #include "Game/Actor/Query/queryCheckManufactResult.h" #include "Game/Actor/Query/queryCheckMapArea.h" @@ -156,7 +154,6 @@ #include "Game/Actor/Query/queryIsSoldOut.h" #include "Game/Actor/Query/queryIsSuccessEndLastDemoAction.h" #include "Game/Actor/Query/queryIsTerrorDisappeared.h" -#include "Game/Actor/Query/queryIsWaitRevival.h" #include "Game/Actor/Query/queryIsWeaponDrawn.h" #include "Game/Actor/Query/queryKeyInputCheck.h" #include "Game/Actor/Query/queryRandomChoice2.h" @@ -170,7 +167,10 @@ #include "Game/Actor/Query/queryWhatMoonName.h" #include "KingSystem/ActorSystem/actAiQueries.h" #include "KingSystem/ActorSystem/actAiQuery.h" +#include "KingSystem/ActorSystem/queryCheckEventCancel.h" +#include "KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.h" #include "KingSystem/ActorSystem/queryDummyQuery.h" +#include "KingSystem/ActorSystem/queryIsWaitRevival.h" namespace uking { @@ -233,7 +233,7 @@ static ksys::act::ai::QueryFactory sQueryFactories[] = { {0x5f93f5f6, Factory::make}, {0x6013e082, Factory::make}, {0x63148c7e, Factory::make}, - {0x6593295f, Factory::make}, + {0x6593295f, Factory::make}, {0x668f18a7, Factory::make}, {0x67f56d1d, Factory::make}, {0x692f3d2e, Factory::make}, @@ -274,7 +274,7 @@ static ksys::act::ai::QueryFactory sQueryFactories[] = { {0x979ded52, Factory::make}, {0x98297948, Factory::make}, {0x988da1f6, Factory::make}, - {0x98934f65, Factory::make}, + {0x98934f65, Factory::make}, {0x9909e013, Factory::make}, {0x9a1ef0c2, Factory::make}, {0x9f439257, Factory::make}, @@ -331,7 +331,7 @@ static ksys::act::ai::QueryFactory sQueryFactories[] = { {0xeda9870b, Factory::make}, {0xf0074ef3, Factory::make}, {0xf39c6c52, Factory::make}, - {0xf3bfbc24, Factory::make}, + {0xf3bfbc24, Factory::make}, {0xf445bb27, Factory::make}, {0xf44bfc07, Factory::make}, {0xf4db0067, Factory::make}, diff --git a/src/KingSystem/ActorSystem/CMakeLists.txt b/src/KingSystem/ActorSystem/CMakeLists.txt index dab97a14..258cde69 100644 --- a/src/KingSystem/ActorSystem/CMakeLists.txt +++ b/src/KingSystem/ActorSystem/CMakeLists.txt @@ -118,10 +118,32 @@ target_sources(uking PRIVATE actionDummyAction.cpp actionDummyAction.h + aiDemoRootAI.cpp + aiDemoRootAI.h aiDummyAi.cpp aiDummyAi.h + aiFork2AI.cpp + aiFork2AI.h + aiFork3AI.cpp + aiFork3AI.h + aiFork4AI.cpp + aiFork4AI.h + aiFork5AI.cpp + aiFork5AI.h + aiFork6AI.cpp + aiFork6AI.h + aiForkAI.cpp + aiForkAI.h + behaviorDummyBehavior.cpp behaviorDummyBehavior.h + + queryCheckEventCancel.cpp + queryCheckEventCancel.h + queryCheckJustBeforeEventCancel.cpp + queryCheckJustBeforeEventCancel.h queryDummyQuery.cpp queryDummyQuery.h + queryIsWaitRevival.cpp + queryIsWaitRevival.h ) diff --git a/src/KingSystem/ActorSystem/aiDemoRootAI.cpp b/src/KingSystem/ActorSystem/aiDemoRootAI.cpp new file mode 100644 index 00000000..d14dd221 --- /dev/null +++ b/src/KingSystem/ActorSystem/aiDemoRootAI.cpp @@ -0,0 +1,23 @@ +#include "KingSystem/ActorSystem/aiDemoRootAI.h" + +namespace ksys::act::ai { + +DemoRootAI::DemoRootAI(const InitArg& arg) : Ai(arg) {} + +DemoRootAI::~DemoRootAI() = default; + +bool DemoRootAI::init_(sead::Heap* heap) { + return Ai::init_(heap); +} + +void DemoRootAI::enter_(InlineParamPack* params) { + Ai::enter_(params); +} + +void DemoRootAI::leave_() { + Ai::leave_(); +} + +void DemoRootAI::loadParams_() {} + +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiDemoRootAI.h b/src/KingSystem/ActorSystem/aiDemoRootAI.h similarity index 55% rename from src/Game/Actor/AI/aiDemoRootAI.h rename to src/KingSystem/ActorSystem/aiDemoRootAI.h index 513f0872..f057dc3a 100644 --- a/src/Game/Actor/AI/aiDemoRootAI.h +++ b/src/KingSystem/ActorSystem/aiDemoRootAI.h @@ -2,20 +2,20 @@ #include "KingSystem/ActorSystem/actAiAi.h" -namespace uking::ai { +namespace ksys::act::ai { -class DemoRootAI : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(DemoRootAI, ksys::act::ai::Ai) +class DemoRootAI : public Ai { + SEAD_RTTI_OVERRIDE(DemoRootAI, Ai) public: explicit DemoRootAI(const InitArg& arg); ~DemoRootAI() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; + void enter_(InlineParamPack* params) override; void leave_() override; void loadParams_() override; protected: }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/aiFork2AI.cpp b/src/KingSystem/ActorSystem/aiFork2AI.cpp new file mode 100644 index 00000000..a480c549 --- /dev/null +++ b/src/KingSystem/ActorSystem/aiFork2AI.cpp @@ -0,0 +1,9 @@ +#include "KingSystem/ActorSystem/aiFork2AI.h" + +namespace ksys::act::ai { + +Fork2AI::Fork2AI(const InitArg& arg) : ForkAI(arg) {} + +Fork2AI::~Fork2AI() = default; + +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiFork2AI.h b/src/KingSystem/ActorSystem/aiFork2AI.h similarity index 68% rename from src/Game/Actor/AI/aiFork2AI.h rename to src/KingSystem/ActorSystem/aiFork2AI.h index 185904ef..01192a21 100644 --- a/src/Game/Actor/AI/aiFork2AI.h +++ b/src/KingSystem/ActorSystem/aiFork2AI.h @@ -1,9 +1,9 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" -namespace uking::ai { +namespace ksys::act::ai { class Fork2AI : public ForkAI { SEAD_RTTI_OVERRIDE(Fork2AI, ForkAI) @@ -14,4 +14,4 @@ public: protected: }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/aiFork3AI.cpp b/src/KingSystem/ActorSystem/aiFork3AI.cpp new file mode 100644 index 00000000..0f92e6c5 --- /dev/null +++ b/src/KingSystem/ActorSystem/aiFork3AI.cpp @@ -0,0 +1,9 @@ +#include "KingSystem/ActorSystem/aiFork3AI.h" + +namespace ksys::act::ai { + +Fork3AI::Fork3AI(const InitArg& arg) : ForkAI(arg) {} + +Fork3AI::~Fork3AI() = default; + +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiFork3AI.h b/src/KingSystem/ActorSystem/aiFork3AI.h similarity index 68% rename from src/Game/Actor/AI/aiFork3AI.h rename to src/KingSystem/ActorSystem/aiFork3AI.h index 2882266c..886202d3 100644 --- a/src/Game/Actor/AI/aiFork3AI.h +++ b/src/KingSystem/ActorSystem/aiFork3AI.h @@ -1,9 +1,9 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" -namespace uking::ai { +namespace ksys::act::ai { class Fork3AI : public ForkAI { SEAD_RTTI_OVERRIDE(Fork3AI, ForkAI) @@ -14,4 +14,4 @@ public: protected: }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/aiFork4AI.cpp b/src/KingSystem/ActorSystem/aiFork4AI.cpp new file mode 100644 index 00000000..7b6acf4d --- /dev/null +++ b/src/KingSystem/ActorSystem/aiFork4AI.cpp @@ -0,0 +1,9 @@ +#include "KingSystem/ActorSystem/aiFork4AI.h" + +namespace ksys::act::ai { + +Fork4AI::Fork4AI(const InitArg& arg) : ForkAI(arg) {} + +Fork4AI::~Fork4AI() = default; + +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiFork4AI.h b/src/KingSystem/ActorSystem/aiFork4AI.h similarity index 68% rename from src/Game/Actor/AI/aiFork4AI.h rename to src/KingSystem/ActorSystem/aiFork4AI.h index cf649022..d4a40097 100644 --- a/src/Game/Actor/AI/aiFork4AI.h +++ b/src/KingSystem/ActorSystem/aiFork4AI.h @@ -1,9 +1,9 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" -namespace uking::ai { +namespace ksys::act::ai { class Fork4AI : public ForkAI { SEAD_RTTI_OVERRIDE(Fork4AI, ForkAI) @@ -14,4 +14,4 @@ public: protected: }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/aiFork5AI.cpp b/src/KingSystem/ActorSystem/aiFork5AI.cpp new file mode 100644 index 00000000..2864523e --- /dev/null +++ b/src/KingSystem/ActorSystem/aiFork5AI.cpp @@ -0,0 +1,9 @@ +#include "KingSystem/ActorSystem/aiFork5AI.h" + +namespace ksys::act::ai { + +Fork5AI::Fork5AI(const InitArg& arg) : ForkAI(arg) {} + +Fork5AI::~Fork5AI() = default; + +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiFork5AI.h b/src/KingSystem/ActorSystem/aiFork5AI.h similarity index 68% rename from src/Game/Actor/AI/aiFork5AI.h rename to src/KingSystem/ActorSystem/aiFork5AI.h index 322b0292..174df2d9 100644 --- a/src/Game/Actor/AI/aiFork5AI.h +++ b/src/KingSystem/ActorSystem/aiFork5AI.h @@ -1,9 +1,9 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" -namespace uking::ai { +namespace ksys::act::ai { class Fork5AI : public ForkAI { SEAD_RTTI_OVERRIDE(Fork5AI, ForkAI) @@ -14,4 +14,4 @@ public: protected: }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/KingSystem/ActorSystem/aiFork6AI.cpp b/src/KingSystem/ActorSystem/aiFork6AI.cpp new file mode 100644 index 00000000..9c218aca --- /dev/null +++ b/src/KingSystem/ActorSystem/aiFork6AI.cpp @@ -0,0 +1,9 @@ +#include "KingSystem/ActorSystem/aiFork6AI.h" + +namespace ksys::act::ai { + +Fork6AI::Fork6AI(const InitArg& arg) : ForkAI(arg) {} + +Fork6AI::~Fork6AI() = default; + +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiFork6AI.h b/src/KingSystem/ActorSystem/aiFork6AI.h similarity index 68% rename from src/Game/Actor/AI/aiFork6AI.h rename to src/KingSystem/ActorSystem/aiFork6AI.h index 7a001267..d3914a34 100644 --- a/src/Game/Actor/AI/aiFork6AI.h +++ b/src/KingSystem/ActorSystem/aiFork6AI.h @@ -1,9 +1,9 @@ #pragma once -#include "Game/Actor/AI/aiForkAI.h" #include "KingSystem/ActorSystem/actAiAi.h" +#include "KingSystem/ActorSystem/aiForkAI.h" -namespace uking::ai { +namespace ksys::act::ai { class Fork6AI : public ForkAI { SEAD_RTTI_OVERRIDE(Fork6AI, ForkAI) @@ -14,4 +14,4 @@ public: protected: }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiForkAI.cpp b/src/KingSystem/ActorSystem/aiForkAI.cpp similarity index 86% rename from src/Game/Actor/AI/aiForkAI.cpp rename to src/KingSystem/ActorSystem/aiForkAI.cpp index 9d156136..d8cd4249 100644 --- a/src/Game/Actor/AI/aiForkAI.cpp +++ b/src/KingSystem/ActorSystem/aiForkAI.cpp @@ -1,9 +1,9 @@ -#include "Game/Actor/AI/aiForkAI.h" +#include "KingSystem/ActorSystem/aiForkAI.h" #include "KingSystem/ActorSystem/actAiRoot.h" -namespace uking::ai { +namespace ksys::act::ai { -ForkAI::ForkAI(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +ForkAI::ForkAI(const InitArg& arg) : Ai(arg) {} ForkAI::~ForkAI() = default; @@ -12,7 +12,7 @@ bool ForkAI::init_(sead::Heap* heap) { return true; } -void ForkAI::enter_(ksys::act::ai::InlineParamPack* params) { +void ForkAI::enter_(InlineParamPack* params) { const int num_children = getNumChildren(); if (num_children >= 1) { for (int i = 0; i < num_children; ++i) @@ -22,10 +22,10 @@ void ForkAI::enter_(ksys::act::ai::InlineParamPack* params) { SEAD_WARN("ForkAI::enter_: no children"); changeChildIdx(num_children - 1); } - setRootAiFlag(ksys::act::ai::RootAiFlag::_8); + setRootAiFlag(RootAiFlag::_8); } -bool ForkAI::reenter(ksys::act::ai::ActionBase* other, const sead::SafeString& context) { +bool ForkAI::reenter(ActionBase* other, const sead::SafeString& context) { auto* other_ = sead::DynamicCast(other); if (!other_) return false; @@ -101,7 +101,7 @@ bool ForkAI::isChangeable() const { return true; } -bool ForkAI::handleMessage_(const ksys::Message& message) { +bool ForkAI::handleMessage_(const Message& message) { const int num_children = getNumChildren(); bool ok = false; @@ -115,7 +115,7 @@ bool ForkAI::handleMessage_(const ksys::Message& message) { return true; } -bool ForkAI::handleAck_(const ksys::MessageAck& message) { +bool ForkAI::handleAck_(const MessageAck& message) { const int num_children = getNumChildren(); bool ok = false; @@ -129,7 +129,7 @@ bool ForkAI::handleAck_(const ksys::MessageAck& message) { return true; } -void ForkAI::getCurrentName(sead::BufferedSafeString* name, ksys::act::ai::ActionBase* last) const { +void ForkAI::getCurrentName(sead::BufferedSafeString* name, ActionBase* last) const { name->appendWithFormat("/%s{", getName()); if (this != last) { const int num_children = getNumChildren(); @@ -154,4 +154,4 @@ void ForkAI::getNames(sead::BufferedSafeString* out) const { out->appendWithFormat("}"); } -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/Game/Actor/AI/aiForkAI.h b/src/KingSystem/ActorSystem/aiForkAI.h similarity index 63% rename from src/Game/Actor/AI/aiForkAI.h rename to src/KingSystem/ActorSystem/aiForkAI.h index e7602336..d71a71af 100644 --- a/src/Game/Actor/AI/aiForkAI.h +++ b/src/KingSystem/ActorSystem/aiForkAI.h @@ -2,26 +2,26 @@ #include "KingSystem/ActorSystem/actAiAi.h" -namespace uking::ai { +namespace ksys::act::ai { -class ForkAI : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(ForkAI, ksys::act::ai::Ai) +class ForkAI : public Ai { + SEAD_RTTI_OVERRIDE(ForkAI, Ai) public: explicit ForkAI(const InitArg& arg); ~ForkAI() override; bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; + void enter_(InlineParamPack* params) override; bool reenter(ActionBase* other, const sead::SafeString& context) override; void calc() override; void leave_() override; bool isFailed() const override; bool isFinished() const override; bool isChangeable() const override; - bool handleMessage_(const ksys::Message& message) override; - bool handleAck_(const ksys::MessageAck& message) override; + bool handleMessage_(const Message& message) override; + bool handleAck_(const MessageAck& message) override; void getCurrentName(sead::BufferedSafeString* name, ActionBase* last) const override; void getNames(sead::BufferedSafeString* out) const override; }; -} // namespace uking::ai +} // namespace ksys::act::ai diff --git a/src/Game/Actor/Query/queryCheckEventCancel.cpp b/src/KingSystem/ActorSystem/queryCheckEventCancel.cpp similarity index 56% rename from src/Game/Actor/Query/queryCheckEventCancel.cpp rename to src/KingSystem/ActorSystem/queryCheckEventCancel.cpp index ab065963..177a3cd9 100644 --- a/src/Game/Actor/Query/queryCheckEventCancel.cpp +++ b/src/KingSystem/ActorSystem/queryCheckEventCancel.cpp @@ -1,9 +1,9 @@ -#include "Game/Actor/Query/queryCheckEventCancel.h" +#include "KingSystem/ActorSystem/queryCheckEventCancel.h" #include -namespace uking::query { +namespace ksys::act::ai { -CheckEventCancel::CheckEventCancel(const InitArg& arg) : ksys::act::ai::Query(arg) {} +CheckEventCancel::CheckEventCancel(const InitArg& arg) : Query(arg) {} CheckEventCancel::~CheckEventCancel() = default; @@ -16,4 +16,4 @@ void CheckEventCancel::loadParams(const evfl::QueryArg& arg) {} void CheckEventCancel::loadParams() {} -} // namespace uking::query +} // namespace ksys::act::ai diff --git a/src/Game/Actor/Query/queryCheckEventCancel.h b/src/KingSystem/ActorSystem/queryCheckEventCancel.h similarity index 74% rename from src/Game/Actor/Query/queryCheckEventCancel.h rename to src/KingSystem/ActorSystem/queryCheckEventCancel.h index 382e1d6b..70d0fd35 100644 --- a/src/Game/Actor/Query/queryCheckEventCancel.h +++ b/src/KingSystem/ActorSystem/queryCheckEventCancel.h @@ -2,9 +2,9 @@ #include "KingSystem/ActorSystem/actAiQuery.h" -namespace uking::query { +namespace ksys::act::ai { -class CheckEventCancel : public ksys::act::ai::Query { +class CheckEventCancel : public Query { SEAD_RTTI_OVERRIDE(CheckEventCancel, Query) public: explicit CheckEventCancel(const InitArg& arg); @@ -15,4 +15,4 @@ public: void loadParams(const evfl::QueryArg& arg) override; }; -} // namespace uking::query +} // namespace ksys::act::ai diff --git a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.cpp b/src/KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.cpp similarity index 69% rename from src/Game/Actor/Query/queryCheckJustBeforeEventCancel.cpp rename to src/KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.cpp index 0b6c389c..61191f0b 100644 --- a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.cpp +++ b/src/KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.cpp @@ -1,10 +1,9 @@ -#include "Game/Actor/Query/queryCheckJustBeforeEventCancel.h" +#include "KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.h" #include -namespace uking::query { +namespace ksys::act::ai { -CheckJustBeforeEventCancel::CheckJustBeforeEventCancel(const InitArg& arg) - : ksys::act::ai::Query(arg) {} +CheckJustBeforeEventCancel::CheckJustBeforeEventCancel(const InitArg& arg) : Query(arg) {} CheckJustBeforeEventCancel::~CheckJustBeforeEventCancel() = default; @@ -17,4 +16,4 @@ void CheckJustBeforeEventCancel::loadParams(const evfl::QueryArg& arg) {} void CheckJustBeforeEventCancel::loadParams() {} -} // namespace uking::query +} // namespace ksys::act::ai diff --git a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.h b/src/KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.h similarity index 74% rename from src/Game/Actor/Query/queryCheckJustBeforeEventCancel.h rename to src/KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.h index f339404c..6cc35062 100644 --- a/src/Game/Actor/Query/queryCheckJustBeforeEventCancel.h +++ b/src/KingSystem/ActorSystem/queryCheckJustBeforeEventCancel.h @@ -2,9 +2,9 @@ #include "KingSystem/ActorSystem/actAiQuery.h" -namespace uking::query { +namespace ksys::act::ai { -class CheckJustBeforeEventCancel : public ksys::act::ai::Query { +class CheckJustBeforeEventCancel : public Query { SEAD_RTTI_OVERRIDE(CheckJustBeforeEventCancel, Query) public: explicit CheckJustBeforeEventCancel(const InitArg& arg); @@ -15,4 +15,4 @@ public: void loadParams(const evfl::QueryArg& arg) override; }; -} // namespace uking::query +} // namespace ksys::act::ai diff --git a/src/Game/Actor/Query/queryIsWaitRevival.cpp b/src/KingSystem/ActorSystem/queryIsWaitRevival.cpp similarity index 56% rename from src/Game/Actor/Query/queryIsWaitRevival.cpp rename to src/KingSystem/ActorSystem/queryIsWaitRevival.cpp index 1417b69a..06312578 100644 --- a/src/Game/Actor/Query/queryIsWaitRevival.cpp +++ b/src/KingSystem/ActorSystem/queryIsWaitRevival.cpp @@ -1,9 +1,9 @@ -#include "Game/Actor/Query/queryIsWaitRevival.h" +#include "KingSystem/ActorSystem/queryIsWaitRevival.h" #include -namespace uking::query { +namespace ksys::act::ai { -IsWaitRevival::IsWaitRevival(const InitArg& arg) : ksys::act::ai::Query(arg) {} +IsWaitRevival::IsWaitRevival(const InitArg& arg) : Query(arg) {} IsWaitRevival::~IsWaitRevival() = default; @@ -16,4 +16,4 @@ void IsWaitRevival::loadParams(const evfl::QueryArg& arg) {} void IsWaitRevival::loadParams() {} -} // namespace uking::query +} // namespace ksys::act::ai diff --git a/src/Game/Actor/Query/queryIsWaitRevival.h b/src/KingSystem/ActorSystem/queryIsWaitRevival.h similarity index 74% rename from src/Game/Actor/Query/queryIsWaitRevival.h rename to src/KingSystem/ActorSystem/queryIsWaitRevival.h index ddcaf6b5..53fbf183 100644 --- a/src/Game/Actor/Query/queryIsWaitRevival.h +++ b/src/KingSystem/ActorSystem/queryIsWaitRevival.h @@ -2,9 +2,9 @@ #include "KingSystem/ActorSystem/actAiQuery.h" -namespace uking::query { +namespace ksys::act::ai { -class IsWaitRevival : public ksys::act::ai::Query { +class IsWaitRevival : public Query { SEAD_RTTI_OVERRIDE(IsWaitRevival, Query) public: explicit IsWaitRevival(const InitArg& arg); @@ -15,4 +15,4 @@ public: void loadParams(const evfl::QueryArg& arg) override; }; -} // namespace uking::query +} // namespace ksys::act::ai