diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 759108c0..1ad99334 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -2707,8 +2707,8 @@ Address,Quality,Size,Name 0x000000710008cec4,O,000240,_ZN5uking6action12AnchorSummon11loadParams_Ev 0x000000710008cfb4,O,000132,_ZNK5uking6action12AnchorSummon27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710008d038,O,000092,_ZNK5uking6action12AnchorSummon18getRuntimeTypeInfoEv -0x000000710008d094,O,000372,_ZN5uking6action22ActionWithPosAngReduce33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710008d208,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action22ActionWithPosAngReduceEE9isDerivedEPKNS0_9InterfaceE +0x000000710008d094,O,000372,_ZN5uking6action8StopBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710008d208,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action8StopBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710008d294,O,000048,_ZN5uking6action5AngryC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710008d2c4,O,000008,_ZN5uking6action5Angry5init_EPN4sead4HeapE 0x000000710008d2cc,W,000068,_ZN5uking6action5Angry6enter_EPN4ksys3act2ai15InlineParamPackE @@ -2785,9 +2785,9 @@ Address,Quality,Size,Name 0x000000710008f338,O,000008,_ZNK5uking6action12AnimalFollow27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710008f340,O,000092,_ZNK5uking6action12AnimalFollow18getRuntimeTypeInfoEv 0x000000710008f39c,U,000012,uking::action::AnimalFollow::m32 -0x000000710008f3a8,U,000004,uking::action::AnimalFollowBase::m34 +0x000000710008f3a8,U,000004,uking::action::HorseFollowBase::m34 0x000000710008f3ac,O,000372,_ZN5uking6action12AnimalFollow33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710008f520,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16AnimalFollowBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710008f520,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15HorseFollowBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710008f5ac,O,000048,_ZN5uking6action12AnimalFreezeC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710008f5dc,O,000004,_ZN5uking6action12AnimalFreezeD1Ev 0x000000710008f5e0,O,000036,_ZN5uking6action12AnimalFreezeD0Ev @@ -2970,12 +2970,12 @@ Address,Quality,Size,Name 0x00000071000953b0,U,000076,_ZNK5uking6action9AnmDamage12isChangeableEv 0x00000071000953fc,O,000216,_ZNK5uking6action9AnmDamage27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000954d4,O,000092,_ZNK5uking6action9AnmDamage18getRuntimeTypeInfoEv -0x0000007100095530,U,000004,uking::action::TakeHitImpactForce::m34 -0x0000007100095534,U,000008,uking::action::TakeHitImpactForce::m36 -0x000000710009553c,U,000012,uking::action::TakeHitImpactForce::m37 +0x0000007100095530,U,000004,uking::action::KnockBackHitImpactForce::m34 +0x0000007100095534,U,000008,uking::action::KnockBackHitImpactForce::m36 +0x000000710009553c,U,000012,uking::action::KnockBackHitImpactForce::m37 0x0000007100095548,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15SmallDamageBaseEE9isDerivedEPKNS0_9InterfaceE -0x00000071000955d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18TakeHitImpactForceEE9isDerivedEPKNS0_9InterfaceE -0x0000007100095660,O,000372,_ZN5uking6action18TakeHitImpactForce33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000955d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23KnockBackHitImpactForceEE9isDerivedEPKNS0_9InterfaceE +0x0000007100095660,O,000372,_ZN5uking6action23KnockBackHitImpactForce33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000957d4,U,000100,AI_Action_AnmDirectionMove::ctor 0x0000007100095838,O,000020,_ZN5uking6action16AnmDirectionMoveD1Ev 0x000000710009584c,O,000052,_ZN5uking6action16AnmDirectionMoveD0Ev @@ -3056,7 +3056,7 @@ Address,Quality,Size,Name 0x0000007100098160,O,000092,_ZNK5uking6action17AnmTimingBackWalk18getRuntimeTypeInfoEv 0x00000071000981bc,U,000008,_ZNK5uking6action12BackWalkBase12isChangeableEv 0x00000071000981c4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14BackWalkWithASEE9isDerivedEPKNS0_9InterfaceE -0x0000007100098250,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action10BackWalkExEE9isDerivedEPKNS0_9InterfaceE +0x0000007100098250,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14NormalBackWalkEE9isDerivedEPKNS0_9InterfaceE 0x00000071000982dc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12BackWalkBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100098368,O,000372,_ZN5uking6action12BackWalkBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000984dc,U,000104,AI_Action_AnmToRagdollDie::ctor @@ -3257,7 +3257,7 @@ Address,Quality,Size,Name 0x000000710009f6d8,U,000020, 0x000000710009f6ec,O,000008,_ZNK5uking6action15AreaFireObserve27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710009f6f4,O,000092,_ZNK5uking6action15AreaFireObserve18getRuntimeTypeInfoEv -0x000000710009f750,O,000020,_ZN5uking6action19AreaFireObserveBaseD1Ev +0x000000710009f750,O,000020,_ZN5uking6action15FireObserveBaseD1Ev 0x000000710009f764,W,000052,_ZN5uking6action15AreaFireObserveD0Ev 0x000000710009f798,U,000024, 0x000000710009f7b0,U,000056, @@ -3267,7 +3267,7 @@ Address,Quality,Size,Name 0x000000710009f800,U,000008,ActorObserverBase::m11 0x000000710009f808,U,000008,ActorObserverBase::m12 0x000000710009f810,O,000372,_ZN5uking6action15AreaFireObserve33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710009f984,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19AreaFireObserveBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710009f984,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15FireObserveBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710009fa10,U,000084,AI_ActionInOutSendMessage::ctor 0x000000710009fa64,W,000200,_ZN5uking6action25ActorAreaInOutSendMessageD1Ev 0x000000710009fb2c,U,000008, @@ -3544,7 +3544,7 @@ Address,Quality,Size,Name 0x00000071000acf74,W,000112,_ZN5uking6action6AttackD0Ev 0x00000071000acfe4,U,000008,uking::action::Attack::m32 0x00000071000acfec,U,000012,uking::action::Attack::m34 -0x00000071000acff8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action10AttackBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000acff8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18StoppingAttackBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000ad084,U,000100,AI_Action_AttackJumpToTarget::ctor 0x00000071000ad0e8,W,000088,_ZN5uking6action18AttackJumpToTargetD1Ev 0x00000071000ad140,W,000096,_ZN5uking6action18AttackJumpToTargetD0Ev @@ -3577,34 +3577,34 @@ Address,Quality,Size,Name 0x00000071000addec,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action6AttackEE9isDerivedEPKNS0_9InterfaceE 0x00000071000ade78,U,000140, 0x00000071000adf04,U,000072,AI_ActionGiantAttack::ctor -0x00000071000adf4c,W,000020,_ZN5uking6action17GiantAttackWithASD1Ev -0x00000071000adf60,W,000052,_ZN5uking6action17GiantAttackWithASD0Ev -0x00000071000adf94,O,000004,_ZN5uking6action17GiantAttackWithAS5init_EPN4sead4HeapE -0x00000071000adf98,W,000072,_ZN5uking6action17GiantAttackWithAS6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000adfe0,W,000176,_ZN5uking6action17GiantAttackWithAS5calc_Ev -0x00000071000ae090,O,000004,_ZN5uking6action17GiantAttackWithAS6leave_Ev -0x00000071000ae094,W,000084,_ZN5uking6action17GiantAttackWithAS11loadParams_Ev -0x00000071000ae0e8,O,000008,_ZNK5uking6action17GiantAttackWithAS27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ae0f0,O,000092,_ZNK5uking6action17GiantAttackWithAS18getRuntimeTypeInfoEv -0x00000071000ae14c,U,000004,uking::action::GiantAttackWithAS::m32 -0x00000071000ae150,U,000004,uking::action::GiantAttackWithAS::m33 -0x00000071000ae154,O,000372,_ZN5uking6action17GiantAttackWithAS33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ae2c8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action11GiantAttackEE9isDerivedEPKNS0_9InterfaceE -0x00000071000ae354,M,000052,_ZN5uking6action25BattleCloseMoveActionBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000ae388,W,000020,_ZN5uking6action25BattleCloseMoveActionBaseD1Ev -0x00000071000ae39c,W,000052,_ZN5uking6action25BattleCloseMoveActionBaseD0Ev -0x00000071000ae3d0,O,000004,_ZN5uking6action25BattleCloseMoveActionBase5init_EPN4sead4HeapE -0x00000071000ae3d4,W,000132,_ZN5uking6action25BattleCloseMoveActionBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000ae458,O,000004,_ZN5uking6action25BattleCloseMoveActionBase5calc_Ev -0x00000071000ae45c,O,000004,_ZN5uking6action25BattleCloseMoveActionBase6leave_Ev -0x00000071000ae460,O,000004,_ZN5uking6action25BattleCloseMoveActionBase11loadParams_Ev -0x00000071000ae464,U,000468,uking::action::BattleCloseMoveActionBase::m37 -0x00000071000ae638,O,000008,_ZNK5uking6action25BattleCloseMoveActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ae640,O,000092,_ZNK5uking6action25BattleCloseMoveActionBase18getRuntimeTypeInfoEv +0x00000071000adf4c,W,000020,_ZN5uking6action12AttackWithASD1Ev +0x00000071000adf60,W,000052,_ZN5uking6action12AttackWithASD0Ev +0x00000071000adf94,O,000004,_ZN5uking6action12AttackWithAS5init_EPN4sead4HeapE +0x00000071000adf98,W,000072,_ZN5uking6action12AttackWithAS6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000adfe0,W,000176,_ZN5uking6action12AttackWithAS5calc_Ev +0x00000071000ae090,O,000004,_ZN5uking6action12AttackWithAS6leave_Ev +0x00000071000ae094,W,000084,_ZN5uking6action12AttackWithAS11loadParams_Ev +0x00000071000ae0e8,O,000008,_ZNK5uking6action12AttackWithAS27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ae0f0,O,000092,_ZNK5uking6action12AttackWithAS18getRuntimeTypeInfoEv +0x00000071000ae14c,U,000004,uking::action::AttackWithAS::m32 +0x00000071000ae150,U,000004,uking::action::AttackWithAS::m33 +0x00000071000ae154,O,000372,_ZN5uking6action12AttackWithAS33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ae2c8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15TurnGiantAttackEE9isDerivedEPKNS0_9InterfaceE +0x00000071000ae354,M,000052,_ZN5uking6action27AvoidingCloseMoveActionBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000ae388,W,000020,_ZN5uking6action27AvoidingCloseMoveActionBaseD1Ev +0x00000071000ae39c,W,000052,_ZN5uking6action27AvoidingCloseMoveActionBaseD0Ev +0x00000071000ae3d0,O,000004,_ZN5uking6action27AvoidingCloseMoveActionBase5init_EPN4sead4HeapE +0x00000071000ae3d4,W,000132,_ZN5uking6action27AvoidingCloseMoveActionBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000ae458,O,000004,_ZN5uking6action27AvoidingCloseMoveActionBase5calc_Ev +0x00000071000ae45c,O,000004,_ZN5uking6action27AvoidingCloseMoveActionBase6leave_Ev +0x00000071000ae460,O,000004,_ZN5uking6action27AvoidingCloseMoveActionBase11loadParams_Ev +0x00000071000ae464,U,000468,uking::action::AvoidingCloseMoveActionBase::m37 +0x00000071000ae638,O,000008,_ZNK5uking6action27AvoidingCloseMoveActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ae640,O,000092,_ZNK5uking6action27AvoidingCloseMoveActionBase18getRuntimeTypeInfoEv 0x00000071000ae69c,U,000008,uking::action::AvoidingCloseMoveBase::m33 0x00000071000ae6a4,U,000008,uking::action::AvoidingCloseMoveBase::m34 0x00000071000ae6ac,U,000012,uking::action::AvoidingCloseMoveBase::m35 -0x00000071000ae6b8,O,000372,_ZN5uking6action25BattleCloseMoveActionBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ae6b8,O,000372,_ZN5uking6action27AvoidingCloseMoveActionBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000ae82c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21AvoidingCloseMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000ae8b8,U,000052,AI_ActionBattleCloseSlippedWalkBase::ctor 0x00000071000ae8ec,O,000004,_ZN5uking6action30AvoidingCloseMoveActionWithAccD1Ev @@ -3913,18 +3913,18 @@ Address,Quality,Size,Name 0x00000071000ba78c,O,000288,_ZNK5uking6action22BasicSignalEnemyNotice27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000ba8ac,O,000092,_ZNK5uking6action22BasicSignalEnemyNotice18getRuntimeTypeInfoEv 0x00000071000ba908,U,000004,uking::action::BasicSignalEnemyNotice::m32 -0x00000071000ba90c,O,000048,_ZN5uking6action9ForbidTagC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000ba93c,O,000020,_ZN5uking6action9ForbidTagD1Ev -0x00000071000ba950,O,000052,_ZN5uking6action9ForbidTagD0Ev -0x00000071000ba984,O,000008,_ZN5uking6action9ForbidTag5init_EPN4sead4HeapE -0x00000071000ba98c,O,000004,_ZN5uking6action9ForbidTag6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000ba990,W,000060,_ZN5uking6action9ForbidTag5calc_Ev -0x00000071000ba9cc,O,000004,_ZN5uking6action9ForbidTag6leave_Ev -0x00000071000ba9d0,O,000004,_ZN5uking6action9ForbidTag11loadParams_Ev -0x00000071000ba9d4,O,000288,_ZNK5uking6action9ForbidTag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000baaf4,O,000092,_ZNK5uking6action9ForbidTag18getRuntimeTypeInfoEv -0x00000071000bab50,U,000004,uking::action::ForbidTag::m32 -0x00000071000bab54,U,000004,uking::action::ForbidTag::m33 +0x00000071000ba90c,O,000048,_ZN5uking6action20BasicSignalForbidTagC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000ba93c,O,000020,_ZN5uking6action20BasicSignalForbidTagD1Ev +0x00000071000ba950,O,000052,_ZN5uking6action20BasicSignalForbidTagD0Ev +0x00000071000ba984,O,000008,_ZN5uking6action20BasicSignalForbidTag5init_EPN4sead4HeapE +0x00000071000ba98c,O,000004,_ZN5uking6action20BasicSignalForbidTag6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000ba990,W,000060,_ZN5uking6action20BasicSignalForbidTag5calc_Ev +0x00000071000ba9cc,O,000004,_ZN5uking6action20BasicSignalForbidTag6leave_Ev +0x00000071000ba9d0,O,000004,_ZN5uking6action20BasicSignalForbidTag11loadParams_Ev +0x00000071000ba9d4,O,000288,_ZNK5uking6action20BasicSignalForbidTag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000baaf4,O,000092,_ZNK5uking6action20BasicSignalForbidTag18getRuntimeTypeInfoEv +0x00000071000bab50,U,000004,uking::action::BasicSignalForbidTag::m32 +0x00000071000bab54,U,000004,uking::action::BasicSignalForbidTag::m33 0x00000071000bab58,U,000052,AI_Action_BattleCloseDangerAvoidRun::ctor 0x00000071000bab8c,O,000004,_ZN5uking6action25BattleCloseDangerAvoidRunD1Ev 0x00000071000bab90,O,000036,_ZN5uking6action25BattleCloseDangerAvoidRunD0Ev @@ -3934,7 +3934,7 @@ Address,Quality,Size,Name 0x00000071000bb0ec,O,000092,_ZNK5uking6action25BattleCloseDangerAvoidRun18getRuntimeTypeInfoEv 0x00000071000bb148,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action29BattleCloseExplosivesAvoidRunEE9isDerivedEPKNS0_9InterfaceE 0x00000071000bb1d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21BattleCloseMoveActionEE9isDerivedEPKNS0_9InterfaceE -0x00000071000bb260,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action25BattleCloseMoveActionBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000bb260,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27AvoidingCloseMoveActionBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000bb2ec,M,000080,_ZN5uking6action29BattleCloseExplosivesAvoidRunC2ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000bb33c,W,000088,_ZN5uking6action29BattleCloseExplosivesAvoidRunD1Ev 0x00000071000bb394,W,000096,_ZN5uking6action29BattleCloseExplosivesAvoidRunD0Ev @@ -4121,20 +4121,20 @@ Address,Quality,Size,Name 0x00000071000c1df0,O,000092,_ZNK5uking6action8BeamMove18getRuntimeTypeInfoEv 0x00000071000c1e4c,U,000012,uking::action::BeamMove::m37 0x00000071000c1e58,U,000096,AI_ActionGuardianMiniNeckSpinBeam::ctor -0x00000071000c1eb8,W,000228,_ZN5uking6action12NeckSpinBeam5init_EPN4sead4HeapE -0x00000071000c1f9c,W,000052,_ZN5uking6action12NeckSpinBeam6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000c1fd0,W,000036,_ZN5uking6action12NeckSpinBeam5calc_Ev -0x00000071000c1ff4,W,000044,_ZN5uking6action12NeckSpinBeam6leave_Ev -0x00000071000c2020,W,000248,_ZN5uking6action12NeckSpinBeam11loadParams_Ev -0x00000071000c2118,U,000140,_ZN5uking6action12NeckSpinBeam14handleMessage_ERKN4ksys7MessageE -0x00000071000c21a4,O,000300,_ZNK5uking6action12NeckSpinBeam27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000c22d0,O,000092,_ZNK5uking6action12NeckSpinBeam18getRuntimeTypeInfoEv -0x00000071000c232c,W,000068,_ZN5uking6action12NeckSpinBeamD1Ev -0x00000071000c2370,W,000076,_ZN5uking6action12NeckSpinBeamD0Ev +0x00000071000c1eb8,W,000228,_ZN5uking6action12BeamNeckSpin5init_EPN4sead4HeapE +0x00000071000c1f9c,W,000052,_ZN5uking6action12BeamNeckSpin6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000c1fd0,W,000036,_ZN5uking6action12BeamNeckSpin5calc_Ev +0x00000071000c1ff4,W,000044,_ZN5uking6action12BeamNeckSpin6leave_Ev +0x00000071000c2020,W,000248,_ZN5uking6action12BeamNeckSpin11loadParams_Ev +0x00000071000c2118,U,000140,_ZN5uking6action12BeamNeckSpin14handleMessage_ERKN4ksys7MessageE +0x00000071000c21a4,O,000300,_ZNK5uking6action12BeamNeckSpin27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000c22d0,O,000092,_ZNK5uking6action12BeamNeckSpin18getRuntimeTypeInfoEv +0x00000071000c232c,W,000068,_ZN5uking6action12BeamNeckSpinD1Ev +0x00000071000c2370,W,000076,_ZN5uking6action12BeamNeckSpinD0Ev 0x00000071000c23bc,U,000008,uking::action::NeckSpin::m32 -0x00000071000c23c4,U,000008,uking::action::NeckSpinBeam::m34 -0x00000071000c23cc,U,000008,uking::action::NeckSpinBeam::m35 -0x00000071000c23d4,U,000008,uking::action::NeckSpinBeam::m36 +0x00000071000c23c4,U,000008,uking::action::BeamNeckSpin::m34 +0x00000071000c23cc,U,000008,uking::action::BeamNeckSpin::m35 +0x00000071000c23d4,U,000008,uking::action::BeamNeckSpin::m36 0x00000071000c23dc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action8NeckSpinEE9isDerivedEPKNS0_9InterfaceE 0x00000071000c2468,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action10StopASPlayEE9isDerivedEPKNS0_9InterfaceE 0x00000071000c24f4,U,000108,AI_Action_BeamosStaticBeam::ctor @@ -4271,22 +4271,22 @@ Address,Quality,Size,Name 0x00000071000c6128,O,000008,_ZNK5uking6action16BindParentAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000c6130,O,000092,_ZNK5uking6action16BindParentAction18getRuntimeTypeInfoEv 0x00000071000c618c,O,000372,_ZN5uking6action16BindParentAction33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000c6300,M,000060,_ZN5uking6action19PlayerStoleOpenBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000c633c,O,000128,_ZN5uking6action19PlayerStoleOpenBase11loadParams_Ev -0x00000071000c63bc,W,000340,_ZN5uking6action19PlayerStoleOpenBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000c6510,O,000060,_ZN5uking6action19PlayerStoleOpenBase5calc_Ev -0x00000071000c654c,W,000016,_ZN5uking6action19PlayerStoleOpenBase6leave_Ev -0x00000071000c655c,O,000008,_ZNK5uking6action19PlayerStoleOpenBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000c6564,O,000092,_ZNK5uking6action19PlayerStoleOpenBase18getRuntimeTypeInfoEv -0x00000071000c65c0,W,000112,_ZN5uking6action19PlayerStoleOpenBaseD1Ev -0x00000071000c6630,W,000120,_ZN5uking6action19PlayerStoleOpenBaseD0Ev -0x00000071000c66a8,O,000372,_ZN5uking6action19PlayerStoleOpenBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000c681c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19PlayerStoleOpenBaseEE9isDerivedEPKNS0_9InterfaceE -0x00000071000c68a8,O,000048,_ZN5uking6action17PlayerStoleOpenExC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000c68d8,U,000028,uking::action::PlayerStoleOpenEx::m32 -0x00000071000c68f4,O,000132,_ZNK5uking6action17PlayerStoleOpenEx27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000c6978,O,000092,_ZNK5uking6action17PlayerStoleOpenEx18getRuntimeTypeInfoEv -0x00000071000c69d4,W,000120,_ZN5uking6action17PlayerStoleOpenExD0Ev +0x00000071000c6300,M,000060,_ZN5uking6action18BindPlayerNodeBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000c633c,O,000128,_ZN5uking6action18BindPlayerNodeBase11loadParams_Ev +0x00000071000c63bc,W,000340,_ZN5uking6action18BindPlayerNodeBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000c6510,O,000060,_ZN5uking6action18BindPlayerNodeBase5calc_Ev +0x00000071000c654c,W,000016,_ZN5uking6action18BindPlayerNodeBase6leave_Ev +0x00000071000c655c,O,000008,_ZNK5uking6action18BindPlayerNodeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000c6564,O,000092,_ZNK5uking6action18BindPlayerNodeBase18getRuntimeTypeInfoEv +0x00000071000c65c0,W,000112,_ZN5uking6action18BindPlayerNodeBaseD1Ev +0x00000071000c6630,W,000120,_ZN5uking6action18BindPlayerNodeBaseD0Ev +0x00000071000c66a8,O,000372,_ZN5uking6action18BindPlayerNodeBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000c681c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18BindPlayerNodeBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000c68a8,O,000048,_ZN5uking6action16BindPlayerNodeExC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000c68d8,U,000028,uking::action::BindPlayerNodeEx::m32 +0x00000071000c68f4,O,000132,_ZNK5uking6action16BindPlayerNodeEx27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000c6978,O,000092,_ZNK5uking6action16BindPlayerNodeEx18getRuntimeTypeInfoEv +0x00000071000c69d4,W,000120,_ZN5uking6action16BindPlayerNodeExD0Ev 0x00000071000c6a4c,U,000128,AI_Action_BirdEscape::ctor 0x00000071000c6acc,W,000068,_ZN5uking6action10BirdEscapeD1Ev 0x00000071000c6b10,W,000076,_ZN5uking6action10BirdEscapeD0Ev @@ -4820,7 +4820,7 @@ Address,Quality,Size,Name 0x00000071000def70,O,000092,_ZNK5uking6action22ChuchuDissappearEscape18getRuntimeTypeInfoEv 0x00000071000defcc,U,000008,_ZNK5uking6action22ChuchuDissappearEscape8isFailedEv 0x00000071000defd4,U,000008,_ZNK5uking6action22ChuchuDissappearEscape10isFinishedEv -0x00000071000defdc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26ChuchuDissappearEscapeBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000defdc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action22DisappearAndEscapeBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000df068,U,000132,AI_Action_ChuchuPreAttack::ctor 0x00000071000df0ec,W,000088,_ZN5uking6action15ChuchuPreAttackD1Ev 0x00000071000df144,W,000096,_ZN5uking6action15ChuchuPreAttackD0Ev @@ -4833,7 +4833,7 @@ Address,Quality,Size,Name 0x00000071000df870,O,000008,_ZNK5uking6action15ChuchuPreAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000df878,O,000092,_ZNK5uking6action15ChuchuPreAttack18getRuntimeTypeInfoEv 0x00000071000df8d4,O,000372,_ZN5uking6action15ChuchuPreAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000dfa48,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19ChuchuPreAttackBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000dfa48,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action11GelJumpBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000dfad4,O,000048,_ZN5uking6action20CloseArmorProcessingC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000dfb04,O,000020,_ZN5uking6action20CloseArmorProcessingD1Ev 0x00000071000dfb18,O,000052,_ZN5uking6action20CloseArmorProcessingD0Ev @@ -4966,17 +4966,17 @@ Address,Quality,Size,Name 0x00000071000e34bc,U,000008, 0x00000071000e34c4,U,000052, 0x00000071000e34f8,U,000008, -0x00000071000e3500,O,000048,_ZN5uking6action19KokkoCreateDropBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000e3530,O,000020,_ZN5uking6action19KokkoCreateDropBaseD1Ev -0x00000071000e3544,O,000052,_ZN5uking6action19KokkoCreateDropBaseD0Ev -0x00000071000e3578,O,000008,_ZN5uking6action19KokkoCreateDropBase5init_EPN4sead4HeapE -0x00000071000e3580,W,000080,_ZN5uking6action19KokkoCreateDropBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000e35d0,O,000004,_ZN5uking6action19KokkoCreateDropBase5calc_Ev -0x00000071000e35d4,O,000004,_ZN5uking6action19KokkoCreateDropBase6leave_Ev -0x00000071000e35d8,O,000004,_ZN5uking6action19KokkoCreateDropBase11loadParams_Ev -0x00000071000e35dc,O,000288,_ZNK5uking6action19KokkoCreateDropBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000e36fc,O,000092,_ZNK5uking6action19KokkoCreateDropBase18getRuntimeTypeInfoEv -0x00000071000e3758,U,000008,uking::action::KokkoCreateDropBase::m32 +0x00000071000e3500,O,000048,_ZN5uking6action14CreateDropBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000e3530,O,000020,_ZN5uking6action14CreateDropBaseD1Ev +0x00000071000e3544,O,000052,_ZN5uking6action14CreateDropBaseD0Ev +0x00000071000e3578,O,000008,_ZN5uking6action14CreateDropBase5init_EPN4sead4HeapE +0x00000071000e3580,W,000080,_ZN5uking6action14CreateDropBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000e35d0,O,000004,_ZN5uking6action14CreateDropBase5calc_Ev +0x00000071000e35d4,O,000004,_ZN5uking6action14CreateDropBase6leave_Ev +0x00000071000e35d8,O,000004,_ZN5uking6action14CreateDropBase11loadParams_Ev +0x00000071000e35dc,O,000288,_ZNK5uking6action14CreateDropBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000e36fc,O,000092,_ZNK5uking6action14CreateDropBase18getRuntimeTypeInfoEv +0x00000071000e3758,U,000008,uking::action::CreateDropBase::m32 0x00000071000e3760,U,000160,AI_Action_CreateEpona::ctor 0x00000071000e3800,W,000124,_ZN5uking6action11CreateEponaD1Ev 0x00000071000e387c,W,000132,_ZN5uking6action11CreateEponaD0Ev @@ -5017,16 +5017,16 @@ Address,Quality,Size,Name 0x00000071000e4db4,O,000288,_ZNK5uking6action25CreateObjectsOfOwnedHorse27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000e4ed4,O,000092,_ZNK5uking6action25CreateObjectsOfOwnedHorse18getRuntimeTypeInfoEv 0x00000071000e4f30,U,000092,AI_ActionMoveToTargetCurve::ctor -0x00000071000e4f8c,O,000020,_ZN5uking6action21MoveToTargetCurveBaseD1Ev -0x00000071000e4fa0,O,000052,_ZN5uking6action21MoveToTargetCurveBaseD0Ev -0x00000071000e4fd4,O,000008,_ZN5uking6action21MoveToTargetCurveBase5init_EPN4sead4HeapE -0x00000071000e4fdc,W,000516,_ZN5uking6action21MoveToTargetCurveBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000e51e0,W,000376,_ZN5uking6action21MoveToTargetCurveBase5calc_Ev -0x00000071000e5358,O,000004,_ZN5uking6action21MoveToTargetCurveBase6leave_Ev -0x00000071000e535c,U,000040,uking::action::MoveToTargetCurveBase::m35 -0x00000071000e5384,O,000128,_ZN5uking6action21MoveToTargetCurveBase11loadParams_Ev -0x00000071000e5404,O,000288,_ZNK5uking6action21MoveToTargetCurveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000e5524,O,000092,_ZNK5uking6action21MoveToTargetCurveBase18getRuntimeTypeInfoEv +0x00000071000e4f8c,O,000020,_ZN5uking6action21CurveMoveToTargetBaseD1Ev +0x00000071000e4fa0,O,000052,_ZN5uking6action21CurveMoveToTargetBaseD0Ev +0x00000071000e4fd4,O,000008,_ZN5uking6action21CurveMoveToTargetBase5init_EPN4sead4HeapE +0x00000071000e4fdc,W,000516,_ZN5uking6action21CurveMoveToTargetBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000e51e0,W,000376,_ZN5uking6action21CurveMoveToTargetBase5calc_Ev +0x00000071000e5358,O,000004,_ZN5uking6action21CurveMoveToTargetBase6leave_Ev +0x00000071000e535c,U,000040,uking::action::CurveMoveToTargetBase::m35 +0x00000071000e5384,O,000128,_ZN5uking6action21CurveMoveToTargetBase11loadParams_Ev +0x00000071000e5404,O,000288,_ZNK5uking6action21CurveMoveToTargetBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000e5524,O,000092,_ZNK5uking6action21CurveMoveToTargetBase18getRuntimeTypeInfoEv 0x00000071000e5580,U,000088,AI_Action_DamagedTurn::ctor 0x00000071000e55d8,O,000020,_ZN5uking6action11DamagedTurnD1Ev 0x00000071000e55ec,O,000052,_ZN5uking6action11DamagedTurnD0Ev @@ -5109,14 +5109,14 @@ Address,Quality,Size,Name 0x00000071000e76dc,O,000164,_ZN5uking6action27DeletePorchItemIncludeEquip11loadParams_Ev 0x00000071000e7780,O,000288,_ZNK5uking6action27DeletePorchItemIncludeEquip27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000e78a0,O,000092,_ZNK5uking6action27DeletePorchItemIncludeEquip18getRuntimeTypeInfoEv -0x00000071000e78fc,O,000052,_ZN5uking6action20ApplyDamageForPlayerC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000e7930,O,000020,_ZN5uking6action20ApplyDamageForPlayerD1Ev -0x00000071000e7944,O,000052,_ZN5uking6action20ApplyDamageForPlayerD0Ev -0x00000071000e7978,O,000008,_ZN5uking6action20ApplyDamageForPlayer5init_EPN4sead4HeapE -0x00000071000e7980,U,000100,_ZN5uking6action20ApplyDamageForPlayer8oneShot_Ev -0x00000071000e79e4,O,000108,_ZN5uking6action20ApplyDamageForPlayer11loadParams_Ev -0x00000071000e7a50,O,000288,_ZNK5uking6action20ApplyDamageForPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000e7b70,O,000092,_ZNK5uking6action20ApplyDamageForPlayer18getRuntimeTypeInfoEv +0x00000071000e78fc,O,000052,_ZN5uking6action19DemoApplyDamageBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000e7930,O,000020,_ZN5uking6action19DemoApplyDamageBaseD1Ev +0x00000071000e7944,O,000052,_ZN5uking6action19DemoApplyDamageBaseD0Ev +0x00000071000e7978,O,000008,_ZN5uking6action19DemoApplyDamageBase5init_EPN4sead4HeapE +0x00000071000e7980,U,000100,_ZN5uking6action19DemoApplyDamageBase8oneShot_Ev +0x00000071000e79e4,O,000108,_ZN5uking6action19DemoApplyDamageBase11loadParams_Ev +0x00000071000e7a50,O,000288,_ZNK5uking6action19DemoApplyDamageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000e7b70,O,000092,_ZNK5uking6action19DemoApplyDamageBase18getRuntimeTypeInfoEv 0x00000071000e7bcc,O,000048,_ZN5uking6action24DemoApplyDamageForPlayerC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000e7bfc,O,000004,_ZN5uking6action24DemoApplyDamageForPlayerD1Ev 0x00000071000e7c00,O,000036,_ZN5uking6action24DemoApplyDamageForPlayerD0Ev @@ -5126,7 +5126,7 @@ Address,Quality,Size,Name 0x00000071000e7cd4,O,000008,_ZNK5uking6action24DemoApplyDamageForPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000e7cdc,O,000092,_ZNK5uking6action24DemoApplyDamageForPlayer18getRuntimeTypeInfoEv 0x00000071000e7d38,O,000372,_ZN5uking6action24DemoApplyDamageForPlayer33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000e7eac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20ApplyDamageForPlayerEE9isDerivedEPKNS0_9InterfaceE +0x00000071000e7eac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19DemoApplyDamageBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000e7f38,U,000096,AI_Action_DemoBeastGanonGrudgeDrop::ctor 0x00000071000e7f98,W,000068,_ZN5uking6action24DemoBeastGanonGrudgeDropD1Ev 0x00000071000e7fdc,W,000076,_ZN5uking6action24DemoBeastGanonGrudgeDropD0Ev @@ -5275,31 +5275,31 @@ Address,Quality,Size,Name 0x00000071000ec5e8,O,000288,_ZNK5uking6action13DemoVisibleOn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000ec708,O,000092,_ZNK5uking6action13DemoVisibleOn18getRuntimeTypeInfoEv 0x00000071000ec764,U,000100,AI_ActionWarpPlayer::ctor -0x00000071000ec7c8,O,000020,_ZN5uking6action14WarpPlayerBaseD1Ev -0x00000071000ec7dc,O,000052,_ZN5uking6action14WarpPlayerBaseD0Ev -0x00000071000ec810,O,000008,_ZN5uking6action14WarpPlayerBase5init_EPN4sead4HeapE -0x00000071000ec818,W,000712,_ZN5uking6action14WarpPlayerBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000ecae0,W,000536,_ZN5uking6action14WarpPlayerBase5calc_Ev -0x00000071000eccf8,O,000004,_ZN5uking6action14WarpPlayerBase6leave_Ev -0x00000071000eccfc,O,000004,_ZN5uking6action14WarpPlayerBase11loadParams_Ev -0x00000071000ecd00,U,000088,uking::action::WarpPlayerBase::m34 -0x00000071000ecd58,U,000120,uking::action::WarpPlayerBase::m35 -0x00000071000ecdd0,U,000056,uking::action::WarpPlayerBase::m36 -0x00000071000ece08,O,000288,_ZNK5uking6action14WarpPlayerBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ecf28,O,000092,_ZNK5uking6action14WarpPlayerBase18getRuntimeTypeInfoEv -0x00000071000ecf84,U,000004,uking::action::WarpPlayerBase::m32 -0x00000071000ecf88,U,000008,uking::action::WarpPlayerBase::m33 +0x00000071000ec7c8,O,000020,_ZN5uking6action18DestPlayerWarpBaseD1Ev +0x00000071000ec7dc,O,000052,_ZN5uking6action18DestPlayerWarpBaseD0Ev +0x00000071000ec810,O,000008,_ZN5uking6action18DestPlayerWarpBase5init_EPN4sead4HeapE +0x00000071000ec818,W,000712,_ZN5uking6action18DestPlayerWarpBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000ecae0,W,000536,_ZN5uking6action18DestPlayerWarpBase5calc_Ev +0x00000071000eccf8,O,000004,_ZN5uking6action18DestPlayerWarpBase6leave_Ev +0x00000071000eccfc,O,000004,_ZN5uking6action18DestPlayerWarpBase11loadParams_Ev +0x00000071000ecd00,U,000088,uking::action::DestPlayerWarpBase::m34 +0x00000071000ecd58,U,000120,uking::action::DestPlayerWarpBase::m35 +0x00000071000ecdd0,U,000056,uking::action::DestPlayerWarpBase::m36 +0x00000071000ece08,O,000288,_ZNK5uking6action18DestPlayerWarpBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ecf28,O,000092,_ZNK5uking6action18DestPlayerWarpBase18getRuntimeTypeInfoEv +0x00000071000ecf84,U,000004,uking::action::DestPlayerWarpBase::m32 +0x00000071000ecf88,U,000008,uking::action::DestPlayerWarpBase::m33 0x00000071000ecf90,U,000104,AI_ActionRailMove::ctor -0x00000071000ecff8,O,000020,_ZN5uking6action12RailMoveBaseD1Ev -0x00000071000ed00c,O,000052,_ZN5uking6action12RailMoveBaseD0Ev -0x00000071000ed040,O,000008,_ZN5uking6action12RailMoveBase5init_EPN4sead4HeapE -0x00000071000ed048,W,000116,_ZN5uking6action12RailMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000ed0bc,W,000360,_ZN5uking6action12RailMoveBase5calc_Ev -0x00000071000ed224,O,000004,_ZN5uking6action12RailMoveBase6leave_Ev -0x00000071000ed228,O,000300,_ZN5uking6action12RailMoveBase11loadParams_Ev -0x00000071000ed354,O,000288,_ZNK5uking6action12RailMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ed474,O,000092,_ZNK5uking6action12RailMoveBase18getRuntimeTypeInfoEv -0x00000071000ed4d0,U,000004,uking::action::RailMoveBase::m32 +0x00000071000ecff8,O,000020,_ZN5uking6action17DestPointMoveBaseD1Ev +0x00000071000ed00c,O,000052,_ZN5uking6action17DestPointMoveBaseD0Ev +0x00000071000ed040,O,000008,_ZN5uking6action17DestPointMoveBase5init_EPN4sead4HeapE +0x00000071000ed048,W,000116,_ZN5uking6action17DestPointMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000ed0bc,W,000360,_ZN5uking6action17DestPointMoveBase5calc_Ev +0x00000071000ed224,O,000004,_ZN5uking6action17DestPointMoveBase6leave_Ev +0x00000071000ed228,O,000300,_ZN5uking6action17DestPointMoveBase11loadParams_Ev +0x00000071000ed354,O,000288,_ZNK5uking6action17DestPointMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ed474,O,000092,_ZNK5uking6action17DestPointMoveBase18getRuntimeTypeInfoEv +0x00000071000ed4d0,U,000004,uking::action::DestPointMoveBase::m32 0x00000071000ed4d4,U,000136,AI_Action_DgnObj_DLC_CogWheel_Rotate::ctor 0x00000071000ed55c,O,000020,_ZN5uking6action26DgnObj_DLC_CogWheel_RotateD1Ev 0x00000071000ed570,O,000052,_ZN5uking6action26DgnObj_DLC_CogWheel_RotateD0Ev @@ -5403,16 +5403,16 @@ Address,Quality,Size,Name 0x00000071000f0334,O,000004,_ZN5uking6action22DisableAutoSavePausing11loadParams_Ev 0x00000071000f0338,O,000288,_ZNK5uking6action22DisableAutoSavePausing27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000f0458,O,000092,_ZNK5uking6action22DisableAutoSavePausing18getRuntimeTypeInfoEv -0x00000071000f04b4,O,000048,_ZN5uking6action26ChuchuDissappearEscapeBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071000f04e4,O,000020,_ZN5uking6action26ChuchuDissappearEscapeBaseD1Ev -0x00000071000f04f8,O,000052,_ZN5uking6action26ChuchuDissappearEscapeBaseD0Ev -0x00000071000f052c,O,000008,_ZN5uking6action26ChuchuDissappearEscapeBase5init_EPN4sead4HeapE -0x00000071000f0534,W,000060,_ZN5uking6action26ChuchuDissappearEscapeBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000f0570,O,000004,_ZN5uking6action26ChuchuDissappearEscapeBase5calc_Ev -0x00000071000f0574,O,000004,_ZN5uking6action26ChuchuDissappearEscapeBase6leave_Ev -0x00000071000f0578,O,000004,_ZN5uking6action26ChuchuDissappearEscapeBase11loadParams_Ev -0x00000071000f057c,O,000216,_ZNK5uking6action26ChuchuDissappearEscapeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000f0654,O,000092,_ZNK5uking6action26ChuchuDissappearEscapeBase18getRuntimeTypeInfoEv +0x00000071000f04b4,O,000048,_ZN5uking6action22DisappearAndEscapeBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071000f04e4,O,000020,_ZN5uking6action22DisappearAndEscapeBaseD1Ev +0x00000071000f04f8,O,000052,_ZN5uking6action22DisappearAndEscapeBaseD0Ev +0x00000071000f052c,O,000008,_ZN5uking6action22DisappearAndEscapeBase5init_EPN4sead4HeapE +0x00000071000f0534,W,000060,_ZN5uking6action22DisappearAndEscapeBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000f0570,O,000004,_ZN5uking6action22DisappearAndEscapeBase5calc_Ev +0x00000071000f0574,O,000004,_ZN5uking6action22DisappearAndEscapeBase6leave_Ev +0x00000071000f0578,O,000004,_ZN5uking6action22DisappearAndEscapeBase11loadParams_Ev +0x00000071000f057c,O,000216,_ZNK5uking6action22DisappearAndEscapeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000f0654,O,000092,_ZNK5uking6action22DisappearAndEscapeBase18getRuntimeTypeInfoEv 0x00000071000f06b0,O,000048,_ZN5uking6action21DisappearDeathCounterC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000f06e0,O,000020,_ZN5uking6action21DisappearDeathCounterD1Ev 0x00000071000f06f4,O,000052,_ZN5uking6action21DisappearDeathCounterD0Ev @@ -5641,7 +5641,7 @@ Address,Quality,Size,Name 0x00000071000f7c7c,O,000008,_ZNK5uking6action14DRCAppNoUseTag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000f7c84,O,000092,_ZNK5uking6action14DRCAppNoUseTag18getRuntimeTypeInfoEv 0x00000071000f7ce0,O,000372,_ZN5uking6action14DRCAppNoUseTag33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000f7e54,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action9ForbidTagEE9isDerivedEPKNS0_9InterfaceE +0x00000071000f7e54,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20BasicSignalForbidTagEE9isDerivedEPKNS0_9InterfaceE 0x00000071000f7ee0,U,000204, 0x00000071000f7fac,U,000092, 0x00000071000f8008,U,000140, @@ -5862,8 +5862,8 @@ Address,Quality,Size,Name 0x00000071001012a4,U,000012,uking::action::DynamicAttackPowerExplode::m35 0x00000071001012b0,U,000012,uking::action::DynamicAttackPowerExplode::m36 0x00000071001012bc,U,000012,uking::action::DynamicAttackPowerExplode::m37 -0x00000071001012c8,O,000372,_ZN5uking6action18AttackPowerExplode33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710010143c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18AttackPowerExplodeEE9isDerivedEPKNS0_9InterfaceE +0x00000071001012c8,O,000372,_ZN5uking6action17EitherSideExplode33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710010143c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17EitherSideExplodeEE9isDerivedEPKNS0_9InterfaceE 0x00000071001014c8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action7ExplodeEE9isDerivedEPKNS0_9InterfaceE 0x0000007100101554,U,000052,AI_Action_DynamicFireWood::ctor 0x0000007100101588,O,000004,_ZN5uking6action15DynamicFireWoodD1Ev @@ -5879,7 +5879,7 @@ Address,Quality,Size,Name 0x000000710010178c,U,000020,uking::action::DynamicFireWood::m33 0x00000071001017a0,O,000372,_ZN5uking6action8FireWood33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100101914,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action8FireWoodEE9isDerivedEPKNS0_9InterfaceE -0x00000071001019a0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12FireWoodBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001019a0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12FireBurnBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100101a2c,O,000052,_ZN5uking6action3EatC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100101a60,O,000020,_ZN5uking6action3EatD1Ev 0x0000007100101a74,O,000052,_ZN5uking6action3EatD0Ev @@ -5924,16 +5924,16 @@ Address,Quality,Size,Name 0x0000007100102a20,O,000092,_ZNK5uking6action9EatWithAS18getRuntimeTypeInfoEv 0x0000007100102a7c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action3EatEE9isDerivedEPKNS0_9InterfaceE 0x0000007100102b08,U,000052,AI_ActionDynamicAttackPowerExplode::ctor -0x0000007100102b3c,O,000004,_ZN5uking6action18AttackPowerExplodeD1Ev -0x0000007100102b40,O,000036,_ZN5uking6action18AttackPowerExplodeD0Ev -0x0000007100102b64,O,000004,_ZN5uking6action18AttackPowerExplode5init_EPN4sead4HeapE -0x0000007100102b68,O,000004,_ZN5uking6action18AttackPowerExplode6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100102b6c,O,000004,_ZN5uking6action18AttackPowerExplode5calc_Ev -0x0000007100102b70,O,000004,_ZN5uking6action18AttackPowerExplode6leave_Ev -0x0000007100102b74,W,000112,_ZN5uking6action18AttackPowerExplode11loadParams_Ev -0x0000007100102be4,U,000348,uking::action::AttackPowerExplode::m32 -0x0000007100102d40,O,000008,_ZNK5uking6action18AttackPowerExplode27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100102d48,O,000092,_ZNK5uking6action18AttackPowerExplode18getRuntimeTypeInfoEv +0x0000007100102b3c,O,000004,_ZN5uking6action17EitherSideExplodeD1Ev +0x0000007100102b40,O,000036,_ZN5uking6action17EitherSideExplodeD0Ev +0x0000007100102b64,O,000004,_ZN5uking6action17EitherSideExplode5init_EPN4sead4HeapE +0x0000007100102b68,O,000004,_ZN5uking6action17EitherSideExplode6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100102b6c,O,000004,_ZN5uking6action17EitherSideExplode5calc_Ev +0x0000007100102b70,O,000004,_ZN5uking6action17EitherSideExplode6leave_Ev +0x0000007100102b74,W,000112,_ZN5uking6action17EitherSideExplode11loadParams_Ev +0x0000007100102be4,U,000348,uking::action::EitherSideExplode::m32 +0x0000007100102d40,O,000008,_ZNK5uking6action17EitherSideExplode27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100102d48,O,000092,_ZNK5uking6action17EitherSideExplode18getRuntimeTypeInfoEv 0x0000007100102da4,U,000108,AI_Action_ElectricAttack::ctor 0x0000007100102e10,W,000244,_ZN5uking6action14ElectricAttackD1Ev 0x0000007100102f04,W,000252,_ZN5uking6action14ElectricAttackD0Ev @@ -6078,19 +6078,19 @@ Address,Quality,Size,Name 0x0000007100107624,O,000372,_ZN5uking6action21EnemyFortressChatCall33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100107798,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21EnemyFortressChatTalkEE9isDerivedEPKNS0_9InterfaceE 0x0000007100107824,U,000060,AI_ActionEnemyFortressChatTurn::ctor -0x0000007100107860,O,000020,_ZN5uking6action25EnemyFortressChatTurnBaseD1Ev -0x0000007100107874,O,000052,_ZN5uking6action25EnemyFortressChatTurnBaseD0Ev -0x00000071001078a8,O,000008,_ZN5uking6action25EnemyFortressChatTurnBase5init_EPN4sead4HeapE -0x00000071001078b0,W,000272,_ZN5uking6action25EnemyFortressChatTurnBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001079c0,W,000440,_ZN5uking6action25EnemyFortressChatTurnBase5calc_Ev -0x0000007100107b78,O,000004,_ZN5uking6action25EnemyFortressChatTurnBase6leave_Ev -0x0000007100107b7c,U,000008,uking::action::EnemyFortressChatTurnBase::m33 -0x0000007100107b84,U,000008,_ZN5uking6action25EnemyFortressChatTurnBase14handleMessage_ERKN4ksys7MessageE -0x0000007100107b8c,U,000372,_ZN5uking6action25EnemyFortressChatTurnBase10handleAck_ERKN4ksys10MessageAckE -0x0000007100107d00,O,000164,_ZN5uking6action25EnemyFortressChatTurnBase11loadParams_Ev -0x0000007100107da4,O,000288,_ZNK5uking6action25EnemyFortressChatTurnBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100107ec4,O,000092,_ZNK5uking6action25EnemyFortressChatTurnBase18getRuntimeTypeInfoEv -0x0000007100107f20,U,000004,uking::action::EnemyFortressChatTurnBase::m32 +0x0000007100107860,O,000020,_ZN5uking6action25EnemyFortressChatLookBaseD1Ev +0x0000007100107874,O,000052,_ZN5uking6action25EnemyFortressChatLookBaseD0Ev +0x00000071001078a8,O,000008,_ZN5uking6action25EnemyFortressChatLookBase5init_EPN4sead4HeapE +0x00000071001078b0,W,000272,_ZN5uking6action25EnemyFortressChatLookBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001079c0,W,000440,_ZN5uking6action25EnemyFortressChatLookBase5calc_Ev +0x0000007100107b78,O,000004,_ZN5uking6action25EnemyFortressChatLookBase6leave_Ev +0x0000007100107b7c,U,000008,uking::action::EnemyFortressChatLookBase::m33 +0x0000007100107b84,U,000008,_ZN5uking6action25EnemyFortressChatLookBase14handleMessage_ERKN4ksys7MessageE +0x0000007100107b8c,U,000372,_ZN5uking6action25EnemyFortressChatLookBase10handleAck_ERKN4ksys10MessageAckE +0x0000007100107d00,O,000164,_ZN5uking6action25EnemyFortressChatLookBase11loadParams_Ev +0x0000007100107da4,O,000288,_ZNK5uking6action25EnemyFortressChatLookBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100107ec4,O,000092,_ZNK5uking6action25EnemyFortressChatLookBase18getRuntimeTypeInfoEv +0x0000007100107f20,U,000004,uking::action::EnemyFortressChatLookBase::m32 0x0000007100107f24,U,000392,AI_Action_EnemyFortressChatSpeak::ctor 0x00000071001080ac,W,000176,_ZN5uking6action22EnemyFortressChatSpeakD1Ev 0x000000710010815c,U,000064, @@ -6155,7 +6155,7 @@ Address,Quality,Size,Name 0x0000007100109ab0,U,000052, 0x0000007100109ae4,U,000008, 0x0000007100109aec,O,000372,_ZN5uking6action21EnemyFortressChatTurn33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100109c60,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action25EnemyFortressChatTurnBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100109c60,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action25EnemyFortressChatLookBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100109cec,U,000148,AI_Action_EnemyFortressSimpleAction::ctor 0x0000007100109d80,W,000092,_ZN5uking6action25EnemyFortressSimpleActionD1Ev 0x0000007100109ddc,U,000064, @@ -6347,17 +6347,17 @@ Address,Quality,Size,Name 0x0000007100112fec,O,000092,_ZNK5uking6action16EquipedWithScale18getRuntimeTypeInfoEv 0x0000007100113048,O,000372,_ZN5uking6action16EquipedWithScale33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001131bc,U,000056,AI_ActionHornUse::ctor -0x00000071001131f4,W,000020,_ZN5uking6action11HornUseBaseD1Ev -0x0000007100113208,W,000052,_ZN5uking6action11HornUseBaseD0Ev -0x000000710011323c,O,000004,_ZN5uking6action11HornUseBase5init_EPN4sead4HeapE -0x0000007100113240,U,000008,_ZN5uking6action11HornUseBase11onPreDeleteEv -0x0000007100113248,W,000180,_ZN5uking6action11HornUseBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001132fc,W,000220,_ZN5uking6action11HornUseBase5calc_Ev -0x00000071001133d8,W,000148,_ZN5uking6action11HornUseBase6leave_Ev -0x000000710011346c,O,000108,_ZN5uking6action11HornUseBase11loadParams_Ev -0x00000071001134d8,O,000300,_ZNK5uking6action11HornUseBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100113604,O,000092,_ZNK5uking6action11HornUseBase18getRuntimeTypeInfoEv -0x0000007100113660,U,000008,_ZN5uking6action11HornUseBase14hasPreDeleteCbEv +0x00000071001131f4,W,000020,_ZN5uking6action16EquipHornUseBaseD1Ev +0x0000007100113208,W,000052,_ZN5uking6action16EquipHornUseBaseD0Ev +0x000000710011323c,O,000004,_ZN5uking6action16EquipHornUseBase5init_EPN4sead4HeapE +0x0000007100113240,U,000008,_ZN5uking6action16EquipHornUseBase11onPreDeleteEv +0x0000007100113248,W,000180,_ZN5uking6action16EquipHornUseBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001132fc,W,000220,_ZN5uking6action16EquipHornUseBase5calc_Ev +0x00000071001133d8,W,000148,_ZN5uking6action16EquipHornUseBase6leave_Ev +0x000000710011346c,O,000108,_ZN5uking6action16EquipHornUseBase11loadParams_Ev +0x00000071001134d8,O,000300,_ZNK5uking6action16EquipHornUseBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100113604,O,000092,_ZNK5uking6action16EquipHornUseBase18getRuntimeTypeInfoEv +0x0000007100113660,U,000008,_ZN5uking6action16EquipHornUseBase14hasPreDeleteCbEv 0x0000007100113668,O,000048,_ZN5uking6action6EscapeC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100113698,W,000060,_ZN5uking6action6Escape6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071001136d4,O,000132,_ZNK5uking6action6Escape27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE @@ -6656,7 +6656,7 @@ Address,Quality,Size,Name 0x000000710011b45c,O,000008,_ZNK5uking6action20EventHoverNullASPlay27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710011b464,O,000092,_ZNK5uking6action20EventHoverNullASPlay18getRuntimeTypeInfoEv 0x000000710011b4c0,O,000372,_ZN5uking6action20EventHoverNullASPlay33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710011b634,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action24EventHoverNullASPlayBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710011b634,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19EventNullASPlayBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710011b6c0,O,000052,_ZN5uking6action19EventMiniGameFinishC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710011b6f4,O,000020,_ZN5uking6action19EventMiniGameFinishD1Ev 0x000000710011b708,O,000052,_ZN5uking6action19EventMiniGameFinishD0Ev @@ -6711,16 +6711,16 @@ Address,Quality,Size,Name 0x000000710011c67c,O,000208,_ZN5uking6action23EventMiniGameTimerWrite11loadParams_Ev 0x000000710011c74c,O,000288,_ZNK5uking6action23EventMiniGameTimerWrite27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710011c86c,O,000092,_ZNK5uking6action23EventMiniGameTimerWrite18getRuntimeTypeInfoEv -0x000000710011c8c8,O,000080,_ZN5uking6action24EventHoverNullASPlayBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710011c918,O,000020,_ZN5uking6action24EventHoverNullASPlayBaseD1Ev -0x000000710011c92c,O,000052,_ZN5uking6action24EventHoverNullASPlayBaseD0Ev -0x000000710011c960,O,000008,_ZN5uking6action24EventHoverNullASPlayBase5init_EPN4sead4HeapE -0x000000710011c968,O,000088,_ZN5uking6action24EventHoverNullASPlayBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710011c9c0,O,000084,_ZN5uking6action24EventHoverNullASPlayBase5calc_Ev -0x000000710011ca14,O,000004,_ZN5uking6action24EventHoverNullASPlayBase6leave_Ev -0x000000710011ca18,O,000332,_ZN5uking6action24EventHoverNullASPlayBase11loadParams_Ev -0x000000710011cb64,O,000288,_ZNK5uking6action24EventHoverNullASPlayBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710011cc84,O,000092,_ZNK5uking6action24EventHoverNullASPlayBase18getRuntimeTypeInfoEv +0x000000710011c8c8,O,000080,_ZN5uking6action19EventNullASPlayBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710011c918,O,000020,_ZN5uking6action19EventNullASPlayBaseD1Ev +0x000000710011c92c,O,000052,_ZN5uking6action19EventNullASPlayBaseD0Ev +0x000000710011c960,O,000008,_ZN5uking6action19EventNullASPlayBase5init_EPN4sead4HeapE +0x000000710011c968,O,000088,_ZN5uking6action19EventNullASPlayBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710011c9c0,O,000084,_ZN5uking6action19EventNullASPlayBase5calc_Ev +0x000000710011ca14,O,000004,_ZN5uking6action19EventNullASPlayBase6leave_Ev +0x000000710011ca18,O,000332,_ZN5uking6action19EventNullASPlayBase11loadParams_Ev +0x000000710011cb64,O,000288,_ZNK5uking6action19EventNullASPlayBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710011cc84,O,000092,_ZNK5uking6action19EventNullASPlayBase18getRuntimeTypeInfoEv 0x000000710011cce0,O,000056,_ZN5uking6action16EventOpenGetDemoC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710011cd18,O,000020,_ZN5uking6action16EventOpenGetDemoD1Ev 0x000000710011cd2c,O,000052,_ZN5uking6action16EventOpenGetDemoD0Ev @@ -7307,17 +7307,17 @@ Address,Quality,Size,Name 0x000000710012d210,U,000008,uking::action::FallAttack::m32 0x000000710012d218,U,000008,uking::action::FallAttack::m33 0x000000710012d220,U,000056,AI_ActionFireWood::ctor -0x000000710012d258,O,000020,_ZN5uking6action12FireWoodBaseD1Ev -0x000000710012d26c,O,000052,_ZN5uking6action12FireWoodBaseD0Ev -0x000000710012d2a0,W,000076,_ZN5uking6action12FireWoodBase5init_EPN4sead4HeapE -0x000000710012d2ec,W,000124,_ZN5uking6action12FireWoodBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710012d368,W,000120,_ZN5uking6action12FireWoodBase5calc_Ev -0x000000710012d3e0,W,000084,_ZN5uking6action12FireWoodBase6leave_Ev -0x000000710012d434,O,000100,_ZN5uking6action12FireWoodBase11loadParams_Ev -0x000000710012d498,U,000228,_ZN5uking6action12FireWoodBase14handleMessage_ERKN4ksys7MessageE -0x000000710012d57c,O,000288,_ZNK5uking6action12FireWoodBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710012d69c,O,000092,_ZNK5uking6action12FireWoodBase18getRuntimeTypeInfoEv -0x000000710012d6f8,U,000012,uking::action::FireWoodBase::m32 +0x000000710012d258,O,000020,_ZN5uking6action12FireBurnBaseD1Ev +0x000000710012d26c,O,000052,_ZN5uking6action12FireBurnBaseD0Ev +0x000000710012d2a0,W,000076,_ZN5uking6action12FireBurnBase5init_EPN4sead4HeapE +0x000000710012d2ec,W,000124,_ZN5uking6action12FireBurnBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710012d368,W,000120,_ZN5uking6action12FireBurnBase5calc_Ev +0x000000710012d3e0,W,000084,_ZN5uking6action12FireBurnBase6leave_Ev +0x000000710012d434,O,000100,_ZN5uking6action12FireBurnBase11loadParams_Ev +0x000000710012d498,U,000228,_ZN5uking6action12FireBurnBase14handleMessage_ERKN4ksys7MessageE +0x000000710012d57c,O,000288,_ZNK5uking6action12FireBurnBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710012d69c,O,000092,_ZNK5uking6action12FireBurnBase18getRuntimeTypeInfoEv +0x000000710012d6f8,U,000012,uking::action::FireBurnBase::m32 0x000000710012d704,U,000056,AI_Action_FireWood::ctor 0x000000710012d73c,O,000004,_ZN5uking6action8FireWoodD1Ev 0x000000710012d740,O,000036,_ZN5uking6action8FireWoodD0Ev @@ -7418,25 +7418,25 @@ Address,Quality,Size,Name 0x00000071001305c8,O,000004,_ZN5uking6action11FlowingDust11loadParams_Ev 0x00000071001305cc,O,000288,_ZNK5uking6action11FlowingDust27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001306ec,O,000092,_ZNK5uking6action11FlowingDust18getRuntimeTypeInfoEv -0x0000007100130748,M,000092,_ZN5uking6action25FlyingCharacterDamageBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001307a4,W,000020,_ZN5uking6action25FlyingCharacterDamageBaseD1Ev -0x00000071001307b8,W,000052,_ZN5uking6action25FlyingCharacterDamageBaseD0Ev -0x00000071001307ec,O,000004,_ZN5uking6action25FlyingCharacterDamageBase5init_EPN4sead4HeapE -0x00000071001307f0,W,000120,_ZN5uking6action25FlyingCharacterDamageBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100130748,M,000092,_ZN5uking6action21FlyingActorDamageBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001307a4,W,000020,_ZN5uking6action21FlyingActorDamageBaseD1Ev +0x00000071001307b8,W,000052,_ZN5uking6action21FlyingActorDamageBaseD0Ev +0x00000071001307ec,O,000004,_ZN5uking6action21FlyingActorDamageBase5init_EPN4sead4HeapE +0x00000071001307f0,W,000120,_ZN5uking6action21FlyingActorDamageBase6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100130868,U,000376, -0x00000071001309e0,W,000192,_ZN5uking6action25FlyingCharacterDamageBase5calc_Ev -0x0000007100130aa0,O,000004,_ZN5uking6action25FlyingCharacterDamageBase6leave_Ev +0x00000071001309e0,W,000192,_ZN5uking6action21FlyingActorDamageBase5calc_Ev +0x0000007100130aa0,O,000004,_ZN5uking6action21FlyingActorDamageBase6leave_Ev 0x0000007100130aa4,U,000216, -0x0000007100130b7c,U,000088,uking::action::FlyingCharacterDamageBase::m34 -0x0000007100130bd4,U,000304,uking::action::FlyingCharacterDamageBase::m37 -0x0000007100130d04,W,000472,_ZN5uking6action25FlyingCharacterDamageBase11loadParams_Ev -0x0000007100130edc,U,000112,uking::action::FlyingCharacterDamageBase::m33 -0x0000007100130f4c,U,000112,uking::action::FlyingCharacterDamageBase::m36 -0x0000007100130fbc,O,000008,_ZNK5uking6action25FlyingCharacterDamageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100130fc4,O,000092,_ZNK5uking6action25FlyingCharacterDamageBase18getRuntimeTypeInfoEv +0x0000007100130b7c,U,000088,uking::action::FlyingActorDamageBase::m34 +0x0000007100130bd4,U,000304,uking::action::FlyingActorDamageBase::m37 +0x0000007100130d04,W,000472,_ZN5uking6action21FlyingActorDamageBase11loadParams_Ev +0x0000007100130edc,U,000112,uking::action::FlyingActorDamageBase::m33 +0x0000007100130f4c,U,000112,uking::action::FlyingActorDamageBase::m36 +0x0000007100130fbc,O,000008,_ZNK5uking6action21FlyingActorDamageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100130fc4,O,000092,_ZNK5uking6action21FlyingActorDamageBase18getRuntimeTypeInfoEv 0x0000007100131020,U,000004,uking::action::FlyingCharacterFreeFallBase::m32 0x0000007100131024,U,000004,uking::action::FlyingCharacterFreeFallBase::m35 -0x0000007100131028,O,000372,_ZN5uking6action25FlyingCharacterDamageBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100131028,O,000372,_ZN5uking6action21FlyingActorDamageBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710013119c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27FlyingCharacterFreeFallBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100131228,U,000056,AI_Action_FlyingBalloonObserverTag::ctor 0x0000007100131260,O,000004,_ZN5uking6action24FlyingBalloonObserverTagD1Ev @@ -7462,7 +7462,7 @@ Address,Quality,Size,Name 0x000000710013156c,U,000128,uking::action::FlyingBirdDie::m38 0x00000071001315ec,O,000132,_ZNK5uking6action13FlyingBirdDie27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100131670,O,000092,_ZNK5uking6action13FlyingBirdDie18getRuntimeTypeInfoEv -0x00000071001316cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action25FlyingCharacterDamageBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001316cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21FlyingActorDamageBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100131758,M,000088,_ZN5uking6action23FlyingCharacterBlownOffC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001317b0,W,000020,_ZN5uking6action23FlyingCharacterBlownOffD1Ev 0x00000071001317c4,W,000052,_ZN5uking6action23FlyingCharacterBlownOffD0Ev @@ -8143,8 +8143,8 @@ Address,Quality,Size,Name 0x00000071001415d0,U,000256,uking::action::ForkASTrgEmitChmFieldPos::m34 0x00000071001416d0,O,000132,_ZNK5uking6action24ForkASTrgEmitChmFieldPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100141754,O,000092,_ZNK5uking6action24ForkASTrgEmitChmFieldPos18getRuntimeTypeInfoEv -0x00000071001417b0,O,000372,_ZN5uking6action16ForkEmitChmField33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100141924,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16ForkEmitChmFieldEE9isDerivedEPKNS0_9InterfaceE +0x00000071001417b0,O,000372,_ZN5uking6action23ForkTrgEmitChmFieldBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100141924,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23ForkTrgEmitChmFieldBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001419b0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19ForkEmitExpandFieldEE9isDerivedEPKNS0_9InterfaceE 0x0000007100141a3c,U,000052,AI_Action_ForkASTrgEmitShockWaveAtEnter::ctor 0x0000007100141a70,O,000004,_ZN5uking6action29ForkASTrgEmitShockWaveAtEnterD1Ev @@ -8532,8 +8532,8 @@ Address,Quality,Size,Name 0x000000710014d574,U,000088,uking::action::ForkDynActorNoTargetSelf::m32 0x000000710014d5cc,O,000132,_ZNK5uking6action24ForkDynActorNoTargetSelf27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710014d650,O,000092,_ZNK5uking6action24ForkDynActorNoTargetSelf18getRuntimeTypeInfoEv -0x000000710014d6ac,O,000372,_ZN5uking6action28ForkDynActorNoTargetSelfBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710014d820,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action28ForkDynActorNoTargetSelfBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710014d6ac,O,000372,_ZN5uking6action22ForkEndByConditionBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710014d820,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action22ForkEndByConditionBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710014d8ac,O,000072,_ZN5uking6action13ForkDynASPlayC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710014d8f4,W,000020,_ZN5uking6action13ForkDynASPlayD1Ev 0x000000710014d908,W,000052,_ZN5uking6action13ForkDynASPlayD0Ev @@ -8630,17 +8630,17 @@ Address,Quality,Size,Name 0x00000071001501d8,O,000008,_ZNK5uking6action26ForkEmitShockWaveByContact27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001501e0,O,000092,_ZNK5uking6action26ForkEmitShockWaveByContact18getRuntimeTypeInfoEv 0x000000710015023c,O,000372,_ZN5uking6action26ForkEmitShockWaveByContact33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001503b0,O,000048,_ZN5uking6action28ForkDynActorNoTargetSelfBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001503e0,O,000004,_ZN5uking6action28ForkDynActorNoTargetSelfBaseD1Ev -0x00000071001503e4,O,000036,_ZN5uking6action28ForkDynActorNoTargetSelfBaseD0Ev -0x0000007100150408,O,000004,_ZN5uking6action28ForkDynActorNoTargetSelfBase5init_EPN4sead4HeapE -0x000000710015040c,O,000004,_ZN5uking6action28ForkDynActorNoTargetSelfBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100150410,W,000068,_ZN5uking6action28ForkDynActorNoTargetSelfBase5calc_Ev -0x0000007100150454,O,000004,_ZN5uking6action28ForkDynActorNoTargetSelfBase6leave_Ev -0x0000007100150458,O,000004,_ZN5uking6action28ForkDynActorNoTargetSelfBase11loadParams_Ev -0x000000710015045c,O,000008,_ZNK5uking6action28ForkDynActorNoTargetSelfBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100150464,O,000092,_ZNK5uking6action28ForkDynActorNoTargetSelfBase18getRuntimeTypeInfoEv -0x00000071001504c0,U,000008,uking::action::ForkDynActorNoTargetSelfBase::m32 +0x00000071001503b0,O,000048,_ZN5uking6action22ForkEndByConditionBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001503e0,O,000004,_ZN5uking6action22ForkEndByConditionBaseD1Ev +0x00000071001503e4,O,000036,_ZN5uking6action22ForkEndByConditionBaseD0Ev +0x0000007100150408,O,000004,_ZN5uking6action22ForkEndByConditionBase5init_EPN4sead4HeapE +0x000000710015040c,O,000004,_ZN5uking6action22ForkEndByConditionBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100150410,W,000068,_ZN5uking6action22ForkEndByConditionBase5calc_Ev +0x0000007100150454,O,000004,_ZN5uking6action22ForkEndByConditionBase6leave_Ev +0x0000007100150458,O,000004,_ZN5uking6action22ForkEndByConditionBase11loadParams_Ev +0x000000710015045c,O,000008,_ZNK5uking6action22ForkEndByConditionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100150464,O,000092,_ZNK5uking6action22ForkEndByConditionBase18getRuntimeTypeInfoEv +0x00000071001504c0,U,000008,uking::action::ForkEndByConditionBase::m32 0x00000071001504c8,O,000060,_ZN5uking6action17ForkEndByDistanceC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100150504,O,000004,_ZN5uking6action17ForkEndByDistanceD1Ev 0x0000007100150508,O,000036,_ZN5uking6action17ForkEndByDistanceD0Ev @@ -8881,18 +8881,18 @@ Address,Quality,Size,Name 0x00000071001576f8,O,000128,_ZN5uking6action23ForkGolemMaterialASPlay11loadParams_Ev 0x0000007100157778,O,000288,_ZNK5uking6action23ForkGolemMaterialASPlay27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100157898,O,000092,_ZNK5uking6action23ForkGolemMaterialASPlay18getRuntimeTypeInfoEv -0x00000071001578f4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18ForkSimpleGrabBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001578f4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12ForkGrabBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100157980,U,000056,AI_ActionForkSimpleGrab::ctor -0x00000071001579b8,O,000020,_ZN5uking6action18ForkSimpleGrabBaseD1Ev -0x00000071001579cc,O,000052,_ZN5uking6action18ForkSimpleGrabBaseD0Ev -0x0000007100157a00,O,000008,_ZN5uking6action18ForkSimpleGrabBase5init_EPN4sead4HeapE -0x0000007100157a08,W,000008,_ZN5uking6action18ForkSimpleGrabBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100157a10,W,000456,_ZN5uking6action18ForkSimpleGrabBase5calc_Ev -0x0000007100157bd8,W,000024,_ZN5uking6action18ForkSimpleGrabBase6leave_Ev -0x0000007100157bf0,O,000100,_ZN5uking6action18ForkSimpleGrabBase11loadParams_Ev -0x0000007100157c54,U,000008,uking::action::ForkSimpleGrabBase::m32 -0x0000007100157c5c,O,000288,_ZNK5uking6action18ForkSimpleGrabBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100157d7c,O,000092,_ZNK5uking6action18ForkSimpleGrabBase18getRuntimeTypeInfoEv +0x00000071001579b8,O,000020,_ZN5uking6action12ForkGrabBaseD1Ev +0x00000071001579cc,O,000052,_ZN5uking6action12ForkGrabBaseD0Ev +0x0000007100157a00,O,000008,_ZN5uking6action12ForkGrabBase5init_EPN4sead4HeapE +0x0000007100157a08,W,000008,_ZN5uking6action12ForkGrabBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100157a10,W,000456,_ZN5uking6action12ForkGrabBase5calc_Ev +0x0000007100157bd8,W,000024,_ZN5uking6action12ForkGrabBase6leave_Ev +0x0000007100157bf0,O,000100,_ZN5uking6action12ForkGrabBase11loadParams_Ev +0x0000007100157c54,U,000008,uking::action::ForkGrabBase::m32 +0x0000007100157c5c,O,000288,_ZNK5uking6action12ForkGrabBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100157d7c,O,000092,_ZNK5uking6action12ForkGrabBase18getRuntimeTypeInfoEv 0x0000007100157dd8,U,000060,AI_Action_ForkGravityScaleChange::ctor 0x0000007100157e14,O,000020,_ZN5uking6action22ForkGravityScaleChangeD1Ev 0x0000007100157e28,O,000052,_ZN5uking6action22ForkGravityScaleChangeD0Ev @@ -8948,7 +8948,7 @@ Address,Quality,Size,Name 0x0000007100158a60,O,000008,_ZNK5uking6action23ForkHoverKeepRotateTurn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100158a68,O,000092,_ZNK5uking6action23ForkHoverKeepRotateTurn18getRuntimeTypeInfoEv 0x0000007100158ac4,O,000372,_ZN5uking6action23ForkHoverKeepRotateTurn33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100158c38,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27ForkHoverKeepRotateTurnBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100158c38,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18ForkKeepRotateTurnEE9isDerivedEPKNS0_9InterfaceE 0x0000007100158cc4,U,000056,AI_Action_ForkIgniteCarriedActor::ctor 0x0000007100158cfc,W,000052,_ZN5uking6action22ForkIgniteCarriedActorD1Ev 0x0000007100158d30,W,000060,_ZN5uking6action22ForkIgniteCarriedActorD0Ev @@ -8982,15 +8982,15 @@ Address,Quality,Size,Name 0x0000007100159a50,O,000288,_ZNK5uking6action25ForkJumpToTargetOnDownEnd27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100159b70,O,000092,_ZNK5uking6action25ForkJumpToTargetOnDownEnd18getRuntimeTypeInfoEv 0x0000007100159bcc,U,000060,AI_ActionForkHoverKeepRotateTurn::ctor -0x0000007100159c08,O,000020,_ZN5uking6action27ForkHoverKeepRotateTurnBaseD1Ev -0x0000007100159c1c,O,000052,_ZN5uking6action27ForkHoverKeepRotateTurnBaseD0Ev -0x0000007100159c50,O,000008,_ZN5uking6action27ForkHoverKeepRotateTurnBase5init_EPN4sead4HeapE -0x0000007100159c58,W,000112,_ZN5uking6action27ForkHoverKeepRotateTurnBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100159cc8,W,000916,_ZN5uking6action27ForkHoverKeepRotateTurnBase5calc_Ev -0x000000710015a05c,O,000004,_ZN5uking6action27ForkHoverKeepRotateTurnBase6leave_Ev -0x000000710015a060,O,000164,_ZN5uking6action27ForkHoverKeepRotateTurnBase11loadParams_Ev -0x000000710015a104,O,000288,_ZNK5uking6action27ForkHoverKeepRotateTurnBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710015a224,O,000092,_ZNK5uking6action27ForkHoverKeepRotateTurnBase18getRuntimeTypeInfoEv +0x0000007100159c08,O,000020,_ZN5uking6action18ForkKeepRotateTurnD1Ev +0x0000007100159c1c,O,000052,_ZN5uking6action18ForkKeepRotateTurnD0Ev +0x0000007100159c50,O,000008,_ZN5uking6action18ForkKeepRotateTurn5init_EPN4sead4HeapE +0x0000007100159c58,W,000112,_ZN5uking6action18ForkKeepRotateTurn6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100159cc8,W,000916,_ZN5uking6action18ForkKeepRotateTurn5calc_Ev +0x000000710015a05c,O,000004,_ZN5uking6action18ForkKeepRotateTurn6leave_Ev +0x000000710015a060,O,000164,_ZN5uking6action18ForkKeepRotateTurn11loadParams_Ev +0x000000710015a104,O,000288,_ZNK5uking6action18ForkKeepRotateTurn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710015a224,O,000092,_ZNK5uking6action18ForkKeepRotateTurn18getRuntimeTypeInfoEv 0x000000710015a280,O,000048,_ZN5uking6action18ForkKnockBackNoRotC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710015a2b0,W,000020,_ZN5uking6action18ForkKnockBackNoRotD1Ev 0x000000710015a2c4,W,000052,_ZN5uking6action18ForkKnockBackNoRotD0Ev @@ -9581,16 +9581,16 @@ Address,Quality,Size,Name 0x0000007100167d2c,O,000216,_ZNK5uking6action28ForkTimerForceResetCondition27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100167e04,O,000092,_ZNK5uking6action28ForkTimerForceResetCondition18getRuntimeTypeInfoEv 0x0000007100167e60,U,000064,AI_ActionForkEmitChmField::ctor -0x0000007100167ea0,O,000004,_ZN5uking6action16ForkEmitChmFieldD1Ev -0x0000007100167ea4,O,000036,_ZN5uking6action16ForkEmitChmFieldD0Ev -0x0000007100167ec8,O,000004,_ZN5uking6action16ForkEmitChmField5init_EPN4sead4HeapE -0x0000007100167ecc,W,000048,_ZN5uking6action16ForkEmitChmField6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100167efc,W,000136,_ZN5uking6action16ForkEmitChmField5calc_Ev -0x0000007100167f84,O,000004,_ZN5uking6action16ForkEmitChmField6leave_Ev -0x0000007100167f88,O,000084,_ZN5uking6action16ForkEmitChmField11loadParams_Ev -0x0000007100167fdc,U,000160,uking::action::ForkEmitChmField::m33 -0x000000710016807c,O,000008,_ZNK5uking6action16ForkEmitChmField27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100168084,O,000092,_ZNK5uking6action16ForkEmitChmField18getRuntimeTypeInfoEv +0x0000007100167ea0,O,000004,_ZN5uking6action23ForkTrgEmitChmFieldBaseD1Ev +0x0000007100167ea4,O,000036,_ZN5uking6action23ForkTrgEmitChmFieldBaseD0Ev +0x0000007100167ec8,O,000004,_ZN5uking6action23ForkTrgEmitChmFieldBase5init_EPN4sead4HeapE +0x0000007100167ecc,W,000048,_ZN5uking6action23ForkTrgEmitChmFieldBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100167efc,W,000136,_ZN5uking6action23ForkTrgEmitChmFieldBase5calc_Ev +0x0000007100167f84,O,000004,_ZN5uking6action23ForkTrgEmitChmFieldBase6leave_Ev +0x0000007100167f88,O,000084,_ZN5uking6action23ForkTrgEmitChmFieldBase11loadParams_Ev +0x0000007100167fdc,U,000160,uking::action::ForkTrgEmitChmFieldBase::m33 +0x000000710016807c,O,000008,_ZNK5uking6action23ForkTrgEmitChmFieldBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100168084,O,000092,_ZNK5uking6action23ForkTrgEmitChmFieldBase18getRuntimeTypeInfoEv 0x00000071001680e0,O,000048,_ZN5uking6action14ForkTurnASHoldC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100168110,O,000004,_ZN5uking6action14ForkTurnASHoldD1Ev 0x0000007100168114,O,000036,_ZN5uking6action14ForkTurnASHoldD0Ev @@ -10219,18 +10219,18 @@ Address,Quality,Size,Name 0x0000007100180564,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15SystemHideChaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001805f0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action10SystemHideEE9isDerivedEPKNS0_9InterfaceE 0x000000710018067c,U,000096,AI_ActionChuchuPreAttack::ctor -0x00000071001806dc,O,000020,_ZN5uking6action19ChuchuPreAttackBaseD1Ev -0x00000071001806f0,O,000052,_ZN5uking6action19ChuchuPreAttackBaseD0Ev -0x0000007100180724,O,000008,_ZN5uking6action19ChuchuPreAttackBase5init_EPN4sead4HeapE -0x000000710018072c,W,000324,_ZN5uking6action19ChuchuPreAttackBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100180870,W,000768,_ZN5uking6action19ChuchuPreAttackBase5calc_Ev +0x00000071001806dc,O,000020,_ZN5uking6action11GelJumpBaseD1Ev +0x00000071001806f0,O,000052,_ZN5uking6action11GelJumpBaseD0Ev +0x0000007100180724,O,000008,_ZN5uking6action11GelJumpBase5init_EPN4sead4HeapE +0x000000710018072c,W,000324,_ZN5uking6action11GelJumpBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100180870,W,000768,_ZN5uking6action11GelJumpBase5calc_Ev 0x0000007100180b70,U,001208, -0x0000007100181028,W,000200,_ZN5uking6action19ChuchuPreAttackBase6leave_Ev -0x00000071001810f0,O,000304,_ZN5uking6action19ChuchuPreAttackBase11loadParams_Ev -0x0000007100181220,U,000100,_ZNK5uking6action19ChuchuPreAttackBase10isFinishedEv -0x0000007100181284,O,000288,_ZNK5uking6action19ChuchuPreAttackBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001813a4,O,000092,_ZNK5uking6action19ChuchuPreAttackBase18getRuntimeTypeInfoEv -0x0000007100181400,U,000004,uking::action::ChuchuPreAttackBase::m32 +0x0000007100181028,W,000200,_ZN5uking6action11GelJumpBase6leave_Ev +0x00000071001810f0,O,000304,_ZN5uking6action11GelJumpBase11loadParams_Ev +0x0000007100181220,U,000100,_ZNK5uking6action11GelJumpBase10isFinishedEv +0x0000007100181284,O,000288,_ZNK5uking6action11GelJumpBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001813a4,O,000092,_ZNK5uking6action11GelJumpBase18getRuntimeTypeInfoEv +0x0000007100181400,U,000004,uking::action::GelJumpBase::m32 0x0000007100181404,U,000084,AI_Action_GelJumpTackle::ctor 0x0000007100181458,W,000104,_ZN5uking6action13GelJumpTackleD1Ev 0x00000071001814c0,W,000112,_ZN5uking6action13GelJumpTackleD0Ev @@ -10503,17 +10503,17 @@ Address,Quality,Size,Name 0x000000710018910c,U,000092,uking::action::GiantDownSwingAttack::m33 0x0000007100189168,O,000132,_ZNK5uking6action20GiantDownSwingAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001891ec,O,000092,_ZNK5uking6action20GiantDownSwingAttack18getRuntimeTypeInfoEv -0x0000007100189248,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17GiantAttackWithASEE9isDerivedEPKNS0_9InterfaceE -0x00000071001892d4,M,000052,_ZN5uking6action27GiantEnemyWalkWithVibrationC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100189308,W,000020,_ZN5uking6action27GiantEnemyWalkWithVibrationD1Ev -0x000000710018931c,W,000052,_ZN5uking6action27GiantEnemyWalkWithVibrationD0Ev -0x0000007100189350,O,000008,_ZN5uking6action27GiantEnemyWalkWithVibration5init_EPN4sead4HeapE -0x0000007100189358,O,000004,_ZN5uking6action27GiantEnemyWalkWithVibration6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710018935c,O,000004,_ZN5uking6action27GiantEnemyWalkWithVibration5calc_Ev -0x0000007100189360,O,000004,_ZN5uking6action27GiantEnemyWalkWithVibration6leave_Ev -0x0000007100189364,W,000084,_ZN5uking6action27GiantEnemyWalkWithVibration11loadParams_Ev -0x00000071001893b8,O,000132,_ZNK5uking6action27GiantEnemyWalkWithVibration27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710018943c,O,000092,_ZNK5uking6action27GiantEnemyWalkWithVibration18getRuntimeTypeInfoEv +0x0000007100189248,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12AttackWithASEE9isDerivedEPKNS0_9InterfaceE +0x00000071001892d4,M,000052,_ZN5uking6action27GiantEnemyMoveWithVibrationC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100189308,W,000020,_ZN5uking6action27GiantEnemyMoveWithVibrationD1Ev +0x000000710018931c,W,000052,_ZN5uking6action27GiantEnemyMoveWithVibrationD0Ev +0x0000007100189350,O,000008,_ZN5uking6action27GiantEnemyMoveWithVibration5init_EPN4sead4HeapE +0x0000007100189358,O,000004,_ZN5uking6action27GiantEnemyMoveWithVibration6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710018935c,O,000004,_ZN5uking6action27GiantEnemyMoveWithVibration5calc_Ev +0x0000007100189360,O,000004,_ZN5uking6action27GiantEnemyMoveWithVibration6leave_Ev +0x0000007100189364,W,000084,_ZN5uking6action27GiantEnemyMoveWithVibration11loadParams_Ev +0x00000071001893b8,O,000132,_ZNK5uking6action27GiantEnemyMoveWithVibration27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710018943c,O,000092,_ZNK5uking6action27GiantEnemyMoveWithVibration18getRuntimeTypeInfoEv 0x0000007100189498,O,000048,_ZN5uking6action14GiantEnemyWalkC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001894c8,O,000004,_ZN5uking6action14GiantEnemyWalkD1Ev 0x00000071001894cc,O,000036,_ZN5uking6action14GiantEnemyWalkD0Ev @@ -10524,7 +10524,7 @@ Address,Quality,Size,Name 0x0000007100189538,O,000004,_ZN5uking6action14GiantEnemyWalk11loadParams_Ev 0x000000710018953c,O,000216,_ZNK5uking6action14GiantEnemyWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100189614,O,000092,_ZNK5uking6action14GiantEnemyWalk18getRuntimeTypeInfoEv -0x0000007100189670,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27GiantEnemyWalkWithVibrationEE9isDerivedEPKNS0_9InterfaceE +0x0000007100189670,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27GiantEnemyMoveWithVibrationEE9isDerivedEPKNS0_9InterfaceE 0x00000071001896fc,U,000052,AI_Action_GiantHandClapToTarget::ctor 0x0000007100189730,O,000004,_ZN5uking6action21GiantHandClapToTargetD1Ev 0x0000007100189734,O,000036,_ZN5uking6action21GiantHandClapToTargetD0Ev @@ -10536,18 +10536,18 @@ Address,Quality,Size,Name 0x0000007100189a50,O,000300,_ZNK5uking6action21GiantHandClapToTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100189b7c,O,000092,_ZNK5uking6action21GiantHandClapToTarget18getRuntimeTypeInfoEv 0x0000007100189bd8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action11PunchAttackEE9isDerivedEPKNS0_9InterfaceE -0x0000007100189c64,M,000052,_ZN5uking6action29GiantNavMeshWalkWithVibrationC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100189c98,W,000020,_ZN5uking6action29GiantNavMeshWalkWithVibrationD1Ev -0x0000007100189cac,W,000052,_ZN5uking6action29GiantNavMeshWalkWithVibrationD0Ev -0x0000007100189ce0,O,000008,_ZN5uking6action29GiantNavMeshWalkWithVibration5init_EPN4sead4HeapE -0x0000007100189ce8,O,000004,_ZN5uking6action29GiantNavMeshWalkWithVibration6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100189cec,O,000004,_ZN5uking6action29GiantNavMeshWalkWithVibration5calc_Ev -0x0000007100189cf0,O,000004,_ZN5uking6action29GiantNavMeshWalkWithVibration6leave_Ev -0x0000007100189cf4,W,000084,_ZN5uking6action29GiantNavMeshWalkWithVibration11loadParams_Ev -0x0000007100189d48,O,000132,_ZNK5uking6action29GiantNavMeshWalkWithVibration27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100189dcc,O,000092,_ZNK5uking6action29GiantNavMeshWalkWithVibration18getRuntimeTypeInfoEv -0x0000007100189e28,O,000372,_ZN5uking6action13NavMeshAction33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100189f9c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action13NavMeshActionEE9isDerivedEPKNS0_9InterfaceE +0x0000007100189c64,M,000052,_ZN5uking6action29GiantNavMeshMoveWithVibrationC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100189c98,W,000020,_ZN5uking6action29GiantNavMeshMoveWithVibrationD1Ev +0x0000007100189cac,W,000052,_ZN5uking6action29GiantNavMeshMoveWithVibrationD0Ev +0x0000007100189ce0,O,000008,_ZN5uking6action29GiantNavMeshMoveWithVibration5init_EPN4sead4HeapE +0x0000007100189ce8,O,000004,_ZN5uking6action29GiantNavMeshMoveWithVibration6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100189cec,O,000004,_ZN5uking6action29GiantNavMeshMoveWithVibration5calc_Ev +0x0000007100189cf0,O,000004,_ZN5uking6action29GiantNavMeshMoveWithVibration6leave_Ev +0x0000007100189cf4,W,000084,_ZN5uking6action29GiantNavMeshMoveWithVibration11loadParams_Ev +0x0000007100189d48,O,000132,_ZNK5uking6action29GiantNavMeshMoveWithVibration27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100189dcc,O,000092,_ZNK5uking6action29GiantNavMeshMoveWithVibration18getRuntimeTypeInfoEv +0x0000007100189e28,O,000372,_ZN5uking6action15NavMeshMoveBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100189f9c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15NavMeshMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710018a028,O,000048,_ZN5uking6action16GiantNavMeshWalkC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710018a058,O,000004,_ZN5uking6action16GiantNavMeshWalkD1Ev 0x000000710018a05c,O,000036,_ZN5uking6action16GiantNavMeshWalkD0Ev @@ -10559,7 +10559,7 @@ Address,Quality,Size,Name 0x000000710018a094,U,000028,uking::action::GiantNavMeshWalk::m34 0x000000710018a0b0,O,000216,_ZNK5uking6action16GiantNavMeshWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710018a188,O,000092,_ZNK5uking6action16GiantNavMeshWalk18getRuntimeTypeInfoEv -0x000000710018a1e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action29GiantNavMeshWalkWithVibrationEE9isDerivedEPKNS0_9InterfaceE +0x000000710018a1e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action29GiantNavMeshMoveWithVibrationEE9isDerivedEPKNS0_9InterfaceE 0x000000710018a270,U,000056,AI_Action_GiantOneHandAttackWithLegTurn::ctor 0x000000710018a2a8,W,000056,_ZN5uking6action29GiantOneHandAttackWithLegTurnD1Ev 0x000000710018a2e0,W,000064,_ZN5uking6action29GiantOneHandAttackWithLegTurnD0Ev @@ -10572,7 +10572,7 @@ Address,Quality,Size,Name 0x000000710018a430,O,000092,_ZNK5uking6action29GiantOneHandAttackWithLegTurn18getRuntimeTypeInfoEv 0x000000710018a48c,U,000008,uking::action::GiantOneHandAttackWithLegTurn::m32 0x000000710018a494,U,000008,uking::action::GiantOneHandAttackWithLegTurn::m33 -0x000000710018a49c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action29GiantOneHandActionWithLegTurnEE9isDerivedEPKNS0_9InterfaceE +0x000000710018a49c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action24OneHandActionWithLegTurnEE9isDerivedEPKNS0_9InterfaceE 0x000000710018a528,U,000056,AI_Action_GiantOneHandPunchWithLegTurn::ctor 0x000000710018a560,W,000056,_ZN5uking6action28GiantOneHandPunchWithLegTurnD1Ev 0x000000710018a598,W,000064,_ZN5uking6action28GiantOneHandPunchWithLegTurnD0Ev @@ -10713,7 +10713,7 @@ Address,Quality,Size,Name 0x000000710018eb70,O,000008,_ZNK5uking6action23GoronHeroDescendentJump27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710018eb78,O,000092,_ZNK5uking6action23GoronHeroDescendentJump18getRuntimeTypeInfoEv 0x000000710018ebd4,O,000372,_ZN5uking6action23GoronHeroDescendentJump33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710018ed48,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21MoveToTargetCurveBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710018ed48,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21CurveMoveToTargetBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710018edd4,O,000056,_ZN5uking6action4GrabC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710018ee0c,O,000008,_ZN5uking6action4Grab5init_EPN4sead4HeapE 0x000000710018ee14,W,000044,_ZN5uking6action4Grab6enter_EPN4ksys3act2ai15InlineParamPackE @@ -10803,7 +10803,7 @@ Address,Quality,Size,Name 0x0000007100191c20,U,000028,uking::action::Guard::m38 0x0000007100191c3c,O,000132,_ZNK5uking6action5Guard27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100191cc0,O,000092,_ZNK5uking6action5Guard18getRuntimeTypeInfoEv -0x0000007100191d1c,O,000020,_ZN5uking6action18TakeHitImpactForceD1Ev +0x0000007100191d1c,O,000020,_ZN5uking6action23KnockBackHitImpactForceD1Ev 0x0000007100191d30,W,000052,_ZN5uking6action5GuardD0Ev 0x0000007100191d64,O,000048,_ZN5uking6action13GuardBackWalkC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100191d94,O,000004,_ZN5uking6action13GuardBackWalk5init_EPN4sead4HeapE @@ -10828,19 +10828,19 @@ Address,Quality,Size,Name 0x00000071001926ac,U,000012,uking::action::GuardBreak::m33 0x00000071001926b8,U,000004,uking::action::GuardBreak::m34 0x00000071001926bc,U,000056,AI_ActionGuardianMove::ctor -0x00000071001926f4,O,000020,_ZN5uking6action14GuardianMoveToD1Ev -0x0000007100192708,O,000052,_ZN5uking6action14GuardianMoveToD0Ev -0x000000710019273c,O,000008,_ZN5uking6action14GuardianMoveTo5init_EPN4sead4HeapE -0x0000007100192744,W,000044,_ZN5uking6action14GuardianMoveTo6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001926f4,O,000020,_ZN5uking6action18GuardianActionBaseD1Ev +0x0000007100192708,O,000052,_ZN5uking6action18GuardianActionBaseD0Ev +0x000000710019273c,O,000008,_ZN5uking6action18GuardianActionBase5init_EPN4sead4HeapE +0x0000007100192744,W,000044,_ZN5uking6action18GuardianActionBase6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100192770,U,000004, -0x0000007100192774,O,000004,_ZN5uking6action14GuardianMoveTo5calc_Ev -0x0000007100192778,W,000028,_ZN5uking6action14GuardianMoveTo6leave_Ev -0x0000007100192794,O,000004,_ZN5uking6action14GuardianMoveTo11loadParams_Ev +0x0000007100192774,O,000004,_ZN5uking6action18GuardianActionBase5calc_Ev +0x0000007100192778,W,000028,_ZN5uking6action18GuardianActionBase6leave_Ev +0x0000007100192794,O,000004,_ZN5uking6action18GuardianActionBase11loadParams_Ev 0x0000007100192798,U,000140, 0x0000007100192824,U,000140, 0x00000071001928b0,U,000344, -0x0000007100192a08,O,000288,_ZNK5uking6action14GuardianMoveTo27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100192b28,O,000092,_ZNK5uking6action14GuardianMoveTo18getRuntimeTypeInfoEv +0x0000007100192a08,O,000288,_ZNK5uking6action18GuardianActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100192b28,O,000092,_ZNK5uking6action18GuardianActionBase18getRuntimeTypeInfoEv 0x0000007100192b84,U,000092,AI_Action_GuardianAimBeam::ctor 0x0000007100192be0,W,000068,_ZN5uking6action15GuardianAimBeamD1Ev 0x0000007100192c24,W,000076,_ZN5uking6action15GuardianAimBeamD0Ev @@ -11003,7 +11003,7 @@ Address,Quality,Size,Name 0x00000071001982b8,O,000092,_ZNK5uking6action24GuardianMiniNeckSpinBeam18getRuntimeTypeInfoEv 0x0000007100198314,U,000012,uking::action::GuardianMiniNeckSpinBeam::m36 0x0000007100198320,O,000384,_ZN5uking6action24GuardianMiniNeckSpinBeam33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001984a0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12NeckSpinBeamEE9isDerivedEPKNS0_9InterfaceE +0x00000071001984a0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12BeamNeckSpinEE9isDerivedEPKNS0_9InterfaceE 0x000000710019852c,O,000052,_ZN5uking6action27GuardianMiniPracticeFlagSetC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100198560,O,000020,_ZN5uking6action27GuardianMiniPracticeFlagSetD1Ev 0x0000007100198574,O,000052,_ZN5uking6action27GuardianMiniPracticeFlagSetD0Ev @@ -11040,7 +11040,7 @@ Address,Quality,Size,Name 0x0000007100199df0,O,000008,_ZNK5uking6action22GuardianMoveToPosition27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100199df8,O,000092,_ZNK5uking6action22GuardianMoveToPosition18getRuntimeTypeInfoEv 0x0000007100199e54,O,000372,_ZN5uking6action22GuardianMoveToPosition33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100199fc8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14GuardianMoveToEE9isDerivedEPKNS0_9InterfaceE +0x0000007100199fc8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18GuardianActionBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710019a054,U,000060,AI_Action_GuardianMoveToTarget::ctor 0x000000710019a090,O,000004,_ZN5uking6action20GuardianMoveToTargetD1Ev 0x000000710019a094,O,000036,_ZN5uking6action20GuardianMoveToTargetD0Ev @@ -11206,7 +11206,7 @@ Address,Quality,Size,Name 0x000000710019e934,O,000008,_ZNK5uking6action7HornUse27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710019e93c,O,000092,_ZNK5uking6action7HornUse18getRuntimeTypeInfoEv 0x000000710019e998,O,000384,_ZN5uking6action7HornUse33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710019eb18,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action11HornUseBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710019eb18,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16EquipHornUseBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710019eba4,U,000096,AI_Action_HorseDie::ctor 0x000000710019ec04,O,000008,_ZN5uking6action8HorseDie5init_EPN4sead4HeapE 0x000000710019ec0c,W,000416,_ZN5uking6action8HorseDie6enter_EPN4ksys3act2ai15InlineParamPackE @@ -11253,17 +11253,17 @@ Address,Quality,Size,Name 0x00000071001a0660,U,000008,uking::action::HorseFollow::m33 0x00000071001a0668,O,000372,_ZN5uking6action11HorseFollow33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001a07dc,U,000080,AI_ActionAnimalFollow::ctor -0x00000071001a082c,O,000020,_ZN5uking6action16AnimalFollowBaseD1Ev -0x00000071001a0840,O,000052,_ZN5uking6action16AnimalFollowBaseD0Ev -0x00000071001a0874,O,000008,_ZN5uking6action16AnimalFollowBase5init_EPN4sead4HeapE -0x00000071001a087c,W,000332,_ZN5uking6action16AnimalFollowBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001a09c8,W,003164,_ZN5uking6action16AnimalFollowBase5calc_Ev -0x00000071001a1624,W,000212,_ZN5uking6action16AnimalFollowBase6leave_Ev -0x00000071001a16f8,O,000584,_ZN5uking6action16AnimalFollowBase11loadParams_Ev -0x00000071001a1940,O,000288,_ZNK5uking6action16AnimalFollowBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001a1a60,O,000092,_ZNK5uking6action16AnimalFollowBase18getRuntimeTypeInfoEv -0x00000071001a1abc,U,000008,uking::action::AnimalFollowBase::m32 -0x00000071001a1ac4,U,000012,uking::action::AnimalFollowBase::m33 +0x00000071001a082c,O,000020,_ZN5uking6action15HorseFollowBaseD1Ev +0x00000071001a0840,O,000052,_ZN5uking6action15HorseFollowBaseD0Ev +0x00000071001a0874,O,000008,_ZN5uking6action15HorseFollowBase5init_EPN4sead4HeapE +0x00000071001a087c,W,000332,_ZN5uking6action15HorseFollowBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001a09c8,W,003164,_ZN5uking6action15HorseFollowBase5calc_Ev +0x00000071001a1624,W,000212,_ZN5uking6action15HorseFollowBase6leave_Ev +0x00000071001a16f8,O,000584,_ZN5uking6action15HorseFollowBase11loadParams_Ev +0x00000071001a1940,O,000288,_ZNK5uking6action15HorseFollowBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001a1a60,O,000092,_ZNK5uking6action15HorseFollowBase18getRuntimeTypeInfoEv +0x00000071001a1abc,U,000008,uking::action::HorseFollowBase::m32 +0x00000071001a1ac4,U,000012,uking::action::HorseFollowBase::m33 0x00000071001a1ad0,M,000092,_ZN5uking6action11HorseFreezeC2ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001a1b2c,O,000020,_ZN5uking6action11HorseFreezeD1Ev 0x00000071001a1b40,O,000052,_ZN5uking6action11HorseFreezeD0Ev @@ -11365,9 +11365,9 @@ Address,Quality,Size,Name 0x00000071001ac910,O,000300,_ZNK5uking6action26HorseRideAngryGear1Coomand27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001aca3c,O,000092,_ZNK5uking6action26HorseRideAngryGear1Coomand18getRuntimeTypeInfoEv 0x00000071001aca98,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16HorseRideCommandEE9isDerivedEPKNS0_9InterfaceE -0x00000071001acb24,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20HorseRideCommandBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001acb24,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27HorseRideOneTimeCommandBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001acbb0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17HorseRideLookWaitEE9isDerivedEPKNS0_9InterfaceE -0x00000071001acc3c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action9HorseRideEE9isDerivedEPKNS0_9InterfaceE +0x00000071001acc3c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action13HorseRideBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001accc8,O,000372,_ZN5uking6action17HorseRideLookWait33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ace3c,U,000004,j__ZdlPv_57 0x00000071001ace40,U,000008, @@ -11392,20 +11392,20 @@ Address,Quality,Size,Name 0x00000071001ad628,O,000164,_ZN5uking6action15HorseRideAttack11loadParams_Ev 0x00000071001ad6cc,O,000132,_ZNK5uking6action15HorseRideAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ad750,O,000092,_ZNK5uking6action15HorseRideAttack18getRuntimeTypeInfoEv -0x00000071001ad7ac,O,000052,_ZN5uking6action9HorseRideC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001ad7e0,O,000020,_ZN5uking6action9HorseRideD1Ev -0x00000071001ad7f4,O,000052,_ZN5uking6action9HorseRideD0Ev -0x00000071001ad828,O,000008,_ZN5uking6action9HorseRide5init_EPN4sead4HeapE -0x00000071001ad830,O,000004,_ZN5uking6action9HorseRide6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001ad834,O,000004,_ZN5uking6action9HorseRide5calc_Ev -0x00000071001ad838,O,000004,_ZN5uking6action9HorseRide6leave_Ev -0x00000071001ad83c,O,000100,_ZN5uking6action9HorseRide11loadParams_Ev +0x00000071001ad7ac,O,000052,_ZN5uking6action13HorseRideBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001ad7e0,O,000020,_ZN5uking6action13HorseRideBaseD1Ev +0x00000071001ad7f4,O,000052,_ZN5uking6action13HorseRideBaseD0Ev +0x00000071001ad828,O,000008,_ZN5uking6action13HorseRideBase5init_EPN4sead4HeapE +0x00000071001ad830,O,000004,_ZN5uking6action13HorseRideBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001ad834,O,000004,_ZN5uking6action13HorseRideBase5calc_Ev +0x00000071001ad838,O,000004,_ZN5uking6action13HorseRideBase6leave_Ev +0x00000071001ad83c,O,000100,_ZN5uking6action13HorseRideBase11loadParams_Ev 0x00000071001ad8a0,U,000472, 0x00000071001ada78,U,000040, 0x00000071001adaa0,U,000008, 0x00000071001adaa8,U,000040, -0x00000071001adad0,O,000288,_ZNK5uking6action9HorseRide27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001adbf0,O,000092,_ZNK5uking6action9HorseRide18getRuntimeTypeInfoEv +0x00000071001adad0,O,000288,_ZNK5uking6action13HorseRideBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001adbf0,O,000092,_ZNK5uking6action13HorseRideBase18getRuntimeTypeInfoEv 0x00000071001adc4c,U,000088,AI_Action_HorseRideCancelCommand::ctor 0x00000071001adca4,W,000036,_ZN5uking6action22HorseRideCancelCommandD1Ev 0x00000071001adcc8,W,000068,_ZN5uking6action22HorseRideCancelCommandD0Ev @@ -11523,16 +11523,16 @@ Address,Quality,Size,Name 0x00000071001afd64,O,000008,_ZNK5uking6action22HorseRideOneTimeASPlay27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001afd6c,O,000092,_ZNK5uking6action22HorseRideOneTimeASPlay18getRuntimeTypeInfoEv 0x00000071001afdc8,O,000372,_ZN5uking6action22HorseRideOneTimeASPlay33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001aff3c,O,000048,_ZN5uking6action20HorseRideCommandBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001aff6c,O,000004,_ZN5uking6action20HorseRideCommandBaseD1Ev -0x00000071001aff70,O,000036,_ZN5uking6action20HorseRideCommandBaseD0Ev -0x00000071001aff94,O,000004,_ZN5uking6action20HorseRideCommandBase5init_EPN4sead4HeapE -0x00000071001aff98,W,000048,_ZN5uking6action20HorseRideCommandBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001affc8,W,000060,_ZN5uking6action20HorseRideCommandBase5calc_Ev -0x00000071001b0004,O,000004,_ZN5uking6action20HorseRideCommandBase6leave_Ev -0x00000071001b0008,O,000004,_ZN5uking6action20HorseRideCommandBase11loadParams_Ev -0x00000071001b000c,O,000132,_ZNK5uking6action20HorseRideCommandBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001b0090,O,000092,_ZNK5uking6action20HorseRideCommandBase18getRuntimeTypeInfoEv +0x00000071001aff3c,O,000048,_ZN5uking6action27HorseRideOneTimeCommandBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001aff6c,O,000004,_ZN5uking6action27HorseRideOneTimeCommandBaseD1Ev +0x00000071001aff70,O,000036,_ZN5uking6action27HorseRideOneTimeCommandBaseD0Ev +0x00000071001aff94,O,000004,_ZN5uking6action27HorseRideOneTimeCommandBase5init_EPN4sead4HeapE +0x00000071001aff98,W,000048,_ZN5uking6action27HorseRideOneTimeCommandBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001affc8,W,000060,_ZN5uking6action27HorseRideOneTimeCommandBase5calc_Ev +0x00000071001b0004,O,000004,_ZN5uking6action27HorseRideOneTimeCommandBase6leave_Ev +0x00000071001b0008,O,000004,_ZN5uking6action27HorseRideOneTimeCommandBase11loadParams_Ev +0x00000071001b000c,O,000132,_ZNK5uking6action27HorseRideOneTimeCommandBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001b0090,O,000092,_ZNK5uking6action27HorseRideOneTimeCommandBase18getRuntimeTypeInfoEv 0x00000071001b00ec,O,000048,_ZN5uking6action26HorseRideOneTimeViewASPlayC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001b011c,O,000004,_ZN5uking6action26HorseRideOneTimeViewASPlayD1Ev 0x00000071001b0120,O,000036,_ZN5uking6action26HorseRideOneTimeViewASPlayD0Ev @@ -11760,17 +11760,17 @@ Address,Quality,Size,Name 0x00000071001b50a4,O,000288,_ZNK5uking6action9IceBroken27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001b51c4,O,000092,_ZNK5uking6action9IceBroken18getRuntimeTypeInfoEv 0x00000071001b5220,U,000056,AI_ActionOctarockReloadWig::ctor -0x00000071001b5258,W,000068,_ZN5uking6action21OctarockReloadWigBaseD1Ev -0x00000071001b529c,W,000076,_ZN5uking6action21OctarockReloadWigBaseD0Ev -0x00000071001b52e8,W,000012,_ZN5uking6action21OctarockReloadWigBase5init_EPN4sead4HeapE -0x00000071001b52f4,W,000056,_ZN5uking6action21OctarockReloadWigBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001b532c,W,000096,_ZN5uking6action21OctarockReloadWigBase5calc_Ev -0x00000071001b538c,W,000044,_ZN5uking6action21OctarockReloadWigBase6leave_Ev -0x00000071001b53b8,W,000044,_ZN5uking6action21OctarockReloadWigBase11loadParams_Ev -0x00000071001b53e4,O,000300,_ZNK5uking6action21OctarockReloadWigBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001b5510,O,000092,_ZNK5uking6action21OctarockReloadWigBase18getRuntimeTypeInfoEv -0x00000071001b556c,U,000032,_ZNK5uking6action21OctarockReloadWigBase8isFailedEv -0x00000071001b558c,U,000076,_ZNK5uking6action21OctarockReloadWigBase10isFinishedEv +0x00000071001b5258,W,000068,_ZN5uking6action21IgniteActorReloadBaseD1Ev +0x00000071001b529c,W,000076,_ZN5uking6action21IgniteActorReloadBaseD0Ev +0x00000071001b52e8,W,000012,_ZN5uking6action21IgniteActorReloadBase5init_EPN4sead4HeapE +0x00000071001b52f4,W,000056,_ZN5uking6action21IgniteActorReloadBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001b532c,W,000096,_ZN5uking6action21IgniteActorReloadBase5calc_Ev +0x00000071001b538c,W,000044,_ZN5uking6action21IgniteActorReloadBase6leave_Ev +0x00000071001b53b8,W,000044,_ZN5uking6action21IgniteActorReloadBase11loadParams_Ev +0x00000071001b53e4,O,000300,_ZNK5uking6action21IgniteActorReloadBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001b5510,O,000092,_ZNK5uking6action21IgniteActorReloadBase18getRuntimeTypeInfoEv +0x00000071001b556c,U,000032,_ZNK5uking6action21IgniteActorReloadBase8isFailedEv +0x00000071001b558c,U,000076,_ZNK5uking6action21IgniteActorReloadBase10isFinishedEv 0x00000071001b55d8,U,000144,AI_Action_IgnitedThrown::ctor 0x00000071001b5668,O,000020,_ZN5uking6action13IgnitedThrownD1Ev 0x00000071001b567c,O,000052,_ZN5uking6action13IgnitedThrownD0Ev @@ -12159,18 +12159,18 @@ Address,Quality,Size,Name 0x00000071001c90fc,U,000140,uking::action::SmallDamageBackwardBase::m34 0x00000071001c9188,O,000132,_ZNK5uking6action23SmallDamageBackwardBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001c920c,O,000092,_ZNK5uking6action23SmallDamageBackwardBase18getRuntimeTypeInfoEv -0x00000071001c9268,U,000008,_ZNK5uking6action18TakeHitImpactForce12isChangeableEv -0x00000071001c9270,M,000076,_ZN5uking6action18TakeHitImpactForceC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001c92bc,W,000392,_ZN5uking6action18TakeHitImpactForce6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001c9268,U,000008,_ZNK5uking6action23KnockBackHitImpactForce12isChangeableEv +0x00000071001c9270,M,000076,_ZN5uking6action23KnockBackHitImpactForceC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001c92bc,W,000392,_ZN5uking6action23KnockBackHitImpactForce6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071001c9444,U,000232, -0x00000071001c952c,W,000388,_ZN5uking6action18TakeHitImpactForce5calc_Ev -0x00000071001c96b0,U,000300,uking::action::TakeHitImpactForce::m35 -0x00000071001c97dc,U,000016,uking::action::TakeHitImpactForce::m32 -0x00000071001c97ec,U,000028,uking::action::TakeHitImpactForce::m33 -0x00000071001c9808,W,000308,_ZN5uking6action18TakeHitImpactForce11loadParams_Ev -0x00000071001c993c,O,000008,_ZNK5uking6action18TakeHitImpactForce27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001c9944,O,000092,_ZNK5uking6action18TakeHitImpactForce18getRuntimeTypeInfoEv -0x00000071001c99a0,O,000052,_ZN5uking6action18TakeHitImpactForceD0Ev +0x00000071001c952c,W,000388,_ZN5uking6action23KnockBackHitImpactForce5calc_Ev +0x00000071001c96b0,U,000300,uking::action::KnockBackHitImpactForce::m35 +0x00000071001c97dc,U,000016,uking::action::KnockBackHitImpactForce::m32 +0x00000071001c97ec,U,000028,uking::action::KnockBackHitImpactForce::m33 +0x00000071001c9808,W,000308,_ZN5uking6action23KnockBackHitImpactForce11loadParams_Ev +0x00000071001c993c,O,000008,_ZNK5uking6action23KnockBackHitImpactForce27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001c9944,O,000092,_ZNK5uking6action23KnockBackHitImpactForce18getRuntimeTypeInfoEv +0x00000071001c99a0,O,000052,_ZN5uking6action23KnockBackHitImpactForceD0Ev 0x00000071001c99d4,O,000048,_ZN5uking6action15SmallDamageBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001c9a04,O,000004,_ZN5uking6action15SmallDamageBase6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071001c9a08,W,000076,_ZN5uking6action15SmallDamageBase5calc_Ev @@ -12188,7 +12188,7 @@ Address,Quality,Size,Name 0x00000071001c9d14,O,000008,_ZNK5uking6action17AnmKnockBackShock27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001c9d1c,O,000092,_ZNK5uking6action17AnmKnockBackShock18getRuntimeTypeInfoEv 0x00000071001c9d78,O,000372,_ZN5uking6action17AnmKnockBackShock33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001c9eec,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14KnockBackShockEE9isDerivedEPKNS0_9InterfaceE +0x00000071001c9eec,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20SimpleKnockBackShockEE9isDerivedEPKNS0_9InterfaceE 0x00000071001c9f78,O,000048,_ZN5uking6action15KokkoCreateDropC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001c9fa8,O,000004,_ZN5uking6action15KokkoCreateDropD1Ev 0x00000071001c9fac,O,000036,_ZN5uking6action15KokkoCreateDropD0Ev @@ -12201,7 +12201,7 @@ Address,Quality,Size,Name 0x00000071001ca02c,O,000008,_ZNK5uking6action15KokkoCreateDrop27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ca034,O,000092,_ZNK5uking6action15KokkoCreateDrop18getRuntimeTypeInfoEv 0x00000071001ca090,O,000372,_ZN5uking6action15KokkoCreateDrop33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001ca204,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19KokkoCreateDropBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001ca204,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14CreateDropBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001ca290,U,000100,AI_Action_KokkoMove::ctor 0x00000071001ca2f4,O,000020,_ZN5uking6action9KokkoMoveD1Ev 0x00000071001ca308,O,000052,_ZN5uking6action9KokkoMoveD0Ev @@ -12498,17 +12498,17 @@ Address,Quality,Size,Name 0x00000071001d8014,O,000128,_ZN5uking6action12LastBossStun11loadParams_Ev 0x00000071001d8094,O,000288,_ZNK5uking6action12LastBossStun27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001d81b4,O,000092,_ZNK5uking6action12LastBossStun18getRuntimeTypeInfoEv -0x00000071001d8210,M,000064,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001d8250,O,000020,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBaseD1Ev -0x00000071001d8264,O,000052,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBaseD0Ev -0x00000071001d8298,O,000008,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBase5init_EPN4sead4HeapE -0x00000071001d82a0,W,000668,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001d853c,W,000604,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBase5calc_Ev -0x00000071001d8798,O,000004,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBase6leave_Ev -0x00000071001d879c,O,000164,_ZN5uking6action33SiteBossSwordWhirlSlashChargeBase11loadParams_Ev -0x00000071001d8840,U,000004,uking::action::SiteBossSwordWhirlSlashChargeBase::m32 -0x00000071001d8844,O,000288,_ZNK5uking6action33SiteBossSwordWhirlSlashChargeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001d8964,O,000092,_ZNK5uking6action33SiteBossSwordWhirlSlashChargeBase18getRuntimeTypeInfoEv +0x00000071001d8210,M,000064,_ZN5uking6action33LastBossSwordWhirlSlashChargeBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001d8250,O,000020,_ZN5uking6action33LastBossSwordWhirlSlashChargeBaseD1Ev +0x00000071001d8264,O,000052,_ZN5uking6action33LastBossSwordWhirlSlashChargeBaseD0Ev +0x00000071001d8298,O,000008,_ZN5uking6action33LastBossSwordWhirlSlashChargeBase5init_EPN4sead4HeapE +0x00000071001d82a0,W,000668,_ZN5uking6action33LastBossSwordWhirlSlashChargeBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001d853c,W,000604,_ZN5uking6action33LastBossSwordWhirlSlashChargeBase5calc_Ev +0x00000071001d8798,O,000004,_ZN5uking6action33LastBossSwordWhirlSlashChargeBase6leave_Ev +0x00000071001d879c,O,000164,_ZN5uking6action33LastBossSwordWhirlSlashChargeBase11loadParams_Ev +0x00000071001d8840,U,000004,uking::action::LastBossSwordWhirlSlashChargeBase::m32 +0x00000071001d8844,O,000288,_ZNK5uking6action33LastBossSwordWhirlSlashChargeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001d8964,O,000092,_ZNK5uking6action33LastBossSwordWhirlSlashChargeBase18getRuntimeTypeInfoEv 0x00000071001d89c0,U,000064,AI_Action_LastBossThunderAppear::ctor 0x00000071001d8a00,O,000020,_ZN5uking6action21LastBossThunderAppearD1Ev 0x00000071001d8a14,O,000052,_ZN5uking6action21LastBossThunderAppearD0Ev @@ -12680,9 +12680,9 @@ Address,Quality,Size,Name 0x00000071001dd888,O,000004,_ZN5uking6action12LookAtObject11loadParams_Ev 0x00000071001dd88c,O,000216,_ZNK5uking6action12LookAtObject27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001dd964,O,000092,_ZNK5uking6action12LookAtObject18getRuntimeTypeInfoEv -0x00000071001dd9c0,U,000004,uking::action::LookAtObjectBase::m38 -0x00000071001dd9c4,U,000008,uking::action::LookAtObjectBase::m39 -0x00000071001dd9cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16LookAtObjectBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001dd9c0,U,000004,uking::action::TurnAndLookToObjBase::m38 +0x00000071001dd9c4,U,000008,uking::action::TurnAndLookToObjBase::m39 +0x00000071001dd9cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20TurnAndLookToObjBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001dda58,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12PlayerActionEE9isDerivedEPKNS0_9InterfaceE 0x00000071001ddae4,O,000372,_ZN5uking6action12PlayerAction33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ddc58,U,000052,AI_Action_LookAtObjectSeachAwareness::ctor @@ -12916,7 +12916,7 @@ Address,Quality,Size,Name 0x00000071001e797c,O,000008,_ZNK5uking6action12Move2HomePos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001e7984,O,000092,_ZNK5uking6action12Move2HomePos18getRuntimeTypeInfoEv 0x00000071001e79e0,O,000372,_ZN5uking6action12Move2HomePos33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001e7b54,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16Move2HomePosBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001e7b54,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15MoveHomePosBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001e7be0,M,000076,_ZN5uking6action8MoveBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001e7c2c,O,000500,_ZN5uking6action8MoveBase11loadParams_Ev 0x00000071001e7e20,W,000372,_ZN5uking6action8MoveBase6enter_EPN4ksys3act2ai15InlineParamPackE @@ -12978,16 +12978,16 @@ Address,Quality,Size,Name 0x00000071001ea258,O,000092,_ZNK5uking6action25MoveByAnimeDrivenToTarget18getRuntimeTypeInfoEv 0x00000071001ea2b4,O,000372,_ZN5uking6action25MoveByAnimeDrivenToTarget33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ea428,U,000096,AI_ActionMove2HomePos::ctor -0x00000071001ea488,O,000020,_ZN5uking6action16Move2HomePosBaseD1Ev -0x00000071001ea49c,O,000052,_ZN5uking6action16Move2HomePosBaseD0Ev -0x00000071001ea4d0,O,000008,_ZN5uking6action16Move2HomePosBase5init_EPN4sead4HeapE -0x00000071001ea4d8,W,000188,_ZN5uking6action16Move2HomePosBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001ea594,W,000528,_ZN5uking6action16Move2HomePosBase5calc_Ev -0x00000071001ea7a4,W,000112,_ZN5uking6action16Move2HomePosBase6leave_Ev -0x00000071001ea814,U,000012,uking::action::Move2HomePosBase::m32 -0x00000071001ea820,O,000192,_ZN5uking6action16Move2HomePosBase11loadParams_Ev -0x00000071001ea8e0,O,000288,_ZNK5uking6action16Move2HomePosBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001eaa00,O,000092,_ZNK5uking6action16Move2HomePosBase18getRuntimeTypeInfoEv +0x00000071001ea488,O,000020,_ZN5uking6action15MoveHomePosBaseD1Ev +0x00000071001ea49c,O,000052,_ZN5uking6action15MoveHomePosBaseD0Ev +0x00000071001ea4d0,O,000008,_ZN5uking6action15MoveHomePosBase5init_EPN4sead4HeapE +0x00000071001ea4d8,W,000188,_ZN5uking6action15MoveHomePosBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001ea594,W,000528,_ZN5uking6action15MoveHomePosBase5calc_Ev +0x00000071001ea7a4,W,000112,_ZN5uking6action15MoveHomePosBase6leave_Ev +0x00000071001ea814,U,000012,uking::action::MoveHomePosBase::m32 +0x00000071001ea820,O,000192,_ZN5uking6action15MoveHomePosBase11loadParams_Ev +0x00000071001ea8e0,O,000288,_ZNK5uking6action15MoveHomePosBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001eaa00,O,000092,_ZNK5uking6action15MoveHomePosBase18getRuntimeTypeInfoEv 0x00000071001eaa5c,O,000056,_ZN5uking6action13MoveKeyFramedC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001eaa94,O,000020,_ZN5uking6action13MoveKeyFramedD1Ev 0x00000071001eaaa8,O,000052,_ZN5uking6action13MoveKeyFramedD0Ev @@ -13099,29 +13099,29 @@ Address,Quality,Size,Name 0x00000071001ed9b4,O,000092,_ZNK5uking6action24Msg2CameraResetNoConnect18getRuntimeTypeInfoEv 0x00000071001eda10,O,000052,_ZN5uking6action24Msg2CameraResetNoConnectD0Ev 0x00000071001eda44,U,000324,AI_ActionMultiVacuumRotScaleTimeByDistBase::ctor -0x00000071001edb88,W,000464,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBaseD1Ev -0x00000071001edd58,W,000036,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBaseD0Ev -0x00000071001edd7c,W,000620,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase5init_EPN4sead4HeapE -0x00000071001edfe8,W,000380,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001ee164,W,000440,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase5calc_Ev +0x00000071001edb88,W,000464,_ZN5uking6action15MultiVacuumBaseD1Ev +0x00000071001edd58,W,000036,_ZN5uking6action15MultiVacuumBaseD0Ev +0x00000071001edd7c,W,000620,_ZN5uking6action15MultiVacuumBase5init_EPN4sead4HeapE +0x00000071001edfe8,W,000380,_ZN5uking6action15MultiVacuumBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001ee164,W,000440,_ZN5uking6action15MultiVacuumBase5calc_Ev 0x00000071001ee31c,U,001180, -0x00000071001ee7b8,W,000168,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase6leave_Ev -0x00000071001ee860,O,000492,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase11loadParams_Ev -0x00000071001eea4c,U,000008,_ZN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase10handleAck_ERKN4ksys10MessageAckE -0x00000071001eea54,O,000288,_ZNK5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001eeb74,O,000092,_ZNK5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBase18getRuntimeTypeInfoEv +0x00000071001ee7b8,W,000168,_ZN5uking6action15MultiVacuumBase6leave_Ev +0x00000071001ee860,O,000492,_ZN5uking6action15MultiVacuumBase11loadParams_Ev +0x00000071001eea4c,U,000008,_ZN5uking6action15MultiVacuumBase10handleAck_ERKN4ksys10MessageAckE +0x00000071001eea54,O,000288,_ZNK5uking6action15MultiVacuumBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001eeb74,O,000092,_ZNK5uking6action15MultiVacuumBase18getRuntimeTypeInfoEv 0x00000071001eebd0,U,000060,AI_ActionMultiVacuumRotScaleTimeByDist::ctor -0x00000071001eec0c,W,000020,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgtD1Ev -0x00000071001eec20,W,000052,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgtD0Ev -0x00000071001eec54,O,000004,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgt5init_EPN4sead4HeapE -0x00000071001eec58,W,000104,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgt6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001eecc0,W,000812,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgt5calc_Ev -0x00000071001eefec,O,000004,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgt6leave_Ev -0x00000071001eeff0,W,000172,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgt11loadParams_Ev -0x00000071001ef09c,O,000008,_ZNK5uking6action36MultiVacuumRotScaleTimeByDistWithTgt27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001ef0a4,O,000092,_ZNK5uking6action36MultiVacuumRotScaleTimeByDistWithTgt18getRuntimeTypeInfoEv -0x00000071001ef100,O,000372,_ZN5uking6action36MultiVacuumRotScaleTimeByDistWithTgt33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001ef274,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action40MultiVacuumRotScaleTimeByDistWithTgtBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071001eec0c,W,000020,_ZN5uking6action18MultiVacuumRotBaseD1Ev +0x00000071001eec20,W,000052,_ZN5uking6action18MultiVacuumRotBaseD0Ev +0x00000071001eec54,O,000004,_ZN5uking6action18MultiVacuumRotBase5init_EPN4sead4HeapE +0x00000071001eec58,W,000104,_ZN5uking6action18MultiVacuumRotBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001eecc0,W,000812,_ZN5uking6action18MultiVacuumRotBase5calc_Ev +0x00000071001eefec,O,000004,_ZN5uking6action18MultiVacuumRotBase6leave_Ev +0x00000071001eeff0,W,000172,_ZN5uking6action18MultiVacuumRotBase11loadParams_Ev +0x00000071001ef09c,O,000008,_ZNK5uking6action18MultiVacuumRotBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001ef0a4,O,000092,_ZNK5uking6action18MultiVacuumRotBase18getRuntimeTypeInfoEv +0x00000071001ef100,O,000372,_ZN5uking6action18MultiVacuumRotBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001ef274,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15MultiVacuumBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001ef300,U,000052,AI_Action_MultiVacuumRotScaleTimeByDist::ctor 0x00000071001ef334,O,000004,_ZN5uking6action29MultiVacuumRotScaleTimeByDistD1Ev 0x00000071001ef338,O,000036,_ZN5uking6action29MultiVacuumRotScaleTimeByDistD0Ev @@ -13132,7 +13132,7 @@ Address,Quality,Size,Name 0x00000071001ef400,W,000084,_ZN5uking6action29MultiVacuumRotScaleTimeByDist11loadParams_Ev 0x00000071001ef454,O,000132,_ZNK5uking6action29MultiVacuumRotScaleTimeByDist27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ef4d8,O,000092,_ZNK5uking6action29MultiVacuumRotScaleTimeByDist18getRuntimeTypeInfoEv -0x00000071001ef534,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action36MultiVacuumRotScaleTimeByDistWithTgtEE9isDerivedEPKNS0_9InterfaceE +0x00000071001ef534,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18MultiVacuumRotBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071001ef5c0,O,000048,_ZN5uking6action17NavMeshBattleWalkC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001ef5f0,O,000008,_ZN5uking6action17NavMeshBattleWalk5init_EPN4sead4HeapE 0x00000071001ef5f8,O,000004,_ZN5uking6action17NavMeshBattleWalk6enter_EPN4ksys3act2ai15InlineParamPackE @@ -13142,7 +13142,7 @@ Address,Quality,Size,Name 0x00000071001ef620,O,000004,_ZN5uking6action17NavMeshBattleWalk11loadParams_Ev 0x00000071001ef624,O,000132,_ZNK5uking6action17NavMeshBattleWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001ef6a8,O,000092,_ZNK5uking6action17NavMeshBattleWalk18getRuntimeTypeInfoEv -0x00000071001ef704,O,000020,_ZN5uking6action13NavMeshActionD1Ev +0x00000071001ef704,O,000020,_ZN5uking6action15NavMeshMoveBaseD1Ev 0x00000071001ef718,W,000052,_ZN5uking6action17NavMeshBattleWalkD0Ev 0x00000071001ef74c,O,000048,_ZN5uking6action13NavMeshEscapeC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001ef77c,U,000028,uking::action::NavMeshEscape::m34 @@ -13200,22 +13200,22 @@ Address,Quality,Size,Name 0x00000071001f0404,O,000132,_ZNK5uking6action15NavMeshLiftWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001f0488,O,000092,_ZNK5uking6action15NavMeshLiftWalk18getRuntimeTypeInfoEv 0x00000071001f04e4,W,000052,_ZN5uking6action15NavMeshLiftWalkD0Ev -0x00000071001f0518,M,000092,_ZN5uking6action13NavMeshActionC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001f0574,O,000304,_ZN5uking6action13NavMeshAction11loadParams_Ev -0x00000071001f06a4,W,000492,_ZN5uking6action13NavMeshAction6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001f0890,W,000084,_ZN5uking6action13NavMeshAction5calc_Ev +0x00000071001f0518,M,000092,_ZN5uking6action15NavMeshMoveBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001f0574,O,000304,_ZN5uking6action15NavMeshMoveBase11loadParams_Ev +0x00000071001f06a4,W,000492,_ZN5uking6action15NavMeshMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001f0890,W,000084,_ZN5uking6action15NavMeshMoveBase5calc_Ev 0x00000071001f08e4,U,000356, -0x00000071001f0a48,W,000304,_ZN5uking6action13NavMeshAction6leave_Ev -0x00000071001f0b78,U,001200,uking::action::NavMeshAction::m32 -0x00000071001f1028,U,000672,uking::action::NavMeshAction::m33 -0x00000071001f12c8,U,000008,uking::action::NavMeshAction::m35 -0x00000071001f12d0,U,000056,uking::action::NavMeshAction::m37 -0x00000071001f1308,U,000072,uking::action::NavMeshAction::m36 +0x00000071001f0a48,W,000304,_ZN5uking6action15NavMeshMoveBase6leave_Ev +0x00000071001f0b78,U,001200,uking::action::NavMeshMoveBase::m32 +0x00000071001f1028,U,000672,uking::action::NavMeshMoveBase::m33 +0x00000071001f12c8,U,000008,uking::action::NavMeshMoveBase::m35 +0x00000071001f12d0,U,000056,uking::action::NavMeshMoveBase::m37 +0x00000071001f1308,U,000072,uking::action::NavMeshMoveBase::m36 0x00000071001f1350,U,000012, 0x00000071001f135c,U,000012, -0x00000071001f1368,O,000008,_ZNK5uking6action13NavMeshAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001f1370,O,000092,_ZNK5uking6action13NavMeshAction18getRuntimeTypeInfoEv -0x00000071001f13cc,O,000052,_ZN5uking6action13NavMeshActionD0Ev +0x00000071001f1368,O,000008,_ZNK5uking6action15NavMeshMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001f1370,O,000092,_ZNK5uking6action15NavMeshMoveBase18getRuntimeTypeInfoEv +0x00000071001f13cc,O,000052,_ZN5uking6action15NavMeshMoveBaseD0Ev 0x00000071001f1400,U,000076,AI_Action_NavMeshMoveWithAS::ctor 0x00000071001f144c,W,000020,_ZN5uking6action17NavMeshMoveWithASD1Ev 0x00000071001f1460,W,000052,_ZN5uking6action17NavMeshMoveWithASD0Ev @@ -13314,18 +13314,18 @@ Address,Quality,Size,Name 0x00000071001f2df8,O,000004,_ZN5uking6action20NoDeleteCurrentActor11loadParams_Ev 0x00000071001f2dfc,O,000288,_ZNK5uking6action20NoDeleteCurrentActor27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001f2f1c,O,000092,_ZNK5uking6action20NoDeleteCurrentActor18getRuntimeTypeInfoEv -0x00000071001f2f78,M,000064,_ZN5uking6action10BackWalkExC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071001f2fb8,W,000020,_ZN5uking6action10BackWalkExD1Ev -0x00000071001f2fcc,W,000052,_ZN5uking6action10BackWalkExD0Ev -0x00000071001f3000,O,000008,_ZN5uking6action10BackWalkEx5init_EPN4sead4HeapE -0x00000071001f3008,W,000220,_ZN5uking6action10BackWalkEx6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001f30e4,O,000004,_ZN5uking6action10BackWalkEx5calc_Ev -0x00000071001f30e8,O,000004,_ZN5uking6action10BackWalkEx6leave_Ev -0x00000071001f30ec,O,000004,_ZN5uking6action10BackWalkEx11loadParams_Ev -0x00000071001f30f0,U,000172,uking::action::BackWalkEx::m32 -0x00000071001f319c,U,000160,uking::action::BackWalkEx::m33 -0x00000071001f323c,O,000132,_ZNK5uking6action10BackWalkEx27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001f32c0,O,000092,_ZNK5uking6action10BackWalkEx18getRuntimeTypeInfoEv +0x00000071001f2f78,M,000064,_ZN5uking6action14NormalBackWalkC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071001f2fb8,W,000020,_ZN5uking6action14NormalBackWalkD1Ev +0x00000071001f2fcc,W,000052,_ZN5uking6action14NormalBackWalkD0Ev +0x00000071001f3000,O,000008,_ZN5uking6action14NormalBackWalk5init_EPN4sead4HeapE +0x00000071001f3008,W,000220,_ZN5uking6action14NormalBackWalk6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001f30e4,O,000004,_ZN5uking6action14NormalBackWalk5calc_Ev +0x00000071001f30e8,O,000004,_ZN5uking6action14NormalBackWalk6leave_Ev +0x00000071001f30ec,O,000004,_ZN5uking6action14NormalBackWalk11loadParams_Ev +0x00000071001f30f0,U,000172,uking::action::NormalBackWalk::m32 +0x00000071001f319c,U,000160,uking::action::NormalBackWalk::m33 +0x00000071001f323c,O,000132,_ZNK5uking6action14NormalBackWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001f32c0,O,000092,_ZNK5uking6action14NormalBackWalk18getRuntimeTypeInfoEv 0x00000071001f331c,O,000048,_ZN5uking6action6NoticeC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071001f334c,W,000060,_ZN5uking6action6Notice6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071001f3388,U,000008,_ZNK5uking6action6Notice12isChangeableEv @@ -14023,7 +14023,7 @@ Address,Quality,Size,Name 0x000000710020f880,O,000008,_ZNK5uking6action17OctarockReloadWig27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710020f888,O,000092,_ZNK5uking6action17OctarockReloadWig18getRuntimeTypeInfoEv 0x000000710020f8e4,O,000384,_ZN5uking6action17OctarockReloadWig33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710020fa64,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21OctarockReloadWigBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710020fa64,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21IgniteActorReloadBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710020faf0,O,000372,_ZN5uking6action12SwimMoveBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710020fc64,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12SwimMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710020fcf0,O,000084,_ZN5uking6action3OffC1ERKN4ksys3act2ai10ActionBase7InitArgE @@ -14095,39 +14095,39 @@ Address,Quality,Size,Name 0x000000710021104c,O,000092,_ZNK5uking6action9OnCorrect18getRuntimeTypeInfoEv 0x00000071002110a8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action2OnEE9isDerivedEPKNS0_9InterfaceE 0x0000007100211134,U,000096,AI_ActionGiantOneHandAttackOrPunch::ctor -0x0000007100211194,W,000056,_ZN5uking6action29GiantOneHandActionWithLegTurnD1Ev -0x00000071002111cc,W,000064,_ZN5uking6action29GiantOneHandActionWithLegTurnD0Ev -0x000000710021120c,O,000004,_ZN5uking6action29GiantOneHandActionWithLegTurn5init_EPN4sead4HeapE -0x0000007100211210,W,000172,_ZN5uking6action29GiantOneHandActionWithLegTurn6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002112bc,W,000220,_ZN5uking6action29GiantOneHandActionWithLegTurn5calc_Ev -0x0000007100211398,W,000040,_ZN5uking6action29GiantOneHandActionWithLegTurn6leave_Ev -0x00000071002113c0,W,000276,_ZN5uking6action29GiantOneHandActionWithLegTurn11loadParams_Ev -0x00000071002114d4,O,000132,_ZNK5uking6action29GiantOneHandActionWithLegTurn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100211558,O,000092,_ZNK5uking6action29GiantOneHandActionWithLegTurn18getRuntimeTypeInfoEv -0x00000071002115b4,O,000372,_ZN5uking6action33ForkOnEnterSwapDropTableActorBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100211728,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action33ForkOnEnterSwapDropTableActorBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100211194,W,000056,_ZN5uking6action24OneHandActionWithLegTurnD1Ev +0x00000071002111cc,W,000064,_ZN5uking6action24OneHandActionWithLegTurnD0Ev +0x000000710021120c,O,000004,_ZN5uking6action24OneHandActionWithLegTurn5init_EPN4sead4HeapE +0x0000007100211210,W,000172,_ZN5uking6action24OneHandActionWithLegTurn6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002112bc,W,000220,_ZN5uking6action24OneHandActionWithLegTurn5calc_Ev +0x0000007100211398,W,000040,_ZN5uking6action24OneHandActionWithLegTurn6leave_Ev +0x00000071002113c0,W,000276,_ZN5uking6action24OneHandActionWithLegTurn11loadParams_Ev +0x00000071002114d4,O,000132,_ZNK5uking6action24OneHandActionWithLegTurn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100211558,O,000092,_ZNK5uking6action24OneHandActionWithLegTurn18getRuntimeTypeInfoEv +0x00000071002115b4,O,000372,_ZN5uking6action20OnEnterSwapActorBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100211728,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20OnEnterSwapActorBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071002117b4,U,000056,AI_ActionOnEnterSwapDropTableActorBase::ctor -0x00000071002117ec,W,000128,_ZN5uking6action33ForkOnEnterSwapDropTableActorBaseD1Ev -0x000000710021186c,W,000136,_ZN5uking6action33ForkOnEnterSwapDropTableActorBaseD0Ev -0x00000071002118f4,W,000276,_ZN5uking6action33ForkOnEnterSwapDropTableActorBase5init_EPN4sead4HeapE -0x0000007100211a08,W,000200,_ZN5uking6action33ForkOnEnterSwapDropTableActorBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100211ad0,W,000272,_ZN5uking6action33ForkOnEnterSwapDropTableActorBase5calc_Ev -0x0000007100211be0,W,000036,_ZN5uking6action33ForkOnEnterSwapDropTableActorBase6leave_Ev -0x0000007100211c04,O,000084,_ZN5uking6action33ForkOnEnterSwapDropTableActorBase11loadParams_Ev -0x0000007100211c58,O,000008,_ZNK5uking6action33ForkOnEnterSwapDropTableActorBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100211c60,O,000092,_ZNK5uking6action33ForkOnEnterSwapDropTableActorBase18getRuntimeTypeInfoEv -0x0000007100211cbc,U,000008,uking::action::ForkOnEnterSwapDropTableActorBase::m32 +0x00000071002117ec,W,000128,_ZN5uking6action20OnEnterSwapActorBaseD1Ev +0x000000710021186c,W,000136,_ZN5uking6action20OnEnterSwapActorBaseD0Ev +0x00000071002118f4,W,000276,_ZN5uking6action20OnEnterSwapActorBase5init_EPN4sead4HeapE +0x0000007100211a08,W,000200,_ZN5uking6action20OnEnterSwapActorBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100211ad0,W,000272,_ZN5uking6action20OnEnterSwapActorBase5calc_Ev +0x0000007100211be0,W,000036,_ZN5uking6action20OnEnterSwapActorBase6leave_Ev +0x0000007100211c04,O,000084,_ZN5uking6action20OnEnterSwapActorBase11loadParams_Ev +0x0000007100211c58,O,000008,_ZNK5uking6action20OnEnterSwapActorBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100211c60,O,000092,_ZNK5uking6action20OnEnterSwapActorBase18getRuntimeTypeInfoEv +0x0000007100211cbc,U,000008,uking::action::OnEnterSwapActorBase::m32 0x0000007100211cc4,U,000072,AI_ActionOnEnterSwapDropTableActor::ctor -0x0000007100211d0c,W,000020,_ZN5uking6action29ForkOnEnterSwapDropTableActorD1Ev -0x0000007100211d20,W,000052,_ZN5uking6action29ForkOnEnterSwapDropTableActorD0Ev -0x0000007100211d54,O,000004,_ZN5uking6action29ForkOnEnterSwapDropTableActor5init_EPN4sead4HeapE -0x0000007100211d58,O,000004,_ZN5uking6action29ForkOnEnterSwapDropTableActor6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100211d5c,O,000004,_ZN5uking6action29ForkOnEnterSwapDropTableActor5calc_Ev -0x0000007100211d60,O,000004,_ZN5uking6action29ForkOnEnterSwapDropTableActor6leave_Ev -0x0000007100211d64,W,000084,_ZN5uking6action29ForkOnEnterSwapDropTableActor11loadParams_Ev -0x0000007100211db8,U,000148,uking::action::ForkOnEnterSwapDropTableActor::m32 -0x0000007100211e4c,O,000132,_ZNK5uking6action29ForkOnEnterSwapDropTableActor27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100211ed0,O,000092,_ZNK5uking6action29ForkOnEnterSwapDropTableActor18getRuntimeTypeInfoEv +0x0000007100211d0c,W,000020,_ZN5uking6action20OnEnterSwapDropTableD1Ev +0x0000007100211d20,W,000052,_ZN5uking6action20OnEnterSwapDropTableD0Ev +0x0000007100211d54,O,000004,_ZN5uking6action20OnEnterSwapDropTable5init_EPN4sead4HeapE +0x0000007100211d58,O,000004,_ZN5uking6action20OnEnterSwapDropTable6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100211d5c,O,000004,_ZN5uking6action20OnEnterSwapDropTable5calc_Ev +0x0000007100211d60,O,000004,_ZN5uking6action20OnEnterSwapDropTable6leave_Ev +0x0000007100211d64,W,000084,_ZN5uking6action20OnEnterSwapDropTable11loadParams_Ev +0x0000007100211db8,U,000148,uking::action::OnEnterSwapDropTable::m32 +0x0000007100211e4c,O,000132,_ZNK5uking6action20OnEnterSwapDropTable27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100211ed0,O,000092,_ZNK5uking6action20OnEnterSwapDropTable18getRuntimeTypeInfoEv 0x0000007100211f2c,U,000052,AI_Action_OnEnterSwapDropTableActor::ctor 0x0000007100211f60,O,000004,_ZN5uking6action25OnEnterSwapDropTableActorD1Ev 0x0000007100211f64,O,000036,_ZN5uking6action25OnEnterSwapDropTableActorD0Ev @@ -14138,7 +14138,7 @@ Address,Quality,Size,Name 0x0000007100211ff0,W,000084,_ZN5uking6action25OnEnterSwapDropTableActor11loadParams_Ev 0x0000007100212044,O,000216,_ZNK5uking6action25OnEnterSwapDropTableActor27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710021211c,O,000092,_ZNK5uking6action25OnEnterSwapDropTableActor18getRuntimeTypeInfoEv -0x0000007100212178,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action29ForkOnEnterSwapDropTableActorEE9isDerivedEPKNS0_9InterfaceE +0x0000007100212178,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20OnEnterSwapDropTableEE9isDerivedEPKNS0_9InterfaceE 0x0000007100212204,O,000048,_ZN5uking6action23OnetimeChangeableASPlayC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100212234,W,000020,_ZN5uking6action23OnetimeChangeableASPlayD1Ev 0x0000007100212248,W,000052,_ZN5uking6action23OnetimeChangeableASPlayD0Ev @@ -14613,7 +14613,7 @@ Address,Quality,Size,Name 0x000000710021ec38,O,000216,_ZNK5uking6action15PlayerStoleOpen27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710021ed10,O,000092,_ZNK5uking6action15PlayerStoleOpen18getRuntimeTypeInfoEv 0x000000710021ed6c,W,000120,_ZN5uking6action15PlayerStoleOpenD0Ev -0x000000710021ede4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17PlayerStoleOpenExEE9isDerivedEPKNS0_9InterfaceE +0x000000710021ede4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16BindPlayerNodeExEE9isDerivedEPKNS0_9InterfaceE 0x000000710021ee70,U,000204,AI_Action_PlayerTurnAndLookToObjectNow::ctor 0x000000710021ef3c,W,000020,_ZN5uking6action28PlayerTurnAndLookToObjectNowD1Ev 0x000000710021ef50,W,000052,_ZN5uking6action28PlayerTurnAndLookToObjectNowD0Ev @@ -14841,7 +14841,7 @@ Address,Quality,Size,Name 0x0000007100227de4,O,000008,_ZNK5uking6action8RailMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100227dec,O,000092,_ZNK5uking6action8RailMove18getRuntimeTypeInfoEv 0x0000007100227e48,O,000372,_ZN5uking6action8RailMove33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100227fbc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12RailMoveBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100227fbc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17DestPointMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100228048,U,000100,AI_Action_RandomJump::ctor 0x00000071002280ac,O,000008,_ZN5uking6action10RandomJump5init_EPN4sead4HeapE 0x00000071002280b4,W,000944,_ZN5uking6action10RandomJump6enter_EPN4ksys3act2ai15InlineParamPackE @@ -14892,19 +14892,19 @@ Address,Quality,Size,Name 0x00000071002297c0,O,000248,_ZN5uking6action13ReflectThrown11loadParams_Ev 0x00000071002298b8,O,000288,_ZNK5uking6action13ReflectThrown27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002299d8,O,000092,_ZNK5uking6action13ReflectThrown18getRuntimeTypeInfoEv -0x0000007100229a34,M,000052,_ZN5uking6action26RegistedActorDeadCheckBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100229a68,O,000004,_ZN5uking6action26RegistedActorDeadCheckBaseD1Ev -0x0000007100229a6c,O,000036,_ZN5uking6action26RegistedActorDeadCheckBaseD0Ev -0x0000007100229a90,W,000052,_ZN5uking6action26RegistedActorDeadCheckBase5init_EPN4sead4HeapE -0x0000007100229ac4,O,000004,_ZN5uking6action26RegistedActorDeadCheckBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100229ac8,W,000204,_ZN5uking6action26RegistedActorDeadCheckBase5calc_Ev -0x0000007100229b94,O,000004,_ZN5uking6action26RegistedActorDeadCheckBase6leave_Ev -0x0000007100229b98,O,000004,_ZN5uking6action26RegistedActorDeadCheckBase11loadParams_Ev -0x0000007100229b9c,O,000008,_ZNK5uking6action26RegistedActorDeadCheckBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100229ba4,O,000092,_ZNK5uking6action26RegistedActorDeadCheckBase18getRuntimeTypeInfoEv -0x0000007100229c00,U,000008,uking::action::RegistedActorDeadCheckBase::m32 -0x0000007100229c08,O,000372,_ZN5uking6action26RegistedActorDeadCheckBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100229d7c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23RegistedActorActionBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100229a34,M,000052,_ZN5uking6action29RegistedActorAllDeadCheckBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100229a68,O,000004,_ZN5uking6action29RegistedActorAllDeadCheckBaseD1Ev +0x0000007100229a6c,O,000036,_ZN5uking6action29RegistedActorAllDeadCheckBaseD0Ev +0x0000007100229a90,W,000052,_ZN5uking6action29RegistedActorAllDeadCheckBase5init_EPN4sead4HeapE +0x0000007100229ac4,O,000004,_ZN5uking6action29RegistedActorAllDeadCheckBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100229ac8,W,000204,_ZN5uking6action29RegistedActorAllDeadCheckBase5calc_Ev +0x0000007100229b94,O,000004,_ZN5uking6action29RegistedActorAllDeadCheckBase6leave_Ev +0x0000007100229b98,O,000004,_ZN5uking6action29RegistedActorAllDeadCheckBase11loadParams_Ev +0x0000007100229b9c,O,000008,_ZNK5uking6action29RegistedActorAllDeadCheckBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100229ba4,O,000092,_ZNK5uking6action29RegistedActorAllDeadCheckBase18getRuntimeTypeInfoEv +0x0000007100229c00,U,000008,uking::action::RegistedActorAllDeadCheckBase::m32 +0x0000007100229c08,O,000372,_ZN5uking6action29RegistedActorAllDeadCheckBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100229d7c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26RegistedActorSetActionBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100229e08,O,000048,_ZN5uking6action29RegistedActorBroadCastMessageC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100229e38,O,000004,_ZN5uking6action29RegistedActorBroadCastMessageD1Ev 0x0000007100229e3c,O,000036,_ZN5uking6action29RegistedActorBroadCastMessageD0Ev @@ -14928,19 +14928,19 @@ Address,Quality,Size,Name 0x000000710022a1e4,U,000088,uking::action::RegistedActorDeadCheck::m32 0x000000710022a23c,O,000132,_ZNK5uking6action22RegistedActorDeadCheck27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710022a2c0,O,000092,_ZNK5uking6action22RegistedActorDeadCheck18getRuntimeTypeInfoEv -0x000000710022a31c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26RegistedActorDeadCheckBaseEE9isDerivedEPKNS0_9InterfaceE -0x000000710022a3a8,M,000064,_ZN5uking6action23RegistedActorActionBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710022a3e8,W,000068,_ZN5uking6action23RegistedActorActionBaseD1Ev -0x000000710022a42c,W,000076,_ZN5uking6action23RegistedActorActionBaseD0Ev -0x000000710022a478,O,000008,_ZN5uking6action23RegistedActorActionBase5init_EPN4sead4HeapE -0x000000710022a480,W,000020,_ZN5uking6action23RegistedActorActionBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710022a494,W,000008,_ZN5uking6action23RegistedActorActionBase5calc_Ev -0x000000710022a49c,O,000004,_ZN5uking6action23RegistedActorActionBase6leave_Ev -0x000000710022a4a0,O,000064,_ZN5uking6action23RegistedActorActionBase11loadParams_Ev -0x000000710022a4e0,U,000008,_ZN5uking6action23RegistedActorActionBase14handleMessage_ERKN4ksys7MessageE -0x000000710022a4e8,U,000008,_ZN5uking6action23RegistedActorActionBase10handleAck_ERKN4ksys10MessageAckE -0x000000710022a4f0,O,000288,_ZNK5uking6action23RegistedActorActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710022a610,O,000092,_ZNK5uking6action23RegistedActorActionBase18getRuntimeTypeInfoEv +0x000000710022a31c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action29RegistedActorAllDeadCheckBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710022a3a8,M,000064,_ZN5uking6action26RegistedActorSetActionBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710022a3e8,W,000068,_ZN5uking6action26RegistedActorSetActionBaseD1Ev +0x000000710022a42c,W,000076,_ZN5uking6action26RegistedActorSetActionBaseD0Ev +0x000000710022a478,O,000008,_ZN5uking6action26RegistedActorSetActionBase5init_EPN4sead4HeapE +0x000000710022a480,W,000020,_ZN5uking6action26RegistedActorSetActionBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710022a494,W,000008,_ZN5uking6action26RegistedActorSetActionBase5calc_Ev +0x000000710022a49c,O,000004,_ZN5uking6action26RegistedActorSetActionBase6leave_Ev +0x000000710022a4a0,O,000064,_ZN5uking6action26RegistedActorSetActionBase11loadParams_Ev +0x000000710022a4e0,U,000008,_ZN5uking6action26RegistedActorSetActionBase14handleMessage_ERKN4ksys7MessageE +0x000000710022a4e8,U,000008,_ZN5uking6action26RegistedActorSetActionBase10handleAck_ERKN4ksys10MessageAckE +0x000000710022a4f0,O,000288,_ZNK5uking6action26RegistedActorSetActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710022a610,O,000092,_ZNK5uking6action26RegistedActorSetActionBase18getRuntimeTypeInfoEv 0x000000710022a66c,U,000084,AI_Action_ReloadArrow::ctor 0x000000710022a6c0,W,000208,_ZN5uking6action11ReloadArrow11loadParams_Ev 0x000000710022a790,W,000304,_ZN5uking6action11ReloadArrow6enter_EPN4ksys3act2ai15InlineParamPackE @@ -15574,17 +15574,17 @@ Address,Quality,Size,Name 0x0000007100243b18,O,000008,_ZNK5uking6action20SendMessageBroadCast27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100243b20,O,000092,_ZNK5uking6action20SendMessageBroadCast18getRuntimeTypeInfoEv 0x0000007100243b7c,O,000372,_ZN5uking6action20SendMessageBroadCast33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100243cf0,M,000168,_ZN5uking6action27SendPlayerNoticeMessageBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100243d98,W,000116,_ZN5uking6action27SendPlayerNoticeMessageBaseD1Ev -0x0000007100243e0c,W,000124,_ZN5uking6action27SendPlayerNoticeMessageBaseD0Ev -0x0000007100243e88,O,000008,_ZN5uking6action27SendPlayerNoticeMessageBase5init_EPN4sead4HeapE -0x0000007100243e90,W,000108,_ZN5uking6action27SendPlayerNoticeMessageBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100243efc,O,000004,_ZN5uking6action27SendPlayerNoticeMessageBase5calc_Ev -0x0000007100243f00,O,000004,_ZN5uking6action27SendPlayerNoticeMessageBase6leave_Ev -0x0000007100243f04,O,000084,_ZN5uking6action27SendPlayerNoticeMessageBase11loadParams_Ev -0x0000007100243f58,U,000208,uking::action::SendPlayerNoticeMessageBase::m32 -0x0000007100244028,O,000300,_ZNK5uking6action27SendPlayerNoticeMessageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100244154,O,000092,_ZNK5uking6action27SendPlayerNoticeMessageBase18getRuntimeTypeInfoEv +0x0000007100243cf0,M,000168,_ZN5uking6action21SendNoticeMessageBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100243d98,W,000116,_ZN5uking6action21SendNoticeMessageBaseD1Ev +0x0000007100243e0c,W,000124,_ZN5uking6action21SendNoticeMessageBaseD0Ev +0x0000007100243e88,O,000008,_ZN5uking6action21SendNoticeMessageBase5init_EPN4sead4HeapE +0x0000007100243e90,W,000108,_ZN5uking6action21SendNoticeMessageBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100243efc,O,000004,_ZN5uking6action21SendNoticeMessageBase5calc_Ev +0x0000007100243f00,O,000004,_ZN5uking6action21SendNoticeMessageBase6leave_Ev +0x0000007100243f04,O,000084,_ZN5uking6action21SendNoticeMessageBase11loadParams_Ev +0x0000007100243f58,U,000208,uking::action::SendNoticeMessageBase::m32 +0x0000007100244028,O,000300,_ZNK5uking6action21SendNoticeMessageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100244154,O,000092,_ZNK5uking6action21SendNoticeMessageBase18getRuntimeTypeInfoEv 0x00000071002441b0,O,000048,_ZN5uking6action23SendPlayerNoticeMessageC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002441e0,O,000004,_ZN5uking6action23SendPlayerNoticeMessageD1Ev 0x00000071002441e4,O,000036,_ZN5uking6action23SendPlayerNoticeMessageD0Ev @@ -15597,7 +15597,7 @@ Address,Quality,Size,Name 0x0000007100244300,O,000008,_ZNK5uking6action23SendPlayerNoticeMessage27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100244308,O,000092,_ZNK5uking6action23SendPlayerNoticeMessage18getRuntimeTypeInfoEv 0x0000007100244364,O,000384,_ZN5uking6action23SendPlayerNoticeMessage33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002444e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27SendPlayerNoticeMessageBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002444e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21SendNoticeMessageBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100244570,O,000052,_ZN5uking6action26SendSignalForSignalFlowActC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002445a4,O,000020,_ZN5uking6action26SendSignalForSignalFlowActD1Ev 0x00000071002445b8,O,000052,_ZN5uking6action26SendSignalForSignalFlowActD0Ev @@ -15607,19 +15607,19 @@ Address,Quality,Size,Name 0x00000071002446cc,O,000288,_ZNK5uking6action26SendSignalForSignalFlowAct27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002447ec,O,000092,_ZNK5uking6action26SendSignalForSignalFlowAct18getRuntimeTypeInfoEv 0x0000007100244848,U,000052,AI_ActionSendTargetActorRequestShareAwn::ctor -0x000000710024487c,O,000004,_ZN5uking6action24SendMessageToTargetActorD1Ev -0x0000007100244880,O,000036,_ZN5uking6action24SendMessageToTargetActorD0Ev -0x00000071002448a4,O,000004,_ZN5uking6action24SendMessageToTargetActor5init_EPN4sead4HeapE -0x00000071002448a8,O,000004,_ZN5uking6action24SendMessageToTargetActor6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002448ac,O,000004,_ZN5uking6action24SendMessageToTargetActor5calc_Ev -0x00000071002448b0,O,000004,_ZN5uking6action24SendMessageToTargetActor6leave_Ev -0x00000071002448b4,O,000112,_ZN5uking6action24SendMessageToTargetActor11loadParams_Ev -0x0000007100244924,U,000088,uking::action::SendMessageToTargetActor::m32 -0x000000710024497c,O,000008,_ZNK5uking6action24SendMessageToTargetActor27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100244984,O,000092,_ZNK5uking6action24SendMessageToTargetActor18getRuntimeTypeInfoEv -0x00000071002449e0,U,000004,uking::action::SendMessageToTargetActor::m33 -0x00000071002449e4,U,000008,uking::action::SendMessageToTargetActor::m34 -0x00000071002449ec,O,000372,_ZN5uking6action24SendMessageToTargetActor33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710024487c,O,000004,_ZN5uking6action26SendTargetActorMessageBaseD1Ev +0x0000007100244880,O,000036,_ZN5uking6action26SendTargetActorMessageBaseD0Ev +0x00000071002448a4,O,000004,_ZN5uking6action26SendTargetActorMessageBase5init_EPN4sead4HeapE +0x00000071002448a8,O,000004,_ZN5uking6action26SendTargetActorMessageBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002448ac,O,000004,_ZN5uking6action26SendTargetActorMessageBase5calc_Ev +0x00000071002448b0,O,000004,_ZN5uking6action26SendTargetActorMessageBase6leave_Ev +0x00000071002448b4,O,000112,_ZN5uking6action26SendTargetActorMessageBase11loadParams_Ev +0x0000007100244924,U,000088,uking::action::SendTargetActorMessageBase::m32 +0x000000710024497c,O,000008,_ZNK5uking6action26SendTargetActorMessageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100244984,O,000092,_ZNK5uking6action26SendTargetActorMessageBase18getRuntimeTypeInfoEv +0x00000071002449e0,U,000004,uking::action::SendTargetActorMessageBase::m33 +0x00000071002449e4,U,000008,uking::action::SendTargetActorMessageBase::m34 +0x00000071002449ec,O,000372,_ZN5uking6action26SendTargetActorMessageBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100244b60,U,000184,AI_Action_SendTargetActorRequestShareAwn::ctor 0x0000007100244c18,W,000088,_ZN5uking6action30SendTargetActorRequestShareAwnD1Ev 0x0000007100244c70,U,000064, @@ -15635,7 +15635,7 @@ Address,Quality,Size,Name 0x0000007100244e68,U,000008,uking::action::SendTargetActorRequestShareAwn::m34 0x0000007100244e70,U,000052, 0x0000007100244ea4,U,000008, -0x0000007100244eac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action24SendMessageToTargetActorEE9isDerivedEPKNS0_9InterfaceE +0x0000007100244eac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26SendTargetActorMessageBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100244f38,U,000084,AI_Action_SeqPunchByASEvent::ctor 0x0000007100244f8c,W,000068,_ZN5uking6action17SeqPunchByASEventD1Ev 0x0000007100244fd0,W,000076,_ZN5uking6action17SeqPunchByASEventD0Ev @@ -16151,16 +16151,16 @@ Address,Quality,Size,Name 0x00000071002523c4,O,000052,_ZN5uking6action15ShutterOpenWaitD0Ev 0x00000071002523f8,O,000372,_ZN5uking6action15ShutterOpenWait33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710025256c,U,000052,AI_ActionSideWalk::ctor -0x00000071002525a0,W,000020,_ZN5uking6action12SideWalkBaseD1Ev -0x00000071002525b4,W,000052,_ZN5uking6action12SideWalkBaseD0Ev -0x00000071002525e8,O,000008,_ZN5uking6action12SideWalkBase5init_EPN4sead4HeapE -0x00000071002525f0,O,000004,_ZN5uking6action12SideWalkBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002525f4,O,000004,_ZN5uking6action12SideWalkBase5calc_Ev -0x00000071002525f8,O,000004,_ZN5uking6action12SideWalkBase6leave_Ev -0x00000071002525fc,W,000084,_ZN5uking6action12SideWalkBase11loadParams_Ev -0x0000007100252650,U,000200,uking::action::SideWalkBase::m32 -0x0000007100252718,O,000132,_ZNK5uking6action12SideWalkBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710025279c,O,000092,_ZNK5uking6action12SideWalkBase18getRuntimeTypeInfoEv +0x00000071002525a0,W,000020,_ZN5uking6action12SideMoveBaseD1Ev +0x00000071002525b4,W,000052,_ZN5uking6action12SideMoveBaseD0Ev +0x00000071002525e8,O,000008,_ZN5uking6action12SideMoveBase5init_EPN4sead4HeapE +0x00000071002525f0,O,000004,_ZN5uking6action12SideMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002525f4,O,000004,_ZN5uking6action12SideMoveBase5calc_Ev +0x00000071002525f8,O,000004,_ZN5uking6action12SideMoveBase6leave_Ev +0x00000071002525fc,W,000084,_ZN5uking6action12SideMoveBase11loadParams_Ev +0x0000007100252650,U,000200,uking::action::SideMoveBase::m32 +0x0000007100252718,O,000132,_ZNK5uking6action12SideMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710025279c,O,000092,_ZNK5uking6action12SideMoveBase18getRuntimeTypeInfoEv 0x00000071002527f8,U,000128,AI_Action_SideStep::ctor 0x0000007100252878,W,000104,_ZN5uking6action8SideStepD1Ev 0x00000071002528e0,W,000112,_ZN5uking6action8SideStepD0Ev @@ -16195,7 +16195,7 @@ Address,Quality,Size,Name 0x0000007100253f38,W,000108,_ZN5uking6action8SideWalk11loadParams_Ev 0x0000007100253fa4,O,000216,_ZNK5uking6action8SideWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710025407c,O,000092,_ZNK5uking6action8SideWalk18getRuntimeTypeInfoEv -0x00000071002540d8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12SideWalkBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002540d8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12SideMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100254164,O,000048,_ZN5uking6action12SilentKilledC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100254194,O,000004,_ZN5uking6action12SilentKilledD1Ev 0x0000007100254198,O,000036,_ZN5uking6action12SilentKilledD0Ev @@ -16207,14 +16207,14 @@ Address,Quality,Size,Name 0x00000071002542fc,O,000008,_ZNK5uking6action12SilentKilled27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100254304,O,000092,_ZNK5uking6action12SilentKilled18getRuntimeTypeInfoEv 0x0000007100254360,O,000372,_ZN5uking6action12SilentKilled33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002544d4,O,000048,_ZN5uking6action20SimpleGrabWithASBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100254504,O,000020,_ZN5uking6action20SimpleGrabWithASBaseD1Ev -0x0000007100254518,O,000052,_ZN5uking6action20SimpleGrabWithASBaseD0Ev -0x000000710025454c,O,000004,_ZN5uking6action20SimpleGrabWithASBase11loadParams_Ev -0x0000007100254550,U,000268,uking::action::SimpleGrabWithASBase::m34 -0x000000710025465c,O,000216,_ZNK5uking6action20SimpleGrabWithASBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100254734,O,000092,_ZNK5uking6action20SimpleGrabWithASBase18getRuntimeTypeInfoEv -0x0000007100254790,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20SimpleGrabWithASBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002544d4,O,000048,_ZN5uking6action14SimpleGrabBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100254504,O,000020,_ZN5uking6action14SimpleGrabBaseD1Ev +0x0000007100254518,O,000052,_ZN5uking6action14SimpleGrabBaseD0Ev +0x000000710025454c,O,000004,_ZN5uking6action14SimpleGrabBase11loadParams_Ev +0x0000007100254550,U,000268,uking::action::SimpleGrabBase::m34 +0x000000710025465c,O,000216,_ZNK5uking6action14SimpleGrabBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100254734,O,000092,_ZNK5uking6action14SimpleGrabBase18getRuntimeTypeInfoEv +0x0000007100254790,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14SimpleGrabBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710025481c,O,000072,_ZN5uking6action16SimpleGrabWithASC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100254864,W,000020,_ZN5uking6action16SimpleGrabWithASD1Ev 0x0000007100254878,W,000052,_ZN5uking6action16SimpleGrabWithASD0Ev @@ -16222,16 +16222,16 @@ Address,Quality,Size,Name 0x0000007100254900,U,000064,uking::action::SimpleGrabWithAS::m32 0x0000007100254940,O,000300,_ZNK5uking6action16SimpleGrabWithAS27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100254a6c,O,000092,_ZNK5uking6action16SimpleGrabWithAS18getRuntimeTypeInfoEv -0x0000007100254ac8,O,000056,_ZN5uking6action14KnockBackShockC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100254b00,O,000020,_ZN5uking6action14KnockBackShockD1Ev -0x0000007100254b14,O,000052,_ZN5uking6action14KnockBackShockD0Ev -0x0000007100254b48,O,000008,_ZN5uking6action14KnockBackShock5init_EPN4sead4HeapE -0x0000007100254b50,W,000624,_ZN5uking6action14KnockBackShock6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100254dc0,W,000204,_ZN5uking6action14KnockBackShock5calc_Ev -0x0000007100254e8c,O,000004,_ZN5uking6action14KnockBackShock6leave_Ev -0x0000007100254e90,O,000128,_ZN5uking6action14KnockBackShock11loadParams_Ev -0x0000007100254f10,O,000288,_ZNK5uking6action14KnockBackShock27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100255030,O,000092,_ZNK5uking6action14KnockBackShock18getRuntimeTypeInfoEv +0x0000007100254ac8,O,000056,_ZN5uking6action20SimpleKnockBackShockC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100254b00,O,000020,_ZN5uking6action20SimpleKnockBackShockD1Ev +0x0000007100254b14,O,000052,_ZN5uking6action20SimpleKnockBackShockD0Ev +0x0000007100254b48,O,000008,_ZN5uking6action20SimpleKnockBackShock5init_EPN4sead4HeapE +0x0000007100254b50,W,000624,_ZN5uking6action20SimpleKnockBackShock6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100254dc0,W,000204,_ZN5uking6action20SimpleKnockBackShock5calc_Ev +0x0000007100254e8c,O,000004,_ZN5uking6action20SimpleKnockBackShock6leave_Ev +0x0000007100254e90,O,000128,_ZN5uking6action20SimpleKnockBackShock11loadParams_Ev +0x0000007100254f10,O,000288,_ZNK5uking6action20SimpleKnockBackShock27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100255030,O,000092,_ZNK5uking6action20SimpleKnockBackShock18getRuntimeTypeInfoEv 0x000000710025508c,U,000064,AI_Action_SimpleLineBeam::ctor 0x00000071002550cc,O,000020,_ZN5uking6action14SimpleLineBeamD1Ev 0x00000071002550e0,O,000052,_ZN5uking6action14SimpleLineBeamD0Ev @@ -16803,7 +16803,7 @@ Address,Quality,Size,Name 0x000000710026dd6c,O,000008,_ZNK5uking6action29SiteBossSwordWhirlSlashCharge27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710026dd74,O,000092,_ZNK5uking6action29SiteBossSwordWhirlSlashCharge18getRuntimeTypeInfoEv 0x000000710026ddd0,O,000372,_ZN5uking6action29SiteBossSwordWhirlSlashCharge33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710026df44,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action33SiteBossSwordWhirlSlashChargeBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710026df44,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action33LastBossSwordWhirlSlashChargeBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710026dfd0,O,000108,_ZN5uking6action18SiteBossThrowPartsC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710026e03c,O,000020,_ZN5uking6action18SiteBossThrowPartsD1Ev 0x000000710026e050,O,000052,_ZN5uking6action18SiteBossThrowPartsD0Ev @@ -16867,15 +16867,15 @@ Address,Quality,Size,Name 0x000000710026fd68,O,000132,_ZNK5uking6action19SlippedBackWalkBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710026fdec,O,000092,_ZNK5uking6action19SlippedBackWalkBase18getRuntimeTypeInfoEv 0x000000710026fe48,U,000064,AI_ActionSlippedCircleWalk::ctor -0x000000710026fe88,O,000020,_ZN5uking6action21SlippedCircleWalkBaseD1Ev -0x000000710026fe9c,O,000052,_ZN5uking6action21SlippedCircleWalkBaseD0Ev -0x000000710026fed0,O,000008,_ZN5uking6action21SlippedCircleWalkBase5init_EPN4sead4HeapE -0x000000710026fed8,W,000208,_ZN5uking6action21SlippedCircleWalkBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710026ffa8,W,001356,_ZN5uking6action21SlippedCircleWalkBase5calc_Ev -0x00000071002704f4,O,000004,_ZN5uking6action21SlippedCircleWalkBase6leave_Ev -0x00000071002704f8,O,000276,_ZN5uking6action21SlippedCircleWalkBase11loadParams_Ev -0x000000710027060c,O,000288,_ZNK5uking6action21SlippedCircleWalkBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710027072c,O,000092,_ZNK5uking6action21SlippedCircleWalkBase18getRuntimeTypeInfoEv +0x000000710026fe88,O,000020,_ZN5uking6action21SlippedCircleMoveBaseD1Ev +0x000000710026fe9c,O,000052,_ZN5uking6action21SlippedCircleMoveBaseD0Ev +0x000000710026fed0,O,000008,_ZN5uking6action21SlippedCircleMoveBase5init_EPN4sead4HeapE +0x000000710026fed8,W,000208,_ZN5uking6action21SlippedCircleMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710026ffa8,W,001356,_ZN5uking6action21SlippedCircleMoveBase5calc_Ev +0x00000071002704f4,O,000004,_ZN5uking6action21SlippedCircleMoveBase6leave_Ev +0x00000071002704f8,O,000276,_ZN5uking6action21SlippedCircleMoveBase11loadParams_Ev +0x000000710027060c,O,000288,_ZNK5uking6action21SlippedCircleMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710027072c,O,000092,_ZNK5uking6action21SlippedCircleMoveBase18getRuntimeTypeInfoEv 0x0000007100270788,U,000072,AI_Action_SlippedCircleWalk::ctor 0x00000071002707d0,W,000020,_ZN5uking6action17SlippedCircleWalkD1Ev 0x00000071002707e4,W,000052,_ZN5uking6action17SlippedCircleWalkD0Ev @@ -16887,18 +16887,18 @@ Address,Quality,Size,Name 0x00000071002708c0,O,000008,_ZNK5uking6action17SlippedCircleWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002708c8,O,000092,_ZNK5uking6action17SlippedCircleWalk18getRuntimeTypeInfoEv 0x0000007100270924,O,000372,_ZN5uking6action17SlippedCircleWalk33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100270a98,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21SlippedCircleWalkBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100270a98,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21SlippedCircleMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100270b24,U,000068,AI_ActionSlippedWalk::ctor -0x0000007100270b68,O,000020,_ZN5uking6action15SlippedWalkBaseD1Ev -0x0000007100270b7c,O,000052,_ZN5uking6action15SlippedWalkBaseD0Ev -0x0000007100270bb0,O,000008,_ZN5uking6action15SlippedWalkBase5init_EPN4sead4HeapE -0x0000007100270bb8,W,000324,_ZN5uking6action15SlippedWalkBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100270cfc,W,001432,_ZN5uking6action15SlippedWalkBase5calc_Ev +0x0000007100270b68,O,000020,_ZN5uking6action15SlippedMoveBaseD1Ev +0x0000007100270b7c,O,000052,_ZN5uking6action15SlippedMoveBaseD0Ev +0x0000007100270bb0,O,000008,_ZN5uking6action15SlippedMoveBase5init_EPN4sead4HeapE +0x0000007100270bb8,W,000324,_ZN5uking6action15SlippedMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100270cfc,W,001432,_ZN5uking6action15SlippedMoveBase5calc_Ev 0x0000007100271294,U,000324, -0x00000071002713d8,O,000004,_ZN5uking6action15SlippedWalkBase6leave_Ev -0x00000071002713dc,O,000360,_ZN5uking6action15SlippedWalkBase11loadParams_Ev -0x0000007100271544,O,000288,_ZNK5uking6action15SlippedWalkBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100271664,O,000092,_ZNK5uking6action15SlippedWalkBase18getRuntimeTypeInfoEv +0x00000071002713d8,O,000004,_ZN5uking6action15SlippedMoveBase6leave_Ev +0x00000071002713dc,O,000360,_ZN5uking6action15SlippedMoveBase11loadParams_Ev +0x0000007100271544,O,000288,_ZNK5uking6action15SlippedMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100271664,O,000092,_ZNK5uking6action15SlippedMoveBase18getRuntimeTypeInfoEv 0x00000071002716c0,U,000072,AI_Action_SlippedWalk::ctor 0x0000007100271708,W,000020,_ZN5uking6action11SlippedWalkD1Ev 0x000000710027171c,W,000052,_ZN5uking6action11SlippedWalkD0Ev @@ -16910,7 +16910,7 @@ Address,Quality,Size,Name 0x00000071002717f8,O,000008,_ZNK5uking6action11SlippedWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100271800,O,000092,_ZNK5uking6action11SlippedWalk18getRuntimeTypeInfoEv 0x000000710027185c,O,000372,_ZN5uking6action11SlippedWalk33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002719d0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15SlippedWalkBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002719d0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15SlippedMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100271a5c,O,000048,_ZN5uking6action11SmallDamageC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100271a8c,W,000068,_ZN5uking6action11SmallDamage6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100271ad0,U,000028,uking::action::SmallDamage::m38 @@ -17152,14 +17152,14 @@ Address,Quality,Size,Name 0x000000710027e284,O,000092,_ZNK5uking6action10StopASPlay18getRuntimeTypeInfoEv 0x000000710027e2e0,O,000020,_ZN5uking6action10StopASPlayD1Ev 0x000000710027e2f4,O,000052,_ZN5uking6action10StopASPlayD0Ev -0x000000710027e328,O,000052,_ZN5uking6action22ActionWithPosAngReduceC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710027e35c,W,000016,_ZN5uking6action22ActionWithPosAngReduce6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710027e36c,W,000124,_ZN5uking6action22ActionWithPosAngReduce5calc_Ev -0x000000710027e3e8,O,000004,_ZN5uking6action22ActionWithPosAngReduce6leave_Ev -0x000000710027e3ec,O,000100,_ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev -0x000000710027e450,O,000008,_ZNK5uking6action22ActionWithPosAngReduce27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710027e458,O,000092,_ZNK5uking6action22ActionWithPosAngReduce18getRuntimeTypeInfoEv -0x000000710027e4b4,O,000052,_ZN5uking6action22ActionWithPosAngReduceD0Ev +0x000000710027e328,O,000052,_ZN5uking6action8StopBaseC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710027e35c,W,000016,_ZN5uking6action8StopBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710027e36c,W,000124,_ZN5uking6action8StopBase5calc_Ev +0x000000710027e3e8,O,000004,_ZN5uking6action8StopBase6leave_Ev +0x000000710027e3ec,O,000100,_ZN5uking6action8StopBase11loadParams_Ev +0x000000710027e450,O,000008,_ZNK5uking6action8StopBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710027e458,O,000092,_ZNK5uking6action8StopBase18getRuntimeTypeInfoEv +0x000000710027e4b4,O,000052,_ZN5uking6action8StopBaseD0Ev 0x000000710027e4e8,U,000080,AI_Action_StopCliffTongueAttack::ctor 0x000000710027e538,W,000020,_ZN5uking6action21StopCliffTongueAttackD1Ev 0x000000710027e54c,W,000052,_ZN5uking6action21StopCliffTongueAttackD0Ev @@ -17213,16 +17213,16 @@ Address,Quality,Size,Name 0x00000071002803a8,O,000288,_ZNK5uking6action9StopOnObj27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002804c8,O,000092,_ZNK5uking6action9StopOnObj18getRuntimeTypeInfoEv 0x0000007100280524,U,000048,AI_ActionAttack::ctor -0x0000007100280554,O,000020,_ZN5uking6action10AttackBaseD1Ev -0x0000007100280568,O,000052,_ZN5uking6action10AttackBaseD0Ev -0x000000710028059c,W,000052,_ZN5uking6action10AttackBase5init_EPN4sead4HeapE -0x00000071002805d0,W,000072,_ZN5uking6action10AttackBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100280618,W,000056,_ZN5uking6action10AttackBase5calc_Ev -0x0000007100280650,W,000056,_ZN5uking6action10AttackBase6leave_Ev -0x0000007100280688,W,000056,_ZN5uking6action10AttackBase11loadParams_Ev -0x00000071002806c0,O,000132,_ZNK5uking6action10AttackBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100280744,O,000092,_ZNK5uking6action10AttackBase18getRuntimeTypeInfoEv -0x00000071002807a0,U,000008,uking::action::AttackBase::m32 +0x0000007100280554,O,000020,_ZN5uking6action18StoppingAttackBaseD1Ev +0x0000007100280568,O,000052,_ZN5uking6action18StoppingAttackBaseD0Ev +0x000000710028059c,W,000052,_ZN5uking6action18StoppingAttackBase5init_EPN4sead4HeapE +0x00000071002805d0,W,000072,_ZN5uking6action18StoppingAttackBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100280618,W,000056,_ZN5uking6action18StoppingAttackBase5calc_Ev +0x0000007100280650,W,000056,_ZN5uking6action18StoppingAttackBase6leave_Ev +0x0000007100280688,W,000056,_ZN5uking6action18StoppingAttackBase11loadParams_Ev +0x00000071002806c0,O,000132,_ZNK5uking6action18StoppingAttackBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100280744,O,000092,_ZNK5uking6action18StoppingAttackBase18getRuntimeTypeInfoEv +0x00000071002807a0,U,000008,uking::action::StoppingAttackBase::m32 0x00000071002807a8,O,000076,_ZN5uking6action23StorePlayerPosAndRotateC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002807f4,O,000020,_ZN5uking6action23StorePlayerPosAndRotateD1Ev 0x0000007100280808,O,000052,_ZN5uking6action23StorePlayerPosAndRotateD0Ev @@ -17426,9 +17426,9 @@ Address,Quality,Size,Name 0x0000007100288864,U,000224,uking::action::SwimEnemyAnmBackBlownOff::m33 0x0000007100288944,O,000008,_ZNK5uking6action24SwimEnemyAnmBackBlownOff27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710028894c,O,000092,_ZNK5uking6action24SwimEnemyAnmBackBlownOff18getRuntimeTypeInfoEv -0x00000071002889a8,U,000076,_ZNK5uking6action28SwimEnemyAnmBackBlownOffBase10isFinishedEv +0x00000071002889a8,U,000076,_ZNK5uking6action21SwimEnemyBlownOffBase10isFinishedEv 0x00000071002889f4,O,000372,_ZN5uking6action24SwimEnemyAnmBackBlownOff33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100288b68,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action28SwimEnemyAnmBackBlownOffBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100288b68,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21SwimEnemyBlownOffBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100288bf4,O,000048,_ZN5uking6action30SwimEnemyAnmBackBlownOffFromPLC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100288c24,O,000004,_ZN5uking6action30SwimEnemyAnmBackBlownOffFromPLD1Ev 0x0000007100288c28,O,000036,_ZN5uking6action30SwimEnemyAnmBackBlownOffFromPLD0Ev @@ -17453,19 +17453,19 @@ Address,Quality,Size,Name 0x0000007100288f90,O,000132,_ZNK5uking6action28SwimEnemyAnmBackBlownOffToPL27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100289014,O,000092,_ZNK5uking6action28SwimEnemyAnmBackBlownOffToPL18getRuntimeTypeInfoEv 0x0000007100289070,U,000096,AI_ActionSwimEnemyAnmBackBlownOff::ctor -0x00000071002890d0,O,000020,_ZN5uking6action28SwimEnemyAnmBackBlownOffBaseD1Ev -0x00000071002890e4,O,000052,_ZN5uking6action28SwimEnemyAnmBackBlownOffBaseD0Ev -0x0000007100289118,O,000008,_ZN5uking6action28SwimEnemyAnmBackBlownOffBase5init_EPN4sead4HeapE -0x0000007100289120,W,000416,_ZN5uking6action28SwimEnemyAnmBackBlownOffBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002892c0,W,000028,_ZN5uking6action28SwimEnemyAnmBackBlownOffBase5calc_Ev -0x00000071002892dc,W,000040,_ZN5uking6action28SwimEnemyAnmBackBlownOffBase6leave_Ev -0x0000007100289304,O,000268,_ZN5uking6action28SwimEnemyAnmBackBlownOffBase11loadParams_Ev +0x00000071002890d0,O,000020,_ZN5uking6action21SwimEnemyBlownOffBaseD1Ev +0x00000071002890e4,O,000052,_ZN5uking6action21SwimEnemyBlownOffBaseD0Ev +0x0000007100289118,O,000008,_ZN5uking6action21SwimEnemyBlownOffBase5init_EPN4sead4HeapE +0x0000007100289120,W,000416,_ZN5uking6action21SwimEnemyBlownOffBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002892c0,W,000028,_ZN5uking6action21SwimEnemyBlownOffBase5calc_Ev +0x00000071002892dc,W,000040,_ZN5uking6action21SwimEnemyBlownOffBase6leave_Ev +0x0000007100289304,O,000268,_ZN5uking6action21SwimEnemyBlownOffBase11loadParams_Ev 0x0000007100289410,U,000080, 0x0000007100289460,U,000052, -0x0000007100289494,U,000124,uking::action::SwimEnemyAnmBackBlownOffBase::m33 -0x0000007100289510,U,000112,uking::action::SwimEnemyAnmBackBlownOffBase::m32 -0x0000007100289580,O,000288,_ZNK5uking6action28SwimEnemyAnmBackBlownOffBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002896a0,O,000092,_ZNK5uking6action28SwimEnemyAnmBackBlownOffBase18getRuntimeTypeInfoEv +0x0000007100289494,U,000124,uking::action::SwimEnemyBlownOffBase::m33 +0x0000007100289510,U,000112,uking::action::SwimEnemyBlownOffBase::m32 +0x0000007100289580,O,000288,_ZNK5uking6action21SwimEnemyBlownOffBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002896a0,O,000092,_ZNK5uking6action21SwimEnemyBlownOffBase18getRuntimeTypeInfoEv 0x00000071002896fc,U,000064,AI_Action_SwimGetUp::ctor 0x000000710028973c,W,000056,_ZN5uking6action9SwimGetUpD1Ev 0x0000007100289774,W,000064,_ZN5uking6action9SwimGetUpD0Ev @@ -18131,21 +18131,21 @@ Address,Quality,Size,Name 0x000000710029e59c,W,000112,_ZN5uking6action24TurnAndLookAtToObjectNow11loadParams_Ev 0x000000710029e60c,O,000300,_ZNK5uking6action24TurnAndLookAtToObjectNow27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710029e738,O,000092,_ZNK5uking6action24TurnAndLookAtToObjectNow18getRuntimeTypeInfoEv -0x000000710029e794,M,000172,_ZN5uking6action16LookAtObjectBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710029e840,O,000020,_ZN5uking6action16LookAtObjectBaseD1Ev -0x000000710029e854,O,000052,_ZN5uking6action16LookAtObjectBaseD0Ev -0x000000710029e888,O,000008,_ZN5uking6action16LookAtObjectBase5init_EPN4sead4HeapE -0x000000710029e890,O,000004,_ZN5uking6action16LookAtObjectBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710029e894,W,000004,_ZN5uking6action16LookAtObjectBase5calc_Ev -0x000000710029e898,W,000004,_ZN5uking6action16LookAtObjectBase6leave_Ev -0x000000710029e89c,U,000124,uking::action::LookAtObjectBase::m33 -0x000000710029e918,U,001060,uking::action::LookAtObjectBase::m34 -0x000000710029ed3c,U,000200,uking::action::LookAtObjectBase::m35 -0x000000710029ee04,U,002512,uking::action::LookAtObjectBase::m36 -0x000000710029f7d4,W,000496,_ZN5uking6action16LookAtObjectBase11loadParams_Ev -0x000000710029f9c4,O,000132,_ZNK5uking6action16LookAtObjectBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710029fa48,O,000092,_ZNK5uking6action16LookAtObjectBase18getRuntimeTypeInfoEv -0x000000710029faa4,U,000004,uking::action::LookAtObjectBase::m37 +0x000000710029e794,M,000172,_ZN5uking6action20TurnAndLookToObjBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710029e840,O,000020,_ZN5uking6action20TurnAndLookToObjBaseD1Ev +0x000000710029e854,O,000052,_ZN5uking6action20TurnAndLookToObjBaseD0Ev +0x000000710029e888,O,000008,_ZN5uking6action20TurnAndLookToObjBase5init_EPN4sead4HeapE +0x000000710029e890,O,000004,_ZN5uking6action20TurnAndLookToObjBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710029e894,W,000004,_ZN5uking6action20TurnAndLookToObjBase5calc_Ev +0x000000710029e898,W,000004,_ZN5uking6action20TurnAndLookToObjBase6leave_Ev +0x000000710029e89c,U,000124,uking::action::TurnAndLookToObjBase::m33 +0x000000710029e918,U,001060,uking::action::TurnAndLookToObjBase::m34 +0x000000710029ed3c,U,000200,uking::action::TurnAndLookToObjBase::m35 +0x000000710029ee04,U,002512,uking::action::TurnAndLookToObjBase::m36 +0x000000710029f7d4,W,000496,_ZN5uking6action20TurnAndLookToObjBase11loadParams_Ev +0x000000710029f9c4,O,000132,_ZNK5uking6action20TurnAndLookToObjBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710029fa48,O,000092,_ZNK5uking6action20TurnAndLookToObjBase18getRuntimeTypeInfoEv +0x000000710029faa4,U,000004,uking::action::TurnAndLookToObjBase::m37 0x000000710029faa8,U,000056,AI_Action_TurnAndLookToObject::ctor 0x000000710029fae0,O,000004,_ZN5uking6action19TurnAndLookToObjectD1Ev 0x000000710029fae4,O,000036,_ZN5uking6action19TurnAndLookToObjectD0Ev @@ -18183,18 +18183,18 @@ Address,Quality,Size,Name 0x00000071002a1650,O,000092,_ZNK5uking6action8TurnBase18getRuntimeTypeInfoEv 0x00000071002a16ac,O,000052,_ZN5uking6action8TurnBaseD0Ev 0x00000071002a16e0,U,000088,AI_ActionGiantAttackBase::ctor -0x00000071002a1738,W,000068,_ZN5uking6action11GiantAttackD1Ev -0x00000071002a177c,W,000076,_ZN5uking6action11GiantAttackD0Ev -0x00000071002a17c8,O,000008,_ZN5uking6action11GiantAttack5init_EPN4sead4HeapE -0x00000071002a17d0,W,000088,_ZN5uking6action11GiantAttack6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002a1828,W,000004,_ZN5uking6action11GiantAttack5calc_Ev +0x00000071002a1738,W,000068,_ZN5uking6action15TurnGiantAttackD1Ev +0x00000071002a177c,W,000076,_ZN5uking6action15TurnGiantAttackD0Ev +0x00000071002a17c8,O,000008,_ZN5uking6action15TurnGiantAttack5init_EPN4sead4HeapE +0x00000071002a17d0,W,000088,_ZN5uking6action15TurnGiantAttack6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002a1828,W,000004,_ZN5uking6action15TurnGiantAttack5calc_Ev 0x00000071002a182c,U,000208, -0x00000071002a18fc,W,000048,_ZN5uking6action11GiantAttack6leave_Ev -0x00000071002a192c,O,000220,_ZN5uking6action11GiantAttack11loadParams_Ev +0x00000071002a18fc,W,000048,_ZN5uking6action15TurnGiantAttack6leave_Ev +0x00000071002a192c,O,000220,_ZN5uking6action15TurnGiantAttack11loadParams_Ev 0x00000071002a1a08,U,000560, 0x00000071002a1c38,U,000660, -0x00000071002a1ecc,O,000288,_ZNK5uking6action11GiantAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002a1fec,O,000092,_ZNK5uking6action11GiantAttack18getRuntimeTypeInfoEv +0x00000071002a1ecc,O,000288,_ZNK5uking6action15TurnGiantAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002a1fec,O,000092,_ZNK5uking6action15TurnGiantAttack18getRuntimeTypeInfoEv 0x00000071002a2048,U,000064,AI_Action_TurnIgnite::ctor 0x00000071002a2088,O,000004,_ZN5uking6action10TurnIgnite5init_EPN4sead4HeapE 0x00000071002a208c,W,000828,_ZN5uking6action10TurnIgnite6enter_EPN4ksys3act2ai15InlineParamPackE @@ -18595,7 +18595,7 @@ Address,Quality,Size,Name 0x00000071002ad8e0,O,000092,_ZNK5uking6action10WarpPlayer18getRuntimeTypeInfoEv 0x00000071002ad93c,U,000008,uking::action::WarpPlayer::m33 0x00000071002ad944,O,000372,_ZN5uking6action10WarpPlayer33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002adab8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14WarpPlayerBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002adab8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18DestPlayerWarpBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071002adb44,U,000092,AI_Action_WarpPlayerToActor::ctor 0x00000071002adba0,W,000020,_ZN5uking6action17WarpPlayerToActorD1Ev 0x00000071002adbb4,W,000052,_ZN5uking6action17WarpPlayerToActorD0Ev @@ -18935,7 +18935,7 @@ Address,Quality,Size,Name 0x00000071002bac10,O,000008,_ZNK5uking6action14WillBallAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002bac18,O,000092,_ZNK5uking6action14WillBallAttack18getRuntimeTypeInfoEv 0x00000071002bac74,O,000372,_ZN5uking6action14WillBallAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002bade8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14WillBallActionEE9isDerivedEPKNS0_9InterfaceE +0x00000071002bade8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12WillBallBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071002bae74,U,000056,AI_Action_WillBallAvoidCenterDist::ctor 0x00000071002baeac,O,000004,_ZN5uking6action23WillBallAvoidCenterDistD1Ev 0x00000071002baeb0,O,000036,_ZN5uking6action23WillBallAvoidCenterDistD0Ev @@ -18949,16 +18949,16 @@ Address,Quality,Size,Name 0x00000071002bb2c4,O,000092,_ZNK5uking6action23WillBallAvoidCenterDist18getRuntimeTypeInfoEv 0x00000071002bb320,O,000372,_ZN5uking6action23WillBallAvoidCenterDist33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002bb494,U,000088,AI_ActionWillBall::ctor -0x00000071002bb4ec,O,000020,_ZN5uking6action14WillBallActionD1Ev -0x00000071002bb500,O,000052,_ZN5uking6action14WillBallActionD0Ev -0x00000071002bb534,O,000008,_ZN5uking6action14WillBallAction5init_EPN4sead4HeapE -0x00000071002bb53c,W,000504,_ZN5uking6action14WillBallAction6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002bb734,W,001076,_ZN5uking6action14WillBallAction5calc_Ev -0x00000071002bbb68,W,000028,_ZN5uking6action14WillBallAction6leave_Ev -0x00000071002bbb84,U,000340,uking::action::WillBallAction::m32 -0x00000071002bbcd8,W,000364,_ZN5uking6action14WillBallAction11loadParams_Ev -0x00000071002bbe44,O,000288,_ZNK5uking6action14WillBallAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002bbf64,O,000092,_ZNK5uking6action14WillBallAction18getRuntimeTypeInfoEv +0x00000071002bb4ec,O,000020,_ZN5uking6action12WillBallBaseD1Ev +0x00000071002bb500,O,000052,_ZN5uking6action12WillBallBaseD0Ev +0x00000071002bb534,O,000008,_ZN5uking6action12WillBallBase5init_EPN4sead4HeapE +0x00000071002bb53c,W,000504,_ZN5uking6action12WillBallBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002bb734,W,001076,_ZN5uking6action12WillBallBase5calc_Ev +0x00000071002bbb68,W,000028,_ZN5uking6action12WillBallBase6leave_Ev +0x00000071002bbb84,U,000340,uking::action::WillBallBase::m32 +0x00000071002bbcd8,W,000364,_ZN5uking6action12WillBallBase11loadParams_Ev +0x00000071002bbe44,O,000288,_ZNK5uking6action12WillBallBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002bbf64,O,000092,_ZNK5uking6action12WillBallBase18getRuntimeTypeInfoEv 0x00000071002bbfc0,U,000072,AI_Action_WillBallParabolaAttack::ctor 0x00000071002bc008,O,000020,_ZN5uking6action22WillBallParabolaAttackD1Ev 0x00000071002bc01c,O,000052,_ZN5uking6action22WillBallParabolaAttackD0Ev @@ -77888,12 +77888,12 @@ Address,Quality,Size,Name 0x0000007100e23bb4,U,000008, 0x0000007100e23bbc,O,000372,_ZN5uking6action23AreaRecreateActorAction33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100e23d30,U,000088,AI_ActionAreaFireObserve::ctor -0x0000007100e23d88,W,000008,_ZN5uking6action19AreaFireObserveBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100e23d90,W,000008,_ZN5uking6action19AreaFireObserveBase5calc_Ev -0x0000007100e23d98,U,000008,_ZN5uking6action19AreaFireObserveBase14handleMessage_ERKN4ksys7MessageE -0x0000007100e23da0,O,000288,_ZNK5uking6action19AreaFireObserveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100e23ec0,O,000092,_ZNK5uking6action19AreaFireObserveBase18getRuntimeTypeInfoEv -0x0000007100e23f1c,O,000052,_ZN5uking6action19AreaFireObserveBaseD0Ev +0x0000007100e23d88,W,000008,_ZN5uking6action15FireObserveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100e23d90,W,000008,_ZN5uking6action15FireObserveBase5calc_Ev +0x0000007100e23d98,U,000008,_ZN5uking6action15FireObserveBase14handleMessage_ERKN4ksys7MessageE +0x0000007100e23da0,O,000288,_ZNK5uking6action15FireObserveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100e23ec0,O,000092,_ZNK5uking6action15FireObserveBase18getRuntimeTypeInfoEv +0x0000007100e23f1c,O,000052,_ZN5uking6action15FireObserveBaseD0Ev 0x0000007100e23f50,U,000024, 0x0000007100e23f68,U,000056, 0x0000007100e23fa0,U,000008, diff --git a/src/Game/Actor/Action/CMakeLists.txt b/src/Game/Actor/Action/CMakeLists.txt index bd494ba6..5ec20b43 100644 --- a/src/Game/Actor/Action/CMakeLists.txt +++ b/src/Game/Actor/Action/CMakeLists.txt @@ -3,8 +3,6 @@ target_sources(uking PRIVATE actionActionEx.h actionActionWithAS.cpp actionActionWithAS.h - actionActionWithPosAngReduce.cpp - actionActionWithPosAngReduce.h actionActivateAttackSensor.cpp actionActivateAttackSensor.h actionActorAreaInOutSendMessage.cpp @@ -59,8 +57,6 @@ target_sources(uking PRIVATE actionAnimalEatAction.h actionAnimalElectricParalysis.cpp actionAnimalElectricParalysis.h - actionAnimalFollowBase.cpp - actionAnimalFollowBase.h actionAnimalFollow.cpp actionAnimalFollow.h actionAnimalFreeze.cpp @@ -137,8 +133,6 @@ target_sources(uking PRIVATE actionAppearNumKorokNuts.h actionAppearNumTargets.cpp actionAppearNumTargets.h - actionApplyDamageForPlayer.cpp - actionApplyDamageForPlayer.h actionApplyHorizontalImpulse.cpp actionApplyHorizontalImpulse.h actionApplyMoveImpulse.cpp @@ -199,16 +193,16 @@ target_sources(uking PRIVATE actionAtOnWait.h actionAtOnWaitNoHitRope.cpp actionAtOnWaitNoHitRope.h - actionAttackBase.cpp - actionAttackBase.h actionAttack.cpp actionAttack.h actionAttackJumpToTarget.cpp actionAttackJumpToTarget.h actionAttackPartBind.cpp actionAttackPartBind.h - actionAttackPowerExplode.cpp - actionAttackPowerExplode.h + actionAttackWithAS.cpp + actionAttackWithAS.h + actionAvoidingCloseMoveActionBase.cpp + actionAvoidingCloseMoveActionBase.h actionAvoidingCloseMoveActionWithAcc.cpp actionAvoidingCloseMoveActionWithAcc.h actionAvoidingCloseMoveBase.cpp @@ -238,8 +232,6 @@ target_sources(uking PRIVATE actionBackWalkBase.cpp actionBackWalkBase.h actionBackWalk.cpp - actionBackWalkEx.cpp - actionBackWalkEx.h actionBackWalk.h actionBackWalkWithAS.cpp actionBackWalkWithAS.h @@ -255,6 +247,8 @@ target_sources(uking PRIVATE actionBasicSignalEnemyForceNotice.cpp actionBasicSignalEnemyForceNotice.h actionBasicSignalEnemyNotice.h + actionBasicSignalForbidTag.cpp + actionBasicSignalForbidTag.h actionBattleCloseDangerAvoidRun.cpp actionBattleCloseDangerAvoidRun.h actionBattleCloseExplosivesAvoidRun.cpp @@ -273,8 +267,6 @@ target_sources(uking PRIVATE actionBattleCloseMeanderGuardRun.h actionBattleCloseMeanderRun.cpp actionBattleCloseMeanderRun.h - actionBattleCloseMoveActionBase.cpp - actionBattleCloseMoveActionBase.h actionBattleCloseMoveAction.cpp actionBattleCloseMoveAction.h actionBattleCloseMove.cpp @@ -295,6 +287,8 @@ target_sources(uking PRIVATE actionBattleWalk.h actionBeamMove.cpp actionBeamMove.h + actionBeamNeckSpin.cpp + actionBeamNeckSpin.h actionBeamosStaticBeam.cpp actionBeamosStaticBeam.h actionBeamTailDelete.cpp @@ -323,6 +317,10 @@ target_sources(uking PRIVATE actionBindOff.h actionBindParentAction.cpp actionBindParentAction.h + actionBindPlayerNodeBase.cpp + actionBindPlayerNodeBase.h + actionBindPlayerNodeEx.cpp + actionBindPlayerNodeEx.h actionBirdEscape.cpp actionBirdEscape.h actionBlownOff.cpp @@ -437,12 +435,8 @@ target_sources(uking PRIVATE actionChemicalward.h actionChuchuCommonDownTimer.cpp actionChuchuCommonDownTimer.h - actionChuchuDissappearEscapeBase.cpp - actionChuchuDissappearEscapeBase.h actionChuchuDissappearEscape.cpp actionChuchuDissappearEscape.h - actionChuchuPreAttackBase.cpp - actionChuchuPreAttackBase.h actionChuchuPreAttack.cpp actionChuchuPreAttack.h actionCloseArmorProcessing.cpp @@ -473,6 +467,8 @@ target_sources(uking PRIVATE actionCreateAndReplaceAssassin.h actionCreateDragonChallengeXLink.cpp actionCreateDragonChallengeXLink.h + actionCreateDropBase.cpp + actionCreateDropBase.h actionCreateEpona.cpp actionCreateEpona.h actionCreateGanonChemicalPillar.cpp @@ -481,6 +477,8 @@ target_sources(uking PRIVATE actionCreateObjectsOfOwnedHorse.h actionCurseRRematchCount.cpp actionCurseRRematchCount.h + actionCurveMoveToTargetBase.cpp + actionCurveMoveToTargetBase.h actionDamagedTurn.cpp actionDamagedTurn.h actionDamageField.cpp @@ -497,6 +495,8 @@ target_sources(uking PRIVATE actionDeleteInGround.h actionDeletePorchItemIncludeEquip.cpp actionDeletePorchItemIncludeEquip.h + actionDemoApplyDamageBase.cpp + actionDemoApplyDamageBase.h actionDemoApplyDamageForPlayer.cpp actionDemoApplyDamageForPlayer.h actionDemoBeastGanonGrudgeDrop.cpp @@ -541,6 +541,10 @@ target_sources(uking PRIVATE actionDemoVisibleOn.h actionDemoVoiceTrigger.cpp actionDemoVoiceTrigger.h + actionDestPlayerWarpBase.cpp + actionDestPlayerWarpBase.h + actionDestPointMoveBase.cpp + actionDestPointMoveBase.h actionDgnObj_DLC_CogWheel_ASPlay.cpp actionDgnObj_DLC_CogWheel_ASPlay.h actionDgnObj_DLC_CogWheel_Reject.cpp @@ -571,6 +575,8 @@ target_sources(uking PRIVATE actionDirectToWindDirection.h actionDisableAutoSavePausing.cpp actionDisableAutoSavePausing.h + actionDisappearAndEscapeBase.cpp + actionDisappearAndEscapeBase.h actionDisappearDeathCounter.cpp actionDisappearDeathCounter.h actionDisappearNumDungeonClearSeal.cpp @@ -669,6 +675,8 @@ target_sources(uking PRIVATE actionEat.h actionEatWithAS.cpp actionEatWithAS.h + actionEitherSideExplode.cpp + actionEitherSideExplode.h actionElectricAttack.cpp actionElectricAttack.h actionElectricBlownOff.cpp @@ -689,12 +697,12 @@ target_sources(uking PRIVATE actionEnemyChangeWeapon.h actionEnemyFortressChatCall.cpp actionEnemyFortressChatCall.h + actionEnemyFortressChatLookBase.cpp + actionEnemyFortressChatLookBase.h actionEnemyFortressChatSpeak.cpp actionEnemyFortressChatSpeak.h actionEnemyFortressChatTalk.cpp actionEnemyFortressChatTalk.h - actionEnemyFortressChatTurnBase.cpp - actionEnemyFortressChatTurnBase.h actionEnemyFortressChatTurn.cpp actionEnemyFortressChatTurn.h actionEnemyFortressSimpleAction.cpp @@ -715,6 +723,8 @@ target_sources(uking PRIVATE actionEquipDisplayGet.cpp actionEquipDisplayGet.h actionEquipDisplay.h + actionEquipHornUseBase.cpp + actionEquipHornUseBase.h actionEquipedAction.cpp actionEquipedAction.h actionEquipedASPlay.cpp @@ -799,8 +809,6 @@ target_sources(uking PRIVATE actionEventFadeOut.h actionEventFireControl.cpp actionEventFireControl.h - actionEventHoverNullASPlayBase.cpp - actionEventHoverNullASPlayBase.h actionEventHoverNullASPlay.cpp actionEventHoverNullASPlay.h actionEventMiniGameFinish.cpp @@ -815,6 +823,8 @@ target_sources(uking PRIVATE actionEventMiniGameTimeMove.h actionEventMiniGameTimerWrite.cpp actionEventMiniGameTimerWrite.h + actionEventNullASPlayBase.cpp + actionEventNullASPlayBase.h actionEventOpenGetDemo.cpp actionEventOpenGetDemo.h actionEventOpenGetWeaponDemo.cpp @@ -937,8 +947,8 @@ target_sources(uking PRIVATE actionFallAttackWithAtAttr.h actionFall.cpp actionFall.h - actionFireWoodBase.cpp - actionFireWoodBase.h + actionFireBurnBase.cpp + actionFireBurnBase.h actionFireWood.cpp actionFireWood.h actionFirstRunelGrudgeDemo.cpp @@ -959,6 +969,8 @@ target_sources(uking PRIVATE actionFloatWait.h actionFlowingDust.cpp actionFlowingDust.h + actionFlyingActorDamageBase.cpp + actionFlyingActorDamageBase.h actionFlyingBalloonObserverTag.cpp actionFlyingBalloonObserverTag.h actionFlyingBirdDie.cpp @@ -967,8 +979,6 @@ target_sources(uking PRIVATE actionFlyingCharacterBlownOffDie.cpp actionFlyingCharacterBlownOffDie.h actionFlyingCharacterBlownOff.h - actionFlyingCharacterDamageBase.cpp - actionFlyingCharacterDamageBase.h actionFlyingCharacterDamage.cpp actionFlyingCharacterDamage.h actionFlyingCharacterDie.cpp @@ -1005,8 +1015,6 @@ target_sources(uking PRIVATE actionForbidComeback.h actionForbidSettingInstEventFlag.cpp actionForbidSettingInstEventFlag.h - actionForbidTag.cpp - actionForbidTag.h actionForceChangeAction.cpp actionForceChangeAction.h actionForceEndPlayerSlow.cpp @@ -1168,18 +1176,14 @@ target_sources(uking PRIVATE actionForkDropWeaponWithSpeed.h actionForkDrownTimer.cpp actionForkDrownTimer.h - actionForkDynActorNoTargetSelfBase.cpp - actionForkDynActorNoTargetSelfBase.h actionForkDynActorNoTargetSelf.cpp actionForkDynActorNoTargetSelf.h actionForkDynASPlay.cpp actionForkDynASPlay.h actionForkEmitChmFieldByContact.cpp actionForkEmitChmFieldByContact.h - actionForkEmitChmField.cpp actionForkEmitChmFieldFromWeapon.cpp actionForkEmitChmFieldFromWeapon.h - actionForkEmitChmField.h actionForkEmitExpandChemicalField.cpp actionForkEmitExpandChemicalField.h actionForkEmitExpandField.cpp @@ -1188,6 +1192,8 @@ target_sources(uking PRIVATE actionForkEmitExpandFieldWithCreate.h actionForkEmitShockWaveByContact.cpp actionForkEmitShockWaveByContact.h + actionForkEndByConditionBase.cpp + actionForkEndByConditionBase.h actionForkEndByDistance.cpp actionForkEndByDistance.h actionForkEndByPartsActorEnd.cpp @@ -1226,6 +1232,8 @@ target_sources(uking PRIVATE actionForkGelDisableBodyRot.h actionForkGolemMaterialASPlay.cpp actionForkGolemMaterialASPlay.h + actionForkGrabBase.cpp + actionForkGrabBase.h actionForkGravityScaleChange.cpp actionForkGravityScaleChange.h actionFork.h @@ -1235,8 +1243,6 @@ target_sources(uking PRIVATE actionForkHopInAir.h actionForkHover.cpp actionForkHover.h - actionForkHoverKeepRotateTurnBase.cpp - actionForkHoverKeepRotateTurnBase.h actionForkHoverKeepRotateTurn.cpp actionForkHoverKeepRotateTurn.h actionForkIgniteCarriedActor.cpp @@ -1245,6 +1251,8 @@ target_sources(uking PRIVATE actionForkInWaterDropWeaponWithSpeed.h actionForkJumpToTargetOnDownEnd.cpp actionForkJumpToTargetOnDownEnd.h + actionForkKeepRotateTurn.cpp + actionForkKeepRotateTurn.h actionForkKnockBackNoRot.cpp actionForkKnockBackNoRot.h actionForkLodNoCountTimer.cpp @@ -1293,10 +1301,6 @@ target_sources(uking PRIVATE actionForkOctarockEnterReloadWig.h actionForkOnEnterCharCtrlInvalid.cpp actionForkOnEnterCharCtrlInvalid.h - actionForkOnEnterSwapDropTableActorBase.cpp - actionForkOnEnterSwapDropTableActorBase.h - actionForkOnEnterSwapDropTableActor.cpp - actionForkOnEnterSwapDropTableActor.h actionForkOnEnterWeaponUse.cpp actionForkOnEnterWeaponUse.h actionForkOnLeaveChildDelete.cpp @@ -1329,8 +1333,6 @@ target_sources(uking PRIVATE actionForkSetJustAvoid.h actionForkSetSwarmMaterialAnimByDist.cpp actionForkSetSwarmMaterialAnimByDist.h - actionForkSimpleGrabBase.cpp - actionForkSimpleGrabBase.h actionForkSimpleGrab.cpp actionForkSimpleGrab.h actionForkSlipAndStop.cpp @@ -1365,6 +1367,8 @@ target_sources(uking PRIVATE actionForkTogglePriestBossFreeMoving.h actionForkToggleWeaponXLinkSleep.cpp actionForkToggleWeaponXLinkSleep.h + actionForkTrgEmitChmFieldBase.cpp + actionForkTrgEmitChmFieldBase.h actionForkTurnASHold.cpp actionForkTurnASHold.h actionForkTurn.cpp @@ -1477,6 +1481,8 @@ target_sources(uking PRIVATE actionGelEnemyFreeze.h actionGelEnemySystemHideChase.cpp actionGelEnemySystemHideChase.h + actionGelJumpBase.cpp + actionGelJumpBase.h actionGelJumpTackle.cpp actionGelJumpTackle.h actionGerudoQueenWakeBoardReady.cpp @@ -1513,10 +1519,6 @@ target_sources(uking PRIVATE actionGiantArmorElectric.h actionGiantArmorEquip.cpp actionGiantArmorEquip.h - actionGiantAttack.cpp - actionGiantAttack.h - actionGiantAttackWithAS.cpp - actionGiantAttackWithAS.h actionGiantBattleCloseAction.cpp actionGiantBattleCloseAction.h actionGiantBattleCloseMove.cpp @@ -1529,18 +1531,16 @@ target_sources(uking PRIVATE actionGiantDoubleGroundPunch.h actionGiantDownSwingAttack.cpp actionGiantDownSwingAttack.h + actionGiantEnemyMoveWithVibration.cpp + actionGiantEnemyMoveWithVibration.h actionGiantEnemyWalk.cpp actionGiantEnemyWalk.h - actionGiantEnemyWalkWithVibration.cpp - actionGiantEnemyWalkWithVibration.h actionGiantHandClapToTarget.cpp actionGiantHandClapToTarget.h + actionGiantNavMeshMoveWithVibration.cpp + actionGiantNavMeshMoveWithVibration.h actionGiantNavMeshWalk.cpp actionGiantNavMeshWalk.h - actionGiantNavMeshWalkWithVibration.cpp - actionGiantNavMeshWalkWithVibration.h - actionGiantOneHandActionWithLegTurn.cpp - actionGiantOneHandActionWithLegTurn.h actionGiantOneHandAttackWithLegTurn.cpp actionGiantOneHandAttackWithLegTurn.h actionGiantOneHandPunchWithLegTurn.cpp @@ -1591,6 +1591,8 @@ target_sources(uking PRIVATE actionGuardBreak.h actionGuard.cpp actionGuard.h + actionGuardianActionBase.cpp + actionGuardianActionBase.h actionGuardianAimBeam.cpp actionGuardianAimBeam.h actionGuardianAimBeamWithAS.cpp @@ -1623,8 +1625,6 @@ target_sources(uking PRIVATE actionGuardianMiniPracticeFlagSet.h actionGuardianMiniWait.cpp actionGuardianMiniWait.h - actionGuardianMoveTo.cpp - actionGuardianMoveTo.h actionGuardianMoveToPosition.cpp actionGuardianMoveToPosition.h actionGuardianMoveToTarget.cpp @@ -1661,8 +1661,6 @@ target_sources(uking PRIVATE actionHoldArrowWalk.h actionHopFlyByTriggers.cpp actionHopFlyByTriggers.h - actionHornUseBase.cpp - actionHornUseBase.h actionHornUse.cpp actionHornUse.h actionHorseDie.cpp @@ -1671,6 +1669,8 @@ target_sources(uking PRIVATE actionHorseEatCarriedItem.h actionHorseElectricParalysis.cpp actionHorseElectricParalysis.h + actionHorseFollowBase.cpp + actionHorseFollowBase.h actionHorseFollow.cpp actionHorseFollow.h actionHorseFreeze.cpp @@ -1687,20 +1687,18 @@ target_sources(uking PRIVATE actionHorseRideArrowReload.h actionHorseRideAttack.cpp actionHorseRideAttack.h + actionHorseRideBase.cpp + actionHorseRideBase.h actionHorseRideCancelCommand.cpp actionHorseRideCancelCommand.h actionHorseRideChargeCommand.cpp actionHorseRideChargeCommand.h actionHorseRideChaseCommand.cpp actionHorseRideChaseCommand.h - actionHorseRideCommandBase.cpp - actionHorseRideCommandBase.h actionHorseRideCommand.cpp actionHorseRideCommand.h - actionHorseRide.cpp actionHorseRideDynSetGearCommand.cpp actionHorseRideDynSetGearCommand.h - actionHorseRide.h actionHorseRideLookWait.cpp actionHorseRideLookWait.h actionHorseRideLoopAttack.cpp @@ -1711,6 +1709,8 @@ target_sources(uking PRIVATE actionHorseRideMoveToCommand.h actionHorseRideOneTimeASPlay.cpp actionHorseRideOneTimeASPlay.h + actionHorseRideOneTimeCommandBase.cpp + actionHorseRideOneTimeCommandBase.h actionHorseRideOneTimeViewASPlay.cpp actionHorseRideOneTimeViewASPlay.h actionHorseRideSearch.cpp @@ -1757,6 +1757,8 @@ target_sources(uking PRIVATE actionIchigekiHeartUiOpen.h actionIdleAction.cpp actionIdleAction.h + actionIgniteActorReloadBase.cpp + actionIgniteActorReloadBase.h actionIgnitedThrown.cpp actionIgnitedThrown.h actionIgniteGrabAndShoot.cpp @@ -1825,10 +1827,8 @@ target_sources(uking PRIVATE actionKillSelectActor.h actionKillUIScreenAction.cpp actionKillUIScreenAction.h - actionKnockBackShock.cpp - actionKnockBackShock.h - actionKokkoCreateDropBase.cpp - actionKokkoCreateDropBase.h + actionKnockBackHitImpactForce.cpp + actionKnockBackHitImpactForce.h actionKokkoCreateDrop.cpp actionKokkoCreateDrop.h actionKokkoMove.cpp @@ -1881,6 +1881,8 @@ target_sources(uking PRIVATE actionLastBossRandomHighWarp.h actionLastBossStun.cpp actionLastBossStun.h + actionLastBossSwordWhirlSlashChargeBase.cpp + actionLastBossSwordWhirlSlashChargeBase.h actionLastBossThunderAppear.cpp actionLastBossThunderAppear.h actionLastBossThunderSign.cpp @@ -1909,8 +1911,6 @@ target_sources(uking PRIVATE actionLinearFlyAttack.h actionLoadSaveDataFromGameOver.cpp actionLoadSaveDataFromGameOver.h - actionLookAtObjectBase.cpp - actionLookAtObjectBase.h actionLookAtObject.cpp actionLookAtObject.h actionLookAtObjectSeachAwareness.cpp @@ -1965,8 +1965,6 @@ target_sources(uking PRIVATE actionMotorcycleWait.h actionMotorcycleWaitUntilFellOver.cpp actionMotorcycleWaitUntilFellOver.h - actionMove2HomePosBase.cpp - actionMove2HomePosBase.h actionMove2HomePos.cpp actionMove2HomePos.h actionMoveBase.cpp @@ -1979,6 +1977,8 @@ target_sources(uking PRIVATE actionMoveByAnimeDriven.h actionMoveByAnimeDrivenToTarget.cpp actionMoveByAnimeDrivenToTarget.h + actionMoveHomePosBase.cpp + actionMoveHomePosBase.h actionMoveKeyFramed.cpp actionMoveKeyFramed.h actionMoveMainRidigBody.cpp @@ -1988,8 +1988,6 @@ target_sources(uking PRIVATE actionMoveToTargetBase.cpp actionMoveToTargetBase.h actionMoveToTarget.cpp - actionMoveToTargetCurveBase.cpp - actionMoveToTargetCurveBase.h actionMoveToTargetCurve.cpp actionMoveToTargetCurve.h actionMoveToTargetDir.cpp @@ -2007,14 +2005,12 @@ target_sources(uking PRIVATE actionMsg2CameraResetInterpolate.h actionMsg2CameraResetNoConnect.cpp actionMsg2CameraResetNoConnect.h + actionMultiVacuumBase.cpp + actionMultiVacuumBase.h + actionMultiVacuumRotBase.cpp + actionMultiVacuumRotBase.h actionMultiVacuumRotScaleTimeByDist.cpp actionMultiVacuumRotScaleTimeByDist.h - actionMultiVacuumRotScaleTimeByDistWithTgtBase.cpp - actionMultiVacuumRotScaleTimeByDistWithTgtBase.h - actionMultiVacuumRotScaleTimeByDistWithTgt.cpp - actionMultiVacuumRotScaleTimeByDistWithTgt.h - actionNavMeshAction.cpp - actionNavMeshAction.h actionNavMeshBattleWalk.cpp actionNavMeshBattleWalk.h actionNavMeshConnectAction.cpp @@ -2035,6 +2031,8 @@ target_sources(uking PRIVATE actionNavMeshJump.h actionNavMeshLiftWalk.cpp actionNavMeshLiftWalk.h + actionNavMeshMoveBase.cpp + actionNavMeshMoveBase.h actionNavMeshMoveWithAS.cpp actionNavMeshMoveWithAS.h actionNavMeshRun.cpp @@ -2047,8 +2045,6 @@ target_sources(uking PRIVATE actionNavMeshWalk.h actionNearHomePosTeleport.cpp actionNearHomePosTeleport.h - actionNeckSpinBeam.cpp - actionNeckSpinBeam.h actionNeckSpin.cpp actionNeckSpin.h actionNoAtTackleMove.cpp @@ -2059,6 +2055,8 @@ target_sources(uking PRIVATE actionNoCountDead.h actionNoDeleteCurrentActor.cpp actionNoDeleteCurrentActor.h + actionNormalBackWalk.cpp + actionNormalBackWalk.h actionNotice.cpp actionNotice.h actionNoticeTurn.cpp @@ -2205,8 +2203,6 @@ target_sources(uking PRIVATE actionOctarockBalloon.h actionOctarockBulletLExplode.cpp actionOctarockBulletLExplode.h - actionOctarockReloadWigBase.cpp - actionOctarockReloadWigBase.h actionOctarockReloadWig.cpp actionOctarockReloadWig.h actionOff.cpp @@ -2222,8 +2218,14 @@ target_sources(uking PRIVATE actionOnCorrect.cpp actionOnCorrect.h actionOn.cpp + actionOneHandActionWithLegTurn.cpp + actionOneHandActionWithLegTurn.h + actionOnEnterSwapActorBase.cpp + actionOnEnterSwapActorBase.h actionOnEnterSwapDropTableActor.cpp actionOnEnterSwapDropTableActor.h + actionOnEnterSwapDropTable.cpp + actionOnEnterSwapDropTable.h actionOnetimeChangeableASPlay.cpp actionOnetimeChangeableASPlay.h actionOnetimeHoverASPlay.cpp @@ -2315,11 +2317,7 @@ target_sources(uking PRIVATE actionPlayerLookAtObjectNow.h actionPlayerSlippingDown.cpp actionPlayerSlippingDown.h - actionPlayerStoleOpenBase.cpp - actionPlayerStoleOpenBase.h actionPlayerStoleOpen.cpp - actionPlayerStoleOpenEx.cpp - actionPlayerStoleOpenEx.h actionPlayerStoleOpen.h actionPlayerTurnAndLookToObjectNow.cpp actionPlayerTurnAndLookToObjectNow.h @@ -2373,8 +2371,6 @@ target_sources(uking PRIVATE actionRagdollFreeze.cpp actionRagdollFreeze.h actionRagdoll.h - actionRailMoveBase.cpp - actionRailMoveBase.h actionRailMove.cpp actionRailMove.h actionRandomJump.cpp @@ -2391,14 +2387,14 @@ target_sources(uking PRIVATE actionRecoverMasterSword.h actionReflectThrown.cpp actionReflectThrown.h - actionRegistedActorActionBase.cpp - actionRegistedActorActionBase.h + actionRegistedActorAllDeadCheckBase.cpp + actionRegistedActorAllDeadCheckBase.h actionRegistedActorBroadCastMessage.cpp actionRegistedActorBroadCastMessage.h - actionRegistedActorDeadCheckBase.cpp - actionRegistedActorDeadCheckBase.h actionRegistedActorDeadCheck.cpp actionRegistedActorDeadCheck.h + actionRegistedActorSetActionBase.cpp + actionRegistedActorSetActionBase.h actionReloadArrow.cpp actionReloadArrow.h actionRemainElectricCannonBeamFire.cpp @@ -2519,16 +2515,16 @@ target_sources(uking PRIVATE actionSendMessageBroadCast.h actionSendMessage.cpp actionSendMessage.h - actionSendMessageToTargetActor.cpp - actionSendMessageToTargetActor.h - actionSendPlayerNoticeMessageBase.cpp - actionSendPlayerNoticeMessageBase.h + actionSendNoticeMessageBase.cpp + actionSendNoticeMessageBase.h actionSendPlayerNoticeMessage.cpp actionSendPlayerNoticeMessage.h actionSendSignalAction.cpp actionSendSignalAction.h actionSendSignalForSignalFlowAct.cpp actionSendSignalForSignalFlowAct.h + actionSendTargetActorMessageBase.cpp + actionSendTargetActorMessageBase.h actionSendTargetActorRequestShareAwn.cpp actionSendTargetActorRequestShareAwn.h actionSeqPunchByASEvent.cpp @@ -2639,18 +2635,18 @@ target_sources(uking PRIVATE actionShutterOpen.h actionShutterOpenWait.cpp actionShutterOpenWait.h + actionSideMoveBase.cpp + actionSideMoveBase.h actionSideStep.cpp actionSideStep.h actionSideStepWait.cpp actionSideStepWait.h - actionSideWalkBase.cpp - actionSideWalkBase.h actionSideWalk.cpp actionSideWalk.h actionSilentKilled.cpp actionSilentKilled.h - actionSimpleGrabWithASBase.cpp - actionSimpleGrabWithASBase.h + actionSimpleGrabBase.cpp + actionSimpleGrabBase.h actionSimpleGrabWithAS.cpp actionSimpleGrabWithAS.h actionSimpleLineBeam.cpp @@ -2665,6 +2661,8 @@ target_sources(uking PRIVATE actionSiteBossAvoid.h actionLastBossBlowOff.cpp actionLastBossBlowOff.h + actionSimpleKnockBackShock.cpp + actionSimpleKnockBackShock.h actionSiteBossBowBlowOff.cpp actionSiteBossBowBlowOff.h actionSiteBossBowChildDeviceBreak.cpp @@ -2749,8 +2747,6 @@ target_sources(uking PRIVATE actionSiteBossSwordSlowMove.h actionSiteBossSwordThrowElectricBall.cpp actionSiteBossSwordThrowElectricBall.h - actionSiteBossSwordWhirlSlashChargeBase.cpp - actionSiteBossSwordWhirlSlashChargeBase.h actionSiteBossSwordWhirlSlashCharge.cpp actionSiteBossSwordWhirlSlashCharge.h actionSiteBossSwordWhirlSlash.cpp @@ -2765,12 +2761,12 @@ target_sources(uking PRIVATE actionSlippedBackWalkBase.h actionSlippedBackWalk.cpp actionSlippedBackWalk.h - actionSlippedCircleWalkBase.cpp - actionSlippedCircleWalkBase.h + actionSlippedCircleMoveBase.cpp + actionSlippedCircleMoveBase.h actionSlippedCircleWalk.cpp actionSlippedCircleWalk.h - actionSlippedWalkBase.cpp - actionSlippedWalkBase.h + actionSlippedMoveBase.cpp + actionSlippedMoveBase.h actionSlippedWalk.cpp actionSlippedWalk.h actionSmallDamageBackwardBase.cpp @@ -2831,6 +2827,8 @@ target_sources(uking PRIVATE actionStopASIgnite.h actionStopASPlay.cpp actionStopASPlay.h + actionStopBase.cpp + actionStopBase.h actionStopChargeChemicalWeaponPower.cpp actionStopChargeChemicalWeaponPower.h actionStopCliffTongueAttack.cpp @@ -2841,6 +2839,8 @@ target_sources(uking PRIVATE actionStopForLimitedTime.h actionStopJump.cpp actionStopJump.h + actionStoppingAttackBase.cpp + actionStoppingAttackBase.h actionStorePlayerPosAndRotate.cpp actionStorePlayerPosAndRotate.h actionStrangeBeacon.cpp @@ -2873,14 +2873,14 @@ target_sources(uking PRIVATE actionSwarmLevelFlyMove.h actionSweepCollision.cpp actionSweepCollision.h - actionSwimEnemyAnmBackBlownOffBase.cpp - actionSwimEnemyAnmBackBlownOffBase.h actionSwimEnemyAnmBackBlownOff.cpp actionSwimEnemyAnmBackBlownOffFromPL.cpp actionSwimEnemyAnmBackBlownOffFromPL.h actionSwimEnemyAnmBackBlownOff.h actionSwimEnemyAnmBackBlownOffToPL.cpp actionSwimEnemyAnmBackBlownOffToPL.h + actionSwimEnemyBlownOffBase.cpp + actionSwimEnemyBlownOffBase.h actionSwimGetUp.cpp actionSwimGetUp.h actionSwimMoveASHoldEvent.cpp @@ -2927,8 +2927,6 @@ target_sources(uking PRIVATE actionSystemWarp.h actionTackleMove.cpp actionTackleMove.h - actionTakeHitImpactForce.cpp - actionTakeHitImpactForce.h actionTakeoffFromCeilLook.cpp actionTakeoffFromCeilLook.h actionTakeoffFromCeilLookTarget.cpp @@ -3007,6 +3005,8 @@ target_sources(uking PRIVATE actionTurnAndChargeAndShoot.h actionTurnAndLookAtToObjectNow.cpp actionTurnAndLookAtToObjectNow.h + actionTurnAndLookToObjBase.cpp + actionTurnAndLookToObjBase.h actionTurnAndLookToObject.cpp actionTurnAndLookToObject.h actionTurnAndLookToObjNotAnimDriven.cpp @@ -3015,6 +3015,8 @@ target_sources(uking PRIVATE actionTurnBase.h actionTurn.cpp actionTurn.h + actionTurnGiantAttack.cpp + actionTurnGiantAttack.h actionTurnIgnite.cpp actionTurnIgnite.h actionTurnToActorBase.cpp @@ -3087,8 +3089,6 @@ target_sources(uking PRIVATE actionWarpOwnedHorse.h actionWarpPLAndResetGimmick.cpp actionWarpPLAndResetGimmick.h - actionWarpPlayerBase.cpp - actionWarpPlayerBase.h actionWarpPlayer.cpp actionWarpPlayer.h actionWarpPlayerToActor.cpp @@ -3155,12 +3155,12 @@ target_sources(uking PRIVATE actionWeaponTrueFormEftCtrl.h actionWildHorseCreate.cpp actionWildHorseCreate.h - actionWillBallAction.cpp - actionWillBallAction.h actionWillBallAttack.cpp actionWillBallAttack.h actionWillBallAvoidCenterDist.cpp actionWillBallAvoidCenterDist.h + actionWillBallBase.cpp + actionWillBallBase.h actionWillBallParabolaAttack.cpp actionWillBallParabolaAttack.h actionWindControl.cpp diff --git a/src/Game/Actor/Action/actionActionWithAS.cpp b/src/Game/Actor/Action/actionActionWithAS.cpp index f01e80b0..973c173c 100644 --- a/src/Game/Actor/Action/actionActionWithAS.cpp +++ b/src/Game/Actor/Action/actionActionWithAS.cpp @@ -2,14 +2,14 @@ namespace uking::action { -ActionWithAS::ActionWithAS(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +ActionWithAS::ActionWithAS(const InitArg& arg) : StopBase(arg) {} void ActionWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void ActionWithAS::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionActionWithAS.h b/src/Game/Actor/Action/actionActionWithAS.h index c6e8d2ef..d41278c2 100644 --- a/src/Game/Actor/Action/actionActionWithAS.h +++ b/src/Game/Actor/Action/actionActionWithAS.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ActionWithAS : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(ActionWithAS, ActionWithPosAngReduce) +class ActionWithAS : public StopBase { + SEAD_RTTI_OVERRIDE(ActionWithAS, StopBase) public: explicit ActionWithAS(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionActionWithPosAngReduce.cpp b/src/Game/Actor/Action/actionActionWithPosAngReduce.cpp deleted file mode 100644 index b04cd2cd..00000000 --- a/src/Game/Actor/Action/actionActionWithPosAngReduce.cpp +++ /dev/null @@ -1,24 +0,0 @@ -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" - -namespace uking::action { - -ActionWithPosAngReduce::ActionWithPosAngReduce(const InitArg& arg) : ActionEx(arg) {} - -void ActionWithPosAngReduce::enter_(ksys::act::ai::InlineParamPack* params) { - ActionEx::enter_(params); -} - -void ActionWithPosAngReduce::leave_() { - ActionEx::leave_(); -} - -void ActionWithPosAngReduce::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); -} - -void ActionWithPosAngReduce::calc_() { - ActionEx::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAnchorSummon.cpp b/src/Game/Actor/Action/actionAnchorSummon.cpp index 2651313b..377c0c0b 100644 --- a/src/Game/Actor/Action/actionAnchorSummon.cpp +++ b/src/Game/Actor/Action/actionAnchorSummon.cpp @@ -2,24 +2,24 @@ namespace uking::action { -AnchorSummon::AnchorSummon(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +AnchorSummon::AnchorSummon(const InitArg& arg) : StopBase(arg) {} AnchorSummon::~AnchorSummon() = default; bool AnchorSummon::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void AnchorSummon::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void AnchorSummon::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void AnchorSummon::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); getDynamicParam(&mSummonActor_d, "SummonActor"); getDynamicParam(&mSummonActorEquip1_d, "SummonActorEquip1"); @@ -27,7 +27,7 @@ void AnchorSummon::loadParams_() { } void AnchorSummon::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionAnchorSummon.h b/src/Game/Actor/Action/actionAnchorSummon.h index b11aeaca..c487c060 100644 --- a/src/Game/Actor/Action/actionAnchorSummon.h +++ b/src/Game/Actor/Action/actionAnchorSummon.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class AnchorSummon : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(AnchorSummon, ActionWithPosAngReduce) +class AnchorSummon : public StopBase { + SEAD_RTTI_OVERRIDE(AnchorSummon, StopBase) public: explicit AnchorSummon(const InitArg& arg); ~AnchorSummon() override; diff --git a/src/Game/Actor/Action/actionAngry.cpp b/src/Game/Actor/Action/actionAngry.cpp index cdca58c5..3bb648c7 100644 --- a/src/Game/Actor/Action/actionAngry.cpp +++ b/src/Game/Actor/Action/actionAngry.cpp @@ -17,7 +17,7 @@ void Angry::leave_() { } void Angry::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void Angry::calc_() { diff --git a/src/Game/Actor/Action/actionAnimalFollow.cpp b/src/Game/Actor/Action/actionAnimalFollow.cpp index 2d195ecb..6e2c02d0 100644 --- a/src/Game/Actor/Action/actionAnimalFollow.cpp +++ b/src/Game/Actor/Action/actionAnimalFollow.cpp @@ -2,29 +2,29 @@ namespace uking::action { -AnimalFollow::AnimalFollow(const InitArg& arg) : AnimalFollowBase(arg) {} +AnimalFollow::AnimalFollow(const InitArg& arg) : HorseFollowBase(arg) {} AnimalFollow::~AnimalFollow() = default; bool AnimalFollow::init_(sead::Heap* heap) { - return AnimalFollowBase::init_(heap); + return HorseFollowBase::init_(heap); } void AnimalFollow::enter_(ksys::act::ai::InlineParamPack* params) { - AnimalFollowBase::enter_(params); + HorseFollowBase::enter_(params); } void AnimalFollow::leave_() { - AnimalFollowBase::leave_(); + HorseFollowBase::leave_(); } void AnimalFollow::loadParams_() { - AnimalFollowBase::loadParams_(); + HorseFollowBase::loadParams_(); getStaticParam(&mDistanceKept_s, "DistanceKept"); } void AnimalFollow::calc_() { - AnimalFollowBase::calc_(); + HorseFollowBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionAnimalFollow.h b/src/Game/Actor/Action/actionAnimalFollow.h index efc3ecea..56c07fc0 100644 --- a/src/Game/Actor/Action/actionAnimalFollow.h +++ b/src/Game/Actor/Action/actionAnimalFollow.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionAnimalFollowBase.h" +#include "Game/Actor/Action/actionHorseFollowBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class AnimalFollow : public AnimalFollowBase { - SEAD_RTTI_OVERRIDE(AnimalFollow, AnimalFollowBase) +class AnimalFollow : public HorseFollowBase { + SEAD_RTTI_OVERRIDE(AnimalFollow, HorseFollowBase) public: explicit AnimalFollow(const InitArg& arg); ~AnimalFollow() override; diff --git a/src/Game/Actor/Action/actionAnmDamage.cpp b/src/Game/Actor/Action/actionAnmDamage.cpp index 2874860c..4f11cc7e 100644 --- a/src/Game/Actor/Action/actionAnmDamage.cpp +++ b/src/Game/Actor/Action/actionAnmDamage.cpp @@ -19,7 +19,7 @@ void AnmDamage::leave_() { } void AnmDamage::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mAS_s, "AS"); } diff --git a/src/Game/Actor/Action/actionAnmKnockBackShock.cpp b/src/Game/Actor/Action/actionAnmKnockBackShock.cpp index 0d758c83..fe0acec5 100644 --- a/src/Game/Actor/Action/actionAnmKnockBackShock.cpp +++ b/src/Game/Actor/Action/actionAnmKnockBackShock.cpp @@ -2,29 +2,29 @@ namespace uking::action { -AnmKnockBackShock::AnmKnockBackShock(const InitArg& arg) : KnockBackShock(arg) {} +AnmKnockBackShock::AnmKnockBackShock(const InitArg& arg) : SimpleKnockBackShock(arg) {} AnmKnockBackShock::~AnmKnockBackShock() = default; bool AnmKnockBackShock::init_(sead::Heap* heap) { - return KnockBackShock::init_(heap); + return SimpleKnockBackShock::init_(heap); } void AnmKnockBackShock::enter_(ksys::act::ai::InlineParamPack* params) { - KnockBackShock::enter_(params); + SimpleKnockBackShock::enter_(params); } void AnmKnockBackShock::leave_() { - KnockBackShock::leave_(); + SimpleKnockBackShock::leave_(); } void AnmKnockBackShock::loadParams_() { - KnockBackShock::loadParams_(); + SimpleKnockBackShock::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void AnmKnockBackShock::calc_() { - KnockBackShock::calc_(); + SimpleKnockBackShock::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionAnmKnockBackShock.h b/src/Game/Actor/Action/actionAnmKnockBackShock.h index 058e796e..08213d0a 100644 --- a/src/Game/Actor/Action/actionAnmKnockBackShock.h +++ b/src/Game/Actor/Action/actionAnmKnockBackShock.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionKnockBackShock.h" +#include "Game/Actor/Action/actionSimpleKnockBackShock.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class AnmKnockBackShock : public KnockBackShock { - SEAD_RTTI_OVERRIDE(AnmKnockBackShock, KnockBackShock) +class AnmKnockBackShock : public SimpleKnockBackShock { + SEAD_RTTI_OVERRIDE(AnmKnockBackShock, SimpleKnockBackShock) public: explicit AnmKnockBackShock(const InitArg& arg); ~AnmKnockBackShock() override; diff --git a/src/Game/Actor/Action/actionApplyDamageForPlayer.cpp b/src/Game/Actor/Action/actionApplyDamageForPlayer.cpp deleted file mode 100644 index 83387369..00000000 --- a/src/Game/Actor/Action/actionApplyDamageForPlayer.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Action/actionApplyDamageForPlayer.h" - -namespace uking::action { - -ApplyDamageForPlayer::ApplyDamageForPlayer(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -ApplyDamageForPlayer::~ApplyDamageForPlayer() = default; - -bool ApplyDamageForPlayer::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ApplyDamageForPlayer::loadParams_() { - getDynamicParam(&mValue_d, "Value"); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAreaFireObserve.cpp b/src/Game/Actor/Action/actionAreaFireObserve.cpp index 4ab5a8a4..649888b1 100644 --- a/src/Game/Actor/Action/actionAreaFireObserve.cpp +++ b/src/Game/Actor/Action/actionAreaFireObserve.cpp @@ -2,6 +2,6 @@ namespace uking::action { -AreaFireObserve::AreaFireObserve(const InitArg& arg) : AreaFireObserveBase(arg) {} +AreaFireObserve::AreaFireObserve(const InitArg& arg) : FireObserveBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Action/actionAreaFireObserve.h b/src/Game/Actor/Action/actionAreaFireObserve.h index 940cafe7..d2556a2c 100644 --- a/src/Game/Actor/Action/actionAreaFireObserve.h +++ b/src/Game/Actor/Action/actionAreaFireObserve.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Area/Action/actionAreaFireObserveBase.h" +#include "Game/Actor/Area/Action/actionFireObserveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class AreaFireObserve : public AreaFireObserveBase { - SEAD_RTTI_OVERRIDE(AreaFireObserve, AreaFireObserveBase) +class AreaFireObserve : public FireObserveBase { + SEAD_RTTI_OVERRIDE(AreaFireObserve, FireObserveBase) public: explicit AreaFireObserve(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionAttack.cpp b/src/Game/Actor/Action/actionAttack.cpp index a507ab62..c8586797 100644 --- a/src/Game/Actor/Action/actionAttack.cpp +++ b/src/Game/Actor/Action/actionAttack.cpp @@ -2,25 +2,25 @@ namespace uking::action { -Attack::Attack(const InitArg& arg) : AttackBase(arg) {} +Attack::Attack(const InitArg& arg) : StoppingAttackBase(arg) {} Attack::~Attack() = default; void Attack::enter_(ksys::act::ai::InlineParamPack* params) { - AttackBase::enter_(params); + StoppingAttackBase::enter_(params); } void Attack::leave_() { - AttackBase::leave_(); + StoppingAttackBase::leave_(); } void Attack::loadParams_() { - AttackBase::loadParams_(); + StoppingAttackBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void Attack::calc_() { - AttackBase::calc_(); + StoppingAttackBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionAttack.h b/src/Game/Actor/Action/actionAttack.h index ae84fef6..e6506a69 100644 --- a/src/Game/Actor/Action/actionAttack.h +++ b/src/Game/Actor/Action/actionAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionAttackBase.h" +#include "Game/Actor/Action/actionStoppingAttackBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Attack : public AttackBase { - SEAD_RTTI_OVERRIDE(Attack, AttackBase) +class Attack : public StoppingAttackBase { + SEAD_RTTI_OVERRIDE(Attack, StoppingAttackBase) public: explicit Attack(const InitArg& arg); ~Attack() override; diff --git a/src/Game/Actor/Action/actionAttackBase.cpp b/src/Game/Actor/Action/actionAttackBase.cpp deleted file mode 100644 index 3815b48b..00000000 --- a/src/Game/Actor/Action/actionAttackBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionAttackBase.h" - -namespace uking::action { - -AttackBase::AttackBase(const InitArg& arg) : ActionWithPosAngReduce(arg) {} - -AttackBase::~AttackBase() = default; - -bool AttackBase::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); -} - -void AttackBase::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); -} - -void AttackBase::leave_() { - ActionWithPosAngReduce::leave_(); -} - -void AttackBase::loadParams_() { - ActionWithPosAngReduce::loadParams_(); -} - -void AttackBase::calc_() { - ActionWithPosAngReduce::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAttackPowerExplode.cpp b/src/Game/Actor/Action/actionAttackPowerExplode.cpp deleted file mode 100644 index 5a2dcf67..00000000 --- a/src/Game/Actor/Action/actionAttackPowerExplode.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionAttackPowerExplode.h" - -namespace uking::action { - -AttackPowerExplode::AttackPowerExplode(const InitArg& arg) : Explode(arg) {} - -AttackPowerExplode::~AttackPowerExplode() = default; - -bool AttackPowerExplode::init_(sead::Heap* heap) { - return Explode::init_(heap); -} - -void AttackPowerExplode::enter_(ksys::act::ai::InlineParamPack* params) { - Explode::enter_(params); -} - -void AttackPowerExplode::leave_() { - Explode::leave_(); -} - -void AttackPowerExplode::loadParams_() { - Explode::loadParams_(); - getDynamicParam(&mIsPlayerAttack_d, "IsPlayerAttack"); -} - -void AttackPowerExplode::calc_() { - Explode::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAttackWithAS.cpp b/src/Game/Actor/Action/actionAttackWithAS.cpp new file mode 100644 index 00000000..0ea7314b --- /dev/null +++ b/src/Game/Actor/Action/actionAttackWithAS.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionAttackWithAS.h" + +namespace uking::action { + +AttackWithAS::AttackWithAS(const InitArg& arg) : TurnGiantAttack(arg) {} + +AttackWithAS::~AttackWithAS() = default; + +bool AttackWithAS::init_(sead::Heap* heap) { + return TurnGiantAttack::init_(heap); +} + +void AttackWithAS::enter_(ksys::act::ai::InlineParamPack* params) { + TurnGiantAttack::enter_(params); +} + +void AttackWithAS::leave_() { + TurnGiantAttack::leave_(); +} + +void AttackWithAS::loadParams_() { + TurnGiantAttack::loadParams_(); + getStaticParam(&mASName_s, "ASName"); +} + +void AttackWithAS::calc_() { + TurnGiantAttack::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantAttackWithAS.h b/src/Game/Actor/Action/actionAttackWithAS.h similarity index 63% rename from src/Game/Actor/Action/actionGiantAttackWithAS.h rename to src/Game/Actor/Action/actionAttackWithAS.h index 4f5842f2..df8c25c7 100644 --- a/src/Game/Actor/Action/actionGiantAttackWithAS.h +++ b/src/Game/Actor/Action/actionAttackWithAS.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionGiantAttack.h" +#include "Game/Actor/Action/actionTurnGiantAttack.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantAttackWithAS : public GiantAttack { - SEAD_RTTI_OVERRIDE(GiantAttackWithAS, GiantAttack) +class AttackWithAS : public TurnGiantAttack { + SEAD_RTTI_OVERRIDE(AttackWithAS, TurnGiantAttack) public: - explicit GiantAttackWithAS(const InitArg& arg); - ~GiantAttackWithAS() override; + explicit AttackWithAS(const InitArg& arg); + ~AttackWithAS() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionAvoidingCloseMoveActionBase.cpp b/src/Game/Actor/Action/actionAvoidingCloseMoveActionBase.cpp new file mode 100644 index 00000000..b6549422 --- /dev/null +++ b/src/Game/Actor/Action/actionAvoidingCloseMoveActionBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionAvoidingCloseMoveActionBase.h" + +namespace uking::action { + +AvoidingCloseMoveActionBase::AvoidingCloseMoveActionBase(const InitArg& arg) + : AvoidingCloseMoveBase(arg) {} + +AvoidingCloseMoveActionBase::~AvoidingCloseMoveActionBase() = default; + +bool AvoidingCloseMoveActionBase::init_(sead::Heap* heap) { + return AvoidingCloseMoveBase::init_(heap); +} + +void AvoidingCloseMoveActionBase::enter_(ksys::act::ai::InlineParamPack* params) { + AvoidingCloseMoveBase::enter_(params); +} + +void AvoidingCloseMoveActionBase::leave_() { + AvoidingCloseMoveBase::leave_(); +} + +void AvoidingCloseMoveActionBase::loadParams_() { + AvoidingCloseMoveBase::loadParams_(); +} + +void AvoidingCloseMoveActionBase::calc_() { + AvoidingCloseMoveBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.h b/src/Game/Actor/Action/actionAvoidingCloseMoveActionBase.h similarity index 61% rename from src/Game/Actor/Action/actionBattleCloseMoveActionBase.h rename to src/Game/Actor/Action/actionAvoidingCloseMoveActionBase.h index c3543839..b32d7266 100644 --- a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.h +++ b/src/Game/Actor/Action/actionAvoidingCloseMoveActionBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class BattleCloseMoveActionBase : public AvoidingCloseMoveBase { - SEAD_RTTI_OVERRIDE(BattleCloseMoveActionBase, AvoidingCloseMoveBase) +class AvoidingCloseMoveActionBase : public AvoidingCloseMoveBase { + SEAD_RTTI_OVERRIDE(AvoidingCloseMoveActionBase, AvoidingCloseMoveBase) public: - explicit BattleCloseMoveActionBase(const InitArg& arg); - ~BattleCloseMoveActionBase() override; + explicit AvoidingCloseMoveActionBase(const InitArg& arg); + ~AvoidingCloseMoveActionBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBackWalk.cpp b/src/Game/Actor/Action/actionBackWalk.cpp index ce9f5ac2..5038121b 100644 --- a/src/Game/Actor/Action/actionBackWalk.cpp +++ b/src/Game/Actor/Action/actionBackWalk.cpp @@ -2,10 +2,10 @@ namespace uking::action { -BackWalk::BackWalk(const InitArg& arg) : BackWalkEx(arg) {} +BackWalk::BackWalk(const InitArg& arg) : NormalBackWalk(arg) {} void BackWalk::enter_(ksys::act::ai::InlineParamPack* params) { - BackWalkEx::enter_(params); + NormalBackWalk::enter_(params); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBackWalk.h b/src/Game/Actor/Action/actionBackWalk.h index e87694b7..fb194f8f 100644 --- a/src/Game/Actor/Action/actionBackWalk.h +++ b/src/Game/Actor/Action/actionBackWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBackWalkEx.h" +#include "Game/Actor/Action/actionNormalBackWalk.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BackWalk : public BackWalkEx { - SEAD_RTTI_OVERRIDE(BackWalk, BackWalkEx) +class BackWalk : public NormalBackWalk { + SEAD_RTTI_OVERRIDE(BackWalk, NormalBackWalk) public: explicit BackWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionBackWalkEx.cpp b/src/Game/Actor/Action/actionBackWalkEx.cpp deleted file mode 100644 index 0697ff81..00000000 --- a/src/Game/Actor/Action/actionBackWalkEx.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionBackWalkEx.h" - -namespace uking::action { - -BackWalkEx::BackWalkEx(const InitArg& arg) : BackWalkBase(arg) {} - -BackWalkEx::~BackWalkEx() = default; - -bool BackWalkEx::init_(sead::Heap* heap) { - return BackWalkBase::init_(heap); -} - -void BackWalkEx::enter_(ksys::act::ai::InlineParamPack* params) { - BackWalkBase::enter_(params); -} - -void BackWalkEx::leave_() { - BackWalkBase::leave_(); -} - -void BackWalkEx::loadParams_() { - BackWalkBase::loadParams_(); -} - -void BackWalkEx::calc_() { - BackWalkBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBackWalkWithAS.cpp b/src/Game/Actor/Action/actionBackWalkWithAS.cpp index 3c6d8b6a..c47ad044 100644 --- a/src/Game/Actor/Action/actionBackWalkWithAS.cpp +++ b/src/Game/Actor/Action/actionBackWalkWithAS.cpp @@ -2,21 +2,21 @@ namespace uking::action { -BackWalkWithAS::BackWalkWithAS(const InitArg& arg) : BackWalkEx(arg) {} +BackWalkWithAS::BackWalkWithAS(const InitArg& arg) : NormalBackWalk(arg) {} BackWalkWithAS::~BackWalkWithAS() = default; void BackWalkWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - BackWalkEx::enter_(params); + NormalBackWalk::enter_(params); } void BackWalkWithAS::loadParams_() { - BackWalkEx::loadParams_(); + NormalBackWalk::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void BackWalkWithAS::calc_() { - BackWalkEx::calc_(); + NormalBackWalk::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBackWalkWithAS.h b/src/Game/Actor/Action/actionBackWalkWithAS.h index e3df530a..6522a243 100644 --- a/src/Game/Actor/Action/actionBackWalkWithAS.h +++ b/src/Game/Actor/Action/actionBackWalkWithAS.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBackWalkEx.h" +#include "Game/Actor/Action/actionNormalBackWalk.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BackWalkWithAS : public BackWalkEx { - SEAD_RTTI_OVERRIDE(BackWalkWithAS, BackWalkEx) +class BackWalkWithAS : public NormalBackWalk { + SEAD_RTTI_OVERRIDE(BackWalkWithAS, NormalBackWalk) public: explicit BackWalkWithAS(const InitArg& arg); ~BackWalkWithAS() override; diff --git a/src/Game/Actor/Action/actionBasicSignalForbidTag.cpp b/src/Game/Actor/Action/actionBasicSignalForbidTag.cpp new file mode 100644 index 00000000..79ccca59 --- /dev/null +++ b/src/Game/Actor/Action/actionBasicSignalForbidTag.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/Action/actionBasicSignalForbidTag.h" + +namespace uking::action { + +BasicSignalForbidTag::BasicSignalForbidTag(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +BasicSignalForbidTag::~BasicSignalForbidTag() = default; + +bool BasicSignalForbidTag::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void BasicSignalForbidTag::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void BasicSignalForbidTag::leave_() { + ksys::act::ai::Action::leave_(); +} + +void BasicSignalForbidTag::loadParams_() {} + +void BasicSignalForbidTag::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionKokkoCreateDropBase.h b/src/Game/Actor/Action/actionBasicSignalForbidTag.h similarity index 60% rename from src/Game/Actor/Action/actionKokkoCreateDropBase.h rename to src/Game/Actor/Action/actionBasicSignalForbidTag.h index fceb832f..31e455ca 100644 --- a/src/Game/Actor/Action/actionKokkoCreateDropBase.h +++ b/src/Game/Actor/Action/actionBasicSignalForbidTag.h @@ -4,11 +4,11 @@ namespace uking::action { -class KokkoCreateDropBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(KokkoCreateDropBase, ksys::act::ai::Action) +class BasicSignalForbidTag : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(BasicSignalForbidTag, ksys::act::ai::Action) public: - explicit KokkoCreateDropBase(const InitArg& arg); - ~KokkoCreateDropBase() override; + explicit BasicSignalForbidTag(const InitArg& arg); + ~BasicSignalForbidTag() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBattleCloseExplosivesAvoidRun.cpp b/src/Game/Actor/Action/actionBattleCloseExplosivesAvoidRun.cpp index 87729b9f..c474d709 100644 --- a/src/Game/Actor/Action/actionBattleCloseExplosivesAvoidRun.cpp +++ b/src/Game/Actor/Action/actionBattleCloseExplosivesAvoidRun.cpp @@ -16,7 +16,7 @@ void BattleCloseExplosivesAvoidRun::leave_() { } void BattleCloseExplosivesAvoidRun::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); + AvoidingCloseMoveActionBase::loadParams_(); getStaticParam(&mDamageIgnoreDist_s, "DamageIgnoreDist"); } diff --git a/src/Game/Actor/Action/actionBattleCloseGuardWalk.cpp b/src/Game/Actor/Action/actionBattleCloseGuardWalk.cpp index 39e807cd..a52790cf 100644 --- a/src/Game/Actor/Action/actionBattleCloseGuardWalk.cpp +++ b/src/Game/Actor/Action/actionBattleCloseGuardWalk.cpp @@ -17,7 +17,7 @@ void BattleCloseGuardWalk::leave_() { } void BattleCloseGuardWalk::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); + AvoidingCloseMoveActionBase::loadParams_(); } void BattleCloseGuardWalk::calc_() { diff --git a/src/Game/Actor/Action/actionBattleCloseMeanderRun.cpp b/src/Game/Actor/Action/actionBattleCloseMeanderRun.cpp index dbd1e5c5..03b73afd 100644 --- a/src/Game/Actor/Action/actionBattleCloseMeanderRun.cpp +++ b/src/Game/Actor/Action/actionBattleCloseMeanderRun.cpp @@ -11,7 +11,7 @@ void BattleCloseMeanderRun::enter_(ksys::act::ai::InlineParamPack* params) { } void BattleCloseMeanderRun::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); + AvoidingCloseMoveActionBase::loadParams_(); getStaticParam(&mMeanderWidth_s, "MeanderWidth"); getStaticParam(&mMeanderSpeed_s, "MeanderSpeed"); getStaticParam(&mJumpUpSpeedReduceRatio_s, "JumpUpSpeedReduceRatio"); diff --git a/src/Game/Actor/Action/actionBattleCloseMoveAction.cpp b/src/Game/Actor/Action/actionBattleCloseMoveAction.cpp index 5728b88e..41074d06 100644 --- a/src/Game/Actor/Action/actionBattleCloseMoveAction.cpp +++ b/src/Game/Actor/Action/actionBattleCloseMoveAction.cpp @@ -2,22 +2,23 @@ namespace uking::action { -BattleCloseMoveAction::BattleCloseMoveAction(const InitArg& arg) : BattleCloseMoveActionBase(arg) {} +BattleCloseMoveAction::BattleCloseMoveAction(const InitArg& arg) + : AvoidingCloseMoveActionBase(arg) {} bool BattleCloseMoveAction::init_(sead::Heap* heap) { - return BattleCloseMoveActionBase::init_(heap); + return AvoidingCloseMoveActionBase::init_(heap); } void BattleCloseMoveAction::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseMoveActionBase::enter_(params); + AvoidingCloseMoveActionBase::enter_(params); } void BattleCloseMoveAction::leave_() { - BattleCloseMoveActionBase::leave_(); + AvoidingCloseMoveActionBase::leave_(); } void BattleCloseMoveAction::calc_() { - BattleCloseMoveActionBase::calc_(); + AvoidingCloseMoveActionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseMoveAction.h b/src/Game/Actor/Action/actionBattleCloseMoveAction.h index 4e9c6bb1..080733e6 100644 --- a/src/Game/Actor/Action/actionBattleCloseMoveAction.h +++ b/src/Game/Actor/Action/actionBattleCloseMoveAction.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBattleCloseMoveActionBase.h" +#include "Game/Actor/Action/actionAvoidingCloseMoveActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BattleCloseMoveAction : public BattleCloseMoveActionBase { - SEAD_RTTI_OVERRIDE(BattleCloseMoveAction, BattleCloseMoveActionBase) +class BattleCloseMoveAction : public AvoidingCloseMoveActionBase { + SEAD_RTTI_OVERRIDE(BattleCloseMoveAction, AvoidingCloseMoveActionBase) public: explicit BattleCloseMoveAction(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp b/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp deleted file mode 100644 index f942ef9b..00000000 --- a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionBattleCloseMoveActionBase.h" - -namespace uking::action { - -BattleCloseMoveActionBase::BattleCloseMoveActionBase(const InitArg& arg) - : AvoidingCloseMoveBase(arg) {} - -BattleCloseMoveActionBase::~BattleCloseMoveActionBase() = default; - -bool BattleCloseMoveActionBase::init_(sead::Heap* heap) { - return AvoidingCloseMoveBase::init_(heap); -} - -void BattleCloseMoveActionBase::enter_(ksys::act::ai::InlineParamPack* params) { - AvoidingCloseMoveBase::enter_(params); -} - -void BattleCloseMoveActionBase::leave_() { - AvoidingCloseMoveBase::leave_(); -} - -void BattleCloseMoveActionBase::loadParams_() { - AvoidingCloseMoveBase::loadParams_(); -} - -void BattleCloseMoveActionBase::calc_() { - AvoidingCloseMoveBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseWalk.cpp b/src/Game/Actor/Action/actionBattleCloseWalk.cpp index e67c5262..b8d70ed8 100644 --- a/src/Game/Actor/Action/actionBattleCloseWalk.cpp +++ b/src/Game/Actor/Action/actionBattleCloseWalk.cpp @@ -17,7 +17,7 @@ void BattleCloseWalk::leave_() { } void BattleCloseWalk::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); + AvoidingCloseMoveActionBase::loadParams_(); } void BattleCloseWalk::calc_() { diff --git a/src/Game/Actor/Action/actionNeckSpinBeam.cpp b/src/Game/Actor/Action/actionBeamNeckSpin.cpp similarity index 62% rename from src/Game/Actor/Action/actionNeckSpinBeam.cpp rename to src/Game/Actor/Action/actionBeamNeckSpin.cpp index 53b9544f..d3791a8f 100644 --- a/src/Game/Actor/Action/actionNeckSpinBeam.cpp +++ b/src/Game/Actor/Action/actionBeamNeckSpin.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionNeckSpinBeam.h" +#include "Game/Actor/Action/actionBeamNeckSpin.h" namespace uking::action { -NeckSpinBeam::NeckSpinBeam(const InitArg& arg) : NeckSpin(arg) {} +BeamNeckSpin::BeamNeckSpin(const InitArg& arg) : NeckSpin(arg) {} -NeckSpinBeam::~NeckSpinBeam() = default; +BeamNeckSpin::~BeamNeckSpin() = default; -bool NeckSpinBeam::init_(sead::Heap* heap) { +bool BeamNeckSpin::init_(sead::Heap* heap) { return NeckSpin::init_(heap); } -void NeckSpinBeam::enter_(ksys::act::ai::InlineParamPack* params) { +void BeamNeckSpin::enter_(ksys::act::ai::InlineParamPack* params) { NeckSpin::enter_(params); } -void NeckSpinBeam::leave_() { +void BeamNeckSpin::leave_() { NeckSpin::leave_(); } -void NeckSpinBeam::loadParams_() { +void BeamNeckSpin::loadParams_() { NeckSpin::loadParams_(); getStaticParam(&mBeamRange_s, "BeamRange"); getStaticParam(&mBeamBoneName_s, "BeamBoneName"); @@ -29,7 +29,7 @@ void NeckSpinBeam::loadParams_() { getMapUnitParam(&mBeamRange_m, "BeamRange"); } -void NeckSpinBeam::calc_() { +void BeamNeckSpin::calc_() { NeckSpin::calc_(); } diff --git a/src/Game/Actor/Action/actionNeckSpinBeam.h b/src/Game/Actor/Action/actionBeamNeckSpin.h similarity index 84% rename from src/Game/Actor/Action/actionNeckSpinBeam.h rename to src/Game/Actor/Action/actionBeamNeckSpin.h index 4bbdb680..9cdf34f1 100644 --- a/src/Game/Actor/Action/actionNeckSpinBeam.h +++ b/src/Game/Actor/Action/actionBeamNeckSpin.h @@ -5,11 +5,11 @@ namespace uking::action { -class NeckSpinBeam : public NeckSpin { - SEAD_RTTI_OVERRIDE(NeckSpinBeam, NeckSpin) +class BeamNeckSpin : public NeckSpin { + SEAD_RTTI_OVERRIDE(BeamNeckSpin, NeckSpin) public: - explicit NeckSpinBeam(const InitArg& arg); - ~NeckSpinBeam() override; + explicit BeamNeckSpin(const InitArg& arg); + ~BeamNeckSpin() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBindPlayerNodeBase.cpp b/src/Game/Actor/Action/actionBindPlayerNodeBase.cpp new file mode 100644 index 00000000..d2515363 --- /dev/null +++ b/src/Game/Actor/Action/actionBindPlayerNodeBase.cpp @@ -0,0 +1,28 @@ +#include "Game/Actor/Action/actionBindPlayerNodeBase.h" + +namespace uking::action { + +BindPlayerNodeBase::BindPlayerNodeBase(const InitArg& arg) : ActionEx(arg) {} + +BindPlayerNodeBase::~BindPlayerNodeBase() = default; + +void BindPlayerNodeBase::enter_(ksys::act::ai::InlineParamPack* params) { + ActionEx::enter_(params); +} + +void BindPlayerNodeBase::leave_() { + ActionEx::leave_(); +} + +void BindPlayerNodeBase::loadParams_() { + getStaticParam(&mBoneName_s, "BoneName"); + getStaticParam(&mPosOffset_s, "PosOffset"); + getStaticParam(&mRotOffsetXyz_s, "RotOffsetXyz"); +} + +void BindPlayerNodeBase::calc_() { + if (isFinishedAS(0, 0)) + setFinished(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerStoleOpenBase.h b/src/Game/Actor/Action/actionBindPlayerNodeBase.h similarity index 74% rename from src/Game/Actor/Action/actionPlayerStoleOpenBase.h rename to src/Game/Actor/Action/actionBindPlayerNodeBase.h index d2bff3b1..8cb5c674 100644 --- a/src/Game/Actor/Action/actionPlayerStoleOpenBase.h +++ b/src/Game/Actor/Action/actionBindPlayerNodeBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class PlayerStoleOpenBase : public ActionEx { - SEAD_RTTI_OVERRIDE(PlayerStoleOpenBase, ActionEx) +class BindPlayerNodeBase : public ActionEx { + SEAD_RTTI_OVERRIDE(BindPlayerNodeBase, ActionEx) public: - explicit PlayerStoleOpenBase(const InitArg& arg); - ~PlayerStoleOpenBase() override; + explicit BindPlayerNodeBase(const InitArg& arg); + ~BindPlayerNodeBase() override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; diff --git a/src/Game/Actor/Action/actionBindPlayerNodeEx.cpp b/src/Game/Actor/Action/actionBindPlayerNodeEx.cpp new file mode 100644 index 00000000..85f7c450 --- /dev/null +++ b/src/Game/Actor/Action/actionBindPlayerNodeEx.cpp @@ -0,0 +1,7 @@ +#include "Game/Actor/Action/actionBindPlayerNodeEx.h" + +namespace uking::action { + +BindPlayerNodeEx::BindPlayerNodeEx(const InitArg& arg) : BindPlayerNodeBase(arg) {} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBindPlayerNodeEx.h b/src/Game/Actor/Action/actionBindPlayerNodeEx.h new file mode 100644 index 00000000..e314a777 --- /dev/null +++ b/src/Game/Actor/Action/actionBindPlayerNodeEx.h @@ -0,0 +1,16 @@ +#pragma once + +#include "Game/Actor/Action/actionBindPlayerNodeBase.h" +#include "KingSystem/ActorSystem/actAiAction.h" + +namespace uking::action { + +class BindPlayerNodeEx : public BindPlayerNodeBase { + SEAD_RTTI_OVERRIDE(BindPlayerNodeEx, BindPlayerNodeBase) +public: + explicit BindPlayerNodeEx(const InitArg& arg); + +protected: +}; + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionCapturedActKnockBack.cpp b/src/Game/Actor/Action/actionCapturedActKnockBack.cpp index 58dc7aaa..3f222186 100644 --- a/src/Game/Actor/Action/actionCapturedActKnockBack.cpp +++ b/src/Game/Actor/Action/actionCapturedActKnockBack.cpp @@ -19,7 +19,7 @@ void CapturedActKnockBack::leave_() { } void CapturedActKnockBack::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); } void CapturedActKnockBack::calc_() { diff --git a/src/Game/Actor/Action/actionChemicalward.cpp b/src/Game/Actor/Action/actionChemicalward.cpp index 1dd0e3c5..afdb9ae9 100644 --- a/src/Game/Actor/Action/actionChemicalward.cpp +++ b/src/Game/Actor/Action/actionChemicalward.cpp @@ -2,24 +2,24 @@ namespace uking::action { -Chemicalward::Chemicalward(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Chemicalward::Chemicalward(const InitArg& arg) : StopBase(arg) {} Chemicalward::~Chemicalward() = default; bool Chemicalward::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void Chemicalward::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Chemicalward::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Chemicalward::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mNodeAxisIdx_s, "NodeAxisIdx"); getStaticParam(&mStableTime_s, "StableTime"); @@ -34,7 +34,7 @@ void Chemicalward::loadParams_() { } void Chemicalward::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalward.h b/src/Game/Actor/Action/actionChemicalward.h index dc543e0d..777785d2 100644 --- a/src/Game/Actor/Action/actionChemicalward.h +++ b/src/Game/Actor/Action/actionChemicalward.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Chemicalward : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Chemicalward, ActionWithPosAngReduce) +class Chemicalward : public StopBase { + SEAD_RTTI_OVERRIDE(Chemicalward, StopBase) public: explicit Chemicalward(const InitArg& arg); ~Chemicalward() override; diff --git a/src/Game/Actor/Action/actionChuchuDissappearEscape.cpp b/src/Game/Actor/Action/actionChuchuDissappearEscape.cpp index dd69e188..8d9226e1 100644 --- a/src/Game/Actor/Action/actionChuchuDissappearEscape.cpp +++ b/src/Game/Actor/Action/actionChuchuDissappearEscape.cpp @@ -2,29 +2,28 @@ namespace uking::action { -ChuchuDissappearEscape::ChuchuDissappearEscape(const InitArg& arg) - : ChuchuDissappearEscapeBase(arg) {} +ChuchuDissappearEscape::ChuchuDissappearEscape(const InitArg& arg) : DisappearAndEscapeBase(arg) {} ChuchuDissappearEscape::~ChuchuDissappearEscape() = default; bool ChuchuDissappearEscape::init_(sead::Heap* heap) { - return ChuchuDissappearEscapeBase::init_(heap); + return DisappearAndEscapeBase::init_(heap); } void ChuchuDissappearEscape::enter_(ksys::act::ai::InlineParamPack* params) { - ChuchuDissappearEscapeBase::enter_(params); + DisappearAndEscapeBase::enter_(params); } void ChuchuDissappearEscape::leave_() { - ChuchuDissappearEscapeBase::leave_(); + DisappearAndEscapeBase::leave_(); } void ChuchuDissappearEscape::loadParams_() { - ChuchuDissappearEscapeBase::loadParams_(); + DisappearAndEscapeBase::loadParams_(); } void ChuchuDissappearEscape::calc_() { - ChuchuDissappearEscapeBase::calc_(); + DisappearAndEscapeBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChuchuDissappearEscape.h b/src/Game/Actor/Action/actionChuchuDissappearEscape.h index c40ebce9..c3b6d3bd 100644 --- a/src/Game/Actor/Action/actionChuchuDissappearEscape.h +++ b/src/Game/Actor/Action/actionChuchuDissappearEscape.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChuchuDissappearEscapeBase.h" +#include "Game/Actor/Action/actionDisappearAndEscapeBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ChuchuDissappearEscape : public ChuchuDissappearEscapeBase { - SEAD_RTTI_OVERRIDE(ChuchuDissappearEscape, ChuchuDissappearEscapeBase) +class ChuchuDissappearEscape : public DisappearAndEscapeBase { + SEAD_RTTI_OVERRIDE(ChuchuDissappearEscape, DisappearAndEscapeBase) public: explicit ChuchuDissappearEscape(const InitArg& arg); ~ChuchuDissappearEscape() override; diff --git a/src/Game/Actor/Action/actionChuchuDissappearEscapeBase.cpp b/src/Game/Actor/Action/actionChuchuDissappearEscapeBase.cpp deleted file mode 100644 index 2e16b6b7..00000000 --- a/src/Game/Actor/Action/actionChuchuDissappearEscapeBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionChuchuDissappearEscapeBase.h" - -namespace uking::action { - -ChuchuDissappearEscapeBase::ChuchuDissappearEscapeBase(const InitArg& arg) : ActionWithAS(arg) {} - -ChuchuDissappearEscapeBase::~ChuchuDissappearEscapeBase() = default; - -bool ChuchuDissappearEscapeBase::init_(sead::Heap* heap) { - return ActionWithAS::init_(heap); -} - -void ChuchuDissappearEscapeBase::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithAS::enter_(params); -} - -void ChuchuDissappearEscapeBase::leave_() { - ActionWithAS::leave_(); -} - -void ChuchuDissappearEscapeBase::loadParams_() { - ActionWithPosAngReduce::loadParams_(); -} - -void ChuchuDissappearEscapeBase::calc_() { - ActionWithAS::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChuchuPreAttack.cpp b/src/Game/Actor/Action/actionChuchuPreAttack.cpp index 88e8b8f4..2ba9825a 100644 --- a/src/Game/Actor/Action/actionChuchuPreAttack.cpp +++ b/src/Game/Actor/Action/actionChuchuPreAttack.cpp @@ -2,24 +2,24 @@ namespace uking::action { -ChuchuPreAttack::ChuchuPreAttack(const InitArg& arg) : ChuchuPreAttackBase(arg) {} +ChuchuPreAttack::ChuchuPreAttack(const InitArg& arg) : GelJumpBase(arg) {} ChuchuPreAttack::~ChuchuPreAttack() = default; bool ChuchuPreAttack::init_(sead::Heap* heap) { - return ChuchuPreAttackBase::init_(heap); + return GelJumpBase::init_(heap); } void ChuchuPreAttack::enter_(ksys::act::ai::InlineParamPack* params) { - ChuchuPreAttackBase::enter_(params); + GelJumpBase::enter_(params); } void ChuchuPreAttack::leave_() { - ChuchuPreAttackBase::leave_(); + GelJumpBase::leave_(); } void ChuchuPreAttack::loadParams_() { - ChuchuPreAttackBase::loadParams_(); + GelJumpBase::loadParams_(); getStaticParam(&mSubASSlot_s, "SubASSlot"); getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); @@ -35,7 +35,7 @@ void ChuchuPreAttack::loadParams_() { } void ChuchuPreAttack::calc_() { - ChuchuPreAttackBase::calc_(); + GelJumpBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChuchuPreAttack.h b/src/Game/Actor/Action/actionChuchuPreAttack.h index 2149ca23..636c5b2d 100644 --- a/src/Game/Actor/Action/actionChuchuPreAttack.h +++ b/src/Game/Actor/Action/actionChuchuPreAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChuchuPreAttackBase.h" +#include "Game/Actor/Action/actionGelJumpBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ChuchuPreAttack : public ChuchuPreAttackBase { - SEAD_RTTI_OVERRIDE(ChuchuPreAttack, ChuchuPreAttackBase) +class ChuchuPreAttack : public GelJumpBase { + SEAD_RTTI_OVERRIDE(ChuchuPreAttack, GelJumpBase) public: explicit ChuchuPreAttack(const InitArg& arg); ~ChuchuPreAttack() override; diff --git a/src/Game/Actor/Action/actionCreateDropBase.cpp b/src/Game/Actor/Action/actionCreateDropBase.cpp new file mode 100644 index 00000000..69b538e2 --- /dev/null +++ b/src/Game/Actor/Action/actionCreateDropBase.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/Action/actionCreateDropBase.h" + +namespace uking::action { + +CreateDropBase::CreateDropBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +CreateDropBase::~CreateDropBase() = default; + +bool CreateDropBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void CreateDropBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void CreateDropBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void CreateDropBase::loadParams_() {} + +void CreateDropBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionWarpPlayerBase.h b/src/Game/Actor/Action/actionCreateDropBase.h similarity index 63% rename from src/Game/Actor/Action/actionWarpPlayerBase.h rename to src/Game/Actor/Action/actionCreateDropBase.h index c4a59138..4e77b32c 100644 --- a/src/Game/Actor/Action/actionWarpPlayerBase.h +++ b/src/Game/Actor/Action/actionCreateDropBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class WarpPlayerBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(WarpPlayerBase, ksys::act::ai::Action) +class CreateDropBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(CreateDropBase, ksys::act::ai::Action) public: - explicit WarpPlayerBase(const InitArg& arg); - ~WarpPlayerBase() override; + explicit CreateDropBase(const InitArg& arg); + ~CreateDropBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionMoveToTargetCurveBase.cpp b/src/Game/Actor/Action/actionCurveMoveToTargetBase.cpp similarity index 51% rename from src/Game/Actor/Action/actionMoveToTargetCurveBase.cpp rename to src/Game/Actor/Action/actionCurveMoveToTargetBase.cpp index 3545015c..dec5037e 100644 --- a/src/Game/Actor/Action/actionMoveToTargetCurveBase.cpp +++ b/src/Game/Actor/Action/actionCurveMoveToTargetBase.cpp @@ -1,30 +1,30 @@ -#include "Game/Actor/Action/actionMoveToTargetCurveBase.h" +#include "Game/Actor/Action/actionCurveMoveToTargetBase.h" namespace uking::action { -MoveToTargetCurveBase::MoveToTargetCurveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +CurveMoveToTargetBase::CurveMoveToTargetBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -MoveToTargetCurveBase::~MoveToTargetCurveBase() = default; +CurveMoveToTargetBase::~CurveMoveToTargetBase() = default; -bool MoveToTargetCurveBase::init_(sead::Heap* heap) { +bool CurveMoveToTargetBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void MoveToTargetCurveBase::enter_(ksys::act::ai::InlineParamPack* params) { +void CurveMoveToTargetBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void MoveToTargetCurveBase::leave_() { +void CurveMoveToTargetBase::leave_() { ksys::act::ai::Action::leave_(); } -void MoveToTargetCurveBase::loadParams_() { +void CurveMoveToTargetBase::loadParams_() { getStaticParam(&mMaxHeight_s, "MaxHeight"); getStaticParam(&mTimeScale_s, "TimeScale"); getStaticParam(&mIsDebugDrawTargetPos_s, "IsDebugDrawTargetPos"); } -void MoveToTargetCurveBase::calc_() { +void CurveMoveToTargetBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionMoveToTargetCurveBase.h b/src/Game/Actor/Action/actionCurveMoveToTargetBase.h similarity index 71% rename from src/Game/Actor/Action/actionMoveToTargetCurveBase.h rename to src/Game/Actor/Action/actionCurveMoveToTargetBase.h index e03afd7c..ee418653 100644 --- a/src/Game/Actor/Action/actionMoveToTargetCurveBase.h +++ b/src/Game/Actor/Action/actionCurveMoveToTargetBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class MoveToTargetCurveBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(MoveToTargetCurveBase, ksys::act::ai::Action) +class CurveMoveToTargetBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(CurveMoveToTargetBase, ksys::act::ai::Action) public: - explicit MoveToTargetCurveBase(const InitArg& arg); - ~MoveToTargetCurveBase() override; + explicit CurveMoveToTargetBase(const InitArg& arg); + ~CurveMoveToTargetBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionDRCAppNoUseTag.cpp b/src/Game/Actor/Action/actionDRCAppNoUseTag.cpp index 4545515f..7d0b5c80 100644 --- a/src/Game/Actor/Action/actionDRCAppNoUseTag.cpp +++ b/src/Game/Actor/Action/actionDRCAppNoUseTag.cpp @@ -2,29 +2,29 @@ namespace uking::action { -DRCAppNoUseTag::DRCAppNoUseTag(const InitArg& arg) : ForbidTag(arg) {} +DRCAppNoUseTag::DRCAppNoUseTag(const InitArg& arg) : BasicSignalForbidTag(arg) {} DRCAppNoUseTag::~DRCAppNoUseTag() = default; bool DRCAppNoUseTag::init_(sead::Heap* heap) { - return ForbidTag::init_(heap); + return BasicSignalForbidTag::init_(heap); } void DRCAppNoUseTag::enter_(ksys::act::ai::InlineParamPack* params) { - ForbidTag::enter_(params); + BasicSignalForbidTag::enter_(params); } void DRCAppNoUseTag::leave_() { - ForbidTag::leave_(); + BasicSignalForbidTag::leave_(); } void DRCAppNoUseTag::loadParams_() { - ForbidTag::loadParams_(); + BasicSignalForbidTag::loadParams_(); getMapUnitParam(&mDRCAppNoUseCause_m, "DRCAppNoUseCause"); } void DRCAppNoUseTag::calc_() { - ForbidTag::calc_(); + BasicSignalForbidTag::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionDRCAppNoUseTag.h b/src/Game/Actor/Action/actionDRCAppNoUseTag.h index 2a34b866..8b56a29d 100644 --- a/src/Game/Actor/Action/actionDRCAppNoUseTag.h +++ b/src/Game/Actor/Action/actionDRCAppNoUseTag.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForbidTag.h" +#include "Game/Actor/Action/actionBasicSignalForbidTag.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class DRCAppNoUseTag : public ForbidTag { - SEAD_RTTI_OVERRIDE(DRCAppNoUseTag, ForbidTag) +class DRCAppNoUseTag : public BasicSignalForbidTag { + SEAD_RTTI_OVERRIDE(DRCAppNoUseTag, BasicSignalForbidTag) public: explicit DRCAppNoUseTag(const InitArg& arg); ~DRCAppNoUseTag() override; diff --git a/src/Game/Actor/Action/actionDemoApplyDamageBase.cpp b/src/Game/Actor/Action/actionDemoApplyDamageBase.cpp new file mode 100644 index 00000000..b55af64c --- /dev/null +++ b/src/Game/Actor/Action/actionDemoApplyDamageBase.cpp @@ -0,0 +1,17 @@ +#include "Game/Actor/Action/actionDemoApplyDamageBase.h" + +namespace uking::action { + +DemoApplyDamageBase::DemoApplyDamageBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +DemoApplyDamageBase::~DemoApplyDamageBase() = default; + +bool DemoApplyDamageBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void DemoApplyDamageBase::loadParams_() { + getDynamicParam(&mValue_d, "Value"); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionApplyDamageForPlayer.h b/src/Game/Actor/Action/actionDemoApplyDamageBase.h similarity index 55% rename from src/Game/Actor/Action/actionApplyDamageForPlayer.h rename to src/Game/Actor/Action/actionDemoApplyDamageBase.h index fd815c5b..47811f9f 100644 --- a/src/Game/Actor/Action/actionApplyDamageForPlayer.h +++ b/src/Game/Actor/Action/actionDemoApplyDamageBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class ApplyDamageForPlayer : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ApplyDamageForPlayer, ksys::act::ai::Action) +class DemoApplyDamageBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(DemoApplyDamageBase, ksys::act::ai::Action) public: - explicit ApplyDamageForPlayer(const InitArg& arg); - ~ApplyDamageForPlayer() override; + explicit DemoApplyDamageBase(const InitArg& arg); + ~DemoApplyDamageBase() override; bool init_(sead::Heap* heap) override; void loadParams_() override; diff --git a/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.cpp b/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.cpp index a28eb775..9f69f83d 100644 --- a/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.cpp +++ b/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.cpp @@ -2,17 +2,16 @@ namespace uking::action { -DemoApplyDamageForPlayer::DemoApplyDamageForPlayer(const InitArg& arg) - : ApplyDamageForPlayer(arg) {} +DemoApplyDamageForPlayer::DemoApplyDamageForPlayer(const InitArg& arg) : DemoApplyDamageBase(arg) {} DemoApplyDamageForPlayer::~DemoApplyDamageForPlayer() = default; bool DemoApplyDamageForPlayer::init_(sead::Heap* heap) { - return ApplyDamageForPlayer::init_(heap); + return DemoApplyDamageBase::init_(heap); } void DemoApplyDamageForPlayer::loadParams_() { - ApplyDamageForPlayer::loadParams_(); + DemoApplyDamageBase::loadParams_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.h b/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.h index ddd01d8e..d2ab99de 100644 --- a/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.h +++ b/src/Game/Actor/Action/actionDemoApplyDamageForPlayer.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionApplyDamageForPlayer.h" +#include "Game/Actor/Action/actionDemoApplyDamageBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class DemoApplyDamageForPlayer : public ApplyDamageForPlayer { - SEAD_RTTI_OVERRIDE(DemoApplyDamageForPlayer, ApplyDamageForPlayer) +class DemoApplyDamageForPlayer : public DemoApplyDamageBase { + SEAD_RTTI_OVERRIDE(DemoApplyDamageForPlayer, DemoApplyDamageBase) public: explicit DemoApplyDamageForPlayer(const InitArg& arg); ~DemoApplyDamageForPlayer() override; diff --git a/src/Game/Actor/Action/actionDestPlayerWarpBase.cpp b/src/Game/Actor/Action/actionDestPlayerWarpBase.cpp new file mode 100644 index 00000000..4e7d365b --- /dev/null +++ b/src/Game/Actor/Action/actionDestPlayerWarpBase.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/Action/actionDestPlayerWarpBase.h" + +namespace uking::action { + +DestPlayerWarpBase::DestPlayerWarpBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +DestPlayerWarpBase::~DestPlayerWarpBase() = default; + +bool DestPlayerWarpBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void DestPlayerWarpBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void DestPlayerWarpBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void DestPlayerWarpBase::loadParams_() {} + +void DestPlayerWarpBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianMoveTo.h b/src/Game/Actor/Action/actionDestPlayerWarpBase.h similarity index 61% rename from src/Game/Actor/Action/actionGuardianMoveTo.h rename to src/Game/Actor/Action/actionDestPlayerWarpBase.h index 22c0e2a2..e8c4ec41 100644 --- a/src/Game/Actor/Action/actionGuardianMoveTo.h +++ b/src/Game/Actor/Action/actionDestPlayerWarpBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class GuardianMoveTo : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(GuardianMoveTo, ksys::act::ai::Action) +class DestPlayerWarpBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(DestPlayerWarpBase, ksys::act::ai::Action) public: - explicit GuardianMoveTo(const InitArg& arg); - ~GuardianMoveTo() override; + explicit DestPlayerWarpBase(const InitArg& arg); + ~DestPlayerWarpBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionRailMoveBase.cpp b/src/Game/Actor/Action/actionDestPointMoveBase.cpp similarity index 52% rename from src/Game/Actor/Action/actionRailMoveBase.cpp rename to src/Game/Actor/Action/actionDestPointMoveBase.cpp index 8c3c7986..90f38483 100644 --- a/src/Game/Actor/Action/actionRailMoveBase.cpp +++ b/src/Game/Actor/Action/actionDestPointMoveBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionRailMoveBase.h" +#include "Game/Actor/Action/actionDestPointMoveBase.h" namespace uking::action { -RailMoveBase::RailMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +DestPointMoveBase::DestPointMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -RailMoveBase::~RailMoveBase() = default; +DestPointMoveBase::~DestPointMoveBase() = default; -bool RailMoveBase::init_(sead::Heap* heap) { +bool DestPointMoveBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void RailMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { +void DestPointMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void RailMoveBase::leave_() { +void DestPointMoveBase::leave_() { ksys::act::ai::Action::leave_(); } -void RailMoveBase::loadParams_() { +void DestPointMoveBase::loadParams_() { getStaticParam(&mSpeed_s, "Speed"); getDynamicParam(&mASSlot_d, "ASSlot"); getDynamicParam(&mSequenceBank_d, "SequenceBank"); @@ -26,7 +26,7 @@ void RailMoveBase::loadParams_() { getDynamicParam(&mASName_d, "ASName"); } -void RailMoveBase::calc_() { +void DestPointMoveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionRailMoveBase.h b/src/Game/Actor/Action/actionDestPointMoveBase.h similarity index 77% rename from src/Game/Actor/Action/actionRailMoveBase.h rename to src/Game/Actor/Action/actionDestPointMoveBase.h index d1f8fb5a..f3971ba5 100644 --- a/src/Game/Actor/Action/actionRailMoveBase.h +++ b/src/Game/Actor/Action/actionDestPointMoveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class RailMoveBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(RailMoveBase, ksys::act::ai::Action) +class DestPointMoveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(DestPointMoveBase, ksys::act::ai::Action) public: - explicit RailMoveBase(const InitArg& arg); - ~RailMoveBase() override; + explicit DestPointMoveBase(const InitArg& arg); + ~DestPointMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionDieAnm.cpp b/src/Game/Actor/Action/actionDieAnm.cpp index 332bcfd7..39eb09a6 100644 --- a/src/Game/Actor/Action/actionDieAnm.cpp +++ b/src/Game/Actor/Action/actionDieAnm.cpp @@ -2,29 +2,29 @@ namespace uking::action { -DieAnm::DieAnm(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +DieAnm::DieAnm(const InitArg& arg) : StopBase(arg) {} DieAnm::~DieAnm() = default; bool DieAnm::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void DieAnm::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void DieAnm::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void DieAnm::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void DieAnm::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionDieAnm.h b/src/Game/Actor/Action/actionDieAnm.h index 89bd36cb..03400b54 100644 --- a/src/Game/Actor/Action/actionDieAnm.h +++ b/src/Game/Actor/Action/actionDieAnm.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class DieAnm : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(DieAnm, ActionWithPosAngReduce) +class DieAnm : public StopBase { + SEAD_RTTI_OVERRIDE(DieAnm, StopBase) public: explicit DieAnm(const InitArg& arg); ~DieAnm() override; diff --git a/src/Game/Actor/Action/actionDieAnmKnockBack.cpp b/src/Game/Actor/Action/actionDieAnmKnockBack.cpp index 72ab7c5b..79093b67 100644 --- a/src/Game/Actor/Action/actionDieAnmKnockBack.cpp +++ b/src/Game/Actor/Action/actionDieAnmKnockBack.cpp @@ -15,7 +15,7 @@ void DieAnmKnockBack::leave_() { } void DieAnmKnockBack::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mWeaponDropSpeedY_s, "WeaponDropSpeedY"); getStaticParam(&mIsDropWeapon_s, "IsDropWeapon"); getStaticParam(&mASName_s, "ASName"); diff --git a/src/Game/Actor/Action/actionDisappearAndEscapeBase.cpp b/src/Game/Actor/Action/actionDisappearAndEscapeBase.cpp new file mode 100644 index 00000000..cfc0d52c --- /dev/null +++ b/src/Game/Actor/Action/actionDisappearAndEscapeBase.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionDisappearAndEscapeBase.h" + +namespace uking::action { + +DisappearAndEscapeBase::DisappearAndEscapeBase(const InitArg& arg) : ActionWithAS(arg) {} + +DisappearAndEscapeBase::~DisappearAndEscapeBase() = default; + +bool DisappearAndEscapeBase::init_(sead::Heap* heap) { + return ActionWithAS::init_(heap); +} + +void DisappearAndEscapeBase::enter_(ksys::act::ai::InlineParamPack* params) { + ActionWithAS::enter_(params); +} + +void DisappearAndEscapeBase::leave_() { + ActionWithAS::leave_(); +} + +void DisappearAndEscapeBase::loadParams_() { + StopBase::loadParams_(); +} + +void DisappearAndEscapeBase::calc_() { + ActionWithAS::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChuchuDissappearEscapeBase.h b/src/Game/Actor/Action/actionDisappearAndEscapeBase.h similarity index 63% rename from src/Game/Actor/Action/actionChuchuDissappearEscapeBase.h rename to src/Game/Actor/Action/actionDisappearAndEscapeBase.h index 3294e025..d7b76a69 100644 --- a/src/Game/Actor/Action/actionChuchuDissappearEscapeBase.h +++ b/src/Game/Actor/Action/actionDisappearAndEscapeBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class ChuchuDissappearEscapeBase : public ActionWithAS { - SEAD_RTTI_OVERRIDE(ChuchuDissappearEscapeBase, ActionWithAS) +class DisappearAndEscapeBase : public ActionWithAS { + SEAD_RTTI_OVERRIDE(DisappearAndEscapeBase, ActionWithAS) public: - explicit ChuchuDissappearEscapeBase(const InitArg& arg); - ~ChuchuDissappearEscapeBase() override; + explicit DisappearAndEscapeBase(const InitArg& arg); + ~DisappearAndEscapeBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionDynamicAttackPowerExplode.cpp b/src/Game/Actor/Action/actionDynamicAttackPowerExplode.cpp index 02965009..012e8398 100644 --- a/src/Game/Actor/Action/actionDynamicAttackPowerExplode.cpp +++ b/src/Game/Actor/Action/actionDynamicAttackPowerExplode.cpp @@ -2,32 +2,31 @@ namespace uking::action { -DynamicAttackPowerExplode::DynamicAttackPowerExplode(const InitArg& arg) - : AttackPowerExplode(arg) {} +DynamicAttackPowerExplode::DynamicAttackPowerExplode(const InitArg& arg) : EitherSideExplode(arg) {} DynamicAttackPowerExplode::~DynamicAttackPowerExplode() = default; bool DynamicAttackPowerExplode::init_(sead::Heap* heap) { - return AttackPowerExplode::init_(heap); + return EitherSideExplode::init_(heap); } void DynamicAttackPowerExplode::enter_(ksys::act::ai::InlineParamPack* params) { - AttackPowerExplode::enter_(params); + EitherSideExplode::enter_(params); } void DynamicAttackPowerExplode::leave_() { - AttackPowerExplode::leave_(); + EitherSideExplode::leave_(); } void DynamicAttackPowerExplode::loadParams_() { - AttackPowerExplode::loadParams_(); + EitherSideExplode::loadParams_(); getStaticParam(&mAttackPower_s, "AttackPower"); getStaticParam(&mMinDamage_s, "MinDamage"); getStaticParam(&mPlayerDamage_s, "PlayerDamage"); } void DynamicAttackPowerExplode::calc_() { - AttackPowerExplode::calc_(); + EitherSideExplode::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionDynamicAttackPowerExplode.h b/src/Game/Actor/Action/actionDynamicAttackPowerExplode.h index 47c7bfce..497d901d 100644 --- a/src/Game/Actor/Action/actionDynamicAttackPowerExplode.h +++ b/src/Game/Actor/Action/actionDynamicAttackPowerExplode.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionAttackPowerExplode.h" +#include "Game/Actor/Action/actionEitherSideExplode.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class DynamicAttackPowerExplode : public AttackPowerExplode { - SEAD_RTTI_OVERRIDE(DynamicAttackPowerExplode, AttackPowerExplode) +class DynamicAttackPowerExplode : public EitherSideExplode { + SEAD_RTTI_OVERRIDE(DynamicAttackPowerExplode, EitherSideExplode) public: explicit DynamicAttackPowerExplode(const InitArg& arg); ~DynamicAttackPowerExplode() override; diff --git a/src/Game/Actor/Action/actionEat.cpp b/src/Game/Actor/Action/actionEat.cpp index 06e68652..c34464f5 100644 --- a/src/Game/Actor/Action/actionEat.cpp +++ b/src/Game/Actor/Action/actionEat.cpp @@ -2,25 +2,25 @@ namespace uking::action { -Eat::Eat(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Eat::Eat(const InitArg& arg) : StopBase(arg) {} Eat::~Eat() = default; void Eat::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Eat::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Eat::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mIsHeal_s, "IsHeal"); } void Eat::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionEat.h b/src/Game/Actor/Action/actionEat.h index a9c80d51..c19681d2 100644 --- a/src/Game/Actor/Action/actionEat.h +++ b/src/Game/Actor/Action/actionEat.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Eat : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Eat, ActionWithPosAngReduce) +class Eat : public StopBase { + SEAD_RTTI_OVERRIDE(Eat, StopBase) public: explicit Eat(const InitArg& arg); ~Eat() override; diff --git a/src/Game/Actor/Action/actionEitherSideExplode.cpp b/src/Game/Actor/Action/actionEitherSideExplode.cpp new file mode 100644 index 00000000..12a0f3c8 --- /dev/null +++ b/src/Game/Actor/Action/actionEitherSideExplode.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionEitherSideExplode.h" + +namespace uking::action { + +EitherSideExplode::EitherSideExplode(const InitArg& arg) : Explode(arg) {} + +EitherSideExplode::~EitherSideExplode() = default; + +bool EitherSideExplode::init_(sead::Heap* heap) { + return Explode::init_(heap); +} + +void EitherSideExplode::enter_(ksys::act::ai::InlineParamPack* params) { + Explode::enter_(params); +} + +void EitherSideExplode::leave_() { + Explode::leave_(); +} + +void EitherSideExplode::loadParams_() { + Explode::loadParams_(); + getDynamicParam(&mIsPlayerAttack_d, "IsPlayerAttack"); +} + +void EitherSideExplode::calc_() { + Explode::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAttackPowerExplode.h b/src/Game/Actor/Action/actionEitherSideExplode.h similarity index 71% rename from src/Game/Actor/Action/actionAttackPowerExplode.h rename to src/Game/Actor/Action/actionEitherSideExplode.h index b8e9b7e0..2816d2bf 100644 --- a/src/Game/Actor/Action/actionAttackPowerExplode.h +++ b/src/Game/Actor/Action/actionEitherSideExplode.h @@ -5,11 +5,11 @@ namespace uking::action { -class AttackPowerExplode : public Explode { - SEAD_RTTI_OVERRIDE(AttackPowerExplode, Explode) +class EitherSideExplode : public Explode { + SEAD_RTTI_OVERRIDE(EitherSideExplode, Explode) public: - explicit AttackPowerExplode(const InitArg& arg); - ~AttackPowerExplode() override; + explicit EitherSideExplode(const InitArg& arg); + ~EitherSideExplode() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionElectricParalysis.cpp b/src/Game/Actor/Action/actionElectricParalysis.cpp index e409f0ea..f5dc67d9 100644 --- a/src/Game/Actor/Action/actionElectricParalysis.cpp +++ b/src/Game/Actor/Action/actionElectricParalysis.cpp @@ -2,29 +2,29 @@ namespace uking::action { -ElectricParalysis::ElectricParalysis(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +ElectricParalysis::ElectricParalysis(const InitArg& arg) : StopBase(arg) {} ElectricParalysis::~ElectricParalysis() = default; bool ElectricParalysis::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void ElectricParalysis::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void ElectricParalysis::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void ElectricParalysis::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void ElectricParalysis::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionElectricParalysis.h b/src/Game/Actor/Action/actionElectricParalysis.h index bec96ec6..dc33a98a 100644 --- a/src/Game/Actor/Action/actionElectricParalysis.h +++ b/src/Game/Actor/Action/actionElectricParalysis.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ElectricParalysis : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(ElectricParalysis, ActionWithPosAngReduce) +class ElectricParalysis : public StopBase { + SEAD_RTTI_OVERRIDE(ElectricParalysis, StopBase) public: explicit ElectricParalysis(const InitArg& arg); ~ElectricParalysis() override; diff --git a/src/Game/Actor/Action/actionEnemyFortressChatTurnBase.cpp b/src/Game/Actor/Action/actionEnemyFortressChatLookBase.cpp similarity index 51% rename from src/Game/Actor/Action/actionEnemyFortressChatTurnBase.cpp rename to src/Game/Actor/Action/actionEnemyFortressChatLookBase.cpp index cd832e6f..0ce41fee 100644 --- a/src/Game/Actor/Action/actionEnemyFortressChatTurnBase.cpp +++ b/src/Game/Actor/Action/actionEnemyFortressChatLookBase.cpp @@ -1,31 +1,31 @@ -#include "Game/Actor/Action/actionEnemyFortressChatTurnBase.h" +#include "Game/Actor/Action/actionEnemyFortressChatLookBase.h" namespace uking::action { -EnemyFortressChatTurnBase::EnemyFortressChatTurnBase(const InitArg& arg) +EnemyFortressChatLookBase::EnemyFortressChatLookBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EnemyFortressChatTurnBase::~EnemyFortressChatTurnBase() = default; +EnemyFortressChatLookBase::~EnemyFortressChatLookBase() = default; -bool EnemyFortressChatTurnBase::init_(sead::Heap* heap) { +bool EnemyFortressChatLookBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EnemyFortressChatTurnBase::enter_(ksys::act::ai::InlineParamPack* params) { +void EnemyFortressChatLookBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void EnemyFortressChatTurnBase::leave_() { +void EnemyFortressChatLookBase::leave_() { ksys::act::ai::Action::leave_(); } -void EnemyFortressChatTurnBase::loadParams_() { +void EnemyFortressChatLookBase::loadParams_() { getStaticParam(&mTryNum_s, "TryNum"); getDynamicParam(&mTargetActor_d, "TargetActor"); getAITreeVariable(&mRegistedActorUnit_a, "RegistedActorUnit"); } -void EnemyFortressChatTurnBase::calc_() { +void EnemyFortressChatLookBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionEnemyFortressChatTurnBase.h b/src/Game/Actor/Action/actionEnemyFortressChatLookBase.h similarity index 71% rename from src/Game/Actor/Action/actionEnemyFortressChatTurnBase.h rename to src/Game/Actor/Action/actionEnemyFortressChatLookBase.h index 7aebb9ae..d7e49428 100644 --- a/src/Game/Actor/Action/actionEnemyFortressChatTurnBase.h +++ b/src/Game/Actor/Action/actionEnemyFortressChatLookBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class EnemyFortressChatTurnBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EnemyFortressChatTurnBase, ksys::act::ai::Action) +class EnemyFortressChatLookBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(EnemyFortressChatLookBase, ksys::act::ai::Action) public: - explicit EnemyFortressChatTurnBase(const InitArg& arg); - ~EnemyFortressChatTurnBase() override; + explicit EnemyFortressChatLookBase(const InitArg& arg); + ~EnemyFortressChatLookBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionEnemyFortressChatTurn.cpp b/src/Game/Actor/Action/actionEnemyFortressChatTurn.cpp index 275ad258..cd8b5e2f 100644 --- a/src/Game/Actor/Action/actionEnemyFortressChatTurn.cpp +++ b/src/Game/Actor/Action/actionEnemyFortressChatTurn.cpp @@ -2,29 +2,29 @@ namespace uking::action { -EnemyFortressChatTurn::EnemyFortressChatTurn(const InitArg& arg) : EnemyFortressChatTurnBase(arg) {} +EnemyFortressChatTurn::EnemyFortressChatTurn(const InitArg& arg) : EnemyFortressChatLookBase(arg) {} EnemyFortressChatTurn::~EnemyFortressChatTurn() = default; bool EnemyFortressChatTurn::init_(sead::Heap* heap) { - return EnemyFortressChatTurnBase::init_(heap); + return EnemyFortressChatLookBase::init_(heap); } void EnemyFortressChatTurn::enter_(ksys::act::ai::InlineParamPack* params) { - EnemyFortressChatTurnBase::enter_(params); + EnemyFortressChatLookBase::enter_(params); } void EnemyFortressChatTurn::leave_() { - EnemyFortressChatTurnBase::leave_(); + EnemyFortressChatLookBase::leave_(); } void EnemyFortressChatTurn::loadParams_() { - EnemyFortressChatTurnBase::loadParams_(); + EnemyFortressChatLookBase::loadParams_(); getDynamicParam(&mTargetActor_d, "TargetActor"); } void EnemyFortressChatTurn::calc_() { - EnemyFortressChatTurnBase::calc_(); + EnemyFortressChatLookBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionEnemyFortressChatTurn.h b/src/Game/Actor/Action/actionEnemyFortressChatTurn.h index bfd51d60..acb6b818 100644 --- a/src/Game/Actor/Action/actionEnemyFortressChatTurn.h +++ b/src/Game/Actor/Action/actionEnemyFortressChatTurn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionEnemyFortressChatTurnBase.h" +#include "Game/Actor/Action/actionEnemyFortressChatLookBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class EnemyFortressChatTurn : public EnemyFortressChatTurnBase { - SEAD_RTTI_OVERRIDE(EnemyFortressChatTurn, EnemyFortressChatTurnBase) +class EnemyFortressChatTurn : public EnemyFortressChatLookBase { + SEAD_RTTI_OVERRIDE(EnemyFortressChatTurn, EnemyFortressChatLookBase) public: explicit EnemyFortressChatTurn(const InitArg& arg); ~EnemyFortressChatTurn() override; diff --git a/src/Game/Actor/Action/actionEquipHornUseBase.cpp b/src/Game/Actor/Action/actionEquipHornUseBase.cpp new file mode 100644 index 00000000..d9125d67 --- /dev/null +++ b/src/Game/Actor/Action/actionEquipHornUseBase.cpp @@ -0,0 +1,31 @@ +#include "Game/Actor/Action/actionEquipHornUseBase.h" + +namespace uking::action { + +EquipHornUseBase::EquipHornUseBase(const InitArg& arg) : TimeredASPlay(arg) {} + +EquipHornUseBase::~EquipHornUseBase() = default; + +bool EquipHornUseBase::init_(sead::Heap* heap) { + return TimeredASPlay::init_(heap); +} + +void EquipHornUseBase::enter_(ksys::act::ai::InlineParamPack* params) { + TimeredASPlay::enter_(params); +} + +void EquipHornUseBase::leave_() { + TimeredASPlay::leave_(); +} + +void EquipHornUseBase::loadParams_() { + TimeredASPlay::loadParams_(); + getStaticParam(&mWeaponIdx_s, "WeaponIdx"); + getStaticParam(&mSignalOnTime_s, "SignalOnTime"); +} + +void EquipHornUseBase::calc_() { + TimeredASPlay::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHornUseBase.h b/src/Game/Actor/Action/actionEquipHornUseBase.h similarity index 73% rename from src/Game/Actor/Action/actionHornUseBase.h rename to src/Game/Actor/Action/actionEquipHornUseBase.h index aead7152..c93d0217 100644 --- a/src/Game/Actor/Action/actionHornUseBase.h +++ b/src/Game/Actor/Action/actionEquipHornUseBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class HornUseBase : public TimeredASPlay { - SEAD_RTTI_OVERRIDE(HornUseBase, TimeredASPlay) +class EquipHornUseBase : public TimeredASPlay { + SEAD_RTTI_OVERRIDE(EquipHornUseBase, TimeredASPlay) public: - explicit HornUseBase(const InitArg& arg); - ~HornUseBase() override; + explicit EquipHornUseBase(const InitArg& arg); + ~EquipHornUseBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionEventHoverNullASPlay.cpp b/src/Game/Actor/Action/actionEventHoverNullASPlay.cpp index caf80d50..657c457a 100644 --- a/src/Game/Actor/Action/actionEventHoverNullASPlay.cpp +++ b/src/Game/Actor/Action/actionEventHoverNullASPlay.cpp @@ -3,16 +3,16 @@ namespace uking::action { -EventHoverNullASPlay::EventHoverNullASPlay(const InitArg& arg) : EventHoverNullASPlayBase(arg) {} +EventHoverNullASPlay::EventHoverNullASPlay(const InitArg& arg) : EventNullASPlayBase(arg) {} EventHoverNullASPlay::~EventHoverNullASPlay() = default; bool EventHoverNullASPlay::init_(sead::Heap* heap) { - return EventHoverNullASPlayBase::init_(heap); + return EventNullASPlayBase::init_(heap); } void EventHoverNullASPlay::enter_(ksys::act::ai::InlineParamPack* params) { - EventHoverNullASPlayBase::enter_(params); + EventNullASPlayBase::enter_(params); mCCAccessor.changeMotionType(mActor->getCharacterController(), ksys::act::MotionType::Hover); } @@ -20,15 +20,15 @@ void EventHoverNullASPlay::enter_(ksys::act::ai::InlineParamPack* params) { void EventHoverNullASPlay::leave_() { resetAllMotion(mActor); - EventHoverNullASPlayBase::leave_(); + EventNullASPlayBase::leave_(); } void EventHoverNullASPlay::loadParams_() { - EventHoverNullASPlayBase::loadParams_(); + EventNullASPlayBase::loadParams_(); } void EventHoverNullASPlay::calc_() { - EventHoverNullASPlayBase::calc_(); + EventNullASPlayBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionEventHoverNullASPlay.h b/src/Game/Actor/Action/actionEventHoverNullASPlay.h index 0f27c6f5..6defff3e 100644 --- a/src/Game/Actor/Action/actionEventHoverNullASPlay.h +++ b/src/Game/Actor/Action/actionEventHoverNullASPlay.h @@ -1,14 +1,14 @@ #pragma once -#include "Game/Actor/Action/actionEventHoverNullASPlayBase.h" +#include "Game/Actor/Action/actionEventNullASPlayBase.h" #include "KingSystem/ActorSystem/actActor.h" #include "KingSystem/ActorSystem/actAiAction.h" #include "KingSystem/ActorSystem/actCCAccessor.h" namespace uking::action { -class EventHoverNullASPlay : public EventHoverNullASPlayBase { - SEAD_RTTI_OVERRIDE(EventHoverNullASPlay, EventHoverNullASPlayBase) +class EventHoverNullASPlay : public EventNullASPlayBase { + SEAD_RTTI_OVERRIDE(EventHoverNullASPlay, EventNullASPlayBase) public: explicit EventHoverNullASPlay(const InitArg& arg); ~EventHoverNullASPlay() override; diff --git a/src/Game/Actor/Action/actionEventHoverNullASPlayBase.cpp b/src/Game/Actor/Action/actionEventNullASPlayBase.cpp similarity index 56% rename from src/Game/Actor/Action/actionEventHoverNullASPlayBase.cpp rename to src/Game/Actor/Action/actionEventNullASPlayBase.cpp index 21c4c588..292dffc9 100644 --- a/src/Game/Actor/Action/actionEventHoverNullASPlayBase.cpp +++ b/src/Game/Actor/Action/actionEventNullASPlayBase.cpp @@ -1,26 +1,25 @@ -#include "Game/Actor/Action/actionEventHoverNullASPlayBase.h" +#include "Game/Actor/Action/actionEventNullASPlayBase.h" namespace uking::action { -EventHoverNullASPlayBase::EventHoverNullASPlayBase(const InitArg& arg) - : ksys::act::ai::Action(arg) {} +EventNullASPlayBase::EventNullASPlayBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -EventHoverNullASPlayBase::~EventHoverNullASPlayBase() = default; +EventNullASPlayBase::~EventNullASPlayBase() = default; -bool EventHoverNullASPlayBase::init_(sead::Heap* heap) { +bool EventNullASPlayBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void EventHoverNullASPlayBase::enter_(ksys::act::ai::InlineParamPack* params) { +void EventNullASPlayBase::enter_(ksys::act::ai::InlineParamPack* params) { playAS(mASName_d.cstr(), *mIsIgnoreSame_d, *mASSlot_d, *mSequenceBank_d, -1.0); mFlags.set(ksys::act::ai::Action::Flag::Changeable); } -void EventHoverNullASPlayBase::leave_() { +void EventNullASPlayBase::leave_() { ksys::act::ai::Action::leave_(); } -void EventHoverNullASPlayBase::loadParams_() { +void EventNullASPlayBase::loadParams_() { getDynamicParam(&mASSlot_d, "ASSlot"); getDynamicParam(&mSequenceBank_d, "SequenceBank"); getDynamicParam(&mIsIgnoreSame_d, "IsIgnoreSame"); @@ -28,7 +27,7 @@ void EventHoverNullASPlayBase::loadParams_() { getDynamicParam(&mASName_d, "ASName"); } -void EventHoverNullASPlayBase::calc_() { +void EventNullASPlayBase::calc_() { if (!isFailed() && isFinishedAS(*mASSlot_d, *mSequenceBank_d)) { setFinished(); } diff --git a/src/Game/Actor/Action/actionEventHoverNullASPlayBase.h b/src/Game/Actor/Action/actionEventNullASPlayBase.h similarity index 73% rename from src/Game/Actor/Action/actionEventHoverNullASPlayBase.h rename to src/Game/Actor/Action/actionEventNullASPlayBase.h index 9db1f7f6..6b9bf896 100644 --- a/src/Game/Actor/Action/actionEventHoverNullASPlayBase.h +++ b/src/Game/Actor/Action/actionEventNullASPlayBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class EventHoverNullASPlayBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(EventHoverNullASPlayBase, ksys::act::ai::Action) +class EventNullASPlayBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(EventNullASPlayBase, ksys::act::ai::Action) public: - explicit EventHoverNullASPlayBase(const InitArg& arg); - ~EventHoverNullASPlayBase() override; + explicit EventNullASPlayBase(const InitArg& arg); + ~EventNullASPlayBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionFireWoodBase.cpp b/src/Game/Actor/Action/actionFireBurnBase.cpp similarity index 51% rename from src/Game/Actor/Action/actionFireWoodBase.cpp rename to src/Game/Actor/Action/actionFireBurnBase.cpp index 622b598b..c88a2f34 100644 --- a/src/Game/Actor/Action/actionFireWoodBase.cpp +++ b/src/Game/Actor/Action/actionFireBurnBase.cpp @@ -1,29 +1,29 @@ -#include "Game/Actor/Action/actionFireWoodBase.h" +#include "Game/Actor/Action/actionFireBurnBase.h" namespace uking::action { -FireWoodBase::FireWoodBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +FireBurnBase::FireBurnBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -FireWoodBase::~FireWoodBase() = default; +FireBurnBase::~FireBurnBase() = default; -bool FireWoodBase::init_(sead::Heap* heap) { +bool FireBurnBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void FireWoodBase::enter_(ksys::act::ai::InlineParamPack* params) { +void FireBurnBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void FireWoodBase::leave_() { +void FireBurnBase::leave_() { ksys::act::ai::Action::leave_(); } -void FireWoodBase::loadParams_() { +void FireBurnBase::loadParams_() { getStaticParam(&mChemicalRigidOn_s, "ChemicalRigidOn"); getMapUnitParam(&mInitBurnState_m, "InitBurnState"); } -void FireWoodBase::calc_() { +void FireBurnBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionFireWoodBase.h b/src/Game/Actor/Action/actionFireBurnBase.h similarity index 72% rename from src/Game/Actor/Action/actionFireWoodBase.h rename to src/Game/Actor/Action/actionFireBurnBase.h index 4e20f88a..3bf948fb 100644 --- a/src/Game/Actor/Action/actionFireWoodBase.h +++ b/src/Game/Actor/Action/actionFireBurnBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class FireWoodBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(FireWoodBase, ksys::act::ai::Action) +class FireBurnBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(FireBurnBase, ksys::act::ai::Action) public: - explicit FireWoodBase(const InitArg& arg); - ~FireWoodBase() override; + explicit FireBurnBase(const InitArg& arg); + ~FireBurnBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionFireWood.cpp b/src/Game/Actor/Action/actionFireWood.cpp index 01c0eff5..adedcefb 100644 --- a/src/Game/Actor/Action/actionFireWood.cpp +++ b/src/Game/Actor/Action/actionFireWood.cpp @@ -2,30 +2,30 @@ namespace uking::action { -FireWood::FireWood(const InitArg& arg) : FireWoodBase(arg) {} +FireWood::FireWood(const InitArg& arg) : FireBurnBase(arg) {} FireWood::~FireWood() = default; bool FireWood::init_(sead::Heap* heap) { - return FireWoodBase::init_(heap); + return FireBurnBase::init_(heap); } void FireWood::enter_(ksys::act::ai::InlineParamPack* params) { - FireWoodBase::enter_(params); + FireBurnBase::enter_(params); } void FireWood::leave_() { - FireWoodBase::leave_(); + FireBurnBase::leave_(); } void FireWood::loadParams_() { - FireWoodBase::loadParams_(); + FireBurnBase::loadParams_(); // FIXME: CALL _ZNK4ksys3act2ai6RootAi18getAITreeVariable2EPPbRKN4sead14SafeStringBaseIcEE @ // 0x7100d66968 } void FireWood::calc_() { - FireWoodBase::calc_(); + FireBurnBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFireWood.h b/src/Game/Actor/Action/actionFireWood.h index 762e37db..71dd34e1 100644 --- a/src/Game/Actor/Action/actionFireWood.h +++ b/src/Game/Actor/Action/actionFireWood.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFireWoodBase.h" +#include "Game/Actor/Action/actionFireBurnBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FireWood : public FireWoodBase { - SEAD_RTTI_OVERRIDE(FireWood, FireWoodBase) +class FireWood : public FireBurnBase { + SEAD_RTTI_OVERRIDE(FireWood, FireBurnBase) public: explicit FireWood(const InitArg& arg); ~FireWood() override; diff --git a/src/Game/Actor/Action/actionFishOnGround.cpp b/src/Game/Actor/Action/actionFishOnGround.cpp index 3dcd0088..06e2cc34 100644 --- a/src/Game/Actor/Action/actionFishOnGround.cpp +++ b/src/Game/Actor/Action/actionFishOnGround.cpp @@ -2,29 +2,29 @@ namespace uking::action { -FishOnGround::FishOnGround(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +FishOnGround::FishOnGround(const InitArg& arg) : StopBase(arg) {} FishOnGround::~FishOnGround() = default; bool FishOnGround::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void FishOnGround::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void FishOnGround::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void FishOnGround::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASKey_s, "ASKey"); } void FishOnGround::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFishOnGround.h b/src/Game/Actor/Action/actionFishOnGround.h index cd73ac86..3627a6f9 100644 --- a/src/Game/Actor/Action/actionFishOnGround.h +++ b/src/Game/Actor/Action/actionFishOnGround.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FishOnGround : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(FishOnGround, ActionWithPosAngReduce) +class FishOnGround : public StopBase { + SEAD_RTTI_OVERRIDE(FishOnGround, StopBase) public: explicit FishOnGround(const InitArg& arg); ~FishOnGround() override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp b/src/Game/Actor/Action/actionFlyingActorDamageBase.cpp similarity index 74% rename from src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp rename to src/Game/Actor/Action/actionFlyingActorDamageBase.cpp index 95043574..f0dae5a9 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp +++ b/src/Game/Actor/Action/actionFlyingActorDamageBase.cpp @@ -1,25 +1,25 @@ -#include "Game/Actor/Action/actionFlyingCharacterDamageBase.h" +#include "Game/Actor/Action/actionFlyingActorDamageBase.h" namespace uking::action { -FlyingCharacterDamageBase::FlyingCharacterDamageBase(const InitArg& arg) +FlyingActorDamageBase::FlyingActorDamageBase(const InitArg& arg) : FlyingCharacterFreeFallBase(arg) {} -FlyingCharacterDamageBase::~FlyingCharacterDamageBase() = default; +FlyingActorDamageBase::~FlyingActorDamageBase() = default; -bool FlyingCharacterDamageBase::init_(sead::Heap* heap) { +bool FlyingActorDamageBase::init_(sead::Heap* heap) { return FlyingCharacterFreeFallBase::init_(heap); } -void FlyingCharacterDamageBase::enter_(ksys::act::ai::InlineParamPack* params) { +void FlyingActorDamageBase::enter_(ksys::act::ai::InlineParamPack* params) { FlyingCharacterFreeFallBase::enter_(params); } -void FlyingCharacterDamageBase::leave_() { +void FlyingActorDamageBase::leave_() { FlyingCharacterFreeFallBase::leave_(); } -void FlyingCharacterDamageBase::loadParams_() { +void FlyingActorDamageBase::loadParams_() { FlyingCharacterFreeFallBase::loadParams_(); getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); @@ -38,7 +38,7 @@ void FlyingCharacterDamageBase::loadParams_() { getStaticParam(&mOnGroundAS_s, "OnGroundAS"); } -void FlyingCharacterDamageBase::calc_() { +void FlyingActorDamageBase::calc_() { FlyingCharacterFreeFallBase::calc_(); } diff --git a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.h b/src/Game/Actor/Action/actionFlyingActorDamageBase.h similarity index 86% rename from src/Game/Actor/Action/actionFlyingCharacterDamageBase.h rename to src/Game/Actor/Action/actionFlyingActorDamageBase.h index f8d9c869..5e6c6eed 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.h +++ b/src/Game/Actor/Action/actionFlyingActorDamageBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class FlyingCharacterDamageBase : public FlyingCharacterFreeFallBase { - SEAD_RTTI_OVERRIDE(FlyingCharacterDamageBase, FlyingCharacterFreeFallBase) +class FlyingActorDamageBase : public FlyingCharacterFreeFallBase { + SEAD_RTTI_OVERRIDE(FlyingActorDamageBase, FlyingCharacterFreeFallBase) public: - explicit FlyingCharacterDamageBase(const InitArg& arg); - ~FlyingCharacterDamageBase() override; + explicit FlyingActorDamageBase(const InitArg& arg); + ~FlyingActorDamageBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionFlyingBirdDie.cpp b/src/Game/Actor/Action/actionFlyingBirdDie.cpp index e39b2eff..97fd1659 100644 --- a/src/Game/Actor/Action/actionFlyingBirdDie.cpp +++ b/src/Game/Actor/Action/actionFlyingBirdDie.cpp @@ -2,30 +2,30 @@ namespace uking::action { -FlyingBirdDie::FlyingBirdDie(const InitArg& arg) : FlyingCharacterDamageBase(arg) {} +FlyingBirdDie::FlyingBirdDie(const InitArg& arg) : FlyingActorDamageBase(arg) {} FlyingBirdDie::~FlyingBirdDie() = default; bool FlyingBirdDie::init_(sead::Heap* heap) { - return FlyingCharacterDamageBase::init_(heap); + return FlyingActorDamageBase::init_(heap); } void FlyingBirdDie::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterDamageBase::enter_(params); + FlyingActorDamageBase::enter_(params); } void FlyingBirdDie::leave_() { - FlyingCharacterDamageBase::leave_(); + FlyingActorDamageBase::leave_(); } void FlyingBirdDie::loadParams_() { - FlyingCharacterDamageBase::loadParams_(); + FlyingActorDamageBase::loadParams_(); getStaticParam(&mEnableHitGroundCheckTimer_s, "EnableHitGroundCheckTimer"); getStaticParam(&mIsChangeStateFallOnce_s, "IsChangeStateFallOnce"); } void FlyingBirdDie::calc_() { - FlyingCharacterDamageBase::calc_(); + FlyingActorDamageBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingBirdDie.h b/src/Game/Actor/Action/actionFlyingBirdDie.h index 08ff74bf..f3c7ccb9 100644 --- a/src/Game/Actor/Action/actionFlyingBirdDie.h +++ b/src/Game/Actor/Action/actionFlyingBirdDie.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterDamageBase.h" +#include "Game/Actor/Action/actionFlyingActorDamageBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingBirdDie : public FlyingCharacterDamageBase { - SEAD_RTTI_OVERRIDE(FlyingBirdDie, FlyingCharacterDamageBase) +class FlyingBirdDie : public FlyingActorDamageBase { + SEAD_RTTI_OVERRIDE(FlyingBirdDie, FlyingActorDamageBase) public: explicit FlyingBirdDie(const InitArg& arg); ~FlyingBirdDie() override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterDamage.cpp b/src/Game/Actor/Action/actionFlyingCharacterDamage.cpp index 24d6efc0..ef9a91b8 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDamage.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterDamage.cpp @@ -2,26 +2,26 @@ namespace uking::action { -FlyingCharacterDamage::FlyingCharacterDamage(const InitArg& arg) : FlyingCharacterDamageBase(arg) {} +FlyingCharacterDamage::FlyingCharacterDamage(const InitArg& arg) : FlyingActorDamageBase(arg) {} bool FlyingCharacterDamage::init_(sead::Heap* heap) { - return FlyingCharacterDamageBase::init_(heap); + return FlyingActorDamageBase::init_(heap); } void FlyingCharacterDamage::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterDamageBase::enter_(params); + FlyingActorDamageBase::enter_(params); } void FlyingCharacterDamage::leave_() { - FlyingCharacterDamageBase::leave_(); + FlyingActorDamageBase::leave_(); } void FlyingCharacterDamage::loadParams_() { - FlyingCharacterDamageBase::loadParams_(); + FlyingActorDamageBase::loadParams_(); } void FlyingCharacterDamage::calc_() { - FlyingCharacterDamageBase::calc_(); + FlyingActorDamageBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterDamage.h b/src/Game/Actor/Action/actionFlyingCharacterDamage.h index 2d301513..a70c74fa 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDamage.h +++ b/src/Game/Actor/Action/actionFlyingCharacterDamage.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterDamageBase.h" +#include "Game/Actor/Action/actionFlyingActorDamageBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterDamage : public FlyingCharacterDamageBase { - SEAD_RTTI_OVERRIDE(FlyingCharacterDamage, FlyingCharacterDamageBase) +class FlyingCharacterDamage : public FlyingActorDamageBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterDamage, FlyingActorDamageBase) public: explicit FlyingCharacterDamage(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionFlyingCharacterDie.cpp b/src/Game/Actor/Action/actionFlyingCharacterDie.cpp index e85b8793..3ef6cfc9 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDie.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterDie.cpp @@ -2,26 +2,26 @@ namespace uking::action { -FlyingCharacterDie::FlyingCharacterDie(const InitArg& arg) : FlyingCharacterDamageBase(arg) {} +FlyingCharacterDie::FlyingCharacterDie(const InitArg& arg) : FlyingActorDamageBase(arg) {} bool FlyingCharacterDie::init_(sead::Heap* heap) { - return FlyingCharacterDamageBase::init_(heap); + return FlyingActorDamageBase::init_(heap); } void FlyingCharacterDie::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterDamageBase::enter_(params); + FlyingActorDamageBase::enter_(params); } void FlyingCharacterDie::leave_() { - FlyingCharacterDamageBase::leave_(); + FlyingActorDamageBase::leave_(); } void FlyingCharacterDie::loadParams_() { - FlyingCharacterDamageBase::loadParams_(); + FlyingActorDamageBase::loadParams_(); } void FlyingCharacterDie::calc_() { - FlyingCharacterDamageBase::calc_(); + FlyingActorDamageBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterDie.h b/src/Game/Actor/Action/actionFlyingCharacterDie.h index 60f38d63..cc56336e 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDie.h +++ b/src/Game/Actor/Action/actionFlyingCharacterDie.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterDamageBase.h" +#include "Game/Actor/Action/actionFlyingActorDamageBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterDie : public FlyingCharacterDamageBase { - SEAD_RTTI_OVERRIDE(FlyingCharacterDie, FlyingCharacterDamageBase) +class FlyingCharacterDie : public FlyingActorDamageBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterDie, FlyingActorDamageBase) public: explicit FlyingCharacterDie(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionForbidTag.cpp b/src/Game/Actor/Action/actionForbidTag.cpp deleted file mode 100644 index eafe6b53..00000000 --- a/src/Game/Actor/Action/actionForbidTag.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionForbidTag.h" - -namespace uking::action { - -ForbidTag::ForbidTag(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -ForbidTag::~ForbidTag() = default; - -bool ForbidTag::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ForbidTag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForbidTag::leave_() { - ksys::act::ai::Action::leave_(); -} - -void ForbidTag::loadParams_() {} - -void ForbidTag::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.cpp b/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.cpp index a3617f6f..f3ceb6dc 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.cpp +++ b/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.cpp @@ -2,29 +2,30 @@ namespace uking::action { -ForkASTrgEmitChmFieldPos::ForkASTrgEmitChmFieldPos(const InitArg& arg) : ForkEmitChmField(arg) {} +ForkASTrgEmitChmFieldPos::ForkASTrgEmitChmFieldPos(const InitArg& arg) + : ForkTrgEmitChmFieldBase(arg) {} ForkASTrgEmitChmFieldPos::~ForkASTrgEmitChmFieldPos() = default; bool ForkASTrgEmitChmFieldPos::init_(sead::Heap* heap) { - return ForkEmitChmField::init_(heap); + return ForkTrgEmitChmFieldBase::init_(heap); } void ForkASTrgEmitChmFieldPos::enter_(ksys::act::ai::InlineParamPack* params) { - ForkEmitChmField::enter_(params); + ForkTrgEmitChmFieldBase::enter_(params); } void ForkASTrgEmitChmFieldPos::leave_() { - ForkEmitChmField::leave_(); + ForkTrgEmitChmFieldBase::leave_(); } void ForkASTrgEmitChmFieldPos::loadParams_() { - ForkEmitChmField::loadParams_(); + ForkTrgEmitChmFieldBase::loadParams_(); getStaticParam(&mOffsetPos_s, "OffsetPos"); } void ForkASTrgEmitChmFieldPos::calc_() { - ForkEmitChmField::calc_(); + ForkTrgEmitChmFieldBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.h b/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.h index 7ee65785..b644adaf 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.h +++ b/src/Game/Actor/Action/actionForkASTrgEmitChmFieldPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkEmitChmField.h" +#include "Game/Actor/Action/actionForkTrgEmitChmFieldBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkASTrgEmitChmFieldPos : public ForkEmitChmField { - SEAD_RTTI_OVERRIDE(ForkASTrgEmitChmFieldPos, ForkEmitChmField) +class ForkASTrgEmitChmFieldPos : public ForkTrgEmitChmFieldBase { + SEAD_RTTI_OVERRIDE(ForkASTrgEmitChmFieldPos, ForkTrgEmitChmFieldBase) public: explicit ForkASTrgEmitChmFieldPos(const InitArg& arg); ~ForkASTrgEmitChmFieldPos() override; diff --git a/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.cpp b/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.cpp index b9671e4b..7cb5c757 100644 --- a/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.cpp +++ b/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.cpp @@ -3,29 +3,29 @@ namespace uking::action { ForkDynActorNoTargetSelf::ForkDynActorNoTargetSelf(const InitArg& arg) - : ForkDynActorNoTargetSelfBase(arg) {} + : ForkEndByConditionBase(arg) {} ForkDynActorNoTargetSelf::~ForkDynActorNoTargetSelf() = default; bool ForkDynActorNoTargetSelf::init_(sead::Heap* heap) { - return ForkDynActorNoTargetSelfBase::init_(heap); + return ForkEndByConditionBase::init_(heap); } void ForkDynActorNoTargetSelf::enter_(ksys::act::ai::InlineParamPack* params) { - ForkDynActorNoTargetSelfBase::enter_(params); + ForkEndByConditionBase::enter_(params); } void ForkDynActorNoTargetSelf::leave_() { - ForkDynActorNoTargetSelfBase::leave_(); + ForkEndByConditionBase::leave_(); } void ForkDynActorNoTargetSelf::loadParams_() { - ForkDynActorNoTargetSelfBase::loadParams_(); + ForkEndByConditionBase::loadParams_(); getDynamicParam(&mTargetActor_d, "TargetActor"); } void ForkDynActorNoTargetSelf::calc_() { - ForkDynActorNoTargetSelfBase::calc_(); + ForkEndByConditionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.h b/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.h index 22e98733..a764ea03 100644 --- a/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.h +++ b/src/Game/Actor/Action/actionForkDynActorNoTargetSelf.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkDynActorNoTargetSelfBase.h" +#include "Game/Actor/Action/actionForkEndByConditionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkDynActorNoTargetSelf : public ForkDynActorNoTargetSelfBase { - SEAD_RTTI_OVERRIDE(ForkDynActorNoTargetSelf, ForkDynActorNoTargetSelfBase) +class ForkDynActorNoTargetSelf : public ForkEndByConditionBase { + SEAD_RTTI_OVERRIDE(ForkDynActorNoTargetSelf, ForkEndByConditionBase) public: explicit ForkDynActorNoTargetSelf(const InitArg& arg); ~ForkDynActorNoTargetSelf() override; diff --git a/src/Game/Actor/Action/actionForkDynActorNoTargetSelfBase.cpp b/src/Game/Actor/Action/actionForkDynActorNoTargetSelfBase.cpp deleted file mode 100644 index b4b5c260..00000000 --- a/src/Game/Actor/Action/actionForkDynActorNoTargetSelfBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionForkDynActorNoTargetSelfBase.h" - -namespace uking::action { - -ForkDynActorNoTargetSelfBase::ForkDynActorNoTargetSelfBase(const InitArg& arg) : Fork(arg) {} - -ForkDynActorNoTargetSelfBase::~ForkDynActorNoTargetSelfBase() = default; - -bool ForkDynActorNoTargetSelfBase::init_(sead::Heap* heap) { - return Fork::init_(heap); -} - -void ForkDynActorNoTargetSelfBase::enter_(ksys::act::ai::InlineParamPack* params) { - Fork::enter_(params); -} - -void ForkDynActorNoTargetSelfBase::leave_() { - Fork::leave_(); -} - -void ForkDynActorNoTargetSelfBase::loadParams_() { - Fork::loadParams_(); -} - -void ForkDynActorNoTargetSelfBase::calc_() { - Fork::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkEmitChmField.cpp b/src/Game/Actor/Action/actionForkEmitChmField.cpp deleted file mode 100644 index 7cda3d4c..00000000 --- a/src/Game/Actor/Action/actionForkEmitChmField.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionForkEmitChmField.h" - -namespace uking::action { - -ForkEmitChmField::ForkEmitChmField(const InitArg& arg) : ForkEmitExpandField(arg) {} - -ForkEmitChmField::~ForkEmitChmField() = default; - -bool ForkEmitChmField::init_(sead::Heap* heap) { - return ForkEmitExpandField::init_(heap); -} - -void ForkEmitChmField::enter_(ksys::act::ai::InlineParamPack* params) { - ForkEmitExpandField::enter_(params); -} - -void ForkEmitChmField::leave_() { - ForkEmitExpandField::leave_(); -} - -void ForkEmitChmField::loadParams_() { - ForkEmitExpandField::loadParams_(); - getStaticParam(&mEmitIntervalTime_s, "EmitIntervalTime"); -} - -void ForkEmitChmField::calc_() { - ForkEmitExpandField::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkEmitChmFieldByContact.cpp b/src/Game/Actor/Action/actionForkEmitChmFieldByContact.cpp index 3031438d..4ac74e76 100644 --- a/src/Game/Actor/Action/actionForkEmitChmFieldByContact.cpp +++ b/src/Game/Actor/Action/actionForkEmitChmFieldByContact.cpp @@ -2,29 +2,30 @@ namespace uking::action { -ForkEmitChmFieldByContact::ForkEmitChmFieldByContact(const InitArg& arg) : ForkEmitChmField(arg) {} +ForkEmitChmFieldByContact::ForkEmitChmFieldByContact(const InitArg& arg) + : ForkTrgEmitChmFieldBase(arg) {} ForkEmitChmFieldByContact::~ForkEmitChmFieldByContact() = default; bool ForkEmitChmFieldByContact::init_(sead::Heap* heap) { - return ForkEmitChmField::init_(heap); + return ForkTrgEmitChmFieldBase::init_(heap); } void ForkEmitChmFieldByContact::enter_(ksys::act::ai::InlineParamPack* params) { - ForkEmitChmField::enter_(params); + ForkTrgEmitChmFieldBase::enter_(params); } void ForkEmitChmFieldByContact::leave_() { - ForkEmitChmField::leave_(); + ForkTrgEmitChmFieldBase::leave_(); } void ForkEmitChmFieldByContact::loadParams_() { - ForkEmitChmField::loadParams_(); + ForkTrgEmitChmFieldBase::loadParams_(); getStaticParam(&mRigidBodyName_s, "RigidBodyName"); } void ForkEmitChmFieldByContact::calc_() { - ForkEmitChmField::calc_(); + ForkTrgEmitChmFieldBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkEmitChmFieldByContact.h b/src/Game/Actor/Action/actionForkEmitChmFieldByContact.h index 10005f52..1fe17ca2 100644 --- a/src/Game/Actor/Action/actionForkEmitChmFieldByContact.h +++ b/src/Game/Actor/Action/actionForkEmitChmFieldByContact.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkEmitChmField.h" +#include "Game/Actor/Action/actionForkTrgEmitChmFieldBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkEmitChmFieldByContact : public ForkEmitChmField { - SEAD_RTTI_OVERRIDE(ForkEmitChmFieldByContact, ForkEmitChmField) +class ForkEmitChmFieldByContact : public ForkTrgEmitChmFieldBase { + SEAD_RTTI_OVERRIDE(ForkEmitChmFieldByContact, ForkTrgEmitChmFieldBase) public: explicit ForkEmitChmFieldByContact(const InitArg& arg); ~ForkEmitChmFieldByContact() override; diff --git a/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.cpp b/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.cpp index ed4ff365..acbf3733 100644 --- a/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.cpp +++ b/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.cpp @@ -3,31 +3,31 @@ namespace uking::action { ForkEmitChmFieldFromWeapon::ForkEmitChmFieldFromWeapon(const InitArg& arg) - : ForkEmitChmField(arg) {} + : ForkTrgEmitChmFieldBase(arg) {} ForkEmitChmFieldFromWeapon::~ForkEmitChmFieldFromWeapon() = default; bool ForkEmitChmFieldFromWeapon::init_(sead::Heap* heap) { - return ForkEmitChmField::init_(heap); + return ForkTrgEmitChmFieldBase::init_(heap); } void ForkEmitChmFieldFromWeapon::enter_(ksys::act::ai::InlineParamPack* params) { - ForkEmitChmField::enter_(params); + ForkTrgEmitChmFieldBase::enter_(params); } void ForkEmitChmFieldFromWeapon::leave_() { - ForkEmitChmField::leave_(); + ForkTrgEmitChmFieldBase::leave_(); } void ForkEmitChmFieldFromWeapon::loadParams_() { - ForkEmitChmField::loadParams_(); + ForkTrgEmitChmFieldBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mSeqBank_s, "SeqBank"); getStaticParam(&mTargetBone_s, "TargetBone"); } void ForkEmitChmFieldFromWeapon::calc_() { - ForkEmitChmField::calc_(); + ForkTrgEmitChmFieldBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.h b/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.h index 4904ff70..07a4f5d9 100644 --- a/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.h +++ b/src/Game/Actor/Action/actionForkEmitChmFieldFromWeapon.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkEmitChmField.h" +#include "Game/Actor/Action/actionForkTrgEmitChmFieldBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkEmitChmFieldFromWeapon : public ForkEmitChmField { - SEAD_RTTI_OVERRIDE(ForkEmitChmFieldFromWeapon, ForkEmitChmField) +class ForkEmitChmFieldFromWeapon : public ForkTrgEmitChmFieldBase { + SEAD_RTTI_OVERRIDE(ForkEmitChmFieldFromWeapon, ForkTrgEmitChmFieldBase) public: explicit ForkEmitChmFieldFromWeapon(const InitArg& arg); ~ForkEmitChmFieldFromWeapon() override; diff --git a/src/Game/Actor/Action/actionForkEndByConditionBase.cpp b/src/Game/Actor/Action/actionForkEndByConditionBase.cpp new file mode 100644 index 00000000..2d52c993 --- /dev/null +++ b/src/Game/Actor/Action/actionForkEndByConditionBase.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionForkEndByConditionBase.h" + +namespace uking::action { + +ForkEndByConditionBase::ForkEndByConditionBase(const InitArg& arg) : Fork(arg) {} + +ForkEndByConditionBase::~ForkEndByConditionBase() = default; + +bool ForkEndByConditionBase::init_(sead::Heap* heap) { + return Fork::init_(heap); +} + +void ForkEndByConditionBase::enter_(ksys::act::ai::InlineParamPack* params) { + Fork::enter_(params); +} + +void ForkEndByConditionBase::leave_() { + Fork::leave_(); +} + +void ForkEndByConditionBase::loadParams_() { + Fork::loadParams_(); +} + +void ForkEndByConditionBase::calc_() { + Fork::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkDynActorNoTargetSelfBase.h b/src/Game/Actor/Action/actionForkEndByConditionBase.h similarity index 63% rename from src/Game/Actor/Action/actionForkDynActorNoTargetSelfBase.h rename to src/Game/Actor/Action/actionForkEndByConditionBase.h index 144f2864..25c0b2a9 100644 --- a/src/Game/Actor/Action/actionForkDynActorNoTargetSelfBase.h +++ b/src/Game/Actor/Action/actionForkEndByConditionBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class ForkDynActorNoTargetSelfBase : public Fork { - SEAD_RTTI_OVERRIDE(ForkDynActorNoTargetSelfBase, Fork) +class ForkEndByConditionBase : public Fork { + SEAD_RTTI_OVERRIDE(ForkEndByConditionBase, Fork) public: - explicit ForkDynActorNoTargetSelfBase(const InitArg& arg); - ~ForkDynActorNoTargetSelfBase() override; + explicit ForkEndByConditionBase(const InitArg& arg); + ~ForkEndByConditionBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionForkGrabBase.cpp b/src/Game/Actor/Action/actionForkGrabBase.cpp new file mode 100644 index 00000000..738d1609 --- /dev/null +++ b/src/Game/Actor/Action/actionForkGrabBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionForkGrabBase.h" + +namespace uking::action { + +ForkGrabBase::ForkGrabBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +ForkGrabBase::~ForkGrabBase() = default; + +bool ForkGrabBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void ForkGrabBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void ForkGrabBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void ForkGrabBase::loadParams_() { + getStaticParam(&mGrabIdx_s, "GrabIdx"); + getStaticParam(&mIsNoGrabSuccess_s, "IsNoGrabSuccess"); +} + +void ForkGrabBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkSimpleGrabBase.h b/src/Game/Actor/Action/actionForkGrabBase.h similarity index 69% rename from src/Game/Actor/Action/actionForkSimpleGrabBase.h rename to src/Game/Actor/Action/actionForkGrabBase.h index 3a0fe62c..4881d192 100644 --- a/src/Game/Actor/Action/actionForkSimpleGrabBase.h +++ b/src/Game/Actor/Action/actionForkGrabBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class ForkSimpleGrabBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ForkSimpleGrabBase, ksys::act::ai::Action) +class ForkGrabBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(ForkGrabBase, ksys::act::ai::Action) public: - explicit ForkSimpleGrabBase(const InitArg& arg); - ~ForkSimpleGrabBase() override; + explicit ForkGrabBase(const InitArg& arg); + ~ForkGrabBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.cpp b/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.cpp index ec5c77eb..1282b11a 100644 --- a/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.cpp +++ b/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.cpp @@ -2,29 +2,28 @@ namespace uking::action { -ForkHoverKeepRotateTurn::ForkHoverKeepRotateTurn(const InitArg& arg) - : ForkHoverKeepRotateTurnBase(arg) {} +ForkHoverKeepRotateTurn::ForkHoverKeepRotateTurn(const InitArg& arg) : ForkKeepRotateTurn(arg) {} ForkHoverKeepRotateTurn::~ForkHoverKeepRotateTurn() = default; bool ForkHoverKeepRotateTurn::init_(sead::Heap* heap) { - return ForkHoverKeepRotateTurnBase::init_(heap); + return ForkKeepRotateTurn::init_(heap); } void ForkHoverKeepRotateTurn::enter_(ksys::act::ai::InlineParamPack* params) { - ForkHoverKeepRotateTurnBase::enter_(params); + ForkKeepRotateTurn::enter_(params); } void ForkHoverKeepRotateTurn::leave_() { - ForkHoverKeepRotateTurnBase::leave_(); + ForkKeepRotateTurn::leave_(); } void ForkHoverKeepRotateTurn::loadParams_() { - ForkHoverKeepRotateTurnBase::loadParams_(); + ForkKeepRotateTurn::loadParams_(); } void ForkHoverKeepRotateTurn::calc_() { - ForkHoverKeepRotateTurnBase::calc_(); + ForkKeepRotateTurn::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.h b/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.h index 0e659c64..614eb15d 100644 --- a/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.h +++ b/src/Game/Actor/Action/actionForkHoverKeepRotateTurn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkHoverKeepRotateTurnBase.h" +#include "Game/Actor/Action/actionForkKeepRotateTurn.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkHoverKeepRotateTurn : public ForkHoverKeepRotateTurnBase { - SEAD_RTTI_OVERRIDE(ForkHoverKeepRotateTurn, ForkHoverKeepRotateTurnBase) +class ForkHoverKeepRotateTurn : public ForkKeepRotateTurn { + SEAD_RTTI_OVERRIDE(ForkHoverKeepRotateTurn, ForkKeepRotateTurn) public: explicit ForkHoverKeepRotateTurn(const InitArg& arg); ~ForkHoverKeepRotateTurn() override; diff --git a/src/Game/Actor/Action/actionForkHoverKeepRotateTurnBase.cpp b/src/Game/Actor/Action/actionForkHoverKeepRotateTurnBase.cpp deleted file mode 100644 index 3f39c659..00000000 --- a/src/Game/Actor/Action/actionForkHoverKeepRotateTurnBase.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "Game/Actor/Action/actionForkHoverKeepRotateTurnBase.h" - -namespace uking::action { - -ForkHoverKeepRotateTurnBase::ForkHoverKeepRotateTurnBase(const InitArg& arg) - : ksys::act::ai::Action(arg) {} - -ForkHoverKeepRotateTurnBase::~ForkHoverKeepRotateTurnBase() = default; - -bool ForkHoverKeepRotateTurnBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ForkHoverKeepRotateTurnBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForkHoverKeepRotateTurnBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void ForkHoverKeepRotateTurnBase::loadParams_() { - getStaticParam(&mMinRotSpd_s, "MinRotSpd"); - getStaticParam(&mEndAngle_s, "EndAngle"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void ForkHoverKeepRotateTurnBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkKeepRotateTurn.cpp b/src/Game/Actor/Action/actionForkKeepRotateTurn.cpp new file mode 100644 index 00000000..2e4e111e --- /dev/null +++ b/src/Game/Actor/Action/actionForkKeepRotateTurn.cpp @@ -0,0 +1,31 @@ +#include "Game/Actor/Action/actionForkKeepRotateTurn.h" + +namespace uking::action { + +ForkKeepRotateTurn::ForkKeepRotateTurn(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +ForkKeepRotateTurn::~ForkKeepRotateTurn() = default; + +bool ForkKeepRotateTurn::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void ForkKeepRotateTurn::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void ForkKeepRotateTurn::leave_() { + ksys::act::ai::Action::leave_(); +} + +void ForkKeepRotateTurn::loadParams_() { + getStaticParam(&mMinRotSpd_s, "MinRotSpd"); + getStaticParam(&mEndAngle_s, "EndAngle"); + getDynamicParam(&mTargetPos_d, "TargetPos"); +} + +void ForkKeepRotateTurn::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkHoverKeepRotateTurnBase.h b/src/Game/Actor/Action/actionForkKeepRotateTurn.h similarity index 68% rename from src/Game/Actor/Action/actionForkHoverKeepRotateTurnBase.h rename to src/Game/Actor/Action/actionForkKeepRotateTurn.h index 1c165551..771f0ce2 100644 --- a/src/Game/Actor/Action/actionForkHoverKeepRotateTurnBase.h +++ b/src/Game/Actor/Action/actionForkKeepRotateTurn.h @@ -4,11 +4,11 @@ namespace uking::action { -class ForkHoverKeepRotateTurnBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ForkHoverKeepRotateTurnBase, ksys::act::ai::Action) +class ForkKeepRotateTurn : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(ForkKeepRotateTurn, ksys::act::ai::Action) public: - explicit ForkHoverKeepRotateTurnBase(const InitArg& arg); - ~ForkHoverKeepRotateTurnBase() override; + explicit ForkKeepRotateTurn(const InitArg& arg); + ~ForkKeepRotateTurn() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionForkKnockBackNoRot.cpp b/src/Game/Actor/Action/actionForkKnockBackNoRot.cpp index ff3f9483..2d1bda43 100644 --- a/src/Game/Actor/Action/actionForkKnockBackNoRot.cpp +++ b/src/Game/Actor/Action/actionForkKnockBackNoRot.cpp @@ -19,7 +19,7 @@ void ForkKnockBackNoRot::leave_() { } void ForkKnockBackNoRot::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); } void ForkKnockBackNoRot::calc_() { diff --git a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActor.cpp b/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActor.cpp deleted file mode 100644 index 1d3df291..00000000 --- a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActor.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionForkOnEnterSwapDropTableActor.h" - -namespace uking::action { - -ForkOnEnterSwapDropTableActor::ForkOnEnterSwapDropTableActor(const InitArg& arg) - : ForkOnEnterSwapDropTableActorBase(arg) {} - -ForkOnEnterSwapDropTableActor::~ForkOnEnterSwapDropTableActor() = default; - -bool ForkOnEnterSwapDropTableActor::init_(sead::Heap* heap) { - return ForkOnEnterSwapDropTableActorBase::init_(heap); -} - -void ForkOnEnterSwapDropTableActor::enter_(ksys::act::ai::InlineParamPack* params) { - ForkOnEnterSwapDropTableActorBase::enter_(params); -} - -void ForkOnEnterSwapDropTableActor::leave_() { - ForkOnEnterSwapDropTableActorBase::leave_(); -} - -void ForkOnEnterSwapDropTableActor::loadParams_() { - ForkOnEnterSwapDropTableActorBase::loadParams_(); - getStaticParam(&mTableName_s, "TableName"); -} - -void ForkOnEnterSwapDropTableActor::calc_() { - ForkOnEnterSwapDropTableActorBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.cpp b/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.cpp deleted file mode 100644 index 03fd12cc..00000000 --- a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.h" - -namespace uking::action { - -ForkOnEnterSwapDropTableActorBase::ForkOnEnterSwapDropTableActorBase(const InitArg& arg) - : Fork(arg) {} - -ForkOnEnterSwapDropTableActorBase::~ForkOnEnterSwapDropTableActorBase() = default; - -bool ForkOnEnterSwapDropTableActorBase::init_(sead::Heap* heap) { - return Fork::init_(heap); -} - -void ForkOnEnterSwapDropTableActorBase::enter_(ksys::act::ai::InlineParamPack* params) { - Fork::enter_(params); -} - -void ForkOnEnterSwapDropTableActorBase::leave_() { - Fork::leave_(); -} - -void ForkOnEnterSwapDropTableActorBase::loadParams_() { - Fork::loadParams_(); - getStaticParam(&mOnGroundPos_s, "OnGroundPos"); -} - -void ForkOnEnterSwapDropTableActorBase::calc_() { - Fork::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkSimpleGrab.cpp b/src/Game/Actor/Action/actionForkSimpleGrab.cpp index 4e7bf382..13f86ff3 100644 --- a/src/Game/Actor/Action/actionForkSimpleGrab.cpp +++ b/src/Game/Actor/Action/actionForkSimpleGrab.cpp @@ -2,29 +2,29 @@ namespace uking::action { -ForkSimpleGrab::ForkSimpleGrab(const InitArg& arg) : ForkSimpleGrabBase(arg) {} +ForkSimpleGrab::ForkSimpleGrab(const InitArg& arg) : ForkGrabBase(arg) {} ForkSimpleGrab::~ForkSimpleGrab() = default; bool ForkSimpleGrab::init_(sead::Heap* heap) { - return ForkSimpleGrabBase::init_(heap); + return ForkGrabBase::init_(heap); } void ForkSimpleGrab::enter_(ksys::act::ai::InlineParamPack* params) { - ForkSimpleGrabBase::enter_(params); + ForkGrabBase::enter_(params); } void ForkSimpleGrab::leave_() { - ForkSimpleGrabBase::leave_(); + ForkGrabBase::leave_(); } void ForkSimpleGrab::loadParams_() { - ForkSimpleGrabBase::loadParams_(); + ForkGrabBase::loadParams_(); getStaticParam(&mCheckRadius_s, "CheckRadius"); } void ForkSimpleGrab::calc_() { - ForkSimpleGrabBase::calc_(); + ForkGrabBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkSimpleGrab.h b/src/Game/Actor/Action/actionForkSimpleGrab.h index bd7d265a..c72a749b 100644 --- a/src/Game/Actor/Action/actionForkSimpleGrab.h +++ b/src/Game/Actor/Action/actionForkSimpleGrab.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkSimpleGrabBase.h" +#include "Game/Actor/Action/actionForkGrabBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkSimpleGrab : public ForkSimpleGrabBase { - SEAD_RTTI_OVERRIDE(ForkSimpleGrab, ForkSimpleGrabBase) +class ForkSimpleGrab : public ForkGrabBase { + SEAD_RTTI_OVERRIDE(ForkSimpleGrab, ForkGrabBase) public: explicit ForkSimpleGrab(const InitArg& arg); ~ForkSimpleGrab() override; diff --git a/src/Game/Actor/Action/actionForkSimpleGrabBase.cpp b/src/Game/Actor/Action/actionForkSimpleGrabBase.cpp deleted file mode 100644 index bf70b409..00000000 --- a/src/Game/Actor/Action/actionForkSimpleGrabBase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionForkSimpleGrabBase.h" - -namespace uking::action { - -ForkSimpleGrabBase::ForkSimpleGrabBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -ForkSimpleGrabBase::~ForkSimpleGrabBase() = default; - -bool ForkSimpleGrabBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void ForkSimpleGrabBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void ForkSimpleGrabBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void ForkSimpleGrabBase::loadParams_() { - getStaticParam(&mGrabIdx_s, "GrabIdx"); - getStaticParam(&mIsNoGrabSuccess_s, "IsNoGrabSuccess"); -} - -void ForkSimpleGrabBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkStop.cpp b/src/Game/Actor/Action/actionForkStop.cpp index 25d14930..6a788a8d 100644 --- a/src/Game/Actor/Action/actionForkStop.cpp +++ b/src/Game/Actor/Action/actionForkStop.cpp @@ -2,28 +2,28 @@ namespace uking::action { -ForkStop::ForkStop(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +ForkStop::ForkStop(const InitArg& arg) : StopBase(arg) {} ForkStop::~ForkStop() = default; bool ForkStop::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void ForkStop::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void ForkStop::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void ForkStop::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void ForkStop::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkStop.h b/src/Game/Actor/Action/actionForkStop.h index c3143fcd..70de67ac 100644 --- a/src/Game/Actor/Action/actionForkStop.h +++ b/src/Game/Actor/Action/actionForkStop.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkStop : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(ForkStop, ActionWithPosAngReduce) +class ForkStop : public StopBase { + SEAD_RTTI_OVERRIDE(ForkStop, StopBase) public: explicit ForkStop(const InitArg& arg); ~ForkStop() override; diff --git a/src/Game/Actor/Action/actionForkTrgEmitChmFieldBase.cpp b/src/Game/Actor/Action/actionForkTrgEmitChmFieldBase.cpp new file mode 100644 index 00000000..2cf4bed6 --- /dev/null +++ b/src/Game/Actor/Action/actionForkTrgEmitChmFieldBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionForkTrgEmitChmFieldBase.h" + +namespace uking::action { + +ForkTrgEmitChmFieldBase::ForkTrgEmitChmFieldBase(const InitArg& arg) : ForkEmitExpandField(arg) {} + +ForkTrgEmitChmFieldBase::~ForkTrgEmitChmFieldBase() = default; + +bool ForkTrgEmitChmFieldBase::init_(sead::Heap* heap) { + return ForkEmitExpandField::init_(heap); +} + +void ForkTrgEmitChmFieldBase::enter_(ksys::act::ai::InlineParamPack* params) { + ForkEmitExpandField::enter_(params); +} + +void ForkTrgEmitChmFieldBase::leave_() { + ForkEmitExpandField::leave_(); +} + +void ForkTrgEmitChmFieldBase::loadParams_() { + ForkEmitExpandField::loadParams_(); + getStaticParam(&mEmitIntervalTime_s, "EmitIntervalTime"); +} + +void ForkTrgEmitChmFieldBase::calc_() { + ForkEmitExpandField::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkEmitChmField.h b/src/Game/Actor/Action/actionForkTrgEmitChmFieldBase.h similarity index 67% rename from src/Game/Actor/Action/actionForkEmitChmField.h rename to src/Game/Actor/Action/actionForkTrgEmitChmFieldBase.h index f4d2c235..6690fca2 100644 --- a/src/Game/Actor/Action/actionForkEmitChmField.h +++ b/src/Game/Actor/Action/actionForkTrgEmitChmFieldBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class ForkEmitChmField : public ForkEmitExpandField { - SEAD_RTTI_OVERRIDE(ForkEmitChmField, ForkEmitExpandField) +class ForkTrgEmitChmFieldBase : public ForkEmitExpandField { + SEAD_RTTI_OVERRIDE(ForkTrgEmitChmFieldBase, ForkEmitExpandField) public: - explicit ForkEmitChmField(const InitArg& arg); - ~ForkEmitChmField() override; + explicit ForkTrgEmitChmFieldBase(const InitArg& arg); + ~ForkTrgEmitChmFieldBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionFreeze.cpp b/src/Game/Actor/Action/actionFreeze.cpp index f0bbdd96..76235dc1 100644 --- a/src/Game/Actor/Action/actionFreeze.cpp +++ b/src/Game/Actor/Action/actionFreeze.cpp @@ -2,24 +2,24 @@ namespace uking::action { -Freeze::Freeze(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Freeze::Freeze(const InitArg& arg) : StopBase(arg) {} Freeze::~Freeze() = default; bool Freeze::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void Freeze::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Freeze::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Freeze::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mIsChangeInAir_s, "IsChangeInAir"); getStaticParam(&mTransBoneKey_s, "TransBoneKey"); getAITreeVariable(&mIsKeepFreeze_a, "IsKeepFreeze"); @@ -27,7 +27,7 @@ void Freeze::loadParams_() { } void Freeze::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFreeze.h b/src/Game/Actor/Action/actionFreeze.h index 7edc4f44..e4aa8830 100644 --- a/src/Game/Actor/Action/actionFreeze.h +++ b/src/Game/Actor/Action/actionFreeze.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Freeze : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Freeze, ActionWithPosAngReduce) +class Freeze : public StopBase { + SEAD_RTTI_OVERRIDE(Freeze, StopBase) public: explicit Freeze(const InitArg& arg); ~Freeze() override; diff --git a/src/Game/Actor/Action/actionGanonSmallDamage.cpp b/src/Game/Actor/Action/actionGanonSmallDamage.cpp index 3bf9deb9..6d77468e 100644 --- a/src/Game/Actor/Action/actionGanonSmallDamage.cpp +++ b/src/Game/Actor/Action/actionGanonSmallDamage.cpp @@ -19,7 +19,7 @@ void GanonSmallDamage::leave_() { } void GanonSmallDamage::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mUpAS_s, "UpAS"); getStaticParam(&mAS_s, "AS"); } diff --git a/src/Game/Actor/Action/actionGelEnemyAppear.cpp b/src/Game/Actor/Action/actionGelEnemyAppear.cpp index 87c266b9..b30ae591 100644 --- a/src/Game/Actor/Action/actionGelEnemyAppear.cpp +++ b/src/Game/Actor/Action/actionGelEnemyAppear.cpp @@ -19,7 +19,7 @@ void GelEnemyAppear::leave_() { } void GelEnemyAppear::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void GelEnemyAppear::calc_() { diff --git a/src/Game/Actor/Action/actionChuchuPreAttackBase.cpp b/src/Game/Actor/Action/actionGelJumpBase.cpp similarity index 59% rename from src/Game/Actor/Action/actionChuchuPreAttackBase.cpp rename to src/Game/Actor/Action/actionGelJumpBase.cpp index f2cd4959..2ac165b5 100644 --- a/src/Game/Actor/Action/actionChuchuPreAttackBase.cpp +++ b/src/Game/Actor/Action/actionGelJumpBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionChuchuPreAttackBase.h" +#include "Game/Actor/Action/actionGelJumpBase.h" namespace uking::action { -ChuchuPreAttackBase::ChuchuPreAttackBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +GelJumpBase::GelJumpBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -ChuchuPreAttackBase::~ChuchuPreAttackBase() = default; +GelJumpBase::~GelJumpBase() = default; -bool ChuchuPreAttackBase::init_(sead::Heap* heap) { +bool GelJumpBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ChuchuPreAttackBase::enter_(ksys::act::ai::InlineParamPack* params) { +void GelJumpBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ChuchuPreAttackBase::leave_() { +void GelJumpBase::leave_() { ksys::act::ai::Action::leave_(); } -void ChuchuPreAttackBase::loadParams_() { +void GelJumpBase::loadParams_() { getStaticParam(&mJumpNum_s, "JumpNum"); getStaticParam(&mMoveBoneRotRatio_s, "MoveBoneRotRatio"); getStaticParam(&mMoveBoneRotSpeedMin_s, "MoveBoneRotSpeedMin"); @@ -29,7 +29,7 @@ void ChuchuPreAttackBase::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void ChuchuPreAttackBase::calc_() { +void GelJumpBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionChuchuPreAttackBase.h b/src/Game/Actor/Action/actionGelJumpBase.h similarity index 80% rename from src/Game/Actor/Action/actionChuchuPreAttackBase.h rename to src/Game/Actor/Action/actionGelJumpBase.h index 95fed124..7282cd91 100644 --- a/src/Game/Actor/Action/actionChuchuPreAttackBase.h +++ b/src/Game/Actor/Action/actionGelJumpBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class ChuchuPreAttackBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ChuchuPreAttackBase, ksys::act::ai::Action) +class GelJumpBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(GelJumpBase, ksys::act::ai::Action) public: - explicit ChuchuPreAttackBase(const InitArg& arg); - ~ChuchuPreAttackBase() override; + explicit GelJumpBase(const InitArg& arg); + ~GelJumpBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionGiantArmorAction.cpp b/src/Game/Actor/Action/actionGiantArmorAction.cpp index e7bb724d..f2dda9a3 100644 --- a/src/Game/Actor/Action/actionGiantArmorAction.cpp +++ b/src/Game/Actor/Action/actionGiantArmorAction.cpp @@ -2,24 +2,24 @@ namespace uking::action { -GiantArmorAction::GiantArmorAction(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +GiantArmorAction::GiantArmorAction(const InitArg& arg) : StopBase(arg) {} GiantArmorAction::~GiantArmorAction() = default; bool GiantArmorAction::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void GiantArmorAction::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void GiantArmorAction::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void GiantArmorAction::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mUseRestart_s, "UseRestart"); getStaticParam(&mStartAS_s, "StartAS"); getStaticParam(&mLoopAS_s, "LoopAS"); @@ -27,7 +27,7 @@ void GiantArmorAction::loadParams_() { } void GiantArmorAction::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantArmorAction.h b/src/Game/Actor/Action/actionGiantArmorAction.h index 4850725d..a5c3ae30 100644 --- a/src/Game/Actor/Action/actionGiantArmorAction.h +++ b/src/Game/Actor/Action/actionGiantArmorAction.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantArmorAction : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(GiantArmorAction, ActionWithPosAngReduce) +class GiantArmorAction : public StopBase { + SEAD_RTTI_OVERRIDE(GiantArmorAction, StopBase) public: explicit GiantArmorAction(const InitArg& arg); ~GiantArmorAction() override; diff --git a/src/Game/Actor/Action/actionGiantAttackWithAS.cpp b/src/Game/Actor/Action/actionGiantAttackWithAS.cpp deleted file mode 100644 index 862e155b..00000000 --- a/src/Game/Actor/Action/actionGiantAttackWithAS.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionGiantAttackWithAS.h" - -namespace uking::action { - -GiantAttackWithAS::GiantAttackWithAS(const InitArg& arg) : GiantAttack(arg) {} - -GiantAttackWithAS::~GiantAttackWithAS() = default; - -bool GiantAttackWithAS::init_(sead::Heap* heap) { - return GiantAttack::init_(heap); -} - -void GiantAttackWithAS::enter_(ksys::act::ai::InlineParamPack* params) { - GiantAttack::enter_(params); -} - -void GiantAttackWithAS::leave_() { - GiantAttack::leave_(); -} - -void GiantAttackWithAS::loadParams_() { - GiantAttack::loadParams_(); - getStaticParam(&mASName_s, "ASName"); -} - -void GiantAttackWithAS::calc_() { - GiantAttack::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantBattleCloseAction.cpp b/src/Game/Actor/Action/actionGiantBattleCloseAction.cpp index 89f5e174..5b8d4d8a 100644 --- a/src/Game/Actor/Action/actionGiantBattleCloseAction.cpp +++ b/src/Game/Actor/Action/actionGiantBattleCloseAction.cpp @@ -19,7 +19,7 @@ void GiantBattleCloseAction::leave_() { } void GiantBattleCloseAction::loadParams_() { - BattleCloseMoveActionBase::loadParams_(); + AvoidingCloseMoveActionBase::loadParams_(); getStaticParam(&mVibrationPower_s, "VibrationPower"); } diff --git a/src/Game/Actor/Action/actionGiantDownSwingAttack.cpp b/src/Game/Actor/Action/actionGiantDownSwingAttack.cpp index 91c767af..54e5d7db 100644 --- a/src/Game/Actor/Action/actionGiantDownSwingAttack.cpp +++ b/src/Game/Actor/Action/actionGiantDownSwingAttack.cpp @@ -2,29 +2,29 @@ namespace uking::action { -GiantDownSwingAttack::GiantDownSwingAttack(const InitArg& arg) : GiantAttackWithAS(arg) {} +GiantDownSwingAttack::GiantDownSwingAttack(const InitArg& arg) : AttackWithAS(arg) {} GiantDownSwingAttack::~GiantDownSwingAttack() = default; bool GiantDownSwingAttack::init_(sead::Heap* heap) { - return GiantAttackWithAS::init_(heap); + return AttackWithAS::init_(heap); } void GiantDownSwingAttack::enter_(ksys::act::ai::InlineParamPack* params) { - GiantAttackWithAS::enter_(params); + AttackWithAS::enter_(params); } void GiantDownSwingAttack::leave_() { - GiantAttackWithAS::leave_(); + AttackWithAS::leave_(); } void GiantDownSwingAttack::loadParams_() { - GiantAttackWithAS::loadParams_(); + AttackWithAS::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); } void GiantDownSwingAttack::calc_() { - GiantAttackWithAS::calc_(); + AttackWithAS::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantDownSwingAttack.h b/src/Game/Actor/Action/actionGiantDownSwingAttack.h index 15df389b..cfb5ccd2 100644 --- a/src/Game/Actor/Action/actionGiantDownSwingAttack.h +++ b/src/Game/Actor/Action/actionGiantDownSwingAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGiantAttackWithAS.h" +#include "Game/Actor/Action/actionAttackWithAS.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantDownSwingAttack : public GiantAttackWithAS { - SEAD_RTTI_OVERRIDE(GiantDownSwingAttack, GiantAttackWithAS) +class GiantDownSwingAttack : public AttackWithAS { + SEAD_RTTI_OVERRIDE(GiantDownSwingAttack, AttackWithAS) public: explicit GiantDownSwingAttack(const InitArg& arg); ~GiantDownSwingAttack() override; diff --git a/src/Game/Actor/Action/actionGiantEnemyMoveWithVibration.cpp b/src/Game/Actor/Action/actionGiantEnemyMoveWithVibration.cpp new file mode 100644 index 00000000..d75bdca1 --- /dev/null +++ b/src/Game/Actor/Action/actionGiantEnemyMoveWithVibration.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionGiantEnemyMoveWithVibration.h" + +namespace uking::action { + +GiantEnemyMoveWithVibration::GiantEnemyMoveWithVibration(const InitArg& arg) : MoveBase(arg) {} + +GiantEnemyMoveWithVibration::~GiantEnemyMoveWithVibration() = default; + +bool GiantEnemyMoveWithVibration::init_(sead::Heap* heap) { + return MoveBase::init_(heap); +} + +void GiantEnemyMoveWithVibration::enter_(ksys::act::ai::InlineParamPack* params) { + MoveBase::enter_(params); +} + +void GiantEnemyMoveWithVibration::leave_() { + MoveBase::leave_(); +} + +void GiantEnemyMoveWithVibration::loadParams_() { + MoveBase::loadParams_(); + getStaticParam(&mVibrationPower_s, "VibrationPower"); +} + +void GiantEnemyMoveWithVibration::calc_() { + MoveBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantEnemyWalkWithVibration.h b/src/Game/Actor/Action/actionGiantEnemyMoveWithVibration.h similarity index 67% rename from src/Game/Actor/Action/actionGiantEnemyWalkWithVibration.h rename to src/Game/Actor/Action/actionGiantEnemyMoveWithVibration.h index 391d51ec..bd38fc55 100644 --- a/src/Game/Actor/Action/actionGiantEnemyWalkWithVibration.h +++ b/src/Game/Actor/Action/actionGiantEnemyMoveWithVibration.h @@ -5,11 +5,11 @@ namespace uking::action { -class GiantEnemyWalkWithVibration : public MoveBase { - SEAD_RTTI_OVERRIDE(GiantEnemyWalkWithVibration, MoveBase) +class GiantEnemyMoveWithVibration : public MoveBase { + SEAD_RTTI_OVERRIDE(GiantEnemyMoveWithVibration, MoveBase) public: - explicit GiantEnemyWalkWithVibration(const InitArg& arg); - ~GiantEnemyWalkWithVibration() override; + explicit GiantEnemyMoveWithVibration(const InitArg& arg); + ~GiantEnemyMoveWithVibration() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionGiantEnemyWalk.cpp b/src/Game/Actor/Action/actionGiantEnemyWalk.cpp index 9c6613d6..a5c16fc3 100644 --- a/src/Game/Actor/Action/actionGiantEnemyWalk.cpp +++ b/src/Game/Actor/Action/actionGiantEnemyWalk.cpp @@ -2,28 +2,28 @@ namespace uking::action { -GiantEnemyWalk::GiantEnemyWalk(const InitArg& arg) : GiantEnemyWalkWithVibration(arg) {} +GiantEnemyWalk::GiantEnemyWalk(const InitArg& arg) : GiantEnemyMoveWithVibration(arg) {} GiantEnemyWalk::~GiantEnemyWalk() = default; bool GiantEnemyWalk::init_(sead::Heap* heap) { - return GiantEnemyWalkWithVibration::init_(heap); + return GiantEnemyMoveWithVibration::init_(heap); } void GiantEnemyWalk::enter_(ksys::act::ai::InlineParamPack* params) { - GiantEnemyWalkWithVibration::enter_(params); + GiantEnemyMoveWithVibration::enter_(params); } void GiantEnemyWalk::leave_() { - GiantEnemyWalkWithVibration::leave_(); + GiantEnemyMoveWithVibration::leave_(); } void GiantEnemyWalk::loadParams_() { - GiantEnemyWalkWithVibration::loadParams_(); + GiantEnemyMoveWithVibration::loadParams_(); } void GiantEnemyWalk::calc_() { - GiantEnemyWalkWithVibration::calc_(); + GiantEnemyMoveWithVibration::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantEnemyWalk.h b/src/Game/Actor/Action/actionGiantEnemyWalk.h index ab8f71a8..652f3529 100644 --- a/src/Game/Actor/Action/actionGiantEnemyWalk.h +++ b/src/Game/Actor/Action/actionGiantEnemyWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGiantEnemyWalkWithVibration.h" +#include "Game/Actor/Action/actionGiantEnemyMoveWithVibration.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantEnemyWalk : public GiantEnemyWalkWithVibration { - SEAD_RTTI_OVERRIDE(GiantEnemyWalk, GiantEnemyWalkWithVibration) +class GiantEnemyWalk : public GiantEnemyMoveWithVibration { + SEAD_RTTI_OVERRIDE(GiantEnemyWalk, GiantEnemyMoveWithVibration) public: explicit GiantEnemyWalk(const InitArg& arg); ~GiantEnemyWalk() override; diff --git a/src/Game/Actor/Action/actionGiantEnemyWalkWithVibration.cpp b/src/Game/Actor/Action/actionGiantEnemyWalkWithVibration.cpp deleted file mode 100644 index 16849941..00000000 --- a/src/Game/Actor/Action/actionGiantEnemyWalkWithVibration.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionGiantEnemyWalkWithVibration.h" - -namespace uking::action { - -GiantEnemyWalkWithVibration::GiantEnemyWalkWithVibration(const InitArg& arg) : MoveBase(arg) {} - -GiantEnemyWalkWithVibration::~GiantEnemyWalkWithVibration() = default; - -bool GiantEnemyWalkWithVibration::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - -void GiantEnemyWalkWithVibration::enter_(ksys::act::ai::InlineParamPack* params) { - MoveBase::enter_(params); -} - -void GiantEnemyWalkWithVibration::leave_() { - MoveBase::leave_(); -} - -void GiantEnemyWalkWithVibration::loadParams_() { - MoveBase::loadParams_(); - getStaticParam(&mVibrationPower_s, "VibrationPower"); -} - -void GiantEnemyWalkWithVibration::calc_() { - MoveBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantNavMeshMoveWithVibration.cpp b/src/Game/Actor/Action/actionGiantNavMeshMoveWithVibration.cpp new file mode 100644 index 00000000..46e1a9cf --- /dev/null +++ b/src/Game/Actor/Action/actionGiantNavMeshMoveWithVibration.cpp @@ -0,0 +1,31 @@ +#include "Game/Actor/Action/actionGiantNavMeshMoveWithVibration.h" + +namespace uking::action { + +GiantNavMeshMoveWithVibration::GiantNavMeshMoveWithVibration(const InitArg& arg) + : NavMeshMoveBase(arg) {} + +GiantNavMeshMoveWithVibration::~GiantNavMeshMoveWithVibration() = default; + +bool GiantNavMeshMoveWithVibration::init_(sead::Heap* heap) { + return NavMeshMoveBase::init_(heap); +} + +void GiantNavMeshMoveWithVibration::enter_(ksys::act::ai::InlineParamPack* params) { + NavMeshMoveBase::enter_(params); +} + +void GiantNavMeshMoveWithVibration::leave_() { + NavMeshMoveBase::leave_(); +} + +void GiantNavMeshMoveWithVibration::loadParams_() { + NavMeshMoveBase::loadParams_(); + getStaticParam(&mVibrationPower_s, "VibrationPower"); +} + +void GiantNavMeshMoveWithVibration::calc_() { + NavMeshMoveBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantNavMeshWalkWithVibration.h b/src/Game/Actor/Action/actionGiantNavMeshMoveWithVibration.h similarity index 58% rename from src/Game/Actor/Action/actionGiantNavMeshWalkWithVibration.h rename to src/Game/Actor/Action/actionGiantNavMeshMoveWithVibration.h index 547c816d..cf535cff 100644 --- a/src/Game/Actor/Action/actionGiantNavMeshWalkWithVibration.h +++ b/src/Game/Actor/Action/actionGiantNavMeshMoveWithVibration.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantNavMeshWalkWithVibration : public NavMeshAction { - SEAD_RTTI_OVERRIDE(GiantNavMeshWalkWithVibration, NavMeshAction) +class GiantNavMeshMoveWithVibration : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(GiantNavMeshMoveWithVibration, NavMeshMoveBase) public: - explicit GiantNavMeshWalkWithVibration(const InitArg& arg); - ~GiantNavMeshWalkWithVibration() override; + explicit GiantNavMeshMoveWithVibration(const InitArg& arg); + ~GiantNavMeshMoveWithVibration() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionGiantNavMeshWalk.cpp b/src/Game/Actor/Action/actionGiantNavMeshWalk.cpp index 200b8bb7..42ff7929 100644 --- a/src/Game/Actor/Action/actionGiantNavMeshWalk.cpp +++ b/src/Game/Actor/Action/actionGiantNavMeshWalk.cpp @@ -2,28 +2,28 @@ namespace uking::action { -GiantNavMeshWalk::GiantNavMeshWalk(const InitArg& arg) : GiantNavMeshWalkWithVibration(arg) {} +GiantNavMeshWalk::GiantNavMeshWalk(const InitArg& arg) : GiantNavMeshMoveWithVibration(arg) {} GiantNavMeshWalk::~GiantNavMeshWalk() = default; bool GiantNavMeshWalk::init_(sead::Heap* heap) { - return GiantNavMeshWalkWithVibration::init_(heap); + return GiantNavMeshMoveWithVibration::init_(heap); } void GiantNavMeshWalk::enter_(ksys::act::ai::InlineParamPack* params) { - GiantNavMeshWalkWithVibration::enter_(params); + GiantNavMeshMoveWithVibration::enter_(params); } void GiantNavMeshWalk::leave_() { - GiantNavMeshWalkWithVibration::leave_(); + GiantNavMeshMoveWithVibration::leave_(); } void GiantNavMeshWalk::loadParams_() { - GiantNavMeshWalkWithVibration::loadParams_(); + GiantNavMeshMoveWithVibration::loadParams_(); } void GiantNavMeshWalk::calc_() { - GiantNavMeshWalkWithVibration::calc_(); + GiantNavMeshMoveWithVibration::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantNavMeshWalk.h b/src/Game/Actor/Action/actionGiantNavMeshWalk.h index 45c90e38..9a69ca30 100644 --- a/src/Game/Actor/Action/actionGiantNavMeshWalk.h +++ b/src/Game/Actor/Action/actionGiantNavMeshWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGiantNavMeshWalkWithVibration.h" +#include "Game/Actor/Action/actionGiantNavMeshMoveWithVibration.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantNavMeshWalk : public GiantNavMeshWalkWithVibration { - SEAD_RTTI_OVERRIDE(GiantNavMeshWalk, GiantNavMeshWalkWithVibration) +class GiantNavMeshWalk : public GiantNavMeshMoveWithVibration { + SEAD_RTTI_OVERRIDE(GiantNavMeshWalk, GiantNavMeshMoveWithVibration) public: explicit GiantNavMeshWalk(const InitArg& arg); ~GiantNavMeshWalk() override; diff --git a/src/Game/Actor/Action/actionGiantNavMeshWalkWithVibration.cpp b/src/Game/Actor/Action/actionGiantNavMeshWalkWithVibration.cpp deleted file mode 100644 index ddafe9df..00000000 --- a/src/Game/Actor/Action/actionGiantNavMeshWalkWithVibration.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionGiantNavMeshWalkWithVibration.h" - -namespace uking::action { - -GiantNavMeshWalkWithVibration::GiantNavMeshWalkWithVibration(const InitArg& arg) - : NavMeshAction(arg) {} - -GiantNavMeshWalkWithVibration::~GiantNavMeshWalkWithVibration() = default; - -bool GiantNavMeshWalkWithVibration::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); -} - -void GiantNavMeshWalkWithVibration::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); -} - -void GiantNavMeshWalkWithVibration::leave_() { - NavMeshAction::leave_(); -} - -void GiantNavMeshWalkWithVibration::loadParams_() { - NavMeshAction::loadParams_(); - getStaticParam(&mVibrationPower_s, "VibrationPower"); -} - -void GiantNavMeshWalkWithVibration::calc_() { - NavMeshAction::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantOneHandActionWithLegTurn.cpp b/src/Game/Actor/Action/actionGiantOneHandActionWithLegTurn.cpp deleted file mode 100644 index e92858b4..00000000 --- a/src/Game/Actor/Action/actionGiantOneHandActionWithLegTurn.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include "Game/Actor/Action/actionGiantOneHandActionWithLegTurn.h" - -namespace uking::action { - -GiantOneHandActionWithLegTurn::GiantOneHandActionWithLegTurn(const InitArg& arg) - : GiantAttackWithAS(arg) {} - -GiantOneHandActionWithLegTurn::~GiantOneHandActionWithLegTurn() = default; - -bool GiantOneHandActionWithLegTurn::init_(sead::Heap* heap) { - return GiantAttackWithAS::init_(heap); -} - -void GiantOneHandActionWithLegTurn::enter_(ksys::act::ai::InlineParamPack* params) { - GiantAttackWithAS::enter_(params); -} - -void GiantOneHandActionWithLegTurn::leave_() { - GiantAttackWithAS::leave_(); -} - -void GiantOneHandActionWithLegTurn::loadParams_() { - GiantAttackWithAS::loadParams_(); - getStaticParam(&mTraceLRAngleMax_s, "TraceLRAngleMax"); - getStaticParam(&mTraceLRAngleMin_s, "TraceLRAngleMin"); - getStaticParam(&mTraceDistFar_s, "TraceDistFar"); - getStaticParam(&mTraceDistNear_s, "TraceDistNear"); - getStaticParam(&mShoulderBoneName_s, "ShoulderBoneName"); - getStaticParam(&mRotOffsetMin_s, "RotOffsetMin"); - getStaticParam(&mRotOffsetMax_s, "RotOffsetMax"); - getStaticParam(&mBaseTargetPos_s, "BaseTargetPos"); -} - -void GiantOneHandActionWithLegTurn::calc_() { - GiantAttackWithAS::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.cpp b/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.cpp index 5b078bf6..b2927f9f 100644 --- a/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.cpp +++ b/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.cpp @@ -3,29 +3,29 @@ namespace uking::action { GiantOneHandAttackWithLegTurn::GiantOneHandAttackWithLegTurn(const InitArg& arg) - : GiantOneHandActionWithLegTurn(arg) {} + : OneHandActionWithLegTurn(arg) {} GiantOneHandAttackWithLegTurn::~GiantOneHandAttackWithLegTurn() = default; bool GiantOneHandAttackWithLegTurn::init_(sead::Heap* heap) { - return GiantOneHandActionWithLegTurn::init_(heap); + return OneHandActionWithLegTurn::init_(heap); } void GiantOneHandAttackWithLegTurn::enter_(ksys::act::ai::InlineParamPack* params) { - GiantOneHandActionWithLegTurn::enter_(params); + OneHandActionWithLegTurn::enter_(params); } void GiantOneHandAttackWithLegTurn::leave_() { - GiantOneHandActionWithLegTurn::leave_(); + OneHandActionWithLegTurn::leave_(); } void GiantOneHandAttackWithLegTurn::loadParams_() { - GiantOneHandActionWithLegTurn::loadParams_(); + OneHandActionWithLegTurn::loadParams_(); // FIXME: CALL sub_71007050F0 @ 0x71007050f0 } void GiantOneHandAttackWithLegTurn::calc_() { - GiantOneHandActionWithLegTurn::calc_(); + OneHandActionWithLegTurn::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.h b/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.h index 278f2438..c4ba401a 100644 --- a/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.h +++ b/src/Game/Actor/Action/actionGiantOneHandAttackWithLegTurn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGiantOneHandActionWithLegTurn.h" +#include "Game/Actor/Action/actionOneHandActionWithLegTurn.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantOneHandAttackWithLegTurn : public GiantOneHandActionWithLegTurn { - SEAD_RTTI_OVERRIDE(GiantOneHandAttackWithLegTurn, GiantOneHandActionWithLegTurn) +class GiantOneHandAttackWithLegTurn : public OneHandActionWithLegTurn { + SEAD_RTTI_OVERRIDE(GiantOneHandAttackWithLegTurn, OneHandActionWithLegTurn) public: explicit GiantOneHandAttackWithLegTurn(const InitArg& arg); ~GiantOneHandAttackWithLegTurn() override; diff --git a/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.cpp b/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.cpp index 6cc28961..1b98bf0e 100644 --- a/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.cpp +++ b/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.cpp @@ -3,29 +3,29 @@ namespace uking::action { GiantOneHandPunchWithLegTurn::GiantOneHandPunchWithLegTurn(const InitArg& arg) - : GiantOneHandActionWithLegTurn(arg) {} + : OneHandActionWithLegTurn(arg) {} GiantOneHandPunchWithLegTurn::~GiantOneHandPunchWithLegTurn() = default; bool GiantOneHandPunchWithLegTurn::init_(sead::Heap* heap) { - return GiantOneHandActionWithLegTurn::init_(heap); + return OneHandActionWithLegTurn::init_(heap); } void GiantOneHandPunchWithLegTurn::enter_(ksys::act::ai::InlineParamPack* params) { - GiantOneHandActionWithLegTurn::enter_(params); + OneHandActionWithLegTurn::enter_(params); } void GiantOneHandPunchWithLegTurn::leave_() { - GiantOneHandActionWithLegTurn::leave_(); + OneHandActionWithLegTurn::leave_(); } void GiantOneHandPunchWithLegTurn::loadParams_() { - GiantOneHandActionWithLegTurn::loadParams_(); + OneHandActionWithLegTurn::loadParams_(); // FIXME: CALL sub_7100704D84 @ 0x7100704d84 } void GiantOneHandPunchWithLegTurn::calc_() { - GiantOneHandActionWithLegTurn::calc_(); + OneHandActionWithLegTurn::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.h b/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.h index ad86dd3d..f6424714 100644 --- a/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.h +++ b/src/Game/Actor/Action/actionGiantOneHandPunchWithLegTurn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGiantOneHandActionWithLegTurn.h" +#include "Game/Actor/Action/actionOneHandActionWithLegTurn.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantOneHandPunchWithLegTurn : public GiantOneHandActionWithLegTurn { - SEAD_RTTI_OVERRIDE(GiantOneHandPunchWithLegTurn, GiantOneHandActionWithLegTurn) +class GiantOneHandPunchWithLegTurn : public OneHandActionWithLegTurn { + SEAD_RTTI_OVERRIDE(GiantOneHandPunchWithLegTurn, OneHandActionWithLegTurn) public: explicit GiantOneHandPunchWithLegTurn(const InitArg& arg); ~GiantOneHandPunchWithLegTurn() override; diff --git a/src/Game/Actor/Action/actionGolemRepairParts.cpp b/src/Game/Actor/Action/actionGolemRepairParts.cpp index b5ab5438..3b234c22 100644 --- a/src/Game/Actor/Action/actionGolemRepairParts.cpp +++ b/src/Game/Actor/Action/actionGolemRepairParts.cpp @@ -19,7 +19,7 @@ void GolemRepairParts::leave_() { } void GolemRepairParts::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); getStaticParam(&mTgtBodyName_s, "TgtBodyName"); getStaticParam(&mChmObjectName_s, "ChmObjectName"); diff --git a/src/Game/Actor/Action/actionGolemThrowPartsBase.cpp b/src/Game/Actor/Action/actionGolemThrowPartsBase.cpp index 5a4a5eb4..75f9d507 100644 --- a/src/Game/Actor/Action/actionGolemThrowPartsBase.cpp +++ b/src/Game/Actor/Action/actionGolemThrowPartsBase.cpp @@ -19,7 +19,7 @@ void GolemThrowPartsBase::leave_() { } void GolemThrowPartsBase::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); getStaticParam(&mTgtBodyName_s, "TgtBodyName"); getStaticParam(&mChmObjectName_s, "ChmObjectName"); diff --git a/src/Game/Actor/Action/actionGoronHeroDescendentJump.cpp b/src/Game/Actor/Action/actionGoronHeroDescendentJump.cpp index c0c51b5f..548f7534 100644 --- a/src/Game/Actor/Action/actionGoronHeroDescendentJump.cpp +++ b/src/Game/Actor/Action/actionGoronHeroDescendentJump.cpp @@ -2,30 +2,30 @@ namespace uking::action { -GoronHeroDescendentJump::GoronHeroDescendentJump(const InitArg& arg) : MoveToTargetCurveBase(arg) {} +GoronHeroDescendentJump::GoronHeroDescendentJump(const InitArg& arg) : CurveMoveToTargetBase(arg) {} GoronHeroDescendentJump::~GoronHeroDescendentJump() = default; bool GoronHeroDescendentJump::init_(sead::Heap* heap) { - return MoveToTargetCurveBase::init_(heap); + return CurveMoveToTargetBase::init_(heap); } void GoronHeroDescendentJump::enter_(ksys::act::ai::InlineParamPack* params) { - MoveToTargetCurveBase::enter_(params); + CurveMoveToTargetBase::enter_(params); } void GoronHeroDescendentJump::leave_() { - MoveToTargetCurveBase::leave_(); + CurveMoveToTargetBase::leave_(); } void GoronHeroDescendentJump::loadParams_() { - MoveToTargetCurveBase::loadParams_(); + CurveMoveToTargetBase::loadParams_(); getDynamicParam(&mIsIntoCannon_d, "IsIntoCannon"); getDynamicParam(&mJumpTargetPos_d, "JumpTargetPos"); } void GoronHeroDescendentJump::calc_() { - MoveToTargetCurveBase::calc_(); + CurveMoveToTargetBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGoronHeroDescendentJump.h b/src/Game/Actor/Action/actionGoronHeroDescendentJump.h index 49c49dda..fe73e537 100644 --- a/src/Game/Actor/Action/actionGoronHeroDescendentJump.h +++ b/src/Game/Actor/Action/actionGoronHeroDescendentJump.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionMoveToTargetCurveBase.h" +#include "Game/Actor/Action/actionCurveMoveToTargetBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GoronHeroDescendentJump : public MoveToTargetCurveBase { - SEAD_RTTI_OVERRIDE(GoronHeroDescendentJump, MoveToTargetCurveBase) +class GoronHeroDescendentJump : public CurveMoveToTargetBase { + SEAD_RTTI_OVERRIDE(GoronHeroDescendentJump, CurveMoveToTargetBase) public: explicit GoronHeroDescendentJump(const InitArg& arg); ~GoronHeroDescendentJump() override; diff --git a/src/Game/Actor/Action/actionGrab.cpp b/src/Game/Actor/Action/actionGrab.cpp index 80b6495e..df063aad 100644 --- a/src/Game/Actor/Action/actionGrab.cpp +++ b/src/Game/Actor/Action/actionGrab.cpp @@ -2,22 +2,22 @@ namespace uking::action { -Grab::Grab(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Grab::Grab(const InitArg& arg) : StopBase(arg) {} bool Grab::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void Grab::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Grab::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Grab::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mGrabIdx_s, "GrabIdx"); getStaticParam(&mCheckRadius_s, "CheckRadius"); getStaticParam(&mCheckSpeed_s, "CheckSpeed"); @@ -25,7 +25,7 @@ void Grab::loadParams_() { } void Grab::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGrab.h b/src/Game/Actor/Action/actionGrab.h index 16fe474a..6af502ff 100644 --- a/src/Game/Actor/Action/actionGrab.h +++ b/src/Game/Actor/Action/actionGrab.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Grab : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Grab, ActionWithPosAngReduce) +class Grab : public StopBase { + SEAD_RTTI_OVERRIDE(Grab, StopBase) public: explicit Grab(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionGuard.cpp b/src/Game/Actor/Action/actionGuard.cpp index 0673c48f..c010f70c 100644 --- a/src/Game/Actor/Action/actionGuard.cpp +++ b/src/Game/Actor/Action/actionGuard.cpp @@ -2,19 +2,19 @@ namespace uking::action { -Guard::Guard(const InitArg& arg) : TakeHitImpactForce(arg) {} +Guard::Guard(const InitArg& arg) : KnockBackHitImpactForce(arg) {} void Guard::enter_(ksys::act::ai::InlineParamPack* params) { - TakeHitImpactForce::enter_(params); + KnockBackHitImpactForce::enter_(params); } void Guard::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mRotSubsAngRate_s, "RotSubsAngRate"); } void Guard::calc_() { - TakeHitImpactForce::calc_(); + KnockBackHitImpactForce::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuard.h b/src/Game/Actor/Action/actionGuard.h index e034cee0..196c8805 100644 --- a/src/Game/Actor/Action/actionGuard.h +++ b/src/Game/Actor/Action/actionGuard.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionTakeHitImpactForce.h" +#include "Game/Actor/Action/actionKnockBackHitImpactForce.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Guard : public TakeHitImpactForce { - SEAD_RTTI_OVERRIDE(Guard, TakeHitImpactForce) +class Guard : public KnockBackHitImpactForce { + SEAD_RTTI_OVERRIDE(Guard, KnockBackHitImpactForce) public: explicit Guard(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionGuardBackWalk.cpp b/src/Game/Actor/Action/actionGuardBackWalk.cpp index 7a9057c7..f2b065cb 100644 --- a/src/Game/Actor/Action/actionGuardBackWalk.cpp +++ b/src/Game/Actor/Action/actionGuardBackWalk.cpp @@ -2,26 +2,26 @@ namespace uking::action { -GuardBackWalk::GuardBackWalk(const InitArg& arg) : BackWalkEx(arg) {} +GuardBackWalk::GuardBackWalk(const InitArg& arg) : NormalBackWalk(arg) {} bool GuardBackWalk::init_(sead::Heap* heap) { - return BackWalkEx::init_(heap); + return NormalBackWalk::init_(heap); } void GuardBackWalk::enter_(ksys::act::ai::InlineParamPack* params) { - BackWalkEx::enter_(params); + NormalBackWalk::enter_(params); } void GuardBackWalk::leave_() { - BackWalkEx::leave_(); + NormalBackWalk::leave_(); } void GuardBackWalk::loadParams_() { - BackWalkEx::loadParams_(); + NormalBackWalk::loadParams_(); } void GuardBackWalk::calc_() { - BackWalkEx::calc_(); + NormalBackWalk::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardBackWalk.h b/src/Game/Actor/Action/actionGuardBackWalk.h index 4b210f36..11b5d3d6 100644 --- a/src/Game/Actor/Action/actionGuardBackWalk.h +++ b/src/Game/Actor/Action/actionGuardBackWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBackWalkEx.h" +#include "Game/Actor/Action/actionNormalBackWalk.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardBackWalk : public BackWalkEx { - SEAD_RTTI_OVERRIDE(GuardBackWalk, BackWalkEx) +class GuardBackWalk : public NormalBackWalk { + SEAD_RTTI_OVERRIDE(GuardBackWalk, NormalBackWalk) public: explicit GuardBackWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionGuardLoop.cpp b/src/Game/Actor/Action/actionGuardLoop.cpp index 56c9f17e..d45fce74 100644 --- a/src/Game/Actor/Action/actionGuardLoop.cpp +++ b/src/Game/Actor/Action/actionGuardLoop.cpp @@ -2,10 +2,10 @@ namespace uking::action { -GuardLoop::GuardLoop(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +GuardLoop::GuardLoop(const InitArg& arg) : StopBase(arg) {} void GuardLoop::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardLoop.h b/src/Game/Actor/Action/actionGuardLoop.h index 76ede33f..75d86c25 100644 --- a/src/Game/Actor/Action/actionGuardLoop.h +++ b/src/Game/Actor/Action/actionGuardLoop.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardLoop : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(GuardLoop, ActionWithPosAngReduce) +class GuardLoop : public StopBase { + SEAD_RTTI_OVERRIDE(GuardLoop, StopBase) public: explicit GuardLoop(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionGuardianActionBase.cpp b/src/Game/Actor/Action/actionGuardianActionBase.cpp new file mode 100644 index 00000000..13f4d031 --- /dev/null +++ b/src/Game/Actor/Action/actionGuardianActionBase.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/Action/actionGuardianActionBase.h" + +namespace uking::action { + +GuardianActionBase::GuardianActionBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +GuardianActionBase::~GuardianActionBase() = default; + +bool GuardianActionBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void GuardianActionBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void GuardianActionBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void GuardianActionBase::loadParams_() {} + +void GuardianActionBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForbidTag.h b/src/Game/Actor/Action/actionGuardianActionBase.h similarity index 61% rename from src/Game/Actor/Action/actionForbidTag.h rename to src/Game/Actor/Action/actionGuardianActionBase.h index 11ea0d16..0c0118bf 100644 --- a/src/Game/Actor/Action/actionForbidTag.h +++ b/src/Game/Actor/Action/actionGuardianActionBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class ForbidTag : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ForbidTag, ksys::act::ai::Action) +class GuardianActionBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(GuardianActionBase, ksys::act::ai::Action) public: - explicit ForbidTag(const InitArg& arg); - ~ForbidTag() override; + explicit GuardianActionBase(const InitArg& arg); + ~GuardianActionBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionGuardianMiniGuardNavMeshWalk.cpp b/src/Game/Actor/Action/actionGuardianMiniGuardNavMeshWalk.cpp index 14d829b9..bb5b8fa4 100644 --- a/src/Game/Actor/Action/actionGuardianMiniGuardNavMeshWalk.cpp +++ b/src/Game/Actor/Action/actionGuardianMiniGuardNavMeshWalk.cpp @@ -7,7 +7,7 @@ GuardianMiniGuardNavMeshWalk::GuardianMiniGuardNavMeshWalk(const InitArg& arg) : GuardianMiniGuardNavMeshWalk::~GuardianMiniGuardNavMeshWalk() = default; void GuardianMiniGuardNavMeshWalk::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); getStaticParam(&mASSlot_s, "ASSlot"); getStaticParam(&mASName_s, "ASName"); } diff --git a/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.cpp b/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.cpp index dad098a2..11773511 100644 --- a/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.cpp +++ b/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.cpp @@ -2,23 +2,23 @@ namespace uking::action { -GuardianMiniNeckSpinBeam::GuardianMiniNeckSpinBeam(const InitArg& arg) : NeckSpinBeam(arg) {} +GuardianMiniNeckSpinBeam::GuardianMiniNeckSpinBeam(const InitArg& arg) : BeamNeckSpin(arg) {} GuardianMiniNeckSpinBeam::~GuardianMiniNeckSpinBeam() = default; void GuardianMiniNeckSpinBeam::enter_(ksys::act::ai::InlineParamPack* params) { - NeckSpinBeam::enter_(params); + BeamNeckSpin::enter_(params); } void GuardianMiniNeckSpinBeam::loadParams_() { - NeckSpinBeam::loadParams_(); + BeamNeckSpin::loadParams_(); getStaticParam(&mSpinNum_s, "SpinNum"); getStaticParam(&mMaxLengthTime_s, "MaxLengthTime"); getStaticParam(&mIsStraight_s, "IsStraight"); } void GuardianMiniNeckSpinBeam::calc_() { - NeckSpinBeam::calc_(); + BeamNeckSpin::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.h b/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.h index 27c599b3..ad3a5b96 100644 --- a/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.h +++ b/src/Game/Actor/Action/actionGuardianMiniNeckSpinBeam.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNeckSpinBeam.h" +#include "Game/Actor/Action/actionBeamNeckSpin.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardianMiniNeckSpinBeam : public NeckSpinBeam { - SEAD_RTTI_OVERRIDE(GuardianMiniNeckSpinBeam, NeckSpinBeam) +class GuardianMiniNeckSpinBeam : public BeamNeckSpin { + SEAD_RTTI_OVERRIDE(GuardianMiniNeckSpinBeam, BeamNeckSpin) public: explicit GuardianMiniNeckSpinBeam(const InitArg& arg); ~GuardianMiniNeckSpinBeam() override; diff --git a/src/Game/Actor/Action/actionGuardianMoveTo.cpp b/src/Game/Actor/Action/actionGuardianMoveTo.cpp deleted file mode 100644 index 848d9521..00000000 --- a/src/Game/Actor/Action/actionGuardianMoveTo.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionGuardianMoveTo.h" - -namespace uking::action { - -GuardianMoveTo::GuardianMoveTo(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -GuardianMoveTo::~GuardianMoveTo() = default; - -bool GuardianMoveTo::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void GuardianMoveTo::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void GuardianMoveTo::leave_() { - ksys::act::ai::Action::leave_(); -} - -void GuardianMoveTo::loadParams_() {} - -void GuardianMoveTo::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianMoveToPosition.cpp b/src/Game/Actor/Action/actionGuardianMoveToPosition.cpp index aa9f8f47..a73286e8 100644 --- a/src/Game/Actor/Action/actionGuardianMoveToPosition.cpp +++ b/src/Game/Actor/Action/actionGuardianMoveToPosition.cpp @@ -2,24 +2,24 @@ namespace uking::action { -GuardianMoveToPosition::GuardianMoveToPosition(const InitArg& arg) : GuardianMoveTo(arg) {} +GuardianMoveToPosition::GuardianMoveToPosition(const InitArg& arg) : GuardianActionBase(arg) {} GuardianMoveToPosition::~GuardianMoveToPosition() = default; bool GuardianMoveToPosition::init_(sead::Heap* heap) { - return GuardianMoveTo::init_(heap); + return GuardianActionBase::init_(heap); } void GuardianMoveToPosition::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianMoveTo::enter_(params); + GuardianActionBase::enter_(params); } void GuardianMoveToPosition::leave_() { - GuardianMoveTo::leave_(); + GuardianActionBase::leave_(); } void GuardianMoveToPosition::loadParams_() { - GuardianMoveTo::loadParams_(); + GuardianActionBase::loadParams_(); getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mDecelerate_s, "Decelerate"); getDynamicParam(&mDynTargetPos_d, "DynTargetPos"); @@ -27,7 +27,7 @@ void GuardianMoveToPosition::loadParams_() { } void GuardianMoveToPosition::calc_() { - GuardianMoveTo::calc_(); + GuardianActionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianMoveToPosition.h b/src/Game/Actor/Action/actionGuardianMoveToPosition.h index 4982d2ac..7271c040 100644 --- a/src/Game/Actor/Action/actionGuardianMoveToPosition.h +++ b/src/Game/Actor/Action/actionGuardianMoveToPosition.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGuardianMoveTo.h" +#include "Game/Actor/Action/actionGuardianActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardianMoveToPosition : public GuardianMoveTo { - SEAD_RTTI_OVERRIDE(GuardianMoveToPosition, GuardianMoveTo) +class GuardianMoveToPosition : public GuardianActionBase { + SEAD_RTTI_OVERRIDE(GuardianMoveToPosition, GuardianActionBase) public: explicit GuardianMoveToPosition(const InitArg& arg); ~GuardianMoveToPosition() override; diff --git a/src/Game/Actor/Action/actionGuardianMoveToTarget.cpp b/src/Game/Actor/Action/actionGuardianMoveToTarget.cpp index 95ce1e79..51a36015 100644 --- a/src/Game/Actor/Action/actionGuardianMoveToTarget.cpp +++ b/src/Game/Actor/Action/actionGuardianMoveToTarget.cpp @@ -2,29 +2,29 @@ namespace uking::action { -GuardianMoveToTarget::GuardianMoveToTarget(const InitArg& arg) : GuardianMoveTo(arg) {} +GuardianMoveToTarget::GuardianMoveToTarget(const InitArg& arg) : GuardianActionBase(arg) {} GuardianMoveToTarget::~GuardianMoveToTarget() = default; bool GuardianMoveToTarget::init_(sead::Heap* heap) { - return GuardianMoveTo::init_(heap); + return GuardianActionBase::init_(heap); } void GuardianMoveToTarget::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianMoveTo::enter_(params); + GuardianActionBase::enter_(params); } void GuardianMoveToTarget::leave_() { - GuardianMoveTo::leave_(); + GuardianActionBase::leave_(); } void GuardianMoveToTarget::loadParams_() { - GuardianMoveTo::loadParams_(); + GuardianActionBase::loadParams_(); getStaticParam(&mSpeed_s, "Speed"); } void GuardianMoveToTarget::calc_() { - GuardianMoveTo::calc_(); + GuardianActionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianMoveToTarget.h b/src/Game/Actor/Action/actionGuardianMoveToTarget.h index 557cfcec..7232b5d6 100644 --- a/src/Game/Actor/Action/actionGuardianMoveToTarget.h +++ b/src/Game/Actor/Action/actionGuardianMoveToTarget.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGuardianMoveTo.h" +#include "Game/Actor/Action/actionGuardianActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardianMoveToTarget : public GuardianMoveTo { - SEAD_RTTI_OVERRIDE(GuardianMoveToTarget, GuardianMoveTo) +class GuardianMoveToTarget : public GuardianActionBase { + SEAD_RTTI_OVERRIDE(GuardianMoveToTarget, GuardianActionBase) public: explicit GuardianMoveToTarget(const InitArg& arg); ~GuardianMoveToTarget() override; diff --git a/src/Game/Actor/Action/actionGuardianSearch.cpp b/src/Game/Actor/Action/actionGuardianSearch.cpp index dce629f2..68b40637 100644 --- a/src/Game/Actor/Action/actionGuardianSearch.cpp +++ b/src/Game/Actor/Action/actionGuardianSearch.cpp @@ -2,30 +2,30 @@ namespace uking::action { -GuardianSearch::GuardianSearch(const InitArg& arg) : GuardianMoveTo(arg) {} +GuardianSearch::GuardianSearch(const InitArg& arg) : GuardianActionBase(arg) {} GuardianSearch::~GuardianSearch() = default; bool GuardianSearch::init_(sead::Heap* heap) { - return GuardianMoveTo::init_(heap); + return GuardianActionBase::init_(heap); } void GuardianSearch::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianMoveTo::enter_(params); + GuardianActionBase::enter_(params); } void GuardianSearch::leave_() { - GuardianMoveTo::leave_(); + GuardianActionBase::leave_(); } void GuardianSearch::loadParams_() { - GuardianMoveTo::loadParams_(); + GuardianActionBase::loadParams_(); getStaticParam(&mWaitFrame_s, "WaitFrame"); getStaticParam(&mLost_s, "Lost"); } void GuardianSearch::calc_() { - GuardianMoveTo::calc_(); + GuardianActionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianSearch.h b/src/Game/Actor/Action/actionGuardianSearch.h index 892251d8..1b80f912 100644 --- a/src/Game/Actor/Action/actionGuardianSearch.h +++ b/src/Game/Actor/Action/actionGuardianSearch.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGuardianMoveTo.h" +#include "Game/Actor/Action/actionGuardianActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardianSearch : public GuardianMoveTo { - SEAD_RTTI_OVERRIDE(GuardianSearch, GuardianMoveTo) +class GuardianSearch : public GuardianActionBase { + SEAD_RTTI_OVERRIDE(GuardianSearch, GuardianActionBase) public: explicit GuardianSearch(const InitArg& arg); ~GuardianSearch() override; diff --git a/src/Game/Actor/Action/actionGuardianStopWait.cpp b/src/Game/Actor/Action/actionGuardianStopWait.cpp index 7916b102..5619b0fc 100644 --- a/src/Game/Actor/Action/actionGuardianStopWait.cpp +++ b/src/Game/Actor/Action/actionGuardianStopWait.cpp @@ -2,31 +2,31 @@ namespace uking::action { -GuardianStopWait::GuardianStopWait(const InitArg& arg) : GuardianMoveTo(arg) {} +GuardianStopWait::GuardianStopWait(const InitArg& arg) : GuardianActionBase(arg) {} GuardianStopWait::~GuardianStopWait() = default; bool GuardianStopWait::init_(sead::Heap* heap) { - return GuardianMoveTo::init_(heap); + return GuardianActionBase::init_(heap); } void GuardianStopWait::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianMoveTo::enter_(params); + GuardianActionBase::enter_(params); } void GuardianStopWait::leave_() { - GuardianMoveTo::leave_(); + GuardianActionBase::leave_(); } void GuardianStopWait::loadParams_() { - GuardianMoveTo::loadParams_(); + GuardianActionBase::loadParams_(); getStaticParam(&mSpeed_s, "Speed"); getDynamicParam(&mDynStopTime_d, "DynStopTime"); getDynamicParam(&mDynStopPos_d, "DynStopPos"); } void GuardianStopWait::calc_() { - GuardianMoveTo::calc_(); + GuardianActionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGuardianStopWait.h b/src/Game/Actor/Action/actionGuardianStopWait.h index 61d2df5f..d7e58b4f 100644 --- a/src/Game/Actor/Action/actionGuardianStopWait.h +++ b/src/Game/Actor/Action/actionGuardianStopWait.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGuardianMoveTo.h" +#include "Game/Actor/Action/actionGuardianActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GuardianStopWait : public GuardianMoveTo { - SEAD_RTTI_OVERRIDE(GuardianStopWait, GuardianMoveTo) +class GuardianStopWait : public GuardianActionBase { + SEAD_RTTI_OVERRIDE(GuardianStopWait, GuardianActionBase) public: explicit GuardianStopWait(const InitArg& arg); ~GuardianStopWait() override; diff --git a/src/Game/Actor/Action/actionHoldArrow.cpp b/src/Game/Actor/Action/actionHoldArrow.cpp index 4e9361de..4a58ab3d 100644 --- a/src/Game/Actor/Action/actionHoldArrow.cpp +++ b/src/Game/Actor/Action/actionHoldArrow.cpp @@ -2,23 +2,23 @@ namespace uking::action { -HoldArrow::HoldArrow(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +HoldArrow::HoldArrow(const InitArg& arg) : StopBase(arg) {} void HoldArrow::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void HoldArrow::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void HoldArrow::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); } void HoldArrow::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHoldArrow.h b/src/Game/Actor/Action/actionHoldArrow.h index b06b1557..00a823c0 100644 --- a/src/Game/Actor/Action/actionHoldArrow.h +++ b/src/Game/Actor/Action/actionHoldArrow.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HoldArrow : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(HoldArrow, ActionWithPosAngReduce) +class HoldArrow : public StopBase { + SEAD_RTTI_OVERRIDE(HoldArrow, StopBase) public: explicit HoldArrow(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionHoldArrowBackWalk.cpp b/src/Game/Actor/Action/actionHoldArrowBackWalk.cpp index 14f1d8b0..939505a0 100644 --- a/src/Game/Actor/Action/actionHoldArrowBackWalk.cpp +++ b/src/Game/Actor/Action/actionHoldArrowBackWalk.cpp @@ -2,23 +2,23 @@ namespace uking::action { -HoldArrowBackWalk::HoldArrowBackWalk(const InitArg& arg) : BackWalkEx(arg) {} +HoldArrowBackWalk::HoldArrowBackWalk(const InitArg& arg) : NormalBackWalk(arg) {} void HoldArrowBackWalk::enter_(ksys::act::ai::InlineParamPack* params) { - BackWalkEx::enter_(params); + NormalBackWalk::enter_(params); } void HoldArrowBackWalk::leave_() { - BackWalkEx::leave_(); + NormalBackWalk::leave_(); } void HoldArrowBackWalk::loadParams_() { - BackWalkEx::loadParams_(); + NormalBackWalk::loadParams_(); getStaticParam(&mHoldWeaponIdx_s, "HoldWeaponIdx"); } void HoldArrowBackWalk::calc_() { - BackWalkEx::calc_(); + NormalBackWalk::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHoldArrowBackWalk.h b/src/Game/Actor/Action/actionHoldArrowBackWalk.h index 9cae36f5..4dd8e36e 100644 --- a/src/Game/Actor/Action/actionHoldArrowBackWalk.h +++ b/src/Game/Actor/Action/actionHoldArrowBackWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBackWalkEx.h" +#include "Game/Actor/Action/actionNormalBackWalk.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HoldArrowBackWalk : public BackWalkEx { - SEAD_RTTI_OVERRIDE(HoldArrowBackWalk, BackWalkEx) +class HoldArrowBackWalk : public NormalBackWalk { + SEAD_RTTI_OVERRIDE(HoldArrowBackWalk, NormalBackWalk) public: explicit HoldArrowBackWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionHornUse.cpp b/src/Game/Actor/Action/actionHornUse.cpp index d2e41e48..609e6247 100644 --- a/src/Game/Actor/Action/actionHornUse.cpp +++ b/src/Game/Actor/Action/actionHornUse.cpp @@ -2,24 +2,24 @@ namespace uking::action { -HornUse::HornUse(const InitArg& arg) : HornUseBase(arg) {} +HornUse::HornUse(const InitArg& arg) : EquipHornUseBase(arg) {} HornUse::~HornUse() = default; bool HornUse::init_(sead::Heap* heap) { - return HornUseBase::init_(heap); + return EquipHornUseBase::init_(heap); } void HornUse::enter_(ksys::act::ai::InlineParamPack* params) { - HornUseBase::enter_(params); + EquipHornUseBase::enter_(params); } void HornUse::leave_() { - HornUseBase::leave_(); + EquipHornUseBase::leave_(); } void HornUse::loadParams_() { - HornUseBase::loadParams_(); + EquipHornUseBase::loadParams_(); getStaticParam(&mSpreadDist_s, "SpreadDist"); getStaticParam(&mSpreadTime_s, "SpreadTime"); getStaticParam(&mTerrorLevel_s, "TerrorLevel"); @@ -27,7 +27,7 @@ void HornUse::loadParams_() { } void HornUse::calc_() { - HornUseBase::calc_(); + EquipHornUseBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHornUse.h b/src/Game/Actor/Action/actionHornUse.h index 33303aba..73072855 100644 --- a/src/Game/Actor/Action/actionHornUse.h +++ b/src/Game/Actor/Action/actionHornUse.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHornUseBase.h" +#include "Game/Actor/Action/actionEquipHornUseBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HornUse : public HornUseBase { - SEAD_RTTI_OVERRIDE(HornUse, HornUseBase) +class HornUse : public EquipHornUseBase { + SEAD_RTTI_OVERRIDE(HornUse, EquipHornUseBase) public: explicit HornUse(const InitArg& arg); ~HornUse() override; diff --git a/src/Game/Actor/Action/actionHornUseBase.cpp b/src/Game/Actor/Action/actionHornUseBase.cpp deleted file mode 100644 index 990c6cd7..00000000 --- a/src/Game/Actor/Action/actionHornUseBase.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionHornUseBase.h" - -namespace uking::action { - -HornUseBase::HornUseBase(const InitArg& arg) : TimeredASPlay(arg) {} - -HornUseBase::~HornUseBase() = default; - -bool HornUseBase::init_(sead::Heap* heap) { - return TimeredASPlay::init_(heap); -} - -void HornUseBase::enter_(ksys::act::ai::InlineParamPack* params) { - TimeredASPlay::enter_(params); -} - -void HornUseBase::leave_() { - TimeredASPlay::leave_(); -} - -void HornUseBase::loadParams_() { - TimeredASPlay::loadParams_(); - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mSignalOnTime_s, "SignalOnTime"); -} - -void HornUseBase::calc_() { - TimeredASPlay::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseElectricParalysis.cpp b/src/Game/Actor/Action/actionHorseElectricParalysis.cpp index 932ac815..87341cce 100644 --- a/src/Game/Actor/Action/actionHorseElectricParalysis.cpp +++ b/src/Game/Actor/Action/actionHorseElectricParalysis.cpp @@ -2,24 +2,24 @@ namespace uking::action { -HorseElectricParalysis::HorseElectricParalysis(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +HorseElectricParalysis::HorseElectricParalysis(const InitArg& arg) : StopBase(arg) {} HorseElectricParalysis::~HorseElectricParalysis() = default; bool HorseElectricParalysis::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void HorseElectricParalysis::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void HorseElectricParalysis::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void HorseElectricParalysis::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mPauseDelayFrames_s, "PauseDelayFrames"); getStaticParam(&mCanRiddenWhenLeave_s, "CanRiddenWhenLeave"); getStaticParam(&mASName_s, "ASName"); @@ -28,7 +28,7 @@ void HorseElectricParalysis::loadParams_() { } void HorseElectricParalysis::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseElectricParalysis.h b/src/Game/Actor/Action/actionHorseElectricParalysis.h index cc5c6f31..048c039e 100644 --- a/src/Game/Actor/Action/actionHorseElectricParalysis.h +++ b/src/Game/Actor/Action/actionHorseElectricParalysis.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseElectricParalysis : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(HorseElectricParalysis, ActionWithPosAngReduce) +class HorseElectricParalysis : public StopBase { + SEAD_RTTI_OVERRIDE(HorseElectricParalysis, StopBase) public: explicit HorseElectricParalysis(const InitArg& arg); ~HorseElectricParalysis() override; diff --git a/src/Game/Actor/Action/actionHorseFollow.cpp b/src/Game/Actor/Action/actionHorseFollow.cpp index 4dd830af..c63ab6ad 100644 --- a/src/Game/Actor/Action/actionHorseFollow.cpp +++ b/src/Game/Actor/Action/actionHorseFollow.cpp @@ -2,30 +2,30 @@ namespace uking::action { -HorseFollow::HorseFollow(const InitArg& arg) : AnimalFollowBase(arg) {} +HorseFollow::HorseFollow(const InitArg& arg) : HorseFollowBase(arg) {} HorseFollow::~HorseFollow() = default; bool HorseFollow::init_(sead::Heap* heap) { - return AnimalFollowBase::init_(heap); + return HorseFollowBase::init_(heap); } void HorseFollow::enter_(ksys::act::ai::InlineParamPack* params) { - AnimalFollowBase::enter_(params); + HorseFollowBase::enter_(params); } void HorseFollow::leave_() { - AnimalFollowBase::leave_(); + HorseFollowBase::leave_(); } void HorseFollow::loadParams_() { - AnimalFollowBase::loadParams_(); + HorseFollowBase::loadParams_(); getDynamicParam(&mDistanceKept_d, "DistanceKept"); getDynamicParam(&mTargetActor_d, "TargetActor"); } void HorseFollow::calc_() { - AnimalFollowBase::calc_(); + HorseFollowBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseFollow.h b/src/Game/Actor/Action/actionHorseFollow.h index 84dbc1cc..0efb665a 100644 --- a/src/Game/Actor/Action/actionHorseFollow.h +++ b/src/Game/Actor/Action/actionHorseFollow.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionAnimalFollowBase.h" +#include "Game/Actor/Action/actionHorseFollowBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseFollow : public AnimalFollowBase { - SEAD_RTTI_OVERRIDE(HorseFollow, AnimalFollowBase) +class HorseFollow : public HorseFollowBase { + SEAD_RTTI_OVERRIDE(HorseFollow, HorseFollowBase) public: explicit HorseFollow(const InitArg& arg); ~HorseFollow() override; diff --git a/src/Game/Actor/Action/actionAnimalFollowBase.cpp b/src/Game/Actor/Action/actionHorseFollowBase.cpp similarity index 78% rename from src/Game/Actor/Action/actionAnimalFollowBase.cpp rename to src/Game/Actor/Action/actionHorseFollowBase.cpp index b272548f..b7bea986 100644 --- a/src/Game/Actor/Action/actionAnimalFollowBase.cpp +++ b/src/Game/Actor/Action/actionHorseFollowBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionAnimalFollowBase.h" +#include "Game/Actor/Action/actionHorseFollowBase.h" namespace uking::action { -AnimalFollowBase::AnimalFollowBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +HorseFollowBase::HorseFollowBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -AnimalFollowBase::~AnimalFollowBase() = default; +HorseFollowBase::~HorseFollowBase() = default; -bool AnimalFollowBase::init_(sead::Heap* heap) { +bool HorseFollowBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AnimalFollowBase::enter_(ksys::act::ai::InlineParamPack* params) { +void HorseFollowBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void AnimalFollowBase::leave_() { +void HorseFollowBase::leave_() { ksys::act::ai::Action::leave_(); } -void AnimalFollowBase::loadParams_() { +void HorseFollowBase::loadParams_() { getStaticParam(&mUseGearType_s, "UseGearType"); getStaticParam(&mWaitDistanceToLeader_s, "WaitDistanceToLeader"); getStaticParam(&mGear1DistanceToLeader_s, "Gear1DistanceToLeader"); @@ -39,7 +39,7 @@ void AnimalFollowBase::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void AnimalFollowBase::calc_() { +void HorseFollowBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionAnimalFollowBase.h b/src/Game/Actor/Action/actionHorseFollowBase.h similarity index 89% rename from src/Game/Actor/Action/actionAnimalFollowBase.h rename to src/Game/Actor/Action/actionHorseFollowBase.h index cb35574d..13d37f34 100644 --- a/src/Game/Actor/Action/actionAnimalFollowBase.h +++ b/src/Game/Actor/Action/actionHorseFollowBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class AnimalFollowBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(AnimalFollowBase, ksys::act::ai::Action) +class HorseFollowBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(HorseFollowBase, ksys::act::ai::Action) public: - explicit AnimalFollowBase(const InitArg& arg); - ~AnimalFollowBase() override; + explicit HorseFollowBase(const InitArg& arg); + ~HorseFollowBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionHorseFreeze.cpp b/src/Game/Actor/Action/actionHorseFreeze.cpp index 0ac21032..0540a830 100644 --- a/src/Game/Actor/Action/actionHorseFreeze.cpp +++ b/src/Game/Actor/Action/actionHorseFreeze.cpp @@ -2,24 +2,24 @@ namespace uking::action { -HorseFreeze::HorseFreeze(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +HorseFreeze::HorseFreeze(const InitArg& arg) : StopBase(arg) {} HorseFreeze::~HorseFreeze() = default; bool HorseFreeze::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void HorseFreeze::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void HorseFreeze::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void HorseFreeze::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mPauseDelayFrames_s, "PauseDelayFrames"); getStaticParam(&mCanRiddenWhenLeave_s, "CanRiddenWhenLeave"); getStaticParam(&mASName_s, "ASName"); @@ -28,7 +28,7 @@ void HorseFreeze::loadParams_() { } void HorseFreeze::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseFreeze.h b/src/Game/Actor/Action/actionHorseFreeze.h index 0ab70301..00419c68 100644 --- a/src/Game/Actor/Action/actionHorseFreeze.h +++ b/src/Game/Actor/Action/actionHorseFreeze.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseFreeze : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(HorseFreeze, ActionWithPosAngReduce) +class HorseFreeze : public StopBase { + SEAD_RTTI_OVERRIDE(HorseFreeze, StopBase) public: explicit HorseFreeze(const InitArg& arg); ~HorseFreeze() override; diff --git a/src/Game/Actor/Action/actionHorseRide.cpp b/src/Game/Actor/Action/actionHorseRide.cpp deleted file mode 100644 index 2c63f93a..00000000 --- a/src/Game/Actor/Action/actionHorseRide.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionHorseRide.h" - -namespace uking::action { - -HorseRide::HorseRide(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -HorseRide::~HorseRide() = default; - -bool HorseRide::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void HorseRide::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void HorseRide::leave_() { - ksys::act::ai::Action::leave_(); -} - -void HorseRide::loadParams_() { - getStaticParam(&mUpperBodyASSlot_s, "UpperBodyASSlot"); - getStaticParam(&mLowerBodyASSlot_s, "LowerBodyASSlot"); -} - -void HorseRide::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideArrowReload.cpp b/src/Game/Actor/Action/actionHorseRideArrowReload.cpp index c68b9965..2db1df73 100644 --- a/src/Game/Actor/Action/actionHorseRideArrowReload.cpp +++ b/src/Game/Actor/Action/actionHorseRideArrowReload.cpp @@ -2,24 +2,24 @@ namespace uking::action { -HorseRideArrowReload::HorseRideArrowReload(const InitArg& arg) : HorseRide(arg) {} +HorseRideArrowReload::HorseRideArrowReload(const InitArg& arg) : HorseRideBase(arg) {} HorseRideArrowReload::~HorseRideArrowReload() = default; bool HorseRideArrowReload::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideArrowReload::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideArrowReload::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideArrowReload::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mRotRatio_s, "RotRatio"); getStaticParam(&mASName_s, "ASName"); @@ -27,7 +27,7 @@ void HorseRideArrowReload::loadParams_() { } void HorseRideArrowReload::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideArrowReload.h b/src/Game/Actor/Action/actionHorseRideArrowReload.h index 190ac278..b02fe03e 100644 --- a/src/Game/Actor/Action/actionHorseRideArrowReload.h +++ b/src/Game/Actor/Action/actionHorseRideArrowReload.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideArrowReload : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideArrowReload, HorseRide) +class HorseRideArrowReload : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideArrowReload, HorseRideBase) public: explicit HorseRideArrowReload(const InitArg& arg); ~HorseRideArrowReload() override; diff --git a/src/Game/Actor/Action/actionHorseRideBase.cpp b/src/Game/Actor/Action/actionHorseRideBase.cpp new file mode 100644 index 00000000..2897172b --- /dev/null +++ b/src/Game/Actor/Action/actionHorseRideBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionHorseRideBase.h" + +namespace uking::action { + +HorseRideBase::HorseRideBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +HorseRideBase::~HorseRideBase() = default; + +bool HorseRideBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void HorseRideBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void HorseRideBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void HorseRideBase::loadParams_() { + getStaticParam(&mUpperBodyASSlot_s, "UpperBodyASSlot"); + getStaticParam(&mLowerBodyASSlot_s, "LowerBodyASSlot"); +} + +void HorseRideBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRide.h b/src/Game/Actor/Action/actionHorseRideBase.h similarity index 71% rename from src/Game/Actor/Action/actionHorseRide.h rename to src/Game/Actor/Action/actionHorseRideBase.h index 95304fa0..41e31913 100644 --- a/src/Game/Actor/Action/actionHorseRide.h +++ b/src/Game/Actor/Action/actionHorseRideBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class HorseRide : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(HorseRide, ksys::act::ai::Action) +class HorseRideBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(HorseRideBase, ksys::act::ai::Action) public: - explicit HorseRide(const InitArg& arg); - ~HorseRide() override; + explicit HorseRideBase(const InitArg& arg); + ~HorseRideBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionHorseRideCommand.cpp b/src/Game/Actor/Action/actionHorseRideCommand.cpp index 5e072d5c..874849b2 100644 --- a/src/Game/Actor/Action/actionHorseRideCommand.cpp +++ b/src/Game/Actor/Action/actionHorseRideCommand.cpp @@ -2,29 +2,29 @@ namespace uking::action { -HorseRideCommand::HorseRideCommand(const InitArg& arg) : HorseRideCommandBase(arg) {} +HorseRideCommand::HorseRideCommand(const InitArg& arg) : HorseRideOneTimeCommandBase(arg) {} HorseRideCommand::~HorseRideCommand() = default; bool HorseRideCommand::init_(sead::Heap* heap) { - return HorseRideCommandBase::init_(heap); + return HorseRideOneTimeCommandBase::init_(heap); } void HorseRideCommand::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRideCommandBase::enter_(params); + HorseRideOneTimeCommandBase::enter_(params); } void HorseRideCommand::leave_() { - HorseRideCommandBase::leave_(); + HorseRideOneTimeCommandBase::leave_(); } void HorseRideCommand::loadParams_() { - HorseRideCommandBase::loadParams_(); + HorseRideOneTimeCommandBase::loadParams_(); getStaticParam(&mCommandTiming_s, "CommandTiming"); } void HorseRideCommand::calc_() { - HorseRideCommandBase::calc_(); + HorseRideOneTimeCommandBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideCommand.h b/src/Game/Actor/Action/actionHorseRideCommand.h index da590912..73978ae3 100644 --- a/src/Game/Actor/Action/actionHorseRideCommand.h +++ b/src/Game/Actor/Action/actionHorseRideCommand.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRideCommandBase.h" +#include "Game/Actor/Action/actionHorseRideOneTimeCommandBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideCommand : public HorseRideCommandBase { - SEAD_RTTI_OVERRIDE(HorseRideCommand, HorseRideCommandBase) +class HorseRideCommand : public HorseRideOneTimeCommandBase { + SEAD_RTTI_OVERRIDE(HorseRideCommand, HorseRideOneTimeCommandBase) public: explicit HorseRideCommand(const InitArg& arg); ~HorseRideCommand() override; diff --git a/src/Game/Actor/Action/actionHorseRideCommandBase.cpp b/src/Game/Actor/Action/actionHorseRideCommandBase.cpp deleted file mode 100644 index a1be2d97..00000000 --- a/src/Game/Actor/Action/actionHorseRideCommandBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionHorseRideCommandBase.h" - -namespace uking::action { - -HorseRideCommandBase::HorseRideCommandBase(const InitArg& arg) : HorseRideLookWait(arg) {} - -HorseRideCommandBase::~HorseRideCommandBase() = default; - -bool HorseRideCommandBase::init_(sead::Heap* heap) { - return HorseRideLookWait::init_(heap); -} - -void HorseRideCommandBase::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRideLookWait::enter_(params); -} - -void HorseRideCommandBase::leave_() { - HorseRideLookWait::leave_(); -} - -void HorseRideCommandBase::loadParams_() { - HorseRideLookWait::loadParams_(); -} - -void HorseRideCommandBase::calc_() { - HorseRideLookWait::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideLookWait.cpp b/src/Game/Actor/Action/actionHorseRideLookWait.cpp index 97e15545..e3c29cae 100644 --- a/src/Game/Actor/Action/actionHorseRideLookWait.cpp +++ b/src/Game/Actor/Action/actionHorseRideLookWait.cpp @@ -2,31 +2,31 @@ namespace uking::action { -HorseRideLookWait::HorseRideLookWait(const InitArg& arg) : HorseRide(arg) {} +HorseRideLookWait::HorseRideLookWait(const InitArg& arg) : HorseRideBase(arg) {} HorseRideLookWait::~HorseRideLookWait() = default; bool HorseRideLookWait::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideLookWait::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideLookWait::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideLookWait::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mRotRatio_s, "RotRatio"); getStaticParam(&mASName_s, "ASName"); getDynamicParam(&mTargetPos_d, "TargetPos"); } void HorseRideLookWait::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideLookWait.h b/src/Game/Actor/Action/actionHorseRideLookWait.h index ff42d9a5..4a34fb34 100644 --- a/src/Game/Actor/Action/actionHorseRideLookWait.h +++ b/src/Game/Actor/Action/actionHorseRideLookWait.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideLookWait : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideLookWait, HorseRide) +class HorseRideLookWait : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideLookWait, HorseRideBase) public: explicit HorseRideLookWait(const InitArg& arg); ~HorseRideLookWait() override; diff --git a/src/Game/Actor/Action/actionHorseRideLoopAttack.cpp b/src/Game/Actor/Action/actionHorseRideLoopAttack.cpp index 6bf64177..e741aa97 100644 --- a/src/Game/Actor/Action/actionHorseRideLoopAttack.cpp +++ b/src/Game/Actor/Action/actionHorseRideLoopAttack.cpp @@ -2,24 +2,24 @@ namespace uking::action { -HorseRideLoopAttack::HorseRideLoopAttack(const InitArg& arg) : HorseRide(arg) {} +HorseRideLoopAttack::HorseRideLoopAttack(const InitArg& arg) : HorseRideBase(arg) {} HorseRideLoopAttack::~HorseRideLoopAttack() = default; bool HorseRideLoopAttack::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideLoopAttack::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideLoopAttack::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideLoopAttack::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mLoopAttackTime_s, "LoopAttackTime"); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mIsFinishByAtHit_s, "IsFinishByAtHit"); @@ -29,7 +29,7 @@ void HorseRideLoopAttack::loadParams_() { } void HorseRideLoopAttack::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideLoopAttack.h b/src/Game/Actor/Action/actionHorseRideLoopAttack.h index a32917d6..3fd6f490 100644 --- a/src/Game/Actor/Action/actionHorseRideLoopAttack.h +++ b/src/Game/Actor/Action/actionHorseRideLoopAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideLoopAttack : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideLoopAttack, HorseRide) +class HorseRideLoopAttack : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideLoopAttack, HorseRideBase) public: explicit HorseRideLoopAttack(const InitArg& arg); ~HorseRideLoopAttack() override; diff --git a/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.cpp b/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.cpp index b8c3b44b..b862760d 100644 --- a/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.cpp +++ b/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.cpp @@ -2,30 +2,30 @@ namespace uking::action { -HorseRideOneTimeASPlay::HorseRideOneTimeASPlay(const InitArg& arg) : HorseRide(arg) {} +HorseRideOneTimeASPlay::HorseRideOneTimeASPlay(const InitArg& arg) : HorseRideBase(arg) {} HorseRideOneTimeASPlay::~HorseRideOneTimeASPlay() = default; bool HorseRideOneTimeASPlay::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideOneTimeASPlay::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideOneTimeASPlay::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideOneTimeASPlay::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mIgnoreSameAS_s, "IgnoreSameAS"); getStaticParam(&mASName_s, "ASName"); } void HorseRideOneTimeASPlay::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.h b/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.h index f053fdce..06ff8d7f 100644 --- a/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.h +++ b/src/Game/Actor/Action/actionHorseRideOneTimeASPlay.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideOneTimeASPlay : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideOneTimeASPlay, HorseRide) +class HorseRideOneTimeASPlay : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideOneTimeASPlay, HorseRideBase) public: explicit HorseRideOneTimeASPlay(const InitArg& arg); ~HorseRideOneTimeASPlay() override; diff --git a/src/Game/Actor/Action/actionHorseRideOneTimeCommandBase.cpp b/src/Game/Actor/Action/actionHorseRideOneTimeCommandBase.cpp new file mode 100644 index 00000000..49c93ba9 --- /dev/null +++ b/src/Game/Actor/Action/actionHorseRideOneTimeCommandBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionHorseRideOneTimeCommandBase.h" + +namespace uking::action { + +HorseRideOneTimeCommandBase::HorseRideOneTimeCommandBase(const InitArg& arg) + : HorseRideLookWait(arg) {} + +HorseRideOneTimeCommandBase::~HorseRideOneTimeCommandBase() = default; + +bool HorseRideOneTimeCommandBase::init_(sead::Heap* heap) { + return HorseRideLookWait::init_(heap); +} + +void HorseRideOneTimeCommandBase::enter_(ksys::act::ai::InlineParamPack* params) { + HorseRideLookWait::enter_(params); +} + +void HorseRideOneTimeCommandBase::leave_() { + HorseRideLookWait::leave_(); +} + +void HorseRideOneTimeCommandBase::loadParams_() { + HorseRideLookWait::loadParams_(); +} + +void HorseRideOneTimeCommandBase::calc_() { + HorseRideLookWait::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideCommandBase.h b/src/Game/Actor/Action/actionHorseRideOneTimeCommandBase.h similarity index 62% rename from src/Game/Actor/Action/actionHorseRideCommandBase.h rename to src/Game/Actor/Action/actionHorseRideOneTimeCommandBase.h index 80f3eb94..ef67f383 100644 --- a/src/Game/Actor/Action/actionHorseRideCommandBase.h +++ b/src/Game/Actor/Action/actionHorseRideOneTimeCommandBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class HorseRideCommandBase : public HorseRideLookWait { - SEAD_RTTI_OVERRIDE(HorseRideCommandBase, HorseRideLookWait) +class HorseRideOneTimeCommandBase : public HorseRideLookWait { + SEAD_RTTI_OVERRIDE(HorseRideOneTimeCommandBase, HorseRideLookWait) public: - explicit HorseRideCommandBase(const InitArg& arg); - ~HorseRideCommandBase() override; + explicit HorseRideOneTimeCommandBase(const InitArg& arg); + ~HorseRideOneTimeCommandBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionHorseRideSearch.cpp b/src/Game/Actor/Action/actionHorseRideSearch.cpp index a03eaa3c..e8b778c0 100644 --- a/src/Game/Actor/Action/actionHorseRideSearch.cpp +++ b/src/Game/Actor/Action/actionHorseRideSearch.cpp @@ -2,28 +2,28 @@ namespace uking::action { -HorseRideSearch::HorseRideSearch(const InitArg& arg) : HorseRide(arg) {} +HorseRideSearch::HorseRideSearch(const InitArg& arg) : HorseRideBase(arg) {} HorseRideSearch::~HorseRideSearch() = default; bool HorseRideSearch::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideSearch::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideSearch::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideSearch::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); } void HorseRideSearch::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideSearch.h b/src/Game/Actor/Action/actionHorseRideSearch.h index 4387cd07..ddd6f9cc 100644 --- a/src/Game/Actor/Action/actionHorseRideSearch.h +++ b/src/Game/Actor/Action/actionHorseRideSearch.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideSearch : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideSearch, HorseRide) +class HorseRideSearch : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideSearch, HorseRideBase) public: explicit HorseRideSearch(const InitArg& arg); ~HorseRideSearch() override; diff --git a/src/Game/Actor/Action/actionHorseRideShoot.cpp b/src/Game/Actor/Action/actionHorseRideShoot.cpp index f8408da1..d227a2a9 100644 --- a/src/Game/Actor/Action/actionHorseRideShoot.cpp +++ b/src/Game/Actor/Action/actionHorseRideShoot.cpp @@ -2,24 +2,24 @@ namespace uking::action { -HorseRideShoot::HorseRideShoot(const InitArg& arg) : HorseRide(arg) {} +HorseRideShoot::HorseRideShoot(const InitArg& arg) : HorseRideBase(arg) {} HorseRideShoot::~HorseRideShoot() = default; bool HorseRideShoot::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideShoot::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideShoot::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideShoot::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mOffsetRangeMin_s, "OffsetRangeMin"); getStaticParam(&mOffsetRangeMax_s, "OffsetRangeMax"); @@ -31,7 +31,7 @@ void HorseRideShoot::loadParams_() { } void HorseRideShoot::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideShoot.h b/src/Game/Actor/Action/actionHorseRideShoot.h index e73c92a6..a656ea33 100644 --- a/src/Game/Actor/Action/actionHorseRideShoot.h +++ b/src/Game/Actor/Action/actionHorseRideShoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideShoot : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideShoot, HorseRide) +class HorseRideShoot : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideShoot, HorseRideBase) public: explicit HorseRideShoot(const InitArg& arg); ~HorseRideShoot() override; diff --git a/src/Game/Actor/Action/actionHorseRideViewWait.cpp b/src/Game/Actor/Action/actionHorseRideViewWait.cpp index c7688aea..fbc607ce 100644 --- a/src/Game/Actor/Action/actionHorseRideViewWait.cpp +++ b/src/Game/Actor/Action/actionHorseRideViewWait.cpp @@ -2,31 +2,31 @@ namespace uking::action { -HorseRideViewWait::HorseRideViewWait(const InitArg& arg) : HorseRide(arg) {} +HorseRideViewWait::HorseRideViewWait(const InitArg& arg) : HorseRideBase(arg) {} HorseRideViewWait::~HorseRideViewWait() = default; bool HorseRideViewWait::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideViewWait::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideViewWait::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideViewWait::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mRotRatio_s, "RotRatio"); getStaticParam(&mASName_s, "ASName"); getDynamicParam(&mTargetPos_d, "TargetPos"); } void HorseRideViewWait::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideViewWait.h b/src/Game/Actor/Action/actionHorseRideViewWait.h index b21e4927..1b5f51c5 100644 --- a/src/Game/Actor/Action/actionHorseRideViewWait.h +++ b/src/Game/Actor/Action/actionHorseRideViewWait.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideViewWait : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideViewWait, HorseRide) +class HorseRideViewWait : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideViewWait, HorseRideBase) public: explicit HorseRideViewWait(const InitArg& arg); ~HorseRideViewWait() override; diff --git a/src/Game/Actor/Action/actionHorseRideWait.cpp b/src/Game/Actor/Action/actionHorseRideWait.cpp index 3101519b..a204af0a 100644 --- a/src/Game/Actor/Action/actionHorseRideWait.cpp +++ b/src/Game/Actor/Action/actionHorseRideWait.cpp @@ -2,30 +2,30 @@ namespace uking::action { -HorseRideWait::HorseRideWait(const InitArg& arg) : HorseRide(arg) {} +HorseRideWait::HorseRideWait(const InitArg& arg) : HorseRideBase(arg) {} HorseRideWait::~HorseRideWait() = default; bool HorseRideWait::init_(sead::Heap* heap) { - return HorseRide::init_(heap); + return HorseRideBase::init_(heap); } void HorseRideWait::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRide::enter_(params); + HorseRideBase::enter_(params); } void HorseRideWait::leave_() { - HorseRide::leave_(); + HorseRideBase::leave_(); } void HorseRideWait::loadParams_() { - HorseRide::loadParams_(); + HorseRideBase::loadParams_(); getStaticParam(&mTime_s, "Time"); getStaticParam(&mTimeRand_s, "TimeRand"); } void HorseRideWait::calc_() { - HorseRide::calc_(); + HorseRideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideWait.h b/src/Game/Actor/Action/actionHorseRideWait.h index a14bd39f..84f17e61 100644 --- a/src/Game/Actor/Action/actionHorseRideWait.h +++ b/src/Game/Actor/Action/actionHorseRideWait.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRide.h" +#include "Game/Actor/Action/actionHorseRideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideWait : public HorseRide { - SEAD_RTTI_OVERRIDE(HorseRideWait, HorseRide) +class HorseRideWait : public HorseRideBase { + SEAD_RTTI_OVERRIDE(HorseRideWait, HorseRideBase) public: explicit HorseRideWait(const InitArg& arg); ~HorseRideWait() override; diff --git a/src/Game/Actor/Action/actionIgniteActorReloadBase.cpp b/src/Game/Actor/Action/actionIgniteActorReloadBase.cpp new file mode 100644 index 00000000..7fba3159 --- /dev/null +++ b/src/Game/Actor/Action/actionIgniteActorReloadBase.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionIgniteActorReloadBase.h" + +namespace uking::action { + +IgniteActorReloadBase::IgniteActorReloadBase(const InitArg& arg) : OnetimeStopASPlay(arg) {} + +IgniteActorReloadBase::~IgniteActorReloadBase() = default; + +bool IgniteActorReloadBase::init_(sead::Heap* heap) { + return OnetimeStopASPlay::init_(heap); +} + +void IgniteActorReloadBase::enter_(ksys::act::ai::InlineParamPack* params) { + OnetimeStopASPlay::enter_(params); +} + +void IgniteActorReloadBase::leave_() { + OnetimeStopASPlay::leave_(); +} + +void IgniteActorReloadBase::loadParams_() { + OnetimeStopASPlay::loadParams_(); +} + +void IgniteActorReloadBase::calc_() { + OnetimeStopASPlay::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionOctarockReloadWigBase.h b/src/Game/Actor/Action/actionIgniteActorReloadBase.h similarity index 64% rename from src/Game/Actor/Action/actionOctarockReloadWigBase.h rename to src/Game/Actor/Action/actionIgniteActorReloadBase.h index 74f83933..bfe9bb36 100644 --- a/src/Game/Actor/Action/actionOctarockReloadWigBase.h +++ b/src/Game/Actor/Action/actionIgniteActorReloadBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class OctarockReloadWigBase : public OnetimeStopASPlay { - SEAD_RTTI_OVERRIDE(OctarockReloadWigBase, OnetimeStopASPlay) +class IgniteActorReloadBase : public OnetimeStopASPlay { + SEAD_RTTI_OVERRIDE(IgniteActorReloadBase, OnetimeStopASPlay) public: - explicit OctarockReloadWigBase(const InitArg& arg); - ~OctarockReloadWigBase() override; + explicit IgniteActorReloadBase(const InitArg& arg); + ~IgniteActorReloadBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionTakeHitImpactForce.cpp b/src/Game/Actor/Action/actionKnockBackHitImpactForce.cpp similarity index 65% rename from src/Game/Actor/Action/actionTakeHitImpactForce.cpp rename to src/Game/Actor/Action/actionKnockBackHitImpactForce.cpp index 88a5cdbb..cc897bda 100644 --- a/src/Game/Actor/Action/actionTakeHitImpactForce.cpp +++ b/src/Game/Actor/Action/actionKnockBackHitImpactForce.cpp @@ -1,16 +1,16 @@ -#include "Game/Actor/Action/actionTakeHitImpactForce.h" +#include "Game/Actor/Action/actionKnockBackHitImpactForce.h" namespace uking::action { -TakeHitImpactForce::TakeHitImpactForce(const InitArg& arg) : ActionEx(arg) {} +KnockBackHitImpactForce::KnockBackHitImpactForce(const InitArg& arg) : ActionEx(arg) {} -TakeHitImpactForce::~TakeHitImpactForce() = default; +KnockBackHitImpactForce::~KnockBackHitImpactForce() = default; -void TakeHitImpactForce::enter_(ksys::act::ai::InlineParamPack* params) { +void KnockBackHitImpactForce::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } -void TakeHitImpactForce::loadParams_() { +void KnockBackHitImpactForce::loadParams_() { getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); getStaticParam(&mHitImpactForceLargeSwordS_s, "HitImpactForceLargeSwordS"); @@ -22,7 +22,7 @@ void TakeHitImpactForce::loadParams_() { getStaticParam(&mVelReduceY_s, "VelReduceY"); } -void TakeHitImpactForce::calc_() { +void KnockBackHitImpactForce::calc_() { ActionEx::calc_(); } diff --git a/src/Game/Actor/Action/actionTakeHitImpactForce.h b/src/Game/Actor/Action/actionKnockBackHitImpactForce.h similarity index 83% rename from src/Game/Actor/Action/actionTakeHitImpactForce.h rename to src/Game/Actor/Action/actionKnockBackHitImpactForce.h index 69d357e1..514655ae 100644 --- a/src/Game/Actor/Action/actionTakeHitImpactForce.h +++ b/src/Game/Actor/Action/actionKnockBackHitImpactForce.h @@ -5,11 +5,11 @@ namespace uking::action { -class TakeHitImpactForce : public ActionEx { - SEAD_RTTI_OVERRIDE(TakeHitImpactForce, ActionEx) +class KnockBackHitImpactForce : public ActionEx { + SEAD_RTTI_OVERRIDE(KnockBackHitImpactForce, ActionEx) public: - explicit TakeHitImpactForce(const InitArg& arg); - ~TakeHitImpactForce() override; + explicit KnockBackHitImpactForce(const InitArg& arg); + ~KnockBackHitImpactForce() override; void enter_(ksys::act::ai::InlineParamPack* params) override; void loadParams_() override; diff --git a/src/Game/Actor/Action/actionKnockBackShock.cpp b/src/Game/Actor/Action/actionKnockBackShock.cpp deleted file mode 100644 index ec0af7c9..00000000 --- a/src/Game/Actor/Action/actionKnockBackShock.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionKnockBackShock.h" - -namespace uking::action { - -KnockBackShock::KnockBackShock(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -KnockBackShock::~KnockBackShock() = default; - -bool KnockBackShock::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void KnockBackShock::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void KnockBackShock::leave_() { - ksys::act::ai::Action::leave_(); -} - -void KnockBackShock::loadParams_() { - getStaticParam(&mHitImpactForce_s, "HitImpactForce"); - getStaticParam(&mVelReduce_s, "VelReduce"); - getStaticParam(&mVelReduceOnGround_s, "VelReduceOnGround"); -} - -void KnockBackShock::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionKokkoCreateDrop.cpp b/src/Game/Actor/Action/actionKokkoCreateDrop.cpp index 9494260f..fefac621 100644 --- a/src/Game/Actor/Action/actionKokkoCreateDrop.cpp +++ b/src/Game/Actor/Action/actionKokkoCreateDrop.cpp @@ -2,28 +2,28 @@ namespace uking::action { -KokkoCreateDrop::KokkoCreateDrop(const InitArg& arg) : KokkoCreateDropBase(arg) {} +KokkoCreateDrop::KokkoCreateDrop(const InitArg& arg) : CreateDropBase(arg) {} KokkoCreateDrop::~KokkoCreateDrop() = default; bool KokkoCreateDrop::init_(sead::Heap* heap) { - return KokkoCreateDropBase::init_(heap); + return CreateDropBase::init_(heap); } void KokkoCreateDrop::enter_(ksys::act::ai::InlineParamPack* params) { - KokkoCreateDropBase::enter_(params); + CreateDropBase::enter_(params); } void KokkoCreateDrop::leave_() { - KokkoCreateDropBase::leave_(); + CreateDropBase::leave_(); } void KokkoCreateDrop::loadParams_() { - KokkoCreateDropBase::loadParams_(); + CreateDropBase::loadParams_(); } void KokkoCreateDrop::calc_() { - KokkoCreateDropBase::calc_(); + CreateDropBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionKokkoCreateDrop.h b/src/Game/Actor/Action/actionKokkoCreateDrop.h index 41f2b708..76457a4b 100644 --- a/src/Game/Actor/Action/actionKokkoCreateDrop.h +++ b/src/Game/Actor/Action/actionKokkoCreateDrop.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionKokkoCreateDropBase.h" +#include "Game/Actor/Action/actionCreateDropBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class KokkoCreateDrop : public KokkoCreateDropBase { - SEAD_RTTI_OVERRIDE(KokkoCreateDrop, KokkoCreateDropBase) +class KokkoCreateDrop : public CreateDropBase { + SEAD_RTTI_OVERRIDE(KokkoCreateDrop, CreateDropBase) public: explicit KokkoCreateDrop(const InitArg& arg); ~KokkoCreateDrop() override; diff --git a/src/Game/Actor/Action/actionKokkoCreateDropBase.cpp b/src/Game/Actor/Action/actionKokkoCreateDropBase.cpp deleted file mode 100644 index d14f29a1..00000000 --- a/src/Game/Actor/Action/actionKokkoCreateDropBase.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionKokkoCreateDropBase.h" - -namespace uking::action { - -KokkoCreateDropBase::KokkoCreateDropBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -KokkoCreateDropBase::~KokkoCreateDropBase() = default; - -bool KokkoCreateDropBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void KokkoCreateDropBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void KokkoCreateDropBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void KokkoCreateDropBase::loadParams_() {} - -void KokkoCreateDropBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.cpp b/src/Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.cpp similarity index 51% rename from src/Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.cpp rename to src/Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.cpp index 88f1d77f..0c064192 100644 --- a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.cpp +++ b/src/Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.cpp @@ -1,31 +1,31 @@ -#include "Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.h" +#include "Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.h" namespace uking::action { -SiteBossSwordWhirlSlashChargeBase::SiteBossSwordWhirlSlashChargeBase(const InitArg& arg) +LastBossSwordWhirlSlashChargeBase::LastBossSwordWhirlSlashChargeBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SiteBossSwordWhirlSlashChargeBase::~SiteBossSwordWhirlSlashChargeBase() = default; +LastBossSwordWhirlSlashChargeBase::~LastBossSwordWhirlSlashChargeBase() = default; -bool SiteBossSwordWhirlSlashChargeBase::init_(sead::Heap* heap) { +bool LastBossSwordWhirlSlashChargeBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SiteBossSwordWhirlSlashChargeBase::enter_(ksys::act::ai::InlineParamPack* params) { +void LastBossSwordWhirlSlashChargeBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void SiteBossSwordWhirlSlashChargeBase::leave_() { +void LastBossSwordWhirlSlashChargeBase::leave_() { ksys::act::ai::Action::leave_(); } -void SiteBossSwordWhirlSlashChargeBase::loadParams_() { +void LastBossSwordWhirlSlashChargeBase::loadParams_() { getStaticParam(&mChargeTime_s, "ChargeTime"); getStaticParam(&mInitSpeed_s, "InitSpeed"); getDynamicParam(&mTargetPos_d, "TargetPos"); } -void SiteBossSwordWhirlSlashChargeBase::calc_() { +void LastBossSwordWhirlSlashChargeBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.h b/src/Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.h similarity index 70% rename from src/Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.h rename to src/Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.h index 7c87cf18..93dc23e8 100644 --- a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.h +++ b/src/Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class SiteBossSwordWhirlSlashChargeBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SiteBossSwordWhirlSlashChargeBase, ksys::act::ai::Action) +class LastBossSwordWhirlSlashChargeBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(LastBossSwordWhirlSlashChargeBase, ksys::act::ai::Action) public: - explicit SiteBossSwordWhirlSlashChargeBase(const InitArg& arg); - ~SiteBossSwordWhirlSlashChargeBase() override; + explicit LastBossSwordWhirlSlashChargeBase(const InitArg& arg); + ~LastBossSwordWhirlSlashChargeBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionLookAtObject.cpp b/src/Game/Actor/Action/actionLookAtObject.cpp index 65b9ec02..f4c7995a 100644 --- a/src/Game/Actor/Action/actionLookAtObject.cpp +++ b/src/Game/Actor/Action/actionLookAtObject.cpp @@ -2,16 +2,16 @@ namespace uking::action { -LookAtObject::LookAtObject(const InitArg& arg) : LookAtObjectBase(arg) {} +LookAtObject::LookAtObject(const InitArg& arg) : TurnAndLookToObjBase(arg) {} LookAtObject::~LookAtObject() = default; bool LookAtObject::init_(sead::Heap* heap) { - return LookAtObjectBase::init_(heap); + return TurnAndLookToObjBase::init_(heap); } void LookAtObject::loadParams_() { - LookAtObjectBase::loadParams_(); + TurnAndLookToObjBase::loadParams_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionLookAtObject.h b/src/Game/Actor/Action/actionLookAtObject.h index f999366d..4c94ef3a 100644 --- a/src/Game/Actor/Action/actionLookAtObject.h +++ b/src/Game/Actor/Action/actionLookAtObject.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionLookAtObjectBase.h" +#include "Game/Actor/Action/actionTurnAndLookToObjBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class LookAtObject : public LookAtObjectBase { - SEAD_RTTI_OVERRIDE(LookAtObject, LookAtObjectBase) +class LookAtObject : public TurnAndLookToObjBase { + SEAD_RTTI_OVERRIDE(LookAtObject, TurnAndLookToObjBase) public: explicit LookAtObject(const InitArg& arg); ~LookAtObject() override; diff --git a/src/Game/Actor/Action/actionMimic.cpp b/src/Game/Actor/Action/actionMimic.cpp index ed291c61..8888fdea 100644 --- a/src/Game/Actor/Action/actionMimic.cpp +++ b/src/Game/Actor/Action/actionMimic.cpp @@ -2,20 +2,20 @@ namespace uking::action { -Mimic::Mimic(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Mimic::Mimic(const InitArg& arg) : StopBase(arg) {} Mimic::~Mimic() = default; void Mimic::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Mimic::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Mimic::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mMimicTime_s, "MimicTime"); getStaticParam(&mMimicRate_s, "MimicRate"); getStaticParam(&mMimicStartASName_s, "MimicStartASName"); @@ -26,7 +26,7 @@ void Mimic::loadParams_() { } void Mimic::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionMimic.h b/src/Game/Actor/Action/actionMimic.h index 59c23402..30b372d3 100644 --- a/src/Game/Actor/Action/actionMimic.h +++ b/src/Game/Actor/Action/actionMimic.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Mimic : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Mimic, ActionWithPosAngReduce) +class Mimic : public StopBase { + SEAD_RTTI_OVERRIDE(Mimic, StopBase) public: explicit Mimic(const InitArg& arg); ~Mimic() override; diff --git a/src/Game/Actor/Action/actionMove2HomePos.cpp b/src/Game/Actor/Action/actionMove2HomePos.cpp index 7380120b..01f0e6ee 100644 --- a/src/Game/Actor/Action/actionMove2HomePos.cpp +++ b/src/Game/Actor/Action/actionMove2HomePos.cpp @@ -2,24 +2,24 @@ namespace uking::action { -Move2HomePos::Move2HomePos(const InitArg& arg) : Move2HomePosBase(arg) {} +Move2HomePos::Move2HomePos(const InitArg& arg) : MoveHomePosBase(arg) {} Move2HomePos::~Move2HomePos() = default; bool Move2HomePos::init_(sead::Heap* heap) { - return Move2HomePosBase::init_(heap); + return MoveHomePosBase::init_(heap); } void Move2HomePos::enter_(ksys::act::ai::InlineParamPack* params) { - Move2HomePosBase::enter_(params); + MoveHomePosBase::enter_(params); } void Move2HomePos::leave_() { - Move2HomePosBase::leave_(); + MoveHomePosBase::leave_(); } void Move2HomePos::loadParams_() { - Move2HomePosBase::loadParams_(); + MoveHomePosBase::loadParams_(); getStaticParam(&mVibDirection_s, "VibDirection"); getStaticParam(&mVibPattern_s, "VibPattern"); getStaticParam(&mVibPower_s, "VibPower"); @@ -28,7 +28,7 @@ void Move2HomePos::loadParams_() { } void Move2HomePos::calc_() { - Move2HomePosBase::calc_(); + MoveHomePosBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionMove2HomePos.h b/src/Game/Actor/Action/actionMove2HomePos.h index 7b911348..76c1e753 100644 --- a/src/Game/Actor/Action/actionMove2HomePos.h +++ b/src/Game/Actor/Action/actionMove2HomePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionMove2HomePosBase.h" +#include "Game/Actor/Action/actionMoveHomePosBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Move2HomePos : public Move2HomePosBase { - SEAD_RTTI_OVERRIDE(Move2HomePos, Move2HomePosBase) +class Move2HomePos : public MoveHomePosBase { + SEAD_RTTI_OVERRIDE(Move2HomePos, MoveHomePosBase) public: explicit Move2HomePos(const InitArg& arg); ~Move2HomePos() override; diff --git a/src/Game/Actor/Action/actionMove2HomePosBase.cpp b/src/Game/Actor/Action/actionMove2HomePosBase.cpp deleted file mode 100644 index 62c55d36..00000000 --- a/src/Game/Actor/Action/actionMove2HomePosBase.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionMove2HomePosBase.h" - -namespace uking::action { - -Move2HomePosBase::Move2HomePosBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -Move2HomePosBase::~Move2HomePosBase() = default; - -bool Move2HomePosBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void Move2HomePosBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void Move2HomePosBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void Move2HomePosBase::loadParams_() { - getStaticParam(&mIsReturn_s, "IsReturn"); - getDynamicParam(&mDynMoveDis_d, "DynMoveDis"); - getDynamicParam(&mDynMoveSpeed_d, "DynMoveSpeed"); -} - -void Move2HomePosBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionMoveHomePosBase.cpp b/src/Game/Actor/Action/actionMoveHomePosBase.cpp new file mode 100644 index 00000000..14cb821a --- /dev/null +++ b/src/Game/Actor/Action/actionMoveHomePosBase.cpp @@ -0,0 +1,31 @@ +#include "Game/Actor/Action/actionMoveHomePosBase.h" + +namespace uking::action { + +MoveHomePosBase::MoveHomePosBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +MoveHomePosBase::~MoveHomePosBase() = default; + +bool MoveHomePosBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void MoveHomePosBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void MoveHomePosBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void MoveHomePosBase::loadParams_() { + getStaticParam(&mIsReturn_s, "IsReturn"); + getDynamicParam(&mDynMoveDis_d, "DynMoveDis"); + getDynamicParam(&mDynMoveSpeed_d, "DynMoveSpeed"); +} + +void MoveHomePosBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionMove2HomePosBase.h b/src/Game/Actor/Action/actionMoveHomePosBase.h similarity index 72% rename from src/Game/Actor/Action/actionMove2HomePosBase.h rename to src/Game/Actor/Action/actionMoveHomePosBase.h index dc36e2ee..2ec535a0 100644 --- a/src/Game/Actor/Action/actionMove2HomePosBase.h +++ b/src/Game/Actor/Action/actionMoveHomePosBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class Move2HomePosBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(Move2HomePosBase, ksys::act::ai::Action) +class MoveHomePosBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(MoveHomePosBase, ksys::act::ai::Action) public: - explicit Move2HomePosBase(const InitArg& arg); - ~Move2HomePosBase() override; + explicit MoveHomePosBase(const InitArg& arg); + ~MoveHomePosBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionMoveToTargetCurve.cpp b/src/Game/Actor/Action/actionMoveToTargetCurve.cpp index 8f77247a..1798ac69 100644 --- a/src/Game/Actor/Action/actionMoveToTargetCurve.cpp +++ b/src/Game/Actor/Action/actionMoveToTargetCurve.cpp @@ -2,29 +2,29 @@ namespace uking::action { -MoveToTargetCurve::MoveToTargetCurve(const InitArg& arg) : MoveToTargetCurveBase(arg) {} +MoveToTargetCurve::MoveToTargetCurve(const InitArg& arg) : CurveMoveToTargetBase(arg) {} MoveToTargetCurve::~MoveToTargetCurve() = default; bool MoveToTargetCurve::init_(sead::Heap* heap) { - return MoveToTargetCurveBase::init_(heap); + return CurveMoveToTargetBase::init_(heap); } void MoveToTargetCurve::enter_(ksys::act::ai::InlineParamPack* params) { - MoveToTargetCurveBase::enter_(params); + CurveMoveToTargetBase::enter_(params); } void MoveToTargetCurve::leave_() { - MoveToTargetCurveBase::leave_(); + CurveMoveToTargetBase::leave_(); } void MoveToTargetCurve::loadParams_() { - MoveToTargetCurveBase::loadParams_(); + CurveMoveToTargetBase::loadParams_(); getMapUnitParam(&mTargetPosition_m, "TargetPosition"); } void MoveToTargetCurve::calc_() { - MoveToTargetCurveBase::calc_(); + CurveMoveToTargetBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionMoveToTargetCurve.h b/src/Game/Actor/Action/actionMoveToTargetCurve.h index 0ef07559..4c965d68 100644 --- a/src/Game/Actor/Action/actionMoveToTargetCurve.h +++ b/src/Game/Actor/Action/actionMoveToTargetCurve.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionMoveToTargetCurveBase.h" +#include "Game/Actor/Action/actionCurveMoveToTargetBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class MoveToTargetCurve : public MoveToTargetCurveBase { - SEAD_RTTI_OVERRIDE(MoveToTargetCurve, MoveToTargetCurveBase) +class MoveToTargetCurve : public CurveMoveToTargetBase { + SEAD_RTTI_OVERRIDE(MoveToTargetCurve, CurveMoveToTargetBase) public: explicit MoveToTargetCurve(const InitArg& arg); ~MoveToTargetCurve() override; diff --git a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.cpp b/src/Game/Actor/Action/actionMultiVacuumBase.cpp similarity index 61% rename from src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.cpp rename to src/Game/Actor/Action/actionMultiVacuumBase.cpp index 04b31658..be596e36 100644 --- a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.cpp +++ b/src/Game/Actor/Action/actionMultiVacuumBase.cpp @@ -1,26 +1,24 @@ -#include "Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.h" +#include "Game/Actor/Action/actionMultiVacuumBase.h" namespace uking::action { -MultiVacuumRotScaleTimeByDistWithTgtBase::MultiVacuumRotScaleTimeByDistWithTgtBase( - const InitArg& arg) - : ksys::act::ai::Action(arg) {} +MultiVacuumBase::MultiVacuumBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -MultiVacuumRotScaleTimeByDistWithTgtBase::~MultiVacuumRotScaleTimeByDistWithTgtBase() = default; +MultiVacuumBase::~MultiVacuumBase() = default; -bool MultiVacuumRotScaleTimeByDistWithTgtBase::init_(sead::Heap* heap) { +bool MultiVacuumBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void MultiVacuumRotScaleTimeByDistWithTgtBase::enter_(ksys::act::ai::InlineParamPack* params) { +void MultiVacuumBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void MultiVacuumRotScaleTimeByDistWithTgtBase::leave_() { +void MultiVacuumBase::leave_() { ksys::act::ai::Action::leave_(); } -void MultiVacuumRotScaleTimeByDistWithTgtBase::loadParams_() { +void MultiVacuumBase::loadParams_() { getStaticParam(&mTime_s, "Time"); getStaticParam(&mAddTimeVacuuming_s, "AddTimeVacuuming"); getStaticParam(&mAddTimeNearVacuuming_s, "AddTimeNearVacuuming"); @@ -39,7 +37,7 @@ void MultiVacuumRotScaleTimeByDistWithTgtBase::loadParams_() { getStaticParam(&mVacuumPosOffset_s, "VacuumPosOffset"); } -void MultiVacuumRotScaleTimeByDistWithTgtBase::calc_() { +void MultiVacuumBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.h b/src/Game/Actor/Action/actionMultiVacuumBase.h similarity index 82% rename from src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.h rename to src/Game/Actor/Action/actionMultiVacuumBase.h index a8f8f086..ae8f8281 100644 --- a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.h +++ b/src/Game/Actor/Action/actionMultiVacuumBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class MultiVacuumRotScaleTimeByDistWithTgtBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(MultiVacuumRotScaleTimeByDistWithTgtBase, ksys::act::ai::Action) +class MultiVacuumBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(MultiVacuumBase, ksys::act::ai::Action) public: - explicit MultiVacuumRotScaleTimeByDistWithTgtBase(const InitArg& arg); - ~MultiVacuumRotScaleTimeByDistWithTgtBase() override; + explicit MultiVacuumBase(const InitArg& arg); + ~MultiVacuumBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionMultiVacuumRotBase.cpp b/src/Game/Actor/Action/actionMultiVacuumRotBase.cpp new file mode 100644 index 00000000..4d3e091f --- /dev/null +++ b/src/Game/Actor/Action/actionMultiVacuumRotBase.cpp @@ -0,0 +1,32 @@ +#include "Game/Actor/Action/actionMultiVacuumRotBase.h" + +namespace uking::action { + +MultiVacuumRotBase::MultiVacuumRotBase(const InitArg& arg) : MultiVacuumBase(arg) {} + +MultiVacuumRotBase::~MultiVacuumRotBase() = default; + +bool MultiVacuumRotBase::init_(sead::Heap* heap) { + return MultiVacuumBase::init_(heap); +} + +void MultiVacuumRotBase::enter_(ksys::act::ai::InlineParamPack* params) { + MultiVacuumBase::enter_(params); +} + +void MultiVacuumRotBase::leave_() { + MultiVacuumBase::leave_(); +} + +void MultiVacuumRotBase::loadParams_() { + MultiVacuumBase::loadParams_(); + getStaticParam(&mRotSpd_s, "RotSpd"); + getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); + getDynamicParam(&mTargetPos_d, "TargetPos"); +} + +void MultiVacuumRotBase::calc_() { + MultiVacuumBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.h b/src/Game/Actor/Action/actionMultiVacuumRotBase.h similarity index 56% rename from src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.h rename to src/Game/Actor/Action/actionMultiVacuumRotBase.h index ebc230cb..4c8d39d6 100644 --- a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.h +++ b/src/Game/Actor/Action/actionMultiVacuumRotBase.h @@ -1,16 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgtBase.h" +#include "Game/Actor/Action/actionMultiVacuumBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class MultiVacuumRotScaleTimeByDistWithTgt : public MultiVacuumRotScaleTimeByDistWithTgtBase { - SEAD_RTTI_OVERRIDE(MultiVacuumRotScaleTimeByDistWithTgt, - MultiVacuumRotScaleTimeByDistWithTgtBase) +class MultiVacuumRotBase : public MultiVacuumBase { + SEAD_RTTI_OVERRIDE(MultiVacuumRotBase, MultiVacuumBase) public: - explicit MultiVacuumRotScaleTimeByDistWithTgt(const InitArg& arg); - ~MultiVacuumRotScaleTimeByDistWithTgt() override; + explicit MultiVacuumRotBase(const InitArg& arg); + ~MultiVacuumRotBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.cpp b/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.cpp index c71c3ac4..545c8f62 100644 --- a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.cpp +++ b/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.cpp @@ -3,29 +3,29 @@ namespace uking::action { MultiVacuumRotScaleTimeByDist::MultiVacuumRotScaleTimeByDist(const InitArg& arg) - : MultiVacuumRotScaleTimeByDistWithTgt(arg) {} + : MultiVacuumRotBase(arg) {} MultiVacuumRotScaleTimeByDist::~MultiVacuumRotScaleTimeByDist() = default; bool MultiVacuumRotScaleTimeByDist::init_(sead::Heap* heap) { - return MultiVacuumRotScaleTimeByDistWithTgt::init_(heap); + return MultiVacuumRotBase::init_(heap); } void MultiVacuumRotScaleTimeByDist::enter_(ksys::act::ai::InlineParamPack* params) { - MultiVacuumRotScaleTimeByDistWithTgt::enter_(params); + MultiVacuumRotBase::enter_(params); } void MultiVacuumRotScaleTimeByDist::leave_() { - MultiVacuumRotScaleTimeByDistWithTgt::leave_(); + MultiVacuumRotBase::leave_(); } void MultiVacuumRotScaleTimeByDist::loadParams_() { - MultiVacuumRotScaleTimeByDistWithTgt::loadParams_(); + MultiVacuumRotBase::loadParams_(); getStaticParam(&mMaxTimeDist_s, "MaxTimeDist"); } void MultiVacuumRotScaleTimeByDist::calc_() { - MultiVacuumRotScaleTimeByDistWithTgt::calc_(); + MultiVacuumRotBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.h b/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.h index c70811aa..2a46fd4c 100644 --- a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.h +++ b/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDist.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.h" +#include "Game/Actor/Action/actionMultiVacuumRotBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class MultiVacuumRotScaleTimeByDist : public MultiVacuumRotScaleTimeByDistWithTgt { - SEAD_RTTI_OVERRIDE(MultiVacuumRotScaleTimeByDist, MultiVacuumRotScaleTimeByDistWithTgt) +class MultiVacuumRotScaleTimeByDist : public MultiVacuumRotBase { + SEAD_RTTI_OVERRIDE(MultiVacuumRotScaleTimeByDist, MultiVacuumRotBase) public: explicit MultiVacuumRotScaleTimeByDist(const InitArg& arg); ~MultiVacuumRotScaleTimeByDist() override; diff --git a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.cpp b/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.cpp deleted file mode 100644 index 810214da..00000000 --- a/src/Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "Game/Actor/Action/actionMultiVacuumRotScaleTimeByDistWithTgt.h" - -namespace uking::action { - -MultiVacuumRotScaleTimeByDistWithTgt::MultiVacuumRotScaleTimeByDistWithTgt(const InitArg& arg) - : MultiVacuumRotScaleTimeByDistWithTgtBase(arg) {} - -MultiVacuumRotScaleTimeByDistWithTgt::~MultiVacuumRotScaleTimeByDistWithTgt() = default; - -bool MultiVacuumRotScaleTimeByDistWithTgt::init_(sead::Heap* heap) { - return MultiVacuumRotScaleTimeByDistWithTgtBase::init_(heap); -} - -void MultiVacuumRotScaleTimeByDistWithTgt::enter_(ksys::act::ai::InlineParamPack* params) { - MultiVacuumRotScaleTimeByDistWithTgtBase::enter_(params); -} - -void MultiVacuumRotScaleTimeByDistWithTgt::leave_() { - MultiVacuumRotScaleTimeByDistWithTgtBase::leave_(); -} - -void MultiVacuumRotScaleTimeByDistWithTgt::loadParams_() { - MultiVacuumRotScaleTimeByDistWithTgtBase::loadParams_(); - getStaticParam(&mRotSpd_s, "RotSpd"); - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -void MultiVacuumRotScaleTimeByDistWithTgt::calc_() { - MultiVacuumRotScaleTimeByDistWithTgtBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshBattleWalk.cpp b/src/Game/Actor/Action/actionNavMeshBattleWalk.cpp index 318f6407..b4d2ecb4 100644 --- a/src/Game/Actor/Action/actionNavMeshBattleWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshBattleWalk.cpp @@ -2,26 +2,26 @@ namespace uking::action { -NavMeshBattleWalk::NavMeshBattleWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshBattleWalk::NavMeshBattleWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} bool NavMeshBattleWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); + return NavMeshMoveBase::init_(heap); } void NavMeshBattleWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); + NavMeshMoveBase::enter_(params); } void NavMeshBattleWalk::leave_() { - NavMeshAction::leave_(); + NavMeshMoveBase::leave_(); } void NavMeshBattleWalk::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); } void NavMeshBattleWalk::calc_() { - NavMeshAction::calc_(); + NavMeshMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshBattleWalk.h b/src/Game/Actor/Action/actionNavMeshBattleWalk.h index 70672ba7..0b76e774 100644 --- a/src/Game/Actor/Action/actionNavMeshBattleWalk.h +++ b/src/Game/Actor/Action/actionNavMeshBattleWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshBattleWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshBattleWalk, NavMeshAction) +class NavMeshBattleWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshBattleWalk, NavMeshMoveBase) public: explicit NavMeshBattleWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNavMeshEscape.cpp b/src/Game/Actor/Action/actionNavMeshEscape.cpp index 181cf3fe..b798a56e 100644 --- a/src/Game/Actor/Action/actionNavMeshEscape.cpp +++ b/src/Game/Actor/Action/actionNavMeshEscape.cpp @@ -2,6 +2,6 @@ namespace uking::action { -NavMeshEscape::NavMeshEscape(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshEscape::NavMeshEscape(const InitArg& arg) : NavMeshMoveBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshEscape.h b/src/Game/Actor/Action/actionNavMeshEscape.h index 33fefee9..cbf9027e 100644 --- a/src/Game/Actor/Action/actionNavMeshEscape.h +++ b/src/Game/Actor/Action/actionNavMeshEscape.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshEscape : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshEscape, NavMeshAction) +class NavMeshEscape : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshEscape, NavMeshMoveBase) public: explicit NavMeshEscape(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNavMeshFly.cpp b/src/Game/Actor/Action/actionNavMeshFly.cpp index 4b95e18d..f8b23e80 100644 --- a/src/Game/Actor/Action/actionNavMeshFly.cpp +++ b/src/Game/Actor/Action/actionNavMeshFly.cpp @@ -2,29 +2,29 @@ namespace uking::action { -NavMeshFly::NavMeshFly(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshFly::NavMeshFly(const InitArg& arg) : NavMeshMoveBase(arg) {} NavMeshFly::~NavMeshFly() = default; bool NavMeshFly::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); + return NavMeshMoveBase::init_(heap); } void NavMeshFly::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); + NavMeshMoveBase::enter_(params); } void NavMeshFly::leave_() { - NavMeshAction::leave_(); + NavMeshMoveBase::leave_(); } void NavMeshFly::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void NavMeshFly::calc_() { - NavMeshAction::calc_(); + NavMeshMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshFly.h b/src/Game/Actor/Action/actionNavMeshFly.h index 220645bd..b4c06fdd 100644 --- a/src/Game/Actor/Action/actionNavMeshFly.h +++ b/src/Game/Actor/Action/actionNavMeshFly.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshFly : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshFly, NavMeshAction) +class NavMeshFly : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshFly, NavMeshMoveBase) public: explicit NavMeshFly(const InitArg& arg); ~NavMeshFly() override; diff --git a/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.cpp b/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.cpp index 5887d4b4..cfb6c057 100644 --- a/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.cpp @@ -2,6 +2,6 @@ namespace uking::action { -NavMeshGrabLeftWalk::NavMeshGrabLeftWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshGrabLeftWalk::NavMeshGrabLeftWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.h b/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.h index a82c3756..0d3933a6 100644 --- a/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.h +++ b/src/Game/Actor/Action/actionNavMeshGrabLeftWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshGrabLeftWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshGrabLeftWalk, NavMeshAction) +class NavMeshGrabLeftWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshGrabLeftWalk, NavMeshMoveBase) public: explicit NavMeshGrabLeftWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNavMeshGrabRightWalk.cpp b/src/Game/Actor/Action/actionNavMeshGrabRightWalk.cpp index 6b011045..6ef47de0 100644 --- a/src/Game/Actor/Action/actionNavMeshGrabRightWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshGrabRightWalk.cpp @@ -2,6 +2,6 @@ namespace uking::action { -NavMeshGrabRightWalk::NavMeshGrabRightWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshGrabRightWalk::NavMeshGrabRightWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshGrabRightWalk.h b/src/Game/Actor/Action/actionNavMeshGrabRightWalk.h index e7f3c3e3..c386f6e7 100644 --- a/src/Game/Actor/Action/actionNavMeshGrabRightWalk.h +++ b/src/Game/Actor/Action/actionNavMeshGrabRightWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshGrabRightWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshGrabRightWalk, NavMeshAction) +class NavMeshGrabRightWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshGrabRightWalk, NavMeshMoveBase) public: explicit NavMeshGrabRightWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNavMeshGuardRun.cpp b/src/Game/Actor/Action/actionNavMeshGuardRun.cpp index adb437fe..9902106a 100644 --- a/src/Game/Actor/Action/actionNavMeshGuardRun.cpp +++ b/src/Game/Actor/Action/actionNavMeshGuardRun.cpp @@ -2,7 +2,7 @@ namespace uking::action { -NavMeshGuardRun::NavMeshGuardRun(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshGuardRun::NavMeshGuardRun(const InitArg& arg) : NavMeshMoveBase(arg) {} NavMeshGuardRun::~NavMeshGuardRun() = default; diff --git a/src/Game/Actor/Action/actionNavMeshGuardRun.h b/src/Game/Actor/Action/actionNavMeshGuardRun.h index 5a0d4232..dbafbdf9 100644 --- a/src/Game/Actor/Action/actionNavMeshGuardRun.h +++ b/src/Game/Actor/Action/actionNavMeshGuardRun.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshGuardRun : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshGuardRun, NavMeshAction) +class NavMeshGuardRun : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshGuardRun, NavMeshMoveBase) public: explicit NavMeshGuardRun(const InitArg& arg); ~NavMeshGuardRun() override; diff --git a/src/Game/Actor/Action/actionNavMeshGuardWalk.cpp b/src/Game/Actor/Action/actionNavMeshGuardWalk.cpp index ecaf50f7..9575b9c9 100644 --- a/src/Game/Actor/Action/actionNavMeshGuardWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshGuardWalk.cpp @@ -2,7 +2,7 @@ namespace uking::action { -NavMeshGuardWalk::NavMeshGuardWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshGuardWalk::NavMeshGuardWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} NavMeshGuardWalk::~NavMeshGuardWalk() = default; diff --git a/src/Game/Actor/Action/actionNavMeshGuardWalk.h b/src/Game/Actor/Action/actionNavMeshGuardWalk.h index f0e3865e..bc201978 100644 --- a/src/Game/Actor/Action/actionNavMeshGuardWalk.h +++ b/src/Game/Actor/Action/actionNavMeshGuardWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshGuardWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshGuardWalk, NavMeshAction) +class NavMeshGuardWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshGuardWalk, NavMeshMoveBase) public: explicit NavMeshGuardWalk(const InitArg& arg); ~NavMeshGuardWalk() override; diff --git a/src/Game/Actor/Action/actionNavMeshLiftWalk.cpp b/src/Game/Actor/Action/actionNavMeshLiftWalk.cpp index 1787cb03..2c6b0d68 100644 --- a/src/Game/Actor/Action/actionNavMeshLiftWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshLiftWalk.cpp @@ -2,26 +2,26 @@ namespace uking::action { -NavMeshLiftWalk::NavMeshLiftWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshLiftWalk::NavMeshLiftWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} bool NavMeshLiftWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); + return NavMeshMoveBase::init_(heap); } void NavMeshLiftWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); + NavMeshMoveBase::enter_(params); } void NavMeshLiftWalk::leave_() { - NavMeshAction::leave_(); + NavMeshMoveBase::leave_(); } void NavMeshLiftWalk::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); } void NavMeshLiftWalk::calc_() { - NavMeshAction::calc_(); + NavMeshMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshLiftWalk.h b/src/Game/Actor/Action/actionNavMeshLiftWalk.h index 88831dd1..43e87293 100644 --- a/src/Game/Actor/Action/actionNavMeshLiftWalk.h +++ b/src/Game/Actor/Action/actionNavMeshLiftWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshLiftWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshLiftWalk, NavMeshAction) +class NavMeshLiftWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshLiftWalk, NavMeshMoveBase) public: explicit NavMeshLiftWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNavMeshAction.cpp b/src/Game/Actor/Action/actionNavMeshMoveBase.cpp similarity index 60% rename from src/Game/Actor/Action/actionNavMeshAction.cpp rename to src/Game/Actor/Action/actionNavMeshMoveBase.cpp index c29703ce..9c861bfd 100644 --- a/src/Game/Actor/Action/actionNavMeshAction.cpp +++ b/src/Game/Actor/Action/actionNavMeshMoveBase.cpp @@ -1,20 +1,20 @@ -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" namespace uking::action { -NavMeshAction::NavMeshAction(const InitArg& arg) : ActionEx(arg) {} +NavMeshMoveBase::NavMeshMoveBase(const InitArg& arg) : ActionEx(arg) {} -NavMeshAction::~NavMeshAction() = default; +NavMeshMoveBase::~NavMeshMoveBase() = default; -void NavMeshAction::enter_(ksys::act::ai::InlineParamPack* params) { +void NavMeshMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionEx::enter_(params); } -void NavMeshAction::leave_() { +void NavMeshMoveBase::leave_() { ActionEx::leave_(); } -void NavMeshAction::loadParams_() { +void NavMeshMoveBase::loadParams_() { getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mRotSpd_s, "RotSpd"); @@ -25,7 +25,7 @@ void NavMeshAction::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void NavMeshAction::calc_() { +void NavMeshMoveBase::calc_() { ActionEx::calc_(); } diff --git a/src/Game/Actor/Action/actionNavMeshAction.h b/src/Game/Actor/Action/actionNavMeshMoveBase.h similarity index 83% rename from src/Game/Actor/Action/actionNavMeshAction.h rename to src/Game/Actor/Action/actionNavMeshMoveBase.h index 565ecad9..5d340a95 100644 --- a/src/Game/Actor/Action/actionNavMeshAction.h +++ b/src/Game/Actor/Action/actionNavMeshMoveBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class NavMeshAction : public ActionEx { - SEAD_RTTI_OVERRIDE(NavMeshAction, ActionEx) +class NavMeshMoveBase : public ActionEx { + SEAD_RTTI_OVERRIDE(NavMeshMoveBase, ActionEx) public: - explicit NavMeshAction(const InitArg& arg); - ~NavMeshAction() override; + explicit NavMeshMoveBase(const InitArg& arg); + ~NavMeshMoveBase() override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; diff --git a/src/Game/Actor/Action/actionNavMeshMoveWithAS.cpp b/src/Game/Actor/Action/actionNavMeshMoveWithAS.cpp index df7e714c..fdaad613 100644 --- a/src/Game/Actor/Action/actionNavMeshMoveWithAS.cpp +++ b/src/Game/Actor/Action/actionNavMeshMoveWithAS.cpp @@ -2,16 +2,16 @@ namespace uking::action { -NavMeshMoveWithAS::NavMeshMoveWithAS(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshMoveWithAS::NavMeshMoveWithAS(const InitArg& arg) : NavMeshMoveBase(arg) {} NavMeshMoveWithAS::~NavMeshMoveWithAS() = default; bool NavMeshMoveWithAS::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); + return NavMeshMoveBase::init_(heap); } void NavMeshMoveWithAS::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); getStaticParam(&mIsIgnoreSameAS_s, "IsIgnoreSameAS"); getStaticParam(&mASName_s, "ASName"); } diff --git a/src/Game/Actor/Action/actionNavMeshMoveWithAS.h b/src/Game/Actor/Action/actionNavMeshMoveWithAS.h index 12615a74..ec7971bb 100644 --- a/src/Game/Actor/Action/actionNavMeshMoveWithAS.h +++ b/src/Game/Actor/Action/actionNavMeshMoveWithAS.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshMoveWithAS : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshMoveWithAS, NavMeshAction) +class NavMeshMoveWithAS : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshMoveWithAS, NavMeshMoveBase) public: explicit NavMeshMoveWithAS(const InitArg& arg); ~NavMeshMoveWithAS() override; diff --git a/src/Game/Actor/Action/actionNavMeshRun.cpp b/src/Game/Actor/Action/actionNavMeshRun.cpp index d25c608e..0fb492b6 100644 --- a/src/Game/Actor/Action/actionNavMeshRun.cpp +++ b/src/Game/Actor/Action/actionNavMeshRun.cpp @@ -2,6 +2,6 @@ namespace uking::action { -NavMeshRun::NavMeshRun(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshRun::NavMeshRun(const InitArg& arg) : NavMeshMoveBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshRun.h b/src/Game/Actor/Action/actionNavMeshRun.h index 7991c4be..6b2394bd 100644 --- a/src/Game/Actor/Action/actionNavMeshRun.h +++ b/src/Game/Actor/Action/actionNavMeshRun.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshRun : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshRun, NavMeshAction) +class NavMeshRun : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshRun, NavMeshMoveBase) public: explicit NavMeshRun(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNavMeshSlippedWalk.cpp b/src/Game/Actor/Action/actionNavMeshSlippedWalk.cpp index 292d546e..0671deb6 100644 --- a/src/Game/Actor/Action/actionNavMeshSlippedWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshSlippedWalk.cpp @@ -2,30 +2,30 @@ namespace uking::action { -NavMeshSlippedWalk::NavMeshSlippedWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshSlippedWalk::NavMeshSlippedWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} NavMeshSlippedWalk::~NavMeshSlippedWalk() = default; bool NavMeshSlippedWalk::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); + return NavMeshMoveBase::init_(heap); } void NavMeshSlippedWalk::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); + NavMeshMoveBase::enter_(params); } void NavMeshSlippedWalk::leave_() { - NavMeshAction::leave_(); + NavMeshMoveBase::leave_(); } void NavMeshSlippedWalk::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); getStaticParam(&mAccRatio_s, "AccRatio"); getStaticParam(&mASName_s, "ASName"); } void NavMeshSlippedWalk::calc_() { - NavMeshAction::calc_(); + NavMeshMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshSlippedWalk.h b/src/Game/Actor/Action/actionNavMeshSlippedWalk.h index 1f4a311a..bb66f08c 100644 --- a/src/Game/Actor/Action/actionNavMeshSlippedWalk.h +++ b/src/Game/Actor/Action/actionNavMeshSlippedWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshSlippedWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshSlippedWalk, NavMeshAction) +class NavMeshSlippedWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshSlippedWalk, NavMeshMoveBase) public: explicit NavMeshSlippedWalk(const InitArg& arg); ~NavMeshSlippedWalk() override; diff --git a/src/Game/Actor/Action/actionNavMeshSwim.cpp b/src/Game/Actor/Action/actionNavMeshSwim.cpp index 7626157c..8329380c 100644 --- a/src/Game/Actor/Action/actionNavMeshSwim.cpp +++ b/src/Game/Actor/Action/actionNavMeshSwim.cpp @@ -2,31 +2,31 @@ namespace uking::action { -NavMeshSwim::NavMeshSwim(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshSwim::NavMeshSwim(const InitArg& arg) : NavMeshMoveBase(arg) {} NavMeshSwim::~NavMeshSwim() = default; bool NavMeshSwim::init_(sead::Heap* heap) { - return NavMeshAction::init_(heap); + return NavMeshMoveBase::init_(heap); } void NavMeshSwim::enter_(ksys::act::ai::InlineParamPack* params) { - NavMeshAction::enter_(params); + NavMeshMoveBase::enter_(params); } void NavMeshSwim::leave_() { - NavMeshAction::leave_(); + NavMeshMoveBase::leave_(); } void NavMeshSwim::loadParams_() { - NavMeshAction::loadParams_(); + NavMeshMoveBase::loadParams_(); getStaticParam(&mInWaterDepth_s, "InWaterDepth"); getStaticParam(&mFloatDepth_s, "FloatDepth"); getStaticParam(&mASName_s, "ASName"); } void NavMeshSwim::calc_() { - NavMeshAction::calc_(); + NavMeshMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshSwim.h b/src/Game/Actor/Action/actionNavMeshSwim.h index 59e283fe..fbcc18c8 100644 --- a/src/Game/Actor/Action/actionNavMeshSwim.h +++ b/src/Game/Actor/Action/actionNavMeshSwim.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshSwim : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshSwim, NavMeshAction) +class NavMeshSwim : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshSwim, NavMeshMoveBase) public: explicit NavMeshSwim(const InitArg& arg); ~NavMeshSwim() override; diff --git a/src/Game/Actor/Action/actionNavMeshWalk.cpp b/src/Game/Actor/Action/actionNavMeshWalk.cpp index 0f5973b4..ce426d2b 100644 --- a/src/Game/Actor/Action/actionNavMeshWalk.cpp +++ b/src/Game/Actor/Action/actionNavMeshWalk.cpp @@ -2,6 +2,6 @@ namespace uking::action { -NavMeshWalk::NavMeshWalk(const InitArg& arg) : NavMeshAction(arg) {} +NavMeshWalk::NavMeshWalk(const InitArg& arg) : NavMeshMoveBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNavMeshWalk.h b/src/Game/Actor/Action/actionNavMeshWalk.h index 5128ca48..f8f3b67c 100644 --- a/src/Game/Actor/Action/actionNavMeshWalk.h +++ b/src/Game/Actor/Action/actionNavMeshWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionNavMeshAction.h" +#include "Game/Actor/Action/actionNavMeshMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NavMeshWalk : public NavMeshAction { - SEAD_RTTI_OVERRIDE(NavMeshWalk, NavMeshAction) +class NavMeshWalk : public NavMeshMoveBase { + SEAD_RTTI_OVERRIDE(NavMeshWalk, NavMeshMoveBase) public: explicit NavMeshWalk(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionNormalBackWalk.cpp b/src/Game/Actor/Action/actionNormalBackWalk.cpp new file mode 100644 index 00000000..e57f81d3 --- /dev/null +++ b/src/Game/Actor/Action/actionNormalBackWalk.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionNormalBackWalk.h" + +namespace uking::action { + +NormalBackWalk::NormalBackWalk(const InitArg& arg) : BackWalkBase(arg) {} + +NormalBackWalk::~NormalBackWalk() = default; + +bool NormalBackWalk::init_(sead::Heap* heap) { + return BackWalkBase::init_(heap); +} + +void NormalBackWalk::enter_(ksys::act::ai::InlineParamPack* params) { + BackWalkBase::enter_(params); +} + +void NormalBackWalk::leave_() { + BackWalkBase::leave_(); +} + +void NormalBackWalk::loadParams_() { + BackWalkBase::loadParams_(); +} + +void NormalBackWalk::calc_() { + BackWalkBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBackWalkEx.h b/src/Game/Actor/Action/actionNormalBackWalk.h similarity index 68% rename from src/Game/Actor/Action/actionBackWalkEx.h rename to src/Game/Actor/Action/actionNormalBackWalk.h index 91ac34da..5d8e6e70 100644 --- a/src/Game/Actor/Action/actionBackWalkEx.h +++ b/src/Game/Actor/Action/actionNormalBackWalk.h @@ -5,11 +5,11 @@ namespace uking::action { -class BackWalkEx : public BackWalkBase { - SEAD_RTTI_OVERRIDE(BackWalkEx, BackWalkBase) +class NormalBackWalk : public BackWalkBase { + SEAD_RTTI_OVERRIDE(NormalBackWalk, BackWalkBase) public: - explicit BackWalkEx(const InitArg& arg); - ~BackWalkEx() override; + explicit NormalBackWalk(const InitArg& arg); + ~NormalBackWalk() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionOctarockReloadWig.cpp b/src/Game/Actor/Action/actionOctarockReloadWig.cpp index 0c76c4be..48ba0a60 100644 --- a/src/Game/Actor/Action/actionOctarockReloadWig.cpp +++ b/src/Game/Actor/Action/actionOctarockReloadWig.cpp @@ -2,30 +2,30 @@ namespace uking::action { -OctarockReloadWig::OctarockReloadWig(const InitArg& arg) : OctarockReloadWigBase(arg) {} +OctarockReloadWig::OctarockReloadWig(const InitArg& arg) : IgniteActorReloadBase(arg) {} OctarockReloadWig::~OctarockReloadWig() = default; bool OctarockReloadWig::init_(sead::Heap* heap) { - return OctarockReloadWigBase::init_(heap); + return IgniteActorReloadBase::init_(heap); } void OctarockReloadWig::enter_(ksys::act::ai::InlineParamPack* params) { - OctarockReloadWigBase::enter_(params); + IgniteActorReloadBase::enter_(params); } void OctarockReloadWig::leave_() { - OctarockReloadWigBase::leave_(); + IgniteActorReloadBase::leave_(); } void OctarockReloadWig::loadParams_() { - OctarockReloadWigBase::loadParams_(); + IgniteActorReloadBase::loadParams_(); // FIXME: CALL _ZN4sead14SafeStringBaseIcEaSERKS1_ @ 0x7100b0caa0 getAITreeVariable(&mOctarockFormChangeUnit_a, "OctarockFormChangeUnit"); } void OctarockReloadWig::calc_() { - OctarockReloadWigBase::calc_(); + IgniteActorReloadBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionOctarockReloadWig.h b/src/Game/Actor/Action/actionOctarockReloadWig.h index 95de5762..fbd93a9c 100644 --- a/src/Game/Actor/Action/actionOctarockReloadWig.h +++ b/src/Game/Actor/Action/actionOctarockReloadWig.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionOctarockReloadWigBase.h" +#include "Game/Actor/Action/actionIgniteActorReloadBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class OctarockReloadWig : public OctarockReloadWigBase { - SEAD_RTTI_OVERRIDE(OctarockReloadWig, OctarockReloadWigBase) +class OctarockReloadWig : public IgniteActorReloadBase { + SEAD_RTTI_OVERRIDE(OctarockReloadWig, IgniteActorReloadBase) public: explicit OctarockReloadWig(const InitArg& arg); ~OctarockReloadWig() override; diff --git a/src/Game/Actor/Action/actionOctarockReloadWigBase.cpp b/src/Game/Actor/Action/actionOctarockReloadWigBase.cpp deleted file mode 100644 index b8ca29d0..00000000 --- a/src/Game/Actor/Action/actionOctarockReloadWigBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionOctarockReloadWigBase.h" - -namespace uking::action { - -OctarockReloadWigBase::OctarockReloadWigBase(const InitArg& arg) : OnetimeStopASPlay(arg) {} - -OctarockReloadWigBase::~OctarockReloadWigBase() = default; - -bool OctarockReloadWigBase::init_(sead::Heap* heap) { - return OnetimeStopASPlay::init_(heap); -} - -void OctarockReloadWigBase::enter_(ksys::act::ai::InlineParamPack* params) { - OnetimeStopASPlay::enter_(params); -} - -void OctarockReloadWigBase::leave_() { - OnetimeStopASPlay::leave_(); -} - -void OctarockReloadWigBase::loadParams_() { - OnetimeStopASPlay::loadParams_(); -} - -void OctarockReloadWigBase::calc_() { - OnetimeStopASPlay::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionOnEnterSwapActorBase.cpp b/src/Game/Actor/Action/actionOnEnterSwapActorBase.cpp new file mode 100644 index 00000000..f853cd27 --- /dev/null +++ b/src/Game/Actor/Action/actionOnEnterSwapActorBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionOnEnterSwapActorBase.h" + +namespace uking::action { + +OnEnterSwapActorBase::OnEnterSwapActorBase(const InitArg& arg) : Fork(arg) {} + +OnEnterSwapActorBase::~OnEnterSwapActorBase() = default; + +bool OnEnterSwapActorBase::init_(sead::Heap* heap) { + return Fork::init_(heap); +} + +void OnEnterSwapActorBase::enter_(ksys::act::ai::InlineParamPack* params) { + Fork::enter_(params); +} + +void OnEnterSwapActorBase::leave_() { + Fork::leave_(); +} + +void OnEnterSwapActorBase::loadParams_() { + Fork::loadParams_(); + getStaticParam(&mOnGroundPos_s, "OnGroundPos"); +} + +void OnEnterSwapActorBase::calc_() { + Fork::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.h b/src/Game/Actor/Action/actionOnEnterSwapActorBase.h similarity index 65% rename from src/Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.h rename to src/Game/Actor/Action/actionOnEnterSwapActorBase.h index 78b455d2..fbb09016 100644 --- a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.h +++ b/src/Game/Actor/Action/actionOnEnterSwapActorBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class ForkOnEnterSwapDropTableActorBase : public Fork { - SEAD_RTTI_OVERRIDE(ForkOnEnterSwapDropTableActorBase, Fork) +class OnEnterSwapActorBase : public Fork { + SEAD_RTTI_OVERRIDE(OnEnterSwapActorBase, Fork) public: - explicit ForkOnEnterSwapDropTableActorBase(const InitArg& arg); - ~ForkOnEnterSwapDropTableActorBase() override; + explicit OnEnterSwapActorBase(const InitArg& arg); + ~OnEnterSwapActorBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionOnEnterSwapDropTable.cpp b/src/Game/Actor/Action/actionOnEnterSwapDropTable.cpp new file mode 100644 index 00000000..2c8c7fb4 --- /dev/null +++ b/src/Game/Actor/Action/actionOnEnterSwapDropTable.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionOnEnterSwapDropTable.h" + +namespace uking::action { + +OnEnterSwapDropTable::OnEnterSwapDropTable(const InitArg& arg) : OnEnterSwapActorBase(arg) {} + +OnEnterSwapDropTable::~OnEnterSwapDropTable() = default; + +bool OnEnterSwapDropTable::init_(sead::Heap* heap) { + return OnEnterSwapActorBase::init_(heap); +} + +void OnEnterSwapDropTable::enter_(ksys::act::ai::InlineParamPack* params) { + OnEnterSwapActorBase::enter_(params); +} + +void OnEnterSwapDropTable::leave_() { + OnEnterSwapActorBase::leave_(); +} + +void OnEnterSwapDropTable::loadParams_() { + OnEnterSwapActorBase::loadParams_(); + getStaticParam(&mTableName_s, "TableName"); +} + +void OnEnterSwapDropTable::calc_() { + OnEnterSwapActorBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActor.h b/src/Game/Actor/Action/actionOnEnterSwapDropTable.h similarity index 54% rename from src/Game/Actor/Action/actionForkOnEnterSwapDropTableActor.h rename to src/Game/Actor/Action/actionOnEnterSwapDropTable.h index f47dbcad..dcab252b 100644 --- a/src/Game/Actor/Action/actionForkOnEnterSwapDropTableActor.h +++ b/src/Game/Actor/Action/actionOnEnterSwapDropTable.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionForkOnEnterSwapDropTableActorBase.h" +#include "Game/Actor/Action/actionOnEnterSwapActorBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkOnEnterSwapDropTableActor : public ForkOnEnterSwapDropTableActorBase { - SEAD_RTTI_OVERRIDE(ForkOnEnterSwapDropTableActor, ForkOnEnterSwapDropTableActorBase) +class OnEnterSwapDropTable : public OnEnterSwapActorBase { + SEAD_RTTI_OVERRIDE(OnEnterSwapDropTable, OnEnterSwapActorBase) public: - explicit ForkOnEnterSwapDropTableActor(const InitArg& arg); - ~ForkOnEnterSwapDropTableActor() override; + explicit OnEnterSwapDropTable(const InitArg& arg); + ~OnEnterSwapDropTable() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.cpp b/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.cpp index 23e5e3ac..75f25d8b 100644 --- a/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.cpp +++ b/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.cpp @@ -3,29 +3,29 @@ namespace uking::action { OnEnterSwapDropTableActor::OnEnterSwapDropTableActor(const InitArg& arg) - : ForkOnEnterSwapDropTableActor(arg) {} + : OnEnterSwapDropTable(arg) {} OnEnterSwapDropTableActor::~OnEnterSwapDropTableActor() = default; bool OnEnterSwapDropTableActor::init_(sead::Heap* heap) { - return ForkOnEnterSwapDropTableActor::init_(heap); + return OnEnterSwapDropTable::init_(heap); } void OnEnterSwapDropTableActor::enter_(ksys::act::ai::InlineParamPack* params) { - ForkOnEnterSwapDropTableActor::enter_(params); + OnEnterSwapDropTable::enter_(params); } void OnEnterSwapDropTableActor::leave_() { - ForkOnEnterSwapDropTableActor::leave_(); + OnEnterSwapDropTable::leave_(); } void OnEnterSwapDropTableActor::loadParams_() { - ForkOnEnterSwapDropTableActor::loadParams_(); + OnEnterSwapDropTable::loadParams_(); getStaticParam(&mDieType_s, "DieType"); } void OnEnterSwapDropTableActor::calc_() { - ForkOnEnterSwapDropTableActor::calc_(); + OnEnterSwapDropTable::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.h b/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.h index 40e80608..7e5061d3 100644 --- a/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.h +++ b/src/Game/Actor/Action/actionOnEnterSwapDropTableActor.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkOnEnterSwapDropTableActor.h" +#include "Game/Actor/Action/actionOnEnterSwapDropTable.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class OnEnterSwapDropTableActor : public ForkOnEnterSwapDropTableActor { - SEAD_RTTI_OVERRIDE(OnEnterSwapDropTableActor, ForkOnEnterSwapDropTableActor) +class OnEnterSwapDropTableActor : public OnEnterSwapDropTable { + SEAD_RTTI_OVERRIDE(OnEnterSwapDropTableActor, OnEnterSwapDropTable) public: explicit OnEnterSwapDropTableActor(const InitArg& arg); ~OnEnterSwapDropTableActor() override; diff --git a/src/Game/Actor/Action/actionOneHandActionWithLegTurn.cpp b/src/Game/Actor/Action/actionOneHandActionWithLegTurn.cpp new file mode 100644 index 00000000..2b87a468 --- /dev/null +++ b/src/Game/Actor/Action/actionOneHandActionWithLegTurn.cpp @@ -0,0 +1,37 @@ +#include "Game/Actor/Action/actionOneHandActionWithLegTurn.h" + +namespace uking::action { + +OneHandActionWithLegTurn::OneHandActionWithLegTurn(const InitArg& arg) : AttackWithAS(arg) {} + +OneHandActionWithLegTurn::~OneHandActionWithLegTurn() = default; + +bool OneHandActionWithLegTurn::init_(sead::Heap* heap) { + return AttackWithAS::init_(heap); +} + +void OneHandActionWithLegTurn::enter_(ksys::act::ai::InlineParamPack* params) { + AttackWithAS::enter_(params); +} + +void OneHandActionWithLegTurn::leave_() { + AttackWithAS::leave_(); +} + +void OneHandActionWithLegTurn::loadParams_() { + AttackWithAS::loadParams_(); + getStaticParam(&mTraceLRAngleMax_s, "TraceLRAngleMax"); + getStaticParam(&mTraceLRAngleMin_s, "TraceLRAngleMin"); + getStaticParam(&mTraceDistFar_s, "TraceDistFar"); + getStaticParam(&mTraceDistNear_s, "TraceDistNear"); + getStaticParam(&mShoulderBoneName_s, "ShoulderBoneName"); + getStaticParam(&mRotOffsetMin_s, "RotOffsetMin"); + getStaticParam(&mRotOffsetMax_s, "RotOffsetMax"); + getStaticParam(&mBaseTargetPos_s, "BaseTargetPos"); +} + +void OneHandActionWithLegTurn::calc_() { + AttackWithAS::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionGiantOneHandActionWithLegTurn.h b/src/Game/Actor/Action/actionOneHandActionWithLegTurn.h similarity index 75% rename from src/Game/Actor/Action/actionGiantOneHandActionWithLegTurn.h rename to src/Game/Actor/Action/actionOneHandActionWithLegTurn.h index db159301..40ce6a85 100644 --- a/src/Game/Actor/Action/actionGiantOneHandActionWithLegTurn.h +++ b/src/Game/Actor/Action/actionOneHandActionWithLegTurn.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionGiantAttackWithAS.h" +#include "Game/Actor/Action/actionAttackWithAS.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GiantOneHandActionWithLegTurn : public GiantAttackWithAS { - SEAD_RTTI_OVERRIDE(GiantOneHandActionWithLegTurn, GiantAttackWithAS) +class OneHandActionWithLegTurn : public AttackWithAS { + SEAD_RTTI_OVERRIDE(OneHandActionWithLegTurn, AttackWithAS) public: - explicit GiantOneHandActionWithLegTurn(const InitArg& arg); - ~GiantOneHandActionWithLegTurn() override; + explicit OneHandActionWithLegTurn(const InitArg& arg); + ~OneHandActionWithLegTurn() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionOnetimeStopASPlay.cpp b/src/Game/Actor/Action/actionOnetimeStopASPlay.cpp index dd05749c..65fc73c5 100644 --- a/src/Game/Actor/Action/actionOnetimeStopASPlay.cpp +++ b/src/Game/Actor/Action/actionOnetimeStopASPlay.cpp @@ -15,7 +15,7 @@ void OnetimeStopASPlay::leave_() { } void OnetimeStopASPlay::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mIsIgnoreSame_s, "IsIgnoreSame"); getStaticParam(&mASName_s, "ASName"); } diff --git a/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.cpp b/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.cpp index 55a85866..15376533 100644 --- a/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.cpp +++ b/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.cpp @@ -3,24 +3,24 @@ namespace uking::action { PlayerInAreaAutoEnemyForbidTag::PlayerInAreaAutoEnemyForbidTag(const InitArg& arg) - : ForbidTag(arg) {} + : BasicSignalForbidTag(arg) {} PlayerInAreaAutoEnemyForbidTag::~PlayerInAreaAutoEnemyForbidTag() = default; bool PlayerInAreaAutoEnemyForbidTag::init_(sead::Heap* heap) { - return ForbidTag::init_(heap); + return BasicSignalForbidTag::init_(heap); } void PlayerInAreaAutoEnemyForbidTag::enter_(ksys::act::ai::InlineParamPack* params) { - ForbidTag::enter_(params); + BasicSignalForbidTag::enter_(params); } void PlayerInAreaAutoEnemyForbidTag::leave_() { - ForbidTag::leave_(); + BasicSignalForbidTag::leave_(); } void PlayerInAreaAutoEnemyForbidTag::loadParams_() { - ForbidTag::loadParams_(); + BasicSignalForbidTag::loadParams_(); getMapUnitParam(&mNonAutoPlacementAnimal_m, "NonAutoPlacementAnimal"); getMapUnitParam(&mNonAutoPlacementBird_m, "NonAutoPlacementBird"); getMapUnitParam(&mNonAutoPlacementEnemy_m, "NonAutoPlacementEnemy"); @@ -31,7 +31,7 @@ void PlayerInAreaAutoEnemyForbidTag::loadParams_() { } void PlayerInAreaAutoEnemyForbidTag::calc_() { - ForbidTag::calc_(); + BasicSignalForbidTag::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.h b/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.h index d8393a48..afd6b8ab 100644 --- a/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.h +++ b/src/Game/Actor/Action/actionPlayerInAreaAutoEnemyForbidTag.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForbidTag.h" +#include "Game/Actor/Action/actionBasicSignalForbidTag.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PlayerInAreaAutoEnemyForbidTag : public ForbidTag { - SEAD_RTTI_OVERRIDE(PlayerInAreaAutoEnemyForbidTag, ForbidTag) +class PlayerInAreaAutoEnemyForbidTag : public BasicSignalForbidTag { + SEAD_RTTI_OVERRIDE(PlayerInAreaAutoEnemyForbidTag, BasicSignalForbidTag) public: explicit PlayerInAreaAutoEnemyForbidTag(const InitArg& arg); ~PlayerInAreaAutoEnemyForbidTag() override; diff --git a/src/Game/Actor/Action/actionPlayerStoleOpen.cpp b/src/Game/Actor/Action/actionPlayerStoleOpen.cpp index 23a5370d..38258e05 100644 --- a/src/Game/Actor/Action/actionPlayerStoleOpen.cpp +++ b/src/Game/Actor/Action/actionPlayerStoleOpen.cpp @@ -2,19 +2,19 @@ namespace uking::action { -PlayerStoleOpen::PlayerStoleOpen(const InitArg& arg) : PlayerStoleOpenEx(arg) {} +PlayerStoleOpen::PlayerStoleOpen(const InitArg& arg) : BindPlayerNodeEx(arg) {} void PlayerStoleOpen::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerStoleOpenEx::enter_(params); + BindPlayerNodeEx::enter_(params); } void PlayerStoleOpen::loadParams_() { - PlayerStoleOpenBase::loadParams_(); + BindPlayerNodeBase::loadParams_(); getStaticParam(&mEnlargeSpd_s, "EnlargeSpd"); } void PlayerStoleOpen::calc_() { - PlayerStoleOpenEx::calc_(); + BindPlayerNodeEx::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerStoleOpen.h b/src/Game/Actor/Action/actionPlayerStoleOpen.h index 10651838..f86705ba 100644 --- a/src/Game/Actor/Action/actionPlayerStoleOpen.h +++ b/src/Game/Actor/Action/actionPlayerStoleOpen.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionPlayerStoleOpenEx.h" +#include "Game/Actor/Action/actionBindPlayerNodeEx.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PlayerStoleOpen : public PlayerStoleOpenEx { - SEAD_RTTI_OVERRIDE(PlayerStoleOpen, PlayerStoleOpenEx) +class PlayerStoleOpen : public BindPlayerNodeEx { + SEAD_RTTI_OVERRIDE(PlayerStoleOpen, BindPlayerNodeEx) public: explicit PlayerStoleOpen(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionPlayerStoleOpenBase.cpp b/src/Game/Actor/Action/actionPlayerStoleOpenBase.cpp deleted file mode 100644 index 449b6bc1..00000000 --- a/src/Game/Actor/Action/actionPlayerStoleOpenBase.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/Action/actionPlayerStoleOpenBase.h" - -namespace uking::action { - -PlayerStoleOpenBase::PlayerStoleOpenBase(const InitArg& arg) : ActionEx(arg) {} - -PlayerStoleOpenBase::~PlayerStoleOpenBase() = default; - -void PlayerStoleOpenBase::enter_(ksys::act::ai::InlineParamPack* params) { - ActionEx::enter_(params); -} - -void PlayerStoleOpenBase::leave_() { - ActionEx::leave_(); -} - -void PlayerStoleOpenBase::loadParams_() { - getStaticParam(&mBoneName_s, "BoneName"); - getStaticParam(&mPosOffset_s, "PosOffset"); - getStaticParam(&mRotOffsetXyz_s, "RotOffsetXyz"); -} - -void PlayerStoleOpenBase::calc_() { - if (isFinishedAS(0, 0)) - setFinished(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerStoleOpenEx.cpp b/src/Game/Actor/Action/actionPlayerStoleOpenEx.cpp deleted file mode 100644 index da773458..00000000 --- a/src/Game/Actor/Action/actionPlayerStoleOpenEx.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "Game/Actor/Action/actionPlayerStoleOpenEx.h" - -namespace uking::action { - -PlayerStoleOpenEx::PlayerStoleOpenEx(const InitArg& arg) : PlayerStoleOpenBase(arg) {} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPlayerStoleOpenEx.h b/src/Game/Actor/Action/actionPlayerStoleOpenEx.h deleted file mode 100644 index bd406098..00000000 --- a/src/Game/Actor/Action/actionPlayerStoleOpenEx.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "Game/Actor/Action/actionPlayerStoleOpenBase.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class PlayerStoleOpenEx : public PlayerStoleOpenBase { - SEAD_RTTI_OVERRIDE(PlayerStoleOpenEx, PlayerStoleOpenBase) -public: - explicit PlayerStoleOpenEx(const InitArg& arg); - -protected: -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPullOut.cpp b/src/Game/Actor/Action/actionPullOut.cpp index 4102e5e5..7744b201 100644 --- a/src/Game/Actor/Action/actionPullOut.cpp +++ b/src/Game/Actor/Action/actionPullOut.cpp @@ -19,7 +19,7 @@ void PullOut::leave_() { } void PullOut::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mAnimGrabPos_s, "AnimGrabPos"); getDynamicParam(&mTargetActor_d, "TargetActor"); } diff --git a/src/Game/Actor/Action/actionPunchAttack.cpp b/src/Game/Actor/Action/actionPunchAttack.cpp index 7d92df04..f8897e35 100644 --- a/src/Game/Actor/Action/actionPunchAttack.cpp +++ b/src/Game/Actor/Action/actionPunchAttack.cpp @@ -19,7 +19,7 @@ void PunchAttack::leave_() { } void PunchAttack::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mAttackIntensity_s, "AttackIntensity"); getStaticParam(&mIsGuardPierce_s, "IsGuardPierce"); getStaticParam(&mIsForceGuardBreak_s, "IsForceGuardBreak"); diff --git a/src/Game/Actor/Action/actionRailMove.cpp b/src/Game/Actor/Action/actionRailMove.cpp index 8467a4df..c747eb5f 100644 --- a/src/Game/Actor/Action/actionRailMove.cpp +++ b/src/Game/Actor/Action/actionRailMove.cpp @@ -2,29 +2,29 @@ namespace uking::action { -RailMove::RailMove(const InitArg& arg) : RailMoveBase(arg) {} +RailMove::RailMove(const InitArg& arg) : DestPointMoveBase(arg) {} RailMove::~RailMove() = default; bool RailMove::init_(sead::Heap* heap) { - return RailMoveBase::init_(heap); + return DestPointMoveBase::init_(heap); } void RailMove::enter_(ksys::act::ai::InlineParamPack* params) { - RailMoveBase::enter_(params); + DestPointMoveBase::enter_(params); } void RailMove::leave_() { - RailMoveBase::leave_(); + DestPointMoveBase::leave_(); } void RailMove::loadParams_() { - RailMoveBase::loadParams_(); + DestPointMoveBase::loadParams_(); getDynamicParam(&mRailName_d, "RailName"); } void RailMove::calc_() { - RailMoveBase::calc_(); + DestPointMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionRailMove.h b/src/Game/Actor/Action/actionRailMove.h index 6ac30e1d..69bd5827 100644 --- a/src/Game/Actor/Action/actionRailMove.h +++ b/src/Game/Actor/Action/actionRailMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRailMoveBase.h" +#include "Game/Actor/Action/actionDestPointMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class RailMove : public RailMoveBase { - SEAD_RTTI_OVERRIDE(RailMove, RailMoveBase) +class RailMove : public DestPointMoveBase { + SEAD_RTTI_OVERRIDE(RailMove, DestPointMoveBase) public: explicit RailMove(const InitArg& arg); ~RailMove() override; diff --git a/src/Game/Actor/Action/actionRegistedActorActionBase.cpp b/src/Game/Actor/Action/actionRegistedActorActionBase.cpp deleted file mode 100644 index 37951296..00000000 --- a/src/Game/Actor/Action/actionRegistedActorActionBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionRegistedActorActionBase.h" - -namespace uking::action { - -RegistedActorActionBase::RegistedActorActionBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -RegistedActorActionBase::~RegistedActorActionBase() = default; - -bool RegistedActorActionBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void RegistedActorActionBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RegistedActorActionBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void RegistedActorActionBase::loadParams_() { - getStaticParam(&mTeachSelfRegistedActor_s, "TeachSelfRegistedActor"); -} - -void RegistedActorActionBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionRegistedActorAllDeadCheckBase.cpp b/src/Game/Actor/Action/actionRegistedActorAllDeadCheckBase.cpp new file mode 100644 index 00000000..8c7ba686 --- /dev/null +++ b/src/Game/Actor/Action/actionRegistedActorAllDeadCheckBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionRegistedActorAllDeadCheckBase.h" + +namespace uking::action { + +RegistedActorAllDeadCheckBase::RegistedActorAllDeadCheckBase(const InitArg& arg) + : RegistedActorSetActionBase(arg) {} + +RegistedActorAllDeadCheckBase::~RegistedActorAllDeadCheckBase() = default; + +bool RegistedActorAllDeadCheckBase::init_(sead::Heap* heap) { + return RegistedActorSetActionBase::init_(heap); +} + +void RegistedActorAllDeadCheckBase::enter_(ksys::act::ai::InlineParamPack* params) { + RegistedActorSetActionBase::enter_(params); +} + +void RegistedActorAllDeadCheckBase::leave_() { + RegistedActorSetActionBase::leave_(); +} + +void RegistedActorAllDeadCheckBase::loadParams_() { + RegistedActorSetActionBase::loadParams_(); +} + +void RegistedActorAllDeadCheckBase::calc_() { + RegistedActorSetActionBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAttackBase.h b/src/Game/Actor/Action/actionRegistedActorAllDeadCheckBase.h similarity index 50% rename from src/Game/Actor/Action/actionAttackBase.h rename to src/Game/Actor/Action/actionRegistedActorAllDeadCheckBase.h index 9601f073..e6c82b38 100644 --- a/src/Game/Actor/Action/actionAttackBase.h +++ b/src/Game/Actor/Action/actionRegistedActorAllDeadCheckBase.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionRegistedActorSetActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class AttackBase : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(AttackBase, ActionWithPosAngReduce) +class RegistedActorAllDeadCheckBase : public RegistedActorSetActionBase { + SEAD_RTTI_OVERRIDE(RegistedActorAllDeadCheckBase, RegistedActorSetActionBase) public: - explicit AttackBase(const InitArg& arg); - ~AttackBase() override; + explicit RegistedActorAllDeadCheckBase(const InitArg& arg); + ~RegistedActorAllDeadCheckBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.cpp b/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.cpp index b237be6a..187120bc 100644 --- a/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.cpp +++ b/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.cpp @@ -3,28 +3,28 @@ namespace uking::action { RegistedActorBroadCastMessage::RegistedActorBroadCastMessage(const InitArg& arg) - : RegistedActorActionBase(arg) {} + : RegistedActorSetActionBase(arg) {} RegistedActorBroadCastMessage::~RegistedActorBroadCastMessage() = default; bool RegistedActorBroadCastMessage::init_(sead::Heap* heap) { - return RegistedActorActionBase::init_(heap); + return RegistedActorSetActionBase::init_(heap); } void RegistedActorBroadCastMessage::enter_(ksys::act::ai::InlineParamPack* params) { - RegistedActorActionBase::enter_(params); + RegistedActorSetActionBase::enter_(params); } void RegistedActorBroadCastMessage::leave_() { - RegistedActorActionBase::leave_(); + RegistedActorSetActionBase::leave_(); } void RegistedActorBroadCastMessage::loadParams_() { - RegistedActorActionBase::loadParams_(); + RegistedActorSetActionBase::loadParams_(); } void RegistedActorBroadCastMessage::calc_() { - RegistedActorActionBase::calc_(); + RegistedActorSetActionBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.h b/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.h index 299f9a1d..0409fb5e 100644 --- a/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.h +++ b/src/Game/Actor/Action/actionRegistedActorBroadCastMessage.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRegistedActorActionBase.h" +#include "Game/Actor/Action/actionRegistedActorSetActionBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class RegistedActorBroadCastMessage : public RegistedActorActionBase { - SEAD_RTTI_OVERRIDE(RegistedActorBroadCastMessage, RegistedActorActionBase) +class RegistedActorBroadCastMessage : public RegistedActorSetActionBase { + SEAD_RTTI_OVERRIDE(RegistedActorBroadCastMessage, RegistedActorSetActionBase) public: explicit RegistedActorBroadCastMessage(const InitArg& arg); ~RegistedActorBroadCastMessage() override; diff --git a/src/Game/Actor/Action/actionRegistedActorDeadCheck.cpp b/src/Game/Actor/Action/actionRegistedActorDeadCheck.cpp index 56318d36..2607a44c 100644 --- a/src/Game/Actor/Action/actionRegistedActorDeadCheck.cpp +++ b/src/Game/Actor/Action/actionRegistedActorDeadCheck.cpp @@ -3,28 +3,28 @@ namespace uking::action { RegistedActorDeadCheck::RegistedActorDeadCheck(const InitArg& arg) - : RegistedActorDeadCheckBase(arg) {} + : RegistedActorAllDeadCheckBase(arg) {} RegistedActorDeadCheck::~RegistedActorDeadCheck() = default; bool RegistedActorDeadCheck::init_(sead::Heap* heap) { - return RegistedActorDeadCheckBase::init_(heap); + return RegistedActorAllDeadCheckBase::init_(heap); } void RegistedActorDeadCheck::enter_(ksys::act::ai::InlineParamPack* params) { - RegistedActorDeadCheckBase::enter_(params); + RegistedActorAllDeadCheckBase::enter_(params); } void RegistedActorDeadCheck::leave_() { - RegistedActorDeadCheckBase::leave_(); + RegistedActorAllDeadCheckBase::leave_(); } void RegistedActorDeadCheck::loadParams_() { - RegistedActorDeadCheckBase::loadParams_(); + RegistedActorAllDeadCheckBase::loadParams_(); } void RegistedActorDeadCheck::calc_() { - RegistedActorDeadCheckBase::calc_(); + RegistedActorAllDeadCheckBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionRegistedActorDeadCheck.h b/src/Game/Actor/Action/actionRegistedActorDeadCheck.h index 0edc7963..c6c3e53c 100644 --- a/src/Game/Actor/Action/actionRegistedActorDeadCheck.h +++ b/src/Game/Actor/Action/actionRegistedActorDeadCheck.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRegistedActorDeadCheckBase.h" +#include "Game/Actor/Action/actionRegistedActorAllDeadCheckBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class RegistedActorDeadCheck : public RegistedActorDeadCheckBase { - SEAD_RTTI_OVERRIDE(RegistedActorDeadCheck, RegistedActorDeadCheckBase) +class RegistedActorDeadCheck : public RegistedActorAllDeadCheckBase { + SEAD_RTTI_OVERRIDE(RegistedActorDeadCheck, RegistedActorAllDeadCheckBase) public: explicit RegistedActorDeadCheck(const InitArg& arg); ~RegistedActorDeadCheck() override; diff --git a/src/Game/Actor/Action/actionRegistedActorDeadCheckBase.cpp b/src/Game/Actor/Action/actionRegistedActorDeadCheckBase.cpp deleted file mode 100644 index e3999d01..00000000 --- a/src/Game/Actor/Action/actionRegistedActorDeadCheckBase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionRegistedActorDeadCheckBase.h" - -namespace uking::action { - -RegistedActorDeadCheckBase::RegistedActorDeadCheckBase(const InitArg& arg) - : RegistedActorActionBase(arg) {} - -RegistedActorDeadCheckBase::~RegistedActorDeadCheckBase() = default; - -bool RegistedActorDeadCheckBase::init_(sead::Heap* heap) { - return RegistedActorActionBase::init_(heap); -} - -void RegistedActorDeadCheckBase::enter_(ksys::act::ai::InlineParamPack* params) { - RegistedActorActionBase::enter_(params); -} - -void RegistedActorDeadCheckBase::leave_() { - RegistedActorActionBase::leave_(); -} - -void RegistedActorDeadCheckBase::loadParams_() { - RegistedActorActionBase::loadParams_(); -} - -void RegistedActorDeadCheckBase::calc_() { - RegistedActorActionBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionRegistedActorDeadCheckBase.h b/src/Game/Actor/Action/actionRegistedActorDeadCheckBase.h deleted file mode 100644 index b80e6d8b..00000000 --- a/src/Game/Actor/Action/actionRegistedActorDeadCheckBase.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "Game/Actor/Action/actionRegistedActorActionBase.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class RegistedActorDeadCheckBase : public RegistedActorActionBase { - SEAD_RTTI_OVERRIDE(RegistedActorDeadCheckBase, RegistedActorActionBase) -public: - explicit RegistedActorDeadCheckBase(const InitArg& arg); - ~RegistedActorDeadCheckBase() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionRegistedActorSetActionBase.cpp b/src/Game/Actor/Action/actionRegistedActorSetActionBase.cpp new file mode 100644 index 00000000..76f245be --- /dev/null +++ b/src/Game/Actor/Action/actionRegistedActorSetActionBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionRegistedActorSetActionBase.h" + +namespace uking::action { + +RegistedActorSetActionBase::RegistedActorSetActionBase(const InitArg& arg) + : ksys::act::ai::Action(arg) {} + +RegistedActorSetActionBase::~RegistedActorSetActionBase() = default; + +bool RegistedActorSetActionBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void RegistedActorSetActionBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void RegistedActorSetActionBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void RegistedActorSetActionBase::loadParams_() { + getStaticParam(&mTeachSelfRegistedActor_s, "TeachSelfRegistedActor"); +} + +void RegistedActorSetActionBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionRegistedActorActionBase.h b/src/Game/Actor/Action/actionRegistedActorSetActionBase.h similarity index 65% rename from src/Game/Actor/Action/actionRegistedActorActionBase.h rename to src/Game/Actor/Action/actionRegistedActorSetActionBase.h index ce38e6b5..5a8a5afd 100644 --- a/src/Game/Actor/Action/actionRegistedActorActionBase.h +++ b/src/Game/Actor/Action/actionRegistedActorSetActionBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class RegistedActorActionBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(RegistedActorActionBase, ksys::act::ai::Action) +class RegistedActorSetActionBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(RegistedActorSetActionBase, ksys::act::ai::Action) public: - explicit RegistedActorActionBase(const InitArg& arg); - ~RegistedActorActionBase() override; + explicit RegistedActorSetActionBase(const InitArg& arg); + ~RegistedActorSetActionBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSandwormASPlay.cpp b/src/Game/Actor/Action/actionSandwormASPlay.cpp index 3067e7cb..16442c9e 100644 --- a/src/Game/Actor/Action/actionSandwormASPlay.cpp +++ b/src/Game/Actor/Action/actionSandwormASPlay.cpp @@ -2,24 +2,24 @@ namespace uking::action { -SandwormASPlay::SandwormASPlay(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +SandwormASPlay::SandwormASPlay(const InitArg& arg) : StopBase(arg) {} SandwormASPlay::~SandwormASPlay() = default; bool SandwormASPlay::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void SandwormASPlay::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void SandwormASPlay::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void SandwormASPlay::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mChangeOffsetDelay_s, "ChangeOffsetDelay"); getStaticParam(&mTargetSandOffset_s, "TargetSandOffset"); getStaticParam(&mSandOffsetSpeed_s, "SandOffsetSpeed"); @@ -33,7 +33,7 @@ void SandwormASPlay::loadParams_() { } void SandwormASPlay::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSandwormASPlay.h b/src/Game/Actor/Action/actionSandwormASPlay.h index 4354080a..18a3404d 100644 --- a/src/Game/Actor/Action/actionSandwormASPlay.h +++ b/src/Game/Actor/Action/actionSandwormASPlay.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SandwormASPlay : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(SandwormASPlay, ActionWithPosAngReduce) +class SandwormASPlay : public StopBase { + SEAD_RTTI_OVERRIDE(SandwormASPlay, StopBase) public: explicit SandwormASPlay(const InitArg& arg); ~SandwormASPlay() override; diff --git a/src/Game/Actor/Action/actionScrapEquip.cpp b/src/Game/Actor/Action/actionScrapEquip.cpp index 2e282425..9d845763 100644 --- a/src/Game/Actor/Action/actionScrapEquip.cpp +++ b/src/Game/Actor/Action/actionScrapEquip.cpp @@ -19,7 +19,7 @@ void ScrapEquip::leave_() { } void ScrapEquip::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mDropSpd_s, "DropSpd"); } diff --git a/src/Game/Actor/Action/actionSearch.cpp b/src/Game/Actor/Action/actionSearch.cpp index 2a7c7d57..f2bc191b 100644 --- a/src/Game/Actor/Action/actionSearch.cpp +++ b/src/Game/Actor/Action/actionSearch.cpp @@ -11,7 +11,7 @@ void Search::enter_(ksys::act::ai::InlineParamPack* params) { } void Search::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mNoChangeTime_s, "NoChangeTime"); } diff --git a/src/Game/Actor/Action/actionSendMessageToTargetActor.cpp b/src/Game/Actor/Action/actionSendMessageToTargetActor.cpp deleted file mode 100644 index f792e3bc..00000000 --- a/src/Game/Actor/Action/actionSendMessageToTargetActor.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionSendMessageToTargetActor.h" - -namespace uking::action { - -SendMessageToTargetActor::SendMessageToTargetActor(const InitArg& arg) : SendMessage(arg) {} - -SendMessageToTargetActor::~SendMessageToTargetActor() = default; - -bool SendMessageToTargetActor::init_(sead::Heap* heap) { - return SendMessage::init_(heap); -} - -void SendMessageToTargetActor::enter_(ksys::act::ai::InlineParamPack* params) { - SendMessage::enter_(params); -} - -void SendMessageToTargetActor::leave_() { - SendMessage::leave_(); -} - -void SendMessageToTargetActor::loadParams_() { - SendMessage::loadParams_(); - getDynamicParam(&mTargetActor_d, "TargetActor"); -} - -void SendMessageToTargetActor::calc_() { - SendMessage::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSendNoticeMessageBase.cpp b/src/Game/Actor/Action/actionSendNoticeMessageBase.cpp new file mode 100644 index 00000000..e637c69d --- /dev/null +++ b/src/Game/Actor/Action/actionSendNoticeMessageBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionSendNoticeMessageBase.h" + +namespace uking::action { + +SendNoticeMessageBase::SendNoticeMessageBase(const InitArg& arg) : OnetimeStopASPlay(arg) {} + +SendNoticeMessageBase::~SendNoticeMessageBase() = default; + +bool SendNoticeMessageBase::init_(sead::Heap* heap) { + return OnetimeStopASPlay::init_(heap); +} + +void SendNoticeMessageBase::enter_(ksys::act::ai::InlineParamPack* params) { + OnetimeStopASPlay::enter_(params); +} + +void SendNoticeMessageBase::leave_() { + OnetimeStopASPlay::leave_(); +} + +void SendNoticeMessageBase::loadParams_() { + OnetimeStopASPlay::loadParams_(); + getStaticParam(&mTargetActorName_s, "TargetActorName"); +} + +void SendNoticeMessageBase::calc_() { + OnetimeStopASPlay::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSendPlayerNoticeMessageBase.h b/src/Game/Actor/Action/actionSendNoticeMessageBase.h similarity index 66% rename from src/Game/Actor/Action/actionSendPlayerNoticeMessageBase.h rename to src/Game/Actor/Action/actionSendNoticeMessageBase.h index 7e8e12c0..2c356239 100644 --- a/src/Game/Actor/Action/actionSendPlayerNoticeMessageBase.h +++ b/src/Game/Actor/Action/actionSendNoticeMessageBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class SendPlayerNoticeMessageBase : public OnetimeStopASPlay { - SEAD_RTTI_OVERRIDE(SendPlayerNoticeMessageBase, OnetimeStopASPlay) +class SendNoticeMessageBase : public OnetimeStopASPlay { + SEAD_RTTI_OVERRIDE(SendNoticeMessageBase, OnetimeStopASPlay) public: - explicit SendPlayerNoticeMessageBase(const InitArg& arg); - ~SendPlayerNoticeMessageBase() override; + explicit SendNoticeMessageBase(const InitArg& arg); + ~SendNoticeMessageBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSendPlayerNoticeMessage.cpp b/src/Game/Actor/Action/actionSendPlayerNoticeMessage.cpp index 00b14fca..5221a5d5 100644 --- a/src/Game/Actor/Action/actionSendPlayerNoticeMessage.cpp +++ b/src/Game/Actor/Action/actionSendPlayerNoticeMessage.cpp @@ -2,29 +2,28 @@ namespace uking::action { -SendPlayerNoticeMessage::SendPlayerNoticeMessage(const InitArg& arg) - : SendPlayerNoticeMessageBase(arg) {} +SendPlayerNoticeMessage::SendPlayerNoticeMessage(const InitArg& arg) : SendNoticeMessageBase(arg) {} SendPlayerNoticeMessage::~SendPlayerNoticeMessage() = default; bool SendPlayerNoticeMessage::init_(sead::Heap* heap) { - return SendPlayerNoticeMessageBase::init_(heap); + return SendNoticeMessageBase::init_(heap); } void SendPlayerNoticeMessage::enter_(ksys::act::ai::InlineParamPack* params) { - SendPlayerNoticeMessageBase::enter_(params); + SendNoticeMessageBase::enter_(params); } void SendPlayerNoticeMessage::leave_() { - SendPlayerNoticeMessageBase::leave_(); + SendNoticeMessageBase::leave_(); } void SendPlayerNoticeMessage::loadParams_() { - SendPlayerNoticeMessageBase::loadParams_(); + SendNoticeMessageBase::loadParams_(); } void SendPlayerNoticeMessage::calc_() { - SendPlayerNoticeMessageBase::calc_(); + SendNoticeMessageBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSendPlayerNoticeMessage.h b/src/Game/Actor/Action/actionSendPlayerNoticeMessage.h index 7b874652..1b84598e 100644 --- a/src/Game/Actor/Action/actionSendPlayerNoticeMessage.h +++ b/src/Game/Actor/Action/actionSendPlayerNoticeMessage.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSendPlayerNoticeMessageBase.h" +#include "Game/Actor/Action/actionSendNoticeMessageBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SendPlayerNoticeMessage : public SendPlayerNoticeMessageBase { - SEAD_RTTI_OVERRIDE(SendPlayerNoticeMessage, SendPlayerNoticeMessageBase) +class SendPlayerNoticeMessage : public SendNoticeMessageBase { + SEAD_RTTI_OVERRIDE(SendPlayerNoticeMessage, SendNoticeMessageBase) public: explicit SendPlayerNoticeMessage(const InitArg& arg); ~SendPlayerNoticeMessage() override; diff --git a/src/Game/Actor/Action/actionSendPlayerNoticeMessageBase.cpp b/src/Game/Actor/Action/actionSendPlayerNoticeMessageBase.cpp deleted file mode 100644 index 75d3b4ca..00000000 --- a/src/Game/Actor/Action/actionSendPlayerNoticeMessageBase.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionSendPlayerNoticeMessageBase.h" - -namespace uking::action { - -SendPlayerNoticeMessageBase::SendPlayerNoticeMessageBase(const InitArg& arg) - : OnetimeStopASPlay(arg) {} - -SendPlayerNoticeMessageBase::~SendPlayerNoticeMessageBase() = default; - -bool SendPlayerNoticeMessageBase::init_(sead::Heap* heap) { - return OnetimeStopASPlay::init_(heap); -} - -void SendPlayerNoticeMessageBase::enter_(ksys::act::ai::InlineParamPack* params) { - OnetimeStopASPlay::enter_(params); -} - -void SendPlayerNoticeMessageBase::leave_() { - OnetimeStopASPlay::leave_(); -} - -void SendPlayerNoticeMessageBase::loadParams_() { - OnetimeStopASPlay::loadParams_(); - getStaticParam(&mTargetActorName_s, "TargetActorName"); -} - -void SendPlayerNoticeMessageBase::calc_() { - OnetimeStopASPlay::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSendTargetActorMessageBase.cpp b/src/Game/Actor/Action/actionSendTargetActorMessageBase.cpp new file mode 100644 index 00000000..98a033f6 --- /dev/null +++ b/src/Game/Actor/Action/actionSendTargetActorMessageBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionSendTargetActorMessageBase.h" + +namespace uking::action { + +SendTargetActorMessageBase::SendTargetActorMessageBase(const InitArg& arg) : SendMessage(arg) {} + +SendTargetActorMessageBase::~SendTargetActorMessageBase() = default; + +bool SendTargetActorMessageBase::init_(sead::Heap* heap) { + return SendMessage::init_(heap); +} + +void SendTargetActorMessageBase::enter_(ksys::act::ai::InlineParamPack* params) { + SendMessage::enter_(params); +} + +void SendTargetActorMessageBase::leave_() { + SendMessage::leave_(); +} + +void SendTargetActorMessageBase::loadParams_() { + SendMessage::loadParams_(); + getDynamicParam(&mTargetActor_d, "TargetActor"); +} + +void SendTargetActorMessageBase::calc_() { + SendMessage::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSendMessageToTargetActor.h b/src/Game/Actor/Action/actionSendTargetActorMessageBase.h similarity index 67% rename from src/Game/Actor/Action/actionSendMessageToTargetActor.h rename to src/Game/Actor/Action/actionSendTargetActorMessageBase.h index 751d6ae1..b652d2fd 100644 --- a/src/Game/Actor/Action/actionSendMessageToTargetActor.h +++ b/src/Game/Actor/Action/actionSendTargetActorMessageBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class SendMessageToTargetActor : public SendMessage { - SEAD_RTTI_OVERRIDE(SendMessageToTargetActor, SendMessage) +class SendTargetActorMessageBase : public SendMessage { + SEAD_RTTI_OVERRIDE(SendTargetActorMessageBase, SendMessage) public: - explicit SendMessageToTargetActor(const InitArg& arg); - ~SendMessageToTargetActor() override; + explicit SendTargetActorMessageBase(const InitArg& arg); + ~SendTargetActorMessageBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.cpp b/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.cpp index 0ac20199..ad6f7927 100644 --- a/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.cpp +++ b/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.cpp @@ -3,28 +3,28 @@ namespace uking::action { SendTargetActorRequestShareAwn::SendTargetActorRequestShareAwn(const InitArg& arg) - : SendMessageToTargetActor(arg) {} + : SendTargetActorMessageBase(arg) {} SendTargetActorRequestShareAwn::~SendTargetActorRequestShareAwn() = default; bool SendTargetActorRequestShareAwn::init_(sead::Heap* heap) { - return SendMessageToTargetActor::init_(heap); + return SendTargetActorMessageBase::init_(heap); } void SendTargetActorRequestShareAwn::enter_(ksys::act::ai::InlineParamPack* params) { - SendMessageToTargetActor::enter_(params); + SendTargetActorMessageBase::enter_(params); } void SendTargetActorRequestShareAwn::leave_() { - SendMessageToTargetActor::leave_(); + SendTargetActorMessageBase::leave_(); } void SendTargetActorRequestShareAwn::loadParams_() { - SendMessageToTargetActor::loadParams_(); + SendTargetActorMessageBase::loadParams_(); } void SendTargetActorRequestShareAwn::calc_() { - SendMessageToTargetActor::calc_(); + SendTargetActorMessageBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.h b/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.h index b5a2f5aa..e94f6b44 100644 --- a/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.h +++ b/src/Game/Actor/Action/actionSendTargetActorRequestShareAwn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSendMessageToTargetActor.h" +#include "Game/Actor/Action/actionSendTargetActorMessageBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SendTargetActorRequestShareAwn : public SendMessageToTargetActor { - SEAD_RTTI_OVERRIDE(SendTargetActorRequestShareAwn, SendMessageToTargetActor) +class SendTargetActorRequestShareAwn : public SendTargetActorMessageBase { + SEAD_RTTI_OVERRIDE(SendTargetActorRequestShareAwn, SendTargetActorMessageBase) public: explicit SendTargetActorRequestShareAwn(const InitArg& arg); ~SendTargetActorRequestShareAwn() override; diff --git a/src/Game/Actor/Action/actionSeqPunchByASEvent.cpp b/src/Game/Actor/Action/actionSeqPunchByASEvent.cpp index def5eb1a..f46085c0 100644 --- a/src/Game/Actor/Action/actionSeqPunchByASEvent.cpp +++ b/src/Game/Actor/Action/actionSeqPunchByASEvent.cpp @@ -19,7 +19,7 @@ void SeqPunchByASEvent::leave_() { } void SeqPunchByASEvent::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); getStaticParam(&mAttackIntensity_s, "AttackIntensity"); getStaticParam(&mIsHammer_s, "IsHammer"); diff --git a/src/Game/Actor/Action/actionSideMoveBase.cpp b/src/Game/Actor/Action/actionSideMoveBase.cpp new file mode 100644 index 00000000..326fbb50 --- /dev/null +++ b/src/Game/Actor/Action/actionSideMoveBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionSideMoveBase.h" + +namespace uking::action { + +SideMoveBase::SideMoveBase(const InitArg& arg) : MoveBase(arg) {} + +SideMoveBase::~SideMoveBase() = default; + +bool SideMoveBase::init_(sead::Heap* heap) { + return MoveBase::init_(heap); +} + +void SideMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { + MoveBase::enter_(params); +} + +void SideMoveBase::leave_() { + MoveBase::leave_(); +} + +void SideMoveBase::loadParams_() { + MoveBase::loadParams_(); + getStaticParam(&mLeftMove_s, "LeftMove"); +} + +void SideMoveBase::calc_() { + MoveBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSideWalkBase.h b/src/Game/Actor/Action/actionSideMoveBase.h similarity index 73% rename from src/Game/Actor/Action/actionSideWalkBase.h rename to src/Game/Actor/Action/actionSideMoveBase.h index bb9f6439..981f66a4 100644 --- a/src/Game/Actor/Action/actionSideWalkBase.h +++ b/src/Game/Actor/Action/actionSideMoveBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class SideWalkBase : public MoveBase { - SEAD_RTTI_OVERRIDE(SideWalkBase, MoveBase) +class SideMoveBase : public MoveBase { + SEAD_RTTI_OVERRIDE(SideMoveBase, MoveBase) public: - explicit SideWalkBase(const InitArg& arg); - ~SideWalkBase() override; + explicit SideMoveBase(const InitArg& arg); + ~SideMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSideWalk.cpp b/src/Game/Actor/Action/actionSideWalk.cpp index 5452e453..345189d5 100644 --- a/src/Game/Actor/Action/actionSideWalk.cpp +++ b/src/Game/Actor/Action/actionSideWalk.cpp @@ -2,30 +2,30 @@ namespace uking::action { -SideWalk::SideWalk(const InitArg& arg) : SideWalkBase(arg) {} +SideWalk::SideWalk(const InitArg& arg) : SideMoveBase(arg) {} SideWalk::~SideWalk() = default; bool SideWalk::init_(sead::Heap* heap) { - return SideWalkBase::init_(heap); + return SideMoveBase::init_(heap); } void SideWalk::enter_(ksys::act::ai::InlineParamPack* params) { - SideWalkBase::enter_(params); + SideMoveBase::enter_(params); } void SideWalk::leave_() { - SideWalkBase::leave_(); + SideMoveBase::leave_(); } void SideWalk::loadParams_() { - SideWalkBase::loadParams_(); + SideMoveBase::loadParams_(); getStaticParam(&mIsIgnoreSameAS_s, "IsIgnoreSameAS"); getStaticParam(&mASKeyName_s, "ASKeyName"); } void SideWalk::calc_() { - SideWalkBase::calc_(); + SideMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSideWalk.h b/src/Game/Actor/Action/actionSideWalk.h index 5a15a34f..23a5c420 100644 --- a/src/Game/Actor/Action/actionSideWalk.h +++ b/src/Game/Actor/Action/actionSideWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSideWalkBase.h" +#include "Game/Actor/Action/actionSideMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SideWalk : public SideWalkBase { - SEAD_RTTI_OVERRIDE(SideWalk, SideWalkBase) +class SideWalk : public SideMoveBase { + SEAD_RTTI_OVERRIDE(SideWalk, SideMoveBase) public: explicit SideWalk(const InitArg& arg); ~SideWalk() override; diff --git a/src/Game/Actor/Action/actionSideWalkBase.cpp b/src/Game/Actor/Action/actionSideWalkBase.cpp deleted file mode 100644 index 728394c0..00000000 --- a/src/Game/Actor/Action/actionSideWalkBase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionSideWalkBase.h" - -namespace uking::action { - -SideWalkBase::SideWalkBase(const InitArg& arg) : MoveBase(arg) {} - -SideWalkBase::~SideWalkBase() = default; - -bool SideWalkBase::init_(sead::Heap* heap) { - return MoveBase::init_(heap); -} - -void SideWalkBase::enter_(ksys::act::ai::InlineParamPack* params) { - MoveBase::enter_(params); -} - -void SideWalkBase::leave_() { - MoveBase::leave_(); -} - -void SideWalkBase::loadParams_() { - MoveBase::loadParams_(); - getStaticParam(&mLeftMove_s, "LeftMove"); -} - -void SideWalkBase::calc_() { - MoveBase::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSimpleGrabBase.cpp b/src/Game/Actor/Action/actionSimpleGrabBase.cpp new file mode 100644 index 00000000..2afd4d1d --- /dev/null +++ b/src/Game/Actor/Action/actionSimpleGrabBase.cpp @@ -0,0 +1,13 @@ +#include "Game/Actor/Action/actionSimpleGrabBase.h" + +namespace uking::action { + +SimpleGrabBase::SimpleGrabBase(const InitArg& arg) : Grab(arg) {} + +SimpleGrabBase::~SimpleGrabBase() = default; + +void SimpleGrabBase::loadParams_() { + Grab::loadParams_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSimpleGrabWithASBase.h b/src/Game/Actor/Action/actionSimpleGrabBase.h similarity index 54% rename from src/Game/Actor/Action/actionSimpleGrabWithASBase.h rename to src/Game/Actor/Action/actionSimpleGrabBase.h index d48fb3a7..f886adfc 100644 --- a/src/Game/Actor/Action/actionSimpleGrabWithASBase.h +++ b/src/Game/Actor/Action/actionSimpleGrabBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class SimpleGrabWithASBase : public Grab { - SEAD_RTTI_OVERRIDE(SimpleGrabWithASBase, Grab) +class SimpleGrabBase : public Grab { + SEAD_RTTI_OVERRIDE(SimpleGrabBase, Grab) public: - explicit SimpleGrabWithASBase(const InitArg& arg); - ~SimpleGrabWithASBase() override; + explicit SimpleGrabBase(const InitArg& arg); + ~SimpleGrabBase() override; void loadParams_() override; diff --git a/src/Game/Actor/Action/actionSimpleGrabWithAS.cpp b/src/Game/Actor/Action/actionSimpleGrabWithAS.cpp index e99f37c9..938c5ac4 100644 --- a/src/Game/Actor/Action/actionSimpleGrabWithAS.cpp +++ b/src/Game/Actor/Action/actionSimpleGrabWithAS.cpp @@ -2,12 +2,12 @@ namespace uking::action { -SimpleGrabWithAS::SimpleGrabWithAS(const InitArg& arg) : SimpleGrabWithASBase(arg) {} +SimpleGrabWithAS::SimpleGrabWithAS(const InitArg& arg) : SimpleGrabBase(arg) {} SimpleGrabWithAS::~SimpleGrabWithAS() = default; void SimpleGrabWithAS::loadParams_() { - SimpleGrabWithASBase::loadParams_(); + SimpleGrabBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } diff --git a/src/Game/Actor/Action/actionSimpleGrabWithAS.h b/src/Game/Actor/Action/actionSimpleGrabWithAS.h index c1c6d756..fbb3bed1 100644 --- a/src/Game/Actor/Action/actionSimpleGrabWithAS.h +++ b/src/Game/Actor/Action/actionSimpleGrabWithAS.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSimpleGrabWithASBase.h" +#include "Game/Actor/Action/actionSimpleGrabBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SimpleGrabWithAS : public SimpleGrabWithASBase { - SEAD_RTTI_OVERRIDE(SimpleGrabWithAS, SimpleGrabWithASBase) +class SimpleGrabWithAS : public SimpleGrabBase { + SEAD_RTTI_OVERRIDE(SimpleGrabWithAS, SimpleGrabBase) public: explicit SimpleGrabWithAS(const InitArg& arg); ~SimpleGrabWithAS() override; diff --git a/src/Game/Actor/Action/actionSimpleGrabWithASBase.cpp b/src/Game/Actor/Action/actionSimpleGrabWithASBase.cpp deleted file mode 100644 index ba2b0859..00000000 --- a/src/Game/Actor/Action/actionSimpleGrabWithASBase.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "Game/Actor/Action/actionSimpleGrabWithASBase.h" - -namespace uking::action { - -SimpleGrabWithASBase::SimpleGrabWithASBase(const InitArg& arg) : Grab(arg) {} - -SimpleGrabWithASBase::~SimpleGrabWithASBase() = default; - -void SimpleGrabWithASBase::loadParams_() { - Grab::loadParams_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSimpleKnockBackShock.cpp b/src/Game/Actor/Action/actionSimpleKnockBackShock.cpp new file mode 100644 index 00000000..7594569d --- /dev/null +++ b/src/Game/Actor/Action/actionSimpleKnockBackShock.cpp @@ -0,0 +1,31 @@ +#include "Game/Actor/Action/actionSimpleKnockBackShock.h" + +namespace uking::action { + +SimpleKnockBackShock::SimpleKnockBackShock(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +SimpleKnockBackShock::~SimpleKnockBackShock() = default; + +bool SimpleKnockBackShock::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void SimpleKnockBackShock::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void SimpleKnockBackShock::leave_() { + ksys::act::ai::Action::leave_(); +} + +void SimpleKnockBackShock::loadParams_() { + getStaticParam(&mHitImpactForce_s, "HitImpactForce"); + getStaticParam(&mVelReduce_s, "VelReduce"); + getStaticParam(&mVelReduceOnGround_s, "VelReduceOnGround"); +} + +void SimpleKnockBackShock::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionKnockBackShock.h b/src/Game/Actor/Action/actionSimpleKnockBackShock.h similarity index 71% rename from src/Game/Actor/Action/actionKnockBackShock.h rename to src/Game/Actor/Action/actionSimpleKnockBackShock.h index 4ce76dc9..00006e0b 100644 --- a/src/Game/Actor/Action/actionKnockBackShock.h +++ b/src/Game/Actor/Action/actionSimpleKnockBackShock.h @@ -4,11 +4,11 @@ namespace uking::action { -class KnockBackShock : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(KnockBackShock, ksys::act::ai::Action) +class SimpleKnockBackShock : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(SimpleKnockBackShock, ksys::act::ai::Action) public: - explicit KnockBackShock(const InitArg& arg); - ~KnockBackShock() override; + explicit SimpleKnockBackShock(const InitArg& arg); + ~SimpleKnockBackShock() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSiteBossChemicalPlus.cpp b/src/Game/Actor/Action/actionSiteBossChemicalPlus.cpp index 07fd8159..6f6893fd 100644 --- a/src/Game/Actor/Action/actionSiteBossChemicalPlus.cpp +++ b/src/Game/Actor/Action/actionSiteBossChemicalPlus.cpp @@ -2,24 +2,24 @@ namespace uking::action { -SiteBossChemicalPlus::SiteBossChemicalPlus(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +SiteBossChemicalPlus::SiteBossChemicalPlus(const InitArg& arg) : StopBase(arg) {} SiteBossChemicalPlus::~SiteBossChemicalPlus() = default; bool SiteBossChemicalPlus::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void SiteBossChemicalPlus::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void SiteBossChemicalPlus::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void SiteBossChemicalPlus::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mIsDeleteAllChildDevice_s, "IsDeleteAllChildDevice"); getStaticParam(&mIsSetCanGuardArrowFlag_s, "IsSetCanGuardArrowFlag"); getStaticParam(&mChemicalLoopASName_s, "ChemicalLoopASName"); @@ -27,7 +27,7 @@ void SiteBossChemicalPlus::loadParams_() { } void SiteBossChemicalPlus::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossChemicalPlus.h b/src/Game/Actor/Action/actionSiteBossChemicalPlus.h index c09045c0..9d0040e3 100644 --- a/src/Game/Actor/Action/actionSiteBossChemicalPlus.h +++ b/src/Game/Actor/Action/actionSiteBossChemicalPlus.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SiteBossChemicalPlus : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(SiteBossChemicalPlus, ActionWithPosAngReduce) +class SiteBossChemicalPlus : public StopBase { + SEAD_RTTI_OVERRIDE(SiteBossChemicalPlus, StopBase) public: explicit SiteBossChemicalPlus(const InitArg& arg); ~SiteBossChemicalPlus() override; diff --git a/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.cpp b/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.cpp index 91c9c8b5..79148876 100644 --- a/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.cpp +++ b/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.cpp @@ -2,29 +2,28 @@ namespace uking::action { -SiteBossSwordChemicalPlus::SiteBossSwordChemicalPlus(const InitArg& arg) - : ActionWithPosAngReduce(arg) {} +SiteBossSwordChemicalPlus::SiteBossSwordChemicalPlus(const InitArg& arg) : StopBase(arg) {} SiteBossSwordChemicalPlus::~SiteBossSwordChemicalPlus() = default; bool SiteBossSwordChemicalPlus::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void SiteBossSwordChemicalPlus::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void SiteBossSwordChemicalPlus::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void SiteBossSwordChemicalPlus::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void SiteBossSwordChemicalPlus::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.h b/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.h index d059f389..e172066b 100644 --- a/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.h +++ b/src/Game/Actor/Action/actionSiteBossSwordChemicalPlus.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SiteBossSwordChemicalPlus : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(SiteBossSwordChemicalPlus, ActionWithPosAngReduce) +class SiteBossSwordChemicalPlus : public StopBase { + SEAD_RTTI_OVERRIDE(SiteBossSwordChemicalPlus, StopBase) public: explicit SiteBossSwordChemicalPlus(const InitArg& arg); ~SiteBossSwordChemicalPlus() override; diff --git a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.cpp b/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.cpp index bdc76bf5..6c4d9cc1 100644 --- a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.cpp +++ b/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.cpp @@ -3,28 +3,28 @@ namespace uking::action { SiteBossSwordWhirlSlashCharge::SiteBossSwordWhirlSlashCharge(const InitArg& arg) - : SiteBossSwordWhirlSlashChargeBase(arg) {} + : LastBossSwordWhirlSlashChargeBase(arg) {} SiteBossSwordWhirlSlashCharge::~SiteBossSwordWhirlSlashCharge() = default; bool SiteBossSwordWhirlSlashCharge::init_(sead::Heap* heap) { - return SiteBossSwordWhirlSlashChargeBase::init_(heap); + return LastBossSwordWhirlSlashChargeBase::init_(heap); } void SiteBossSwordWhirlSlashCharge::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossSwordWhirlSlashChargeBase::enter_(params); + LastBossSwordWhirlSlashChargeBase::enter_(params); } void SiteBossSwordWhirlSlashCharge::leave_() { - SiteBossSwordWhirlSlashChargeBase::leave_(); + LastBossSwordWhirlSlashChargeBase::leave_(); } void SiteBossSwordWhirlSlashCharge::loadParams_() { - SiteBossSwordWhirlSlashChargeBase::loadParams_(); + LastBossSwordWhirlSlashChargeBase::loadParams_(); } void SiteBossSwordWhirlSlashCharge::calc_() { - SiteBossSwordWhirlSlashChargeBase::calc_(); + LastBossSwordWhirlSlashChargeBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.h b/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.h index 6083ab59..6c6629ae 100644 --- a/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.h +++ b/src/Game/Actor/Action/actionSiteBossSwordWhirlSlashCharge.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSiteBossSwordWhirlSlashChargeBase.h" +#include "Game/Actor/Action/actionLastBossSwordWhirlSlashChargeBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SiteBossSwordWhirlSlashCharge : public SiteBossSwordWhirlSlashChargeBase { - SEAD_RTTI_OVERRIDE(SiteBossSwordWhirlSlashCharge, SiteBossSwordWhirlSlashChargeBase) +class SiteBossSwordWhirlSlashCharge : public LastBossSwordWhirlSlashChargeBase { + SEAD_RTTI_OVERRIDE(SiteBossSwordWhirlSlashCharge, LastBossSwordWhirlSlashChargeBase) public: explicit SiteBossSwordWhirlSlashCharge(const InitArg& arg); ~SiteBossSwordWhirlSlashCharge() override; diff --git a/src/Game/Actor/Action/actionSleep.cpp b/src/Game/Actor/Action/actionSleep.cpp index 10e87afd..055838f8 100644 --- a/src/Game/Actor/Action/actionSleep.cpp +++ b/src/Game/Actor/Action/actionSleep.cpp @@ -2,28 +2,28 @@ namespace uking::action { -Sleep::Sleep(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Sleep::Sleep(const InitArg& arg) : StopBase(arg) {} Sleep::~Sleep() = default; bool Sleep::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void Sleep::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Sleep::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Sleep::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void Sleep::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSleep.h b/src/Game/Actor/Action/actionSleep.h index 3ec091f9..7c0b52c9 100644 --- a/src/Game/Actor/Action/actionSleep.h +++ b/src/Game/Actor/Action/actionSleep.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Sleep : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Sleep, ActionWithPosAngReduce) +class Sleep : public StopBase { + SEAD_RTTI_OVERRIDE(Sleep, StopBase) public: explicit Sleep(const InitArg& arg); ~Sleep() override; diff --git a/src/Game/Actor/Action/actionSlippedCircleWalkBase.cpp b/src/Game/Actor/Action/actionSlippedCircleMoveBase.cpp similarity index 56% rename from src/Game/Actor/Action/actionSlippedCircleWalkBase.cpp rename to src/Game/Actor/Action/actionSlippedCircleMoveBase.cpp index a6b8e504..40745d04 100644 --- a/src/Game/Actor/Action/actionSlippedCircleWalkBase.cpp +++ b/src/Game/Actor/Action/actionSlippedCircleMoveBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionSlippedCircleWalkBase.h" +#include "Game/Actor/Action/actionSlippedCircleMoveBase.h" namespace uking::action { -SlippedCircleWalkBase::SlippedCircleWalkBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +SlippedCircleMoveBase::SlippedCircleMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SlippedCircleWalkBase::~SlippedCircleWalkBase() = default; +SlippedCircleMoveBase::~SlippedCircleMoveBase() = default; -bool SlippedCircleWalkBase::init_(sead::Heap* heap) { +bool SlippedCircleMoveBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SlippedCircleWalkBase::enter_(ksys::act::ai::InlineParamPack* params) { +void SlippedCircleMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void SlippedCircleWalkBase::leave_() { +void SlippedCircleMoveBase::leave_() { ksys::act::ai::Action::leave_(); } -void SlippedCircleWalkBase::loadParams_() { +void SlippedCircleMoveBase::loadParams_() { getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mRotSpd_s, "RotSpd"); getStaticParam(&mRotDist_s, "RotDist"); @@ -27,7 +27,7 @@ void SlippedCircleWalkBase::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void SlippedCircleWalkBase::calc_() { +void SlippedCircleMoveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionSlippedCircleWalkBase.h b/src/Game/Actor/Action/actionSlippedCircleMoveBase.h similarity index 77% rename from src/Game/Actor/Action/actionSlippedCircleWalkBase.h rename to src/Game/Actor/Action/actionSlippedCircleMoveBase.h index af606b24..1807fbca 100644 --- a/src/Game/Actor/Action/actionSlippedCircleWalkBase.h +++ b/src/Game/Actor/Action/actionSlippedCircleMoveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class SlippedCircleWalkBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SlippedCircleWalkBase, ksys::act::ai::Action) +class SlippedCircleMoveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(SlippedCircleMoveBase, ksys::act::ai::Action) public: - explicit SlippedCircleWalkBase(const InitArg& arg); - ~SlippedCircleWalkBase() override; + explicit SlippedCircleMoveBase(const InitArg& arg); + ~SlippedCircleMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSlippedCircleWalk.cpp b/src/Game/Actor/Action/actionSlippedCircleWalk.cpp index 957dd036..90652ed1 100644 --- a/src/Game/Actor/Action/actionSlippedCircleWalk.cpp +++ b/src/Game/Actor/Action/actionSlippedCircleWalk.cpp @@ -2,29 +2,29 @@ namespace uking::action { -SlippedCircleWalk::SlippedCircleWalk(const InitArg& arg) : SlippedCircleWalkBase(arg) {} +SlippedCircleWalk::SlippedCircleWalk(const InitArg& arg) : SlippedCircleMoveBase(arg) {} SlippedCircleWalk::~SlippedCircleWalk() = default; bool SlippedCircleWalk::init_(sead::Heap* heap) { - return SlippedCircleWalkBase::init_(heap); + return SlippedCircleMoveBase::init_(heap); } void SlippedCircleWalk::enter_(ksys::act::ai::InlineParamPack* params) { - SlippedCircleWalkBase::enter_(params); + SlippedCircleMoveBase::enter_(params); } void SlippedCircleWalk::leave_() { - SlippedCircleWalkBase::leave_(); + SlippedCircleMoveBase::leave_(); } void SlippedCircleWalk::loadParams_() { - SlippedCircleWalkBase::loadParams_(); + SlippedCircleMoveBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void SlippedCircleWalk::calc_() { - SlippedCircleWalkBase::calc_(); + SlippedCircleMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSlippedCircleWalk.h b/src/Game/Actor/Action/actionSlippedCircleWalk.h index 476f812e..ce65ac94 100644 --- a/src/Game/Actor/Action/actionSlippedCircleWalk.h +++ b/src/Game/Actor/Action/actionSlippedCircleWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSlippedCircleWalkBase.h" +#include "Game/Actor/Action/actionSlippedCircleMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SlippedCircleWalk : public SlippedCircleWalkBase { - SEAD_RTTI_OVERRIDE(SlippedCircleWalk, SlippedCircleWalkBase) +class SlippedCircleWalk : public SlippedCircleMoveBase { + SEAD_RTTI_OVERRIDE(SlippedCircleWalk, SlippedCircleMoveBase) public: explicit SlippedCircleWalk(const InitArg& arg); ~SlippedCircleWalk() override; diff --git a/src/Game/Actor/Action/actionSlippedWalkBase.cpp b/src/Game/Actor/Action/actionSlippedMoveBase.cpp similarity index 66% rename from src/Game/Actor/Action/actionSlippedWalkBase.cpp rename to src/Game/Actor/Action/actionSlippedMoveBase.cpp index c730ca3e..4afe1bc7 100644 --- a/src/Game/Actor/Action/actionSlippedWalkBase.cpp +++ b/src/Game/Actor/Action/actionSlippedMoveBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionSlippedWalkBase.h" +#include "Game/Actor/Action/actionSlippedMoveBase.h" namespace uking::action { -SlippedWalkBase::SlippedWalkBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +SlippedMoveBase::SlippedMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SlippedWalkBase::~SlippedWalkBase() = default; +SlippedMoveBase::~SlippedMoveBase() = default; -bool SlippedWalkBase::init_(sead::Heap* heap) { +bool SlippedMoveBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SlippedWalkBase::enter_(ksys::act::ai::InlineParamPack* params) { +void SlippedMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void SlippedWalkBase::leave_() { +void SlippedMoveBase::leave_() { ksys::act::ai::Action::leave_(); } -void SlippedWalkBase::loadParams_() { +void SlippedMoveBase::loadParams_() { getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mWallHitLimitTime_s, "WallHitLimitTime"); getStaticParam(&mSpeed_s, "Speed"); @@ -31,7 +31,7 @@ void SlippedWalkBase::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void SlippedWalkBase::calc_() { +void SlippedMoveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionSlippedWalkBase.h b/src/Game/Actor/Action/actionSlippedMoveBase.h similarity index 83% rename from src/Game/Actor/Action/actionSlippedWalkBase.h rename to src/Game/Actor/Action/actionSlippedMoveBase.h index 7a7f0653..70ba5f75 100644 --- a/src/Game/Actor/Action/actionSlippedWalkBase.h +++ b/src/Game/Actor/Action/actionSlippedMoveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class SlippedWalkBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SlippedWalkBase, ksys::act::ai::Action) +class SlippedMoveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(SlippedMoveBase, ksys::act::ai::Action) public: - explicit SlippedWalkBase(const InitArg& arg); - ~SlippedWalkBase() override; + explicit SlippedMoveBase(const InitArg& arg); + ~SlippedMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSlippedWalk.cpp b/src/Game/Actor/Action/actionSlippedWalk.cpp index 9b9e8e42..ca5c9573 100644 --- a/src/Game/Actor/Action/actionSlippedWalk.cpp +++ b/src/Game/Actor/Action/actionSlippedWalk.cpp @@ -2,29 +2,29 @@ namespace uking::action { -SlippedWalk::SlippedWalk(const InitArg& arg) : SlippedWalkBase(arg) {} +SlippedWalk::SlippedWalk(const InitArg& arg) : SlippedMoveBase(arg) {} SlippedWalk::~SlippedWalk() = default; bool SlippedWalk::init_(sead::Heap* heap) { - return SlippedWalkBase::init_(heap); + return SlippedMoveBase::init_(heap); } void SlippedWalk::enter_(ksys::act::ai::InlineParamPack* params) { - SlippedWalkBase::enter_(params); + SlippedMoveBase::enter_(params); } void SlippedWalk::leave_() { - SlippedWalkBase::leave_(); + SlippedMoveBase::leave_(); } void SlippedWalk::loadParams_() { - SlippedWalkBase::loadParams_(); + SlippedMoveBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void SlippedWalk::calc_() { - SlippedWalkBase::calc_(); + SlippedMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSlippedWalk.h b/src/Game/Actor/Action/actionSlippedWalk.h index c69853bd..1ad2fcd9 100644 --- a/src/Game/Actor/Action/actionSlippedWalk.h +++ b/src/Game/Actor/Action/actionSlippedWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSlippedWalkBase.h" +#include "Game/Actor/Action/actionSlippedMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SlippedWalk : public SlippedWalkBase { - SEAD_RTTI_OVERRIDE(SlippedWalk, SlippedWalkBase) +class SlippedWalk : public SlippedMoveBase { + SEAD_RTTI_OVERRIDE(SlippedWalk, SlippedMoveBase) public: explicit SlippedWalk(const InitArg& arg); ~SlippedWalk() override; diff --git a/src/Game/Actor/Action/actionSmallDamageBackwardBase.cpp b/src/Game/Actor/Action/actionSmallDamageBackwardBase.cpp index 24c85373..34121f37 100644 --- a/src/Game/Actor/Action/actionSmallDamageBackwardBase.cpp +++ b/src/Game/Actor/Action/actionSmallDamageBackwardBase.cpp @@ -2,28 +2,29 @@ namespace uking::action { -SmallDamageBackwardBase::SmallDamageBackwardBase(const InitArg& arg) : TakeHitImpactForce(arg) {} +SmallDamageBackwardBase::SmallDamageBackwardBase(const InitArg& arg) + : KnockBackHitImpactForce(arg) {} SmallDamageBackwardBase::~SmallDamageBackwardBase() = default; bool SmallDamageBackwardBase::init_(sead::Heap* heap) { - return TakeHitImpactForce::init_(heap); + return KnockBackHitImpactForce::init_(heap); } void SmallDamageBackwardBase::enter_(ksys::act::ai::InlineParamPack* params) { - TakeHitImpactForce::enter_(params); + KnockBackHitImpactForce::enter_(params); } void SmallDamageBackwardBase::leave_() { - TakeHitImpactForce::leave_(); + KnockBackHitImpactForce::leave_(); } void SmallDamageBackwardBase::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); } void SmallDamageBackwardBase::calc_() { - TakeHitImpactForce::calc_(); + KnockBackHitImpactForce::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSmallDamageBackwardBase.h b/src/Game/Actor/Action/actionSmallDamageBackwardBase.h index 104b7da1..7d6ce351 100644 --- a/src/Game/Actor/Action/actionSmallDamageBackwardBase.h +++ b/src/Game/Actor/Action/actionSmallDamageBackwardBase.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionTakeHitImpactForce.h" +#include "Game/Actor/Action/actionKnockBackHitImpactForce.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SmallDamageBackwardBase : public TakeHitImpactForce { - SEAD_RTTI_OVERRIDE(SmallDamageBackwardBase, TakeHitImpactForce) +class SmallDamageBackwardBase : public KnockBackHitImpactForce { + SEAD_RTTI_OVERRIDE(SmallDamageBackwardBase, KnockBackHitImpactForce) public: explicit SmallDamageBackwardBase(const InitArg& arg); ~SmallDamageBackwardBase() override; diff --git a/src/Game/Actor/Action/actionSmallDamageBase.cpp b/src/Game/Actor/Action/actionSmallDamageBase.cpp index d4c9c05f..bab380ba 100644 --- a/src/Game/Actor/Action/actionSmallDamageBase.cpp +++ b/src/Game/Actor/Action/actionSmallDamageBase.cpp @@ -2,14 +2,14 @@ namespace uking::action { -SmallDamageBase::SmallDamageBase(const InitArg& arg) : TakeHitImpactForce(arg) {} +SmallDamageBase::SmallDamageBase(const InitArg& arg) : KnockBackHitImpactForce(arg) {} void SmallDamageBase::enter_(ksys::act::ai::InlineParamPack* params) { - TakeHitImpactForce::enter_(params); + KnockBackHitImpactForce::enter_(params); } void SmallDamageBase::calc_() { - TakeHitImpactForce::calc_(); + KnockBackHitImpactForce::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSmallDamageBase.h b/src/Game/Actor/Action/actionSmallDamageBase.h index c23de953..8578285b 100644 --- a/src/Game/Actor/Action/actionSmallDamageBase.h +++ b/src/Game/Actor/Action/actionSmallDamageBase.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionTakeHitImpactForce.h" +#include "Game/Actor/Action/actionKnockBackHitImpactForce.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SmallDamageBase : public TakeHitImpactForce { - SEAD_RTTI_OVERRIDE(SmallDamageBase, TakeHitImpactForce) +class SmallDamageBase : public KnockBackHitImpactForce { + SEAD_RTTI_OVERRIDE(SmallDamageBase, KnockBackHitImpactForce) public: explicit SmallDamageBase(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionSmallDamageDirectPreTargetBone.cpp b/src/Game/Actor/Action/actionSmallDamageDirectPreTargetBone.cpp index caf586e6..718ef711 100644 --- a/src/Game/Actor/Action/actionSmallDamageDirectPreTargetBone.cpp +++ b/src/Game/Actor/Action/actionSmallDamageDirectPreTargetBone.cpp @@ -8,7 +8,7 @@ SmallDamageDirectPreTargetBone::SmallDamageDirectPreTargetBone(const InitArg& ar SmallDamageDirectPreTargetBone::~SmallDamageDirectPreTargetBone() = default; void SmallDamageDirectPreTargetBone::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mPreTargetBone_s, "PreTargetBone"); getStaticParam(&mASName_s, "ASName"); getStaticParam(&mIsSetHitPosSelecter_s, "IsSetHitPosSelecter"); diff --git a/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.cpp b/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.cpp index e7e14d7b..dbc938de 100644 --- a/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.cpp +++ b/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.cpp @@ -2,25 +2,24 @@ namespace uking::action { -StalEnemyHeadShotReaction::StalEnemyHeadShotReaction(const InitArg& arg) - : ActionWithPosAngReduce(arg) {} +StalEnemyHeadShotReaction::StalEnemyHeadShotReaction(const InitArg& arg) : StopBase(arg) {} StalEnemyHeadShotReaction::~StalEnemyHeadShotReaction() = default; bool StalEnemyHeadShotReaction::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void StalEnemyHeadShotReaction::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void StalEnemyHeadShotReaction::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void StalEnemyHeadShotReaction::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mRotSpd_s, "RotSpd"); getStaticParam(&mUseAddVec_s, "UseAddVec"); @@ -34,7 +33,7 @@ void StalEnemyHeadShotReaction::loadParams_() { } void StalEnemyHeadShotReaction::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.h b/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.h index ccf8fa91..3c32648b 100644 --- a/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.h +++ b/src/Game/Actor/Action/actionStalEnemyHeadShotReaction.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class StalEnemyHeadShotReaction : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(StalEnemyHeadShotReaction, ActionWithPosAngReduce) +class StalEnemyHeadShotReaction : public StopBase { + SEAD_RTTI_OVERRIDE(StalEnemyHeadShotReaction, StopBase) public: explicit StalEnemyHeadShotReaction(const InitArg& arg); ~StalEnemyHeadShotReaction() override; diff --git a/src/Game/Actor/Action/actionStalEnemyHideWait.cpp b/src/Game/Actor/Action/actionStalEnemyHideWait.cpp index 5311a764..192c7355 100644 --- a/src/Game/Actor/Action/actionStalEnemyHideWait.cpp +++ b/src/Game/Actor/Action/actionStalEnemyHideWait.cpp @@ -2,29 +2,29 @@ namespace uking::action { -StalEnemyHideWait::StalEnemyHideWait(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +StalEnemyHideWait::StalEnemyHideWait(const InitArg& arg) : StopBase(arg) {} StalEnemyHideWait::~StalEnemyHideWait() = default; bool StalEnemyHideWait::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void StalEnemyHideWait::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void StalEnemyHideWait::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void StalEnemyHideWait::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void StalEnemyHideWait::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionStalEnemyHideWait.h b/src/Game/Actor/Action/actionStalEnemyHideWait.h index 3ad793a2..18b5e785 100644 --- a/src/Game/Actor/Action/actionStalEnemyHideWait.h +++ b/src/Game/Actor/Action/actionStalEnemyHideWait.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class StalEnemyHideWait : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(StalEnemyHideWait, ActionWithPosAngReduce) +class StalEnemyHideWait : public StopBase { + SEAD_RTTI_OVERRIDE(StalEnemyHideWait, StopBase) public: explicit StalEnemyHideWait(const InitArg& arg); ~StalEnemyHideWait() override; diff --git a/src/Game/Actor/Action/actionStopASPlay.cpp b/src/Game/Actor/Action/actionStopASPlay.cpp index e75ae636..33cbc15e 100644 --- a/src/Game/Actor/Action/actionStopASPlay.cpp +++ b/src/Game/Actor/Action/actionStopASPlay.cpp @@ -2,26 +2,26 @@ namespace uking::action { -StopASPlay::StopASPlay(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +StopASPlay::StopASPlay(const InitArg& arg) : StopBase(arg) {} StopASPlay::~StopASPlay() = default; void StopASPlay::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void StopASPlay::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void StopASPlay::loadParams_() { getStaticParam(&mASName_s, "ASName"); getStaticParam(&mIsIgnoreSame_s, "IsIgnoreSame"); - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void StopASPlay::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionStopASPlay.h b/src/Game/Actor/Action/actionStopASPlay.h index f62a82c1..2d494b1f 100644 --- a/src/Game/Actor/Action/actionStopASPlay.h +++ b/src/Game/Actor/Action/actionStopASPlay.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class StopASPlay : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(StopASPlay, ActionWithPosAngReduce) +class StopASPlay : public StopBase { + SEAD_RTTI_OVERRIDE(StopASPlay, StopBase) public: explicit StopASPlay(const InitArg& arg); ~StopASPlay() override; diff --git a/src/Game/Actor/Action/actionStopBase.cpp b/src/Game/Actor/Action/actionStopBase.cpp new file mode 100644 index 00000000..b38136d9 --- /dev/null +++ b/src/Game/Actor/Action/actionStopBase.cpp @@ -0,0 +1,24 @@ +#include "Game/Actor/Action/actionStopBase.h" + +namespace uking::action { + +StopBase::StopBase(const InitArg& arg) : ActionEx(arg) {} + +void StopBase::enter_(ksys::act::ai::InlineParamPack* params) { + ActionEx::enter_(params); +} + +void StopBase::leave_() { + ActionEx::leave_(); +} + +void StopBase::loadParams_() { + getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); + getStaticParam(&mAngReduceRatio_s, "AngReduceRatio"); +} + +void StopBase::calc_() { + ActionEx::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionActionWithPosAngReduce.h b/src/Game/Actor/Action/actionStopBase.h similarity index 75% rename from src/Game/Actor/Action/actionActionWithPosAngReduce.h rename to src/Game/Actor/Action/actionStopBase.h index 012780ca..e20fab1d 100644 --- a/src/Game/Actor/Action/actionActionWithPosAngReduce.h +++ b/src/Game/Actor/Action/actionStopBase.h @@ -5,10 +5,10 @@ namespace uking::action { -class ActionWithPosAngReduce : public ActionEx { - SEAD_RTTI_OVERRIDE(ActionWithPosAngReduce, ActionEx) +class StopBase : public ActionEx { + SEAD_RTTI_OVERRIDE(StopBase, ActionEx) public: - explicit ActionWithPosAngReduce(const InitArg& arg); + explicit StopBase(const InitArg& arg); void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; diff --git a/src/Game/Actor/Action/actionStopJump.cpp b/src/Game/Actor/Action/actionStopJump.cpp index 0fa34156..02bd9648 100644 --- a/src/Game/Actor/Action/actionStopJump.cpp +++ b/src/Game/Actor/Action/actionStopJump.cpp @@ -2,31 +2,31 @@ namespace uking::action { -StopJump::StopJump(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +StopJump::StopJump(const InitArg& arg) : StopBase(arg) {} StopJump::~StopJump() = default; bool StopJump::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void StopJump::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void StopJump::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void StopJump::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mJumpHeight_s, "JumpHeight"); getStaticParam(&mJumpLoopAS_s, "JumpLoopAS"); getStaticParam(&mLandingAS_s, "LandingAS"); } void StopJump::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionStopJump.h b/src/Game/Actor/Action/actionStopJump.h index 225e6c04..badbc5e8 100644 --- a/src/Game/Actor/Action/actionStopJump.h +++ b/src/Game/Actor/Action/actionStopJump.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class StopJump : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(StopJump, ActionWithPosAngReduce) +class StopJump : public StopBase { + SEAD_RTTI_OVERRIDE(StopJump, StopBase) public: explicit StopJump(const InitArg& arg); ~StopJump() override; diff --git a/src/Game/Actor/Action/actionStoppingAttackBase.cpp b/src/Game/Actor/Action/actionStoppingAttackBase.cpp new file mode 100644 index 00000000..75f6edd5 --- /dev/null +++ b/src/Game/Actor/Action/actionStoppingAttackBase.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionStoppingAttackBase.h" + +namespace uking::action { + +StoppingAttackBase::StoppingAttackBase(const InitArg& arg) : StopBase(arg) {} + +StoppingAttackBase::~StoppingAttackBase() = default; + +bool StoppingAttackBase::init_(sead::Heap* heap) { + return StopBase::init_(heap); +} + +void StoppingAttackBase::enter_(ksys::act::ai::InlineParamPack* params) { + StopBase::enter_(params); +} + +void StoppingAttackBase::leave_() { + StopBase::leave_(); +} + +void StoppingAttackBase::loadParams_() { + StopBase::loadParams_(); +} + +void StoppingAttackBase::calc_() { + StopBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionStoppingAttackBase.h b/src/Game/Actor/Action/actionStoppingAttackBase.h new file mode 100644 index 00000000..acef3e33 --- /dev/null +++ b/src/Game/Actor/Action/actionStoppingAttackBase.h @@ -0,0 +1,23 @@ +#pragma once + +#include "Game/Actor/Action/actionStopBase.h" +#include "KingSystem/ActorSystem/actAiAction.h" + +namespace uking::action { + +class StoppingAttackBase : public StopBase { + SEAD_RTTI_OVERRIDE(StoppingAttackBase, StopBase) +public: + explicit StoppingAttackBase(const InitArg& arg); + ~StoppingAttackBase() override; + + bool init_(sead::Heap* heap) override; + void enter_(ksys::act::ai::InlineParamPack* params) override; + void leave_() override; + void loadParams_() override; + +protected: + void calc_() override; +}; + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSubAnmSmallDamage.cpp b/src/Game/Actor/Action/actionSubAnmSmallDamage.cpp index 3d8a6c98..f5b116bb 100644 --- a/src/Game/Actor/Action/actionSubAnmSmallDamage.cpp +++ b/src/Game/Actor/Action/actionSubAnmSmallDamage.cpp @@ -19,7 +19,7 @@ void SubAnmSmallDamage::leave_() { } void SubAnmSmallDamage::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mSubASSlot_s, "SubASSlot"); getStaticParam(&mSubAS_s, "SubAS"); getStaticParam(&mLeaveSubAS_s, "LeaveSubAS"); diff --git a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.cpp b/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.cpp index 3ce286a2..6a68100a 100644 --- a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.cpp +++ b/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.cpp @@ -3,29 +3,29 @@ namespace uking::action { SwimEnemyAnmBackBlownOff::SwimEnemyAnmBackBlownOff(const InitArg& arg) - : SwimEnemyAnmBackBlownOffBase(arg) {} + : SwimEnemyBlownOffBase(arg) {} SwimEnemyAnmBackBlownOff::~SwimEnemyAnmBackBlownOff() = default; bool SwimEnemyAnmBackBlownOff::init_(sead::Heap* heap) { - return SwimEnemyAnmBackBlownOffBase::init_(heap); + return SwimEnemyBlownOffBase::init_(heap); } void SwimEnemyAnmBackBlownOff::enter_(ksys::act::ai::InlineParamPack* params) { - SwimEnemyAnmBackBlownOffBase::enter_(params); + SwimEnemyBlownOffBase::enter_(params); } void SwimEnemyAnmBackBlownOff::leave_() { - SwimEnemyAnmBackBlownOffBase::leave_(); + SwimEnemyBlownOffBase::leave_(); } void SwimEnemyAnmBackBlownOff::loadParams_() { - SwimEnemyAnmBackBlownOffBase::loadParams_(); + SwimEnemyBlownOffBase::loadParams_(); getStaticParam(&mRotSpeed_s, "RotSpeed"); } void SwimEnemyAnmBackBlownOff::calc_() { - SwimEnemyAnmBackBlownOffBase::calc_(); + SwimEnemyBlownOffBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.h b/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.h index 5bc7cf1c..a2a0a973 100644 --- a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.h +++ b/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOff.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.h" +#include "Game/Actor/Action/actionSwimEnemyBlownOffBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SwimEnemyAnmBackBlownOff : public SwimEnemyAnmBackBlownOffBase { - SEAD_RTTI_OVERRIDE(SwimEnemyAnmBackBlownOff, SwimEnemyAnmBackBlownOffBase) +class SwimEnemyAnmBackBlownOff : public SwimEnemyBlownOffBase { + SEAD_RTTI_OVERRIDE(SwimEnemyAnmBackBlownOff, SwimEnemyBlownOffBase) public: explicit SwimEnemyAnmBackBlownOff(const InitArg& arg); ~SwimEnemyAnmBackBlownOff() override; diff --git a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.cpp b/src/Game/Actor/Action/actionSwimEnemyBlownOffBase.cpp similarity index 54% rename from src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.cpp rename to src/Game/Actor/Action/actionSwimEnemyBlownOffBase.cpp index b19441da..674421a1 100644 --- a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.cpp +++ b/src/Game/Actor/Action/actionSwimEnemyBlownOffBase.cpp @@ -1,25 +1,24 @@ -#include "Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.h" +#include "Game/Actor/Action/actionSwimEnemyBlownOffBase.h" namespace uking::action { -SwimEnemyAnmBackBlownOffBase::SwimEnemyAnmBackBlownOffBase(const InitArg& arg) - : ksys::act::ai::Action(arg) {} +SwimEnemyBlownOffBase::SwimEnemyBlownOffBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SwimEnemyAnmBackBlownOffBase::~SwimEnemyAnmBackBlownOffBase() = default; +SwimEnemyBlownOffBase::~SwimEnemyBlownOffBase() = default; -bool SwimEnemyAnmBackBlownOffBase::init_(sead::Heap* heap) { +bool SwimEnemyBlownOffBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SwimEnemyAnmBackBlownOffBase::enter_(ksys::act::ai::InlineParamPack* params) { +void SwimEnemyBlownOffBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void SwimEnemyAnmBackBlownOffBase::leave_() { +void SwimEnemyBlownOffBase::leave_() { ksys::act::ai::Action::leave_(); } -void SwimEnemyAnmBackBlownOffBase::loadParams_() { +void SwimEnemyBlownOffBase::loadParams_() { getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mBlownHeight_s, "BlownHeight"); getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); @@ -30,7 +29,7 @@ void SwimEnemyAnmBackBlownOffBase::loadParams_() { getStaticParam(&mAS_s, "AS"); } -void SwimEnemyAnmBackBlownOffBase::calc_() { +void SwimEnemyBlownOffBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.h b/src/Game/Actor/Action/actionSwimEnemyBlownOffBase.h similarity index 78% rename from src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.h rename to src/Game/Actor/Action/actionSwimEnemyBlownOffBase.h index c502dd7e..ba0e1f31 100644 --- a/src/Game/Actor/Action/actionSwimEnemyAnmBackBlownOffBase.h +++ b/src/Game/Actor/Action/actionSwimEnemyBlownOffBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class SwimEnemyAnmBackBlownOffBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SwimEnemyAnmBackBlownOffBase, ksys::act::ai::Action) +class SwimEnemyBlownOffBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(SwimEnemyBlownOffBase, ksys::act::ai::Action) public: - explicit SwimEnemyAnmBackBlownOffBase(const InitArg& arg); - ~SwimEnemyAnmBackBlownOffBase() override; + explicit SwimEnemyBlownOffBase(const InitArg& arg); + ~SwimEnemyBlownOffBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionSwimSmallDamage.cpp b/src/Game/Actor/Action/actionSwimSmallDamage.cpp index cce32ac8..21beb15b 100644 --- a/src/Game/Actor/Action/actionSwimSmallDamage.cpp +++ b/src/Game/Actor/Action/actionSwimSmallDamage.cpp @@ -15,7 +15,7 @@ void SwimSmallDamage::leave_() { } void SwimSmallDamage::loadParams_() { - TakeHitImpactForce::loadParams_(); + KnockBackHitImpactForce::loadParams_(); getStaticParam(&mInWaterDepth_s, "InWaterDepth"); getStaticParam(&mFloatDepth_s, "FloatDepth"); getStaticParam(&mFloatRadius_s, "FloatRadius"); diff --git a/src/Game/Actor/Action/actionThrow.cpp b/src/Game/Actor/Action/actionThrow.cpp index 7fa78534..366fe008 100644 --- a/src/Game/Actor/Action/actionThrow.cpp +++ b/src/Game/Actor/Action/actionThrow.cpp @@ -2,28 +2,28 @@ namespace uking::action { -Throw::Throw(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +Throw::Throw(const InitArg& arg) : StopBase(arg) {} Throw::~Throw() = default; bool Throw::init_(sead::Heap* heap) { - return ActionWithPosAngReduce::init_(heap); + return StopBase::init_(heap); } void Throw::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void Throw::leave_() { - ActionWithPosAngReduce::leave_(); + StopBase::leave_(); } void Throw::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); } void Throw::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionThrow.h b/src/Game/Actor/Action/actionThrow.h index ad4bbf44..255a240a 100644 --- a/src/Game/Actor/Action/actionThrow.h +++ b/src/Game/Actor/Action/actionThrow.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class Throw : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(Throw, ActionWithPosAngReduce) +class Throw : public StopBase { + SEAD_RTTI_OVERRIDE(Throw, StopBase) public: explicit Throw(const InitArg& arg); ~Throw() override; diff --git a/src/Game/Actor/Action/actionThrowWeapon.cpp b/src/Game/Actor/Action/actionThrowWeapon.cpp index ea09a996..44a22b7a 100644 --- a/src/Game/Actor/Action/actionThrowWeapon.cpp +++ b/src/Game/Actor/Action/actionThrowWeapon.cpp @@ -15,7 +15,7 @@ void ThrowWeapon::leave_() { } void ThrowWeapon::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mSpeedMin_s, "SpeedMin"); getStaticParam(&mSpeedMax_s, "SpeedMax"); diff --git a/src/Game/Actor/Action/actionLookAtObjectBase.cpp b/src/Game/Actor/Action/actionTurnAndLookToObjBase.cpp similarity index 57% rename from src/Game/Actor/Action/actionLookAtObjectBase.cpp rename to src/Game/Actor/Action/actionTurnAndLookToObjBase.cpp index e54daa42..25be8043 100644 --- a/src/Game/Actor/Action/actionLookAtObjectBase.cpp +++ b/src/Game/Actor/Action/actionTurnAndLookToObjBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionLookAtObjectBase.h" +#include "Game/Actor/Action/actionTurnAndLookToObjBase.h" namespace uking::action { -LookAtObjectBase::LookAtObjectBase(const InitArg& arg) : PlayerAction(arg) {} +TurnAndLookToObjBase::TurnAndLookToObjBase(const InitArg& arg) : PlayerAction(arg) {} -LookAtObjectBase::~LookAtObjectBase() = default; +TurnAndLookToObjBase::~TurnAndLookToObjBase() = default; -bool LookAtObjectBase::init_(sead::Heap* heap) { +bool TurnAndLookToObjBase::init_(sead::Heap* heap) { return PlayerAction::init_(heap); } -void LookAtObjectBase::enter_(ksys::act::ai::InlineParamPack* params) { +void TurnAndLookToObjBase::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } -void LookAtObjectBase::leave_() { +void TurnAndLookToObjBase::leave_() { PlayerAction::leave_(); } -void LookAtObjectBase::loadParams_() { +void TurnAndLookToObjBase::loadParams_() { getDynamicParam(&mObjectId_d, "ObjectId"); getDynamicParam(&mFaceId_d, "FaceId"); getDynamicParam(&mTurnDirection_d, "TurnDirection"); @@ -29,7 +29,7 @@ void LookAtObjectBase::loadParams_() { getDynamicParam(&mTurnPosition_d, "TurnPosition"); } -void LookAtObjectBase::calc_() { +void TurnAndLookToObjBase::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/Actor/Action/actionLookAtObjectBase.h b/src/Game/Actor/Action/actionTurnAndLookToObjBase.h similarity index 82% rename from src/Game/Actor/Action/actionLookAtObjectBase.h rename to src/Game/Actor/Action/actionTurnAndLookToObjBase.h index b4197f11..9107da26 100644 --- a/src/Game/Actor/Action/actionLookAtObjectBase.h +++ b/src/Game/Actor/Action/actionTurnAndLookToObjBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class LookAtObjectBase : public PlayerAction { - SEAD_RTTI_OVERRIDE(LookAtObjectBase, PlayerAction) +class TurnAndLookToObjBase : public PlayerAction { + SEAD_RTTI_OVERRIDE(TurnAndLookToObjBase, PlayerAction) public: - explicit LookAtObjectBase(const InitArg& arg); - ~LookAtObjectBase() override; + explicit TurnAndLookToObjBase(const InitArg& arg); + ~TurnAndLookToObjBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.cpp b/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.cpp index 77fd0666..0cd57bd4 100644 --- a/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.cpp +++ b/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.cpp @@ -3,24 +3,24 @@ namespace uking::action { TurnAndLookToObjNotAnimDriven::TurnAndLookToObjNotAnimDriven(const InitArg& arg) - : LookAtObjectBase(arg) {} + : TurnAndLookToObjBase(arg) {} TurnAndLookToObjNotAnimDriven::~TurnAndLookToObjNotAnimDriven() = default; bool TurnAndLookToObjNotAnimDriven::init_(sead::Heap* heap) { - return LookAtObjectBase::init_(heap); + return TurnAndLookToObjBase::init_(heap); } void TurnAndLookToObjNotAnimDriven::enter_(ksys::act::ai::InlineParamPack* params) { - LookAtObjectBase::enter_(params); + TurnAndLookToObjBase::enter_(params); } void TurnAndLookToObjNotAnimDriven::leave_() { - LookAtObjectBase::leave_(); + TurnAndLookToObjBase::leave_(); } void TurnAndLookToObjNotAnimDriven::loadParams_() { - LookAtObjectBase::loadParams_(); + TurnAndLookToObjBase::loadParams_(); getDynamicParam(&mRotSpdMax_d, "RotSpdMax"); getDynamicParam(&mRotSpdMin_d, "RotSpdMin"); getDynamicParam(&mRotInitSpd_d, "RotInitSpd"); @@ -29,7 +29,7 @@ void TurnAndLookToObjNotAnimDriven::loadParams_() { } void TurnAndLookToObjNotAnimDriven::calc_() { - LookAtObjectBase::calc_(); + TurnAndLookToObjBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.h b/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.h index 9e27f940..84a926a3 100644 --- a/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.h +++ b/src/Game/Actor/Action/actionTurnAndLookToObjNotAnimDriven.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionLookAtObjectBase.h" +#include "Game/Actor/Action/actionTurnAndLookToObjBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class TurnAndLookToObjNotAnimDriven : public LookAtObjectBase { - SEAD_RTTI_OVERRIDE(TurnAndLookToObjNotAnimDriven, LookAtObjectBase) +class TurnAndLookToObjNotAnimDriven : public TurnAndLookToObjBase { + SEAD_RTTI_OVERRIDE(TurnAndLookToObjNotAnimDriven, TurnAndLookToObjBase) public: explicit TurnAndLookToObjNotAnimDriven(const InitArg& arg); ~TurnAndLookToObjNotAnimDriven() override; diff --git a/src/Game/Actor/Action/actionGiantAttack.cpp b/src/Game/Actor/Action/actionTurnGiantAttack.cpp similarity index 55% rename from src/Game/Actor/Action/actionGiantAttack.cpp rename to src/Game/Actor/Action/actionTurnGiantAttack.cpp index 291c18d4..b97afccf 100644 --- a/src/Game/Actor/Action/actionGiantAttack.cpp +++ b/src/Game/Actor/Action/actionTurnGiantAttack.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionGiantAttack.h" +#include "Game/Actor/Action/actionTurnGiantAttack.h" namespace uking::action { -GiantAttack::GiantAttack(const InitArg& arg) : ksys::act::ai::Action(arg) {} +TurnGiantAttack::TurnGiantAttack(const InitArg& arg) : ksys::act::ai::Action(arg) {} -GiantAttack::~GiantAttack() = default; +TurnGiantAttack::~TurnGiantAttack() = default; -bool GiantAttack::init_(sead::Heap* heap) { +bool TurnGiantAttack::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void GiantAttack::enter_(ksys::act::ai::InlineParamPack* params) { +void TurnGiantAttack::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void GiantAttack::leave_() { +void TurnGiantAttack::leave_() { ksys::act::ai::Action::leave_(); } -void GiantAttack::loadParams_() { +void TurnGiantAttack::loadParams_() { getStaticParam(&mRotSpeed_s, "RotSpeed"); getStaticParam(&mStopSpeedRatio_s, "StopSpeedRatio"); getStaticParam(&mStopRotSpeedRatio_s, "StopRotSpeedRatio"); @@ -26,7 +26,7 @@ void GiantAttack::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void GiantAttack::calc_() { +void TurnGiantAttack::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionGiantAttack.h b/src/Game/Actor/Action/actionTurnGiantAttack.h similarity index 77% rename from src/Game/Actor/Action/actionGiantAttack.h rename to src/Game/Actor/Action/actionTurnGiantAttack.h index 93b6ba3d..1d4ed8df 100644 --- a/src/Game/Actor/Action/actionGiantAttack.h +++ b/src/Game/Actor/Action/actionTurnGiantAttack.h @@ -4,11 +4,11 @@ namespace uking::action { -class GiantAttack : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(GiantAttack, ksys::act::ai::Action) +class TurnGiantAttack : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(TurnGiantAttack, ksys::act::ai::Action) public: - explicit GiantAttack(const InitArg& arg); - ~GiantAttack() override; + explicit TurnGiantAttack(const InitArg& arg); + ~TurnGiantAttack() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionWaitBase.cpp b/src/Game/Actor/Action/actionWaitBase.cpp index a60c3967..13b39d2c 100644 --- a/src/Game/Actor/Action/actionWaitBase.cpp +++ b/src/Game/Actor/Action/actionWaitBase.cpp @@ -2,22 +2,22 @@ namespace uking::action { -WaitBase::WaitBase(const InitArg& arg) : ActionWithPosAngReduce(arg) {} +WaitBase::WaitBase(const InitArg& arg) : StopBase(arg) {} WaitBase::~WaitBase() = default; void WaitBase::enter_(ksys::act::ai::InlineParamPack* params) { - ActionWithPosAngReduce::enter_(params); + StopBase::enter_(params); } void WaitBase::loadParams_() { - ActionWithPosAngReduce::loadParams_(); + StopBase::loadParams_(); getStaticParam(&mTime_s, "Time"); getStaticParam(&mTimeRand_s, "TimeRand"); } void WaitBase::calc_() { - ActionWithPosAngReduce::calc_(); + StopBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWaitBase.h b/src/Game/Actor/Action/actionWaitBase.h index e7aeb1b7..5bc653b7 100644 --- a/src/Game/Actor/Action/actionWaitBase.h +++ b/src/Game/Actor/Action/actionWaitBase.h @@ -1,13 +1,13 @@ #pragma once -#include "Game/Actor/Action/actionActionWithPosAngReduce.h" +#include "Game/Actor/Action/actionStopBase.h" #include "KingSystem/ActorSystem/actAiAction.h" #include "KingSystem/System/Timer.h" namespace uking::action { -class WaitBase : public ActionWithPosAngReduce { - SEAD_RTTI_OVERRIDE(WaitBase, ActionWithPosAngReduce) +class WaitBase : public StopBase { + SEAD_RTTI_OVERRIDE(WaitBase, StopBase) public: explicit WaitBase(const InitArg& arg); ~WaitBase() override; diff --git a/src/Game/Actor/Action/actionWarpPlayer.cpp b/src/Game/Actor/Action/actionWarpPlayer.cpp index 3518ad41..5178b1a2 100644 --- a/src/Game/Actor/Action/actionWarpPlayer.cpp +++ b/src/Game/Actor/Action/actionWarpPlayer.cpp @@ -2,30 +2,30 @@ namespace uking::action { -WarpPlayer::WarpPlayer(const InitArg& arg) : WarpPlayerBase(arg) {} +WarpPlayer::WarpPlayer(const InitArg& arg) : DestPlayerWarpBase(arg) {} WarpPlayer::~WarpPlayer() = default; bool WarpPlayer::init_(sead::Heap* heap) { - return WarpPlayerBase::init_(heap); + return DestPlayerWarpBase::init_(heap); } void WarpPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - WarpPlayerBase::enter_(params); + DestPlayerWarpBase::enter_(params); } void WarpPlayer::leave_() { - WarpPlayerBase::leave_(); + DestPlayerWarpBase::leave_(); } void WarpPlayer::loadParams_() { - WarpPlayerBase::loadParams_(); + DestPlayerWarpBase::loadParams_(); getDynamicParam(&mWarpDestMapName_d, "WarpDestMapName"); getDynamicParam(&mWarpDestPosName_d, "WarpDestPosName"); } void WarpPlayer::calc_() { - WarpPlayerBase::calc_(); + DestPlayerWarpBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWarpPlayer.h b/src/Game/Actor/Action/actionWarpPlayer.h index 721777fe..1973faf2 100644 --- a/src/Game/Actor/Action/actionWarpPlayer.h +++ b/src/Game/Actor/Action/actionWarpPlayer.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWarpPlayerBase.h" +#include "Game/Actor/Action/actionDestPlayerWarpBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WarpPlayer : public WarpPlayerBase { - SEAD_RTTI_OVERRIDE(WarpPlayer, WarpPlayerBase) +class WarpPlayer : public DestPlayerWarpBase { + SEAD_RTTI_OVERRIDE(WarpPlayer, DestPlayerWarpBase) public: explicit WarpPlayer(const InitArg& arg); ~WarpPlayer() override; diff --git a/src/Game/Actor/Action/actionWarpPlayerBase.cpp b/src/Game/Actor/Action/actionWarpPlayerBase.cpp deleted file mode 100644 index 39b0cb9d..00000000 --- a/src/Game/Actor/Action/actionWarpPlayerBase.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionWarpPlayerBase.h" - -namespace uking::action { - -WarpPlayerBase::WarpPlayerBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -WarpPlayerBase::~WarpPlayerBase() = default; - -bool WarpPlayerBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void WarpPlayerBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WarpPlayerBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void WarpPlayerBase::loadParams_() {} - -void WarpPlayerBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionWarpPlayerToActor.cpp b/src/Game/Actor/Action/actionWarpPlayerToActor.cpp index 8bf6574b..c7a1715a 100644 --- a/src/Game/Actor/Action/actionWarpPlayerToActor.cpp +++ b/src/Game/Actor/Action/actionWarpPlayerToActor.cpp @@ -2,24 +2,24 @@ namespace uking::action { -WarpPlayerToActor::WarpPlayerToActor(const InitArg& arg) : WarpPlayerBase(arg) {} +WarpPlayerToActor::WarpPlayerToActor(const InitArg& arg) : DestPlayerWarpBase(arg) {} WarpPlayerToActor::~WarpPlayerToActor() = default; bool WarpPlayerToActor::init_(sead::Heap* heap) { - return WarpPlayerBase::init_(heap); + return DestPlayerWarpBase::init_(heap); } void WarpPlayerToActor::enter_(ksys::act::ai::InlineParamPack* params) { - WarpPlayerBase::enter_(params); + DestPlayerWarpBase::enter_(params); } void WarpPlayerToActor::leave_() { - WarpPlayerBase::leave_(); + DestPlayerWarpBase::leave_(); } void WarpPlayerToActor::loadParams_() { - WarpPlayerBase::loadParams_(); + DestPlayerWarpBase::loadParams_(); getDynamicParam(&mDestinationX_d, "DestinationX"); getDynamicParam(&mDestinationY_d, "DestinationY"); getDynamicParam(&mDestinationZ_d, "DestinationZ"); @@ -33,7 +33,7 @@ void WarpPlayerToActor::loadParams_() { } void WarpPlayerToActor::calc_() { - WarpPlayerBase::calc_(); + DestPlayerWarpBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWarpPlayerToActor.h b/src/Game/Actor/Action/actionWarpPlayerToActor.h index 827cac1a..0cec978f 100644 --- a/src/Game/Actor/Action/actionWarpPlayerToActor.h +++ b/src/Game/Actor/Action/actionWarpPlayerToActor.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWarpPlayerBase.h" +#include "Game/Actor/Action/actionDestPlayerWarpBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WarpPlayerToActor : public WarpPlayerBase { - SEAD_RTTI_OVERRIDE(WarpPlayerToActor, WarpPlayerBase) +class WarpPlayerToActor : public DestPlayerWarpBase { + SEAD_RTTI_OVERRIDE(WarpPlayerToActor, DestPlayerWarpBase) public: explicit WarpPlayerToActor(const InitArg& arg); ~WarpPlayerToActor() override; diff --git a/src/Game/Actor/Action/actionWarpPlayerToAnchor.cpp b/src/Game/Actor/Action/actionWarpPlayerToAnchor.cpp index d00001ad..87be6756 100644 --- a/src/Game/Actor/Action/actionWarpPlayerToAnchor.cpp +++ b/src/Game/Actor/Action/actionWarpPlayerToAnchor.cpp @@ -2,30 +2,30 @@ namespace uking::action { -WarpPlayerToAnchor::WarpPlayerToAnchor(const InitArg& arg) : WarpPlayerBase(arg) {} +WarpPlayerToAnchor::WarpPlayerToAnchor(const InitArg& arg) : DestPlayerWarpBase(arg) {} WarpPlayerToAnchor::~WarpPlayerToAnchor() = default; bool WarpPlayerToAnchor::init_(sead::Heap* heap) { - return WarpPlayerBase::init_(heap); + return DestPlayerWarpBase::init_(heap); } void WarpPlayerToAnchor::enter_(ksys::act::ai::InlineParamPack* params) { - WarpPlayerBase::enter_(params); + DestPlayerWarpBase::enter_(params); } void WarpPlayerToAnchor::leave_() { - WarpPlayerBase::leave_(); + DestPlayerWarpBase::leave_(); } void WarpPlayerToAnchor::loadParams_() { - WarpPlayerBase::loadParams_(); + DestPlayerWarpBase::loadParams_(); getDynamicParam(&mUniqueName_d, "UniqueName"); getDynamicParam(&mAnchorName_d, "AnchorName"); } void WarpPlayerToAnchor::calc_() { - WarpPlayerBase::calc_(); + DestPlayerWarpBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWarpPlayerToAnchor.h b/src/Game/Actor/Action/actionWarpPlayerToAnchor.h index 1f453ee6..ea5cf026 100644 --- a/src/Game/Actor/Action/actionWarpPlayerToAnchor.h +++ b/src/Game/Actor/Action/actionWarpPlayerToAnchor.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWarpPlayerBase.h" +#include "Game/Actor/Action/actionDestPlayerWarpBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WarpPlayerToAnchor : public WarpPlayerBase { - SEAD_RTTI_OVERRIDE(WarpPlayerToAnchor, WarpPlayerBase) +class WarpPlayerToAnchor : public DestPlayerWarpBase { + SEAD_RTTI_OVERRIDE(WarpPlayerToAnchor, DestPlayerWarpBase) public: explicit WarpPlayerToAnchor(const InitArg& arg); ~WarpPlayerToAnchor() override; diff --git a/src/Game/Actor/Action/actionWarpPlayerToDestination.cpp b/src/Game/Actor/Action/actionWarpPlayerToDestination.cpp index 1f6b4513..6ac24c46 100644 --- a/src/Game/Actor/Action/actionWarpPlayerToDestination.cpp +++ b/src/Game/Actor/Action/actionWarpPlayerToDestination.cpp @@ -2,24 +2,24 @@ namespace uking::action { -WarpPlayerToDestination::WarpPlayerToDestination(const InitArg& arg) : WarpPlayerBase(arg) {} +WarpPlayerToDestination::WarpPlayerToDestination(const InitArg& arg) : DestPlayerWarpBase(arg) {} WarpPlayerToDestination::~WarpPlayerToDestination() = default; bool WarpPlayerToDestination::init_(sead::Heap* heap) { - return WarpPlayerBase::init_(heap); + return DestPlayerWarpBase::init_(heap); } void WarpPlayerToDestination::enter_(ksys::act::ai::InlineParamPack* params) { - WarpPlayerBase::enter_(params); + DestPlayerWarpBase::enter_(params); } void WarpPlayerToDestination::leave_() { - WarpPlayerBase::leave_(); + DestPlayerWarpBase::leave_(); } void WarpPlayerToDestination::loadParams_() { - WarpPlayerBase::loadParams_(); + DestPlayerWarpBase::loadParams_(); getDynamicParam(&mDestinationX_d, "DestinationX"); getDynamicParam(&mDestinationY_d, "DestinationY"); getDynamicParam(&mDestinationZ_d, "DestinationZ"); @@ -27,7 +27,7 @@ void WarpPlayerToDestination::loadParams_() { } void WarpPlayerToDestination::calc_() { - WarpPlayerBase::calc_(); + DestPlayerWarpBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWarpPlayerToDestination.h b/src/Game/Actor/Action/actionWarpPlayerToDestination.h index 85718c3e..120a05c3 100644 --- a/src/Game/Actor/Action/actionWarpPlayerToDestination.h +++ b/src/Game/Actor/Action/actionWarpPlayerToDestination.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWarpPlayerBase.h" +#include "Game/Actor/Action/actionDestPlayerWarpBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WarpPlayerToDestination : public WarpPlayerBase { - SEAD_RTTI_OVERRIDE(WarpPlayerToDestination, WarpPlayerBase) +class WarpPlayerToDestination : public DestPlayerWarpBase { + SEAD_RTTI_OVERRIDE(WarpPlayerToDestination, DestPlayerWarpBase) public: explicit WarpPlayerToDestination(const InitArg& arg); ~WarpPlayerToDestination() override; diff --git a/src/Game/Actor/Action/actionWillBallAttack.cpp b/src/Game/Actor/Action/actionWillBallAttack.cpp index c85be4ce..b7eec25a 100644 --- a/src/Game/Actor/Action/actionWillBallAttack.cpp +++ b/src/Game/Actor/Action/actionWillBallAttack.cpp @@ -2,30 +2,30 @@ namespace uking::action { -WillBallAttack::WillBallAttack(const InitArg& arg) : WillBallAction(arg) {} +WillBallAttack::WillBallAttack(const InitArg& arg) : WillBallBase(arg) {} WillBallAttack::~WillBallAttack() = default; bool WillBallAttack::init_(sead::Heap* heap) { - return WillBallAction::init_(heap); + return WillBallBase::init_(heap); } void WillBallAttack::enter_(ksys::act::ai::InlineParamPack* params) { - WillBallAction::enter_(params); + WillBallBase::enter_(params); } void WillBallAttack::leave_() { - WillBallAction::leave_(); + WillBallBase::leave_(); } void WillBallAttack::loadParams_() { - WillBallAction::loadParams_(); + WillBallBase::loadParams_(); getStaticParam(&mReactionLevel_s, "ReactionLevel"); getStaticParam(&mIsAbleGuard_s, "IsAbleGuard"); } void WillBallAttack::calc_() { - WillBallAction::calc_(); + WillBallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWillBallAttack.h b/src/Game/Actor/Action/actionWillBallAttack.h index 8bc1b463..add94b28 100644 --- a/src/Game/Actor/Action/actionWillBallAttack.h +++ b/src/Game/Actor/Action/actionWillBallAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWillBallAction.h" +#include "Game/Actor/Action/actionWillBallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WillBallAttack : public WillBallAction { - SEAD_RTTI_OVERRIDE(WillBallAttack, WillBallAction) +class WillBallAttack : public WillBallBase { + SEAD_RTTI_OVERRIDE(WillBallAttack, WillBallBase) public: explicit WillBallAttack(const InitArg& arg); ~WillBallAttack() override; diff --git a/src/Game/Actor/Action/actionWillBallAvoidCenterDist.cpp b/src/Game/Actor/Action/actionWillBallAvoidCenterDist.cpp index b45dbeb7..e8bb7bd8 100644 --- a/src/Game/Actor/Action/actionWillBallAvoidCenterDist.cpp +++ b/src/Game/Actor/Action/actionWillBallAvoidCenterDist.cpp @@ -2,24 +2,24 @@ namespace uking::action { -WillBallAvoidCenterDist::WillBallAvoidCenterDist(const InitArg& arg) : WillBallAction(arg) {} +WillBallAvoidCenterDist::WillBallAvoidCenterDist(const InitArg& arg) : WillBallBase(arg) {} WillBallAvoidCenterDist::~WillBallAvoidCenterDist() = default; bool WillBallAvoidCenterDist::init_(sead::Heap* heap) { - return WillBallAction::init_(heap); + return WillBallBase::init_(heap); } void WillBallAvoidCenterDist::enter_(ksys::act::ai::InlineParamPack* params) { - WillBallAction::enter_(params); + WillBallBase::enter_(params); } void WillBallAvoidCenterDist::leave_() { - WillBallAction::leave_(); + WillBallBase::leave_(); } void WillBallAvoidCenterDist::loadParams_() { - WillBallAction::loadParams_(); + WillBallBase::loadParams_(); getStaticParam(&mDist_s, "Dist"); getStaticParam(&mMaxDist_s, "MaxDist"); getStaticParam(&mMiddleDist_s, "MiddleDist"); @@ -27,7 +27,7 @@ void WillBallAvoidCenterDist::loadParams_() { } void WillBallAvoidCenterDist::calc_() { - WillBallAction::calc_(); + WillBallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWillBallAvoidCenterDist.h b/src/Game/Actor/Action/actionWillBallAvoidCenterDist.h index af70c1bc..f3e9473b 100644 --- a/src/Game/Actor/Action/actionWillBallAvoidCenterDist.h +++ b/src/Game/Actor/Action/actionWillBallAvoidCenterDist.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWillBallAction.h" +#include "Game/Actor/Action/actionWillBallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WillBallAvoidCenterDist : public WillBallAction { - SEAD_RTTI_OVERRIDE(WillBallAvoidCenterDist, WillBallAction) +class WillBallAvoidCenterDist : public WillBallBase { + SEAD_RTTI_OVERRIDE(WillBallAvoidCenterDist, WillBallBase) public: explicit WillBallAvoidCenterDist(const InitArg& arg); ~WillBallAvoidCenterDist() override; diff --git a/src/Game/Actor/Action/actionWillBallAction.cpp b/src/Game/Actor/Action/actionWillBallBase.cpp similarity index 65% rename from src/Game/Actor/Action/actionWillBallAction.cpp rename to src/Game/Actor/Action/actionWillBallBase.cpp index 6bf3a8b7..1643a60d 100644 --- a/src/Game/Actor/Action/actionWillBallAction.cpp +++ b/src/Game/Actor/Action/actionWillBallBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionWillBallAction.h" +#include "Game/Actor/Action/actionWillBallBase.h" namespace uking::action { -WillBallAction::WillBallAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} +WillBallBase::WillBallBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -WillBallAction::~WillBallAction() = default; +WillBallBase::~WillBallBase() = default; -bool WillBallAction::init_(sead::Heap* heap) { +bool WillBallBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WillBallAction::enter_(ksys::act::ai::InlineParamPack* params) { +void WillBallBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void WillBallAction::leave_() { +void WillBallBase::leave_() { ksys::act::ai::Action::leave_(); } -void WillBallAction::loadParams_() { +void WillBallBase::loadParams_() { getStaticParam(&mRotBaseRatio_s, "RotBaseRatio"); getStaticParam(&mMaxSpeed_s, "MaxSpeed"); getStaticParam(&mRotSpeed_s, "RotSpeed"); @@ -31,7 +31,7 @@ void WillBallAction::loadParams_() { getStaticParam(&mAccel_s, "Accel"); } -void WillBallAction::calc_() { +void WillBallBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionWillBallAction.h b/src/Game/Actor/Action/actionWillBallBase.h similarity index 84% rename from src/Game/Actor/Action/actionWillBallAction.h rename to src/Game/Actor/Action/actionWillBallBase.h index faafcdc5..a006d16f 100644 --- a/src/Game/Actor/Action/actionWillBallAction.h +++ b/src/Game/Actor/Action/actionWillBallBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class WillBallAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(WillBallAction, ksys::act::ai::Action) +class WillBallBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(WillBallBase, ksys::act::ai::Action) public: - explicit WillBallAction(const InitArg& arg); - ~WillBallAction() override; + explicit WillBallBase(const InitArg& arg); + ~WillBallBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Area/Action/CMakeLists.txt b/src/Game/Actor/Area/Action/CMakeLists.txt index d37f513c..8fed1308 100644 --- a/src/Game/Actor/Area/Action/CMakeLists.txt +++ b/src/Game/Actor/Area/Action/CMakeLists.txt @@ -1,8 +1,6 @@ target_sources(uking PRIVATE actionAreaActorObserve.cpp actionAreaActorObserve.h - actionAreaFireObserveBase.cpp - actionAreaFireObserveBase.h actionAreaHorseSpeedLimitAction.cpp actionAreaHorseSpeedLimitAction.h actionAreaObserveActorAction.cpp @@ -13,6 +11,8 @@ target_sources(uking PRIVATE actionAreaRecreateActorAction.h actionAreaTagAction.cpp actionAreaTagAction.h + actionFireObserveBase.cpp + actionFireObserveBase.h actionOwnedHorseObserveAction.cpp actionOwnedHorseObserveAction.h ) diff --git a/src/Game/Actor/Area/Action/actionAreaFireObserveBase.cpp b/src/Game/Actor/Area/Action/actionAreaFireObserveBase.cpp deleted file mode 100644 index 58d4ae80..00000000 --- a/src/Game/Actor/Area/Action/actionAreaFireObserveBase.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include "Game/Actor/Area/Action/actionAreaFireObserveBase.h" - -namespace uking::action { - -AreaFireObserveBase::AreaFireObserveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -AreaFireObserveBase::~AreaFireObserveBase() = default; - -void AreaFireObserveBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void AreaFireObserveBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Area/Action/actionFireObserveBase.cpp b/src/Game/Actor/Area/Action/actionFireObserveBase.cpp new file mode 100644 index 00000000..3772ea96 --- /dev/null +++ b/src/Game/Actor/Area/Action/actionFireObserveBase.cpp @@ -0,0 +1,17 @@ +#include "Game/Actor/Area/Action/actionFireObserveBase.h" + +namespace uking::action { + +FireObserveBase::FireObserveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +FireObserveBase::~FireObserveBase() = default; + +void FireObserveBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void FireObserveBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Area/Action/actionAreaFireObserveBase.h b/src/Game/Actor/Area/Action/actionFireObserveBase.h similarity index 52% rename from src/Game/Actor/Area/Action/actionAreaFireObserveBase.h rename to src/Game/Actor/Area/Action/actionFireObserveBase.h index ad4828cd..024aeec5 100644 --- a/src/Game/Actor/Area/Action/actionAreaFireObserveBase.h +++ b/src/Game/Actor/Area/Action/actionFireObserveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class AreaFireObserveBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(AreaFireObserveBase, ksys::act::ai::Action) +class FireObserveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(FireObserveBase, ksys::act::ai::Action) public: - explicit AreaFireObserveBase(const InitArg& arg); - ~AreaFireObserveBase() override; + explicit FireObserveBase(const InitArg& arg); + ~FireObserveBase() override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Player/Action/actionPlayerLookAtObject.cpp b/src/Game/Actor/Player/Action/actionPlayerLookAtObject.cpp index ffd5e757..b193de98 100644 --- a/src/Game/Actor/Player/Action/actionPlayerLookAtObject.cpp +++ b/src/Game/Actor/Player/Action/actionPlayerLookAtObject.cpp @@ -2,16 +2,16 @@ namespace uking::action { -PlayerLookAtObject::PlayerLookAtObject(const InitArg& arg) : LookAtObjectBase(arg) {} +PlayerLookAtObject::PlayerLookAtObject(const InitArg& arg) : TurnAndLookToObjBase(arg) {} PlayerLookAtObject::~PlayerLookAtObject() = default; bool PlayerLookAtObject::init_(sead::Heap* heap) { - return LookAtObjectBase::init_(heap); + return TurnAndLookToObjBase::init_(heap); } void PlayerLookAtObject::loadParams_() { - LookAtObjectBase::loadParams_(); + TurnAndLookToObjBase::loadParams_(); } } // namespace uking::action diff --git a/src/Game/Actor/Player/Action/actionPlayerLookAtObject.h b/src/Game/Actor/Player/Action/actionPlayerLookAtObject.h index 5a4b83b7..3e2d107a 100644 --- a/src/Game/Actor/Player/Action/actionPlayerLookAtObject.h +++ b/src/Game/Actor/Player/Action/actionPlayerLookAtObject.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionLookAtObjectBase.h" +#include "Game/Actor/Action/actionTurnAndLookToObjBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PlayerLookAtObject : public LookAtObjectBase { - SEAD_RTTI_OVERRIDE(PlayerLookAtObject, LookAtObjectBase) +class PlayerLookAtObject : public TurnAndLookToObjBase { + SEAD_RTTI_OVERRIDE(PlayerLookAtObject, TurnAndLookToObjBase) public: explicit PlayerLookAtObject(const InitArg& arg); ~PlayerLookAtObject() override;