Action: rename 56 base classes to fit link order

Action TUs link in case-insensitive file-name order, so a guessed base name that does not sort into the slot where the class's TU sits is wrong. Each new name sorts between the neighbouring TUs below and is coined from the class's params, derived classes and code. | Old | New | Links between | TU start | |---|---|---|---| | GiantAttackWithAS | AttackWithAS | AttackPartBind – AvoidingCloseMoveActionBase | 0x71000adf4c | | BattleCloseMoveActionBase | AvoidingCloseMoveActionBase | AttackWithAS – AvoidingCloseMoveBase | 0x71000ae354 | | ForbidTag | BasicSignalForbidTag | BasicSignalEnemyNotice – BattleCloseDangerAvoidRun | 0x71000ba90c | | NeckSpinBeam | BeamNeckSpin | BeamMove – NeckSpin | 0x71000c1eb8 | | PlayerStoleOpenBase | BindPlayerNodeBase | BindParentAction – BindPlayerNodeEx | 0x71000c6300 | | PlayerStoleOpenEx | BindPlayerNodeEx | BindPlayerNodeBase – BirdEscape | 0x71000c68a8 | | KokkoCreateDropBase | CreateDropBase | CreateAndReplaceAssassin – CreateEpona | 0x71000e3500 | | MoveToTargetCurveBase | CurveMoveToTargetBase | CreateObjectsOfOwnedHorse – DamagedTurn | 0x71000e4f8c | | ApplyDamageForPlayer | DemoApplyDamageBase | DeletePorchItemIncludeEquip – DemoApplyDamageForPlayer | 0x71000e78fc | | WarpPlayerBase | DestPlayerWarpBase | DemoVisibleOn – DestPointMoveBase | 0x71000ec7c8 | | RailMoveBase | DestPointMoveBase | DestPlayerWarpBase – DgnObj_DLC_CogWheel_Rotate | 0x71000ecff8 | | ChuchuDissappearEscapeBase | DisappearAndEscapeBase | DisableAutoSavePausing – DisappearDeathCounter | 0x71000f04b4 | | AttackPowerExplode | EitherSideExplode | EatWithAS – ElectricAttack | 0x7100102b3c | | EnemyFortressChatTurnBase | EnemyFortressChatLookBase | EnemyFortressChatCall – EnemyFortressChatSpeak | 0x7100107860 | | HornUseBase | EquipHornUseBase | EquipedWithScale – Escape | 0x71001131f4 | | EventHoverNullASPlayBase | EventNullASPlayBase | EventMiniGameTimerWrite – EventOpenGetDemo | 0x710011c8c8 | | FireWoodBase | FireBurnBase | FallAttack – FireWood | 0x710012d258 | | AreaFireObserveBase | FireObserveBase | AreaRecreateActorAction – OwnedHorseObserveAction (Area) | 0x7100e23d88 | | FlyingCharacterDamageBase | FlyingActorDamageBase | FlowingDust – FlyingCharacterFreeFallBase | 0x7100130748 | | ForkDynActorNoTargetSelfBase | ForkEndByConditionBase | ForkEmitShockWaveByContact – ForkEndByDistance | 0x71001503b0 | | ForkSimpleGrabBase | ForkGrabBase | ForkGolemMaterialASPlay – ForkGravityScaleChange | 0x71001579b8 | | ForkHoverKeepRotateTurnBase | ForkKeepRotateTurn | ForkJumpToTargetOnDownEnd – ForkKnockBackNoRot | 0x7100159c08 | | ForkEmitChmField | ForkTrgEmitChmFieldBase | ForkTimerForceResetCondition – ForkTurnASHold | 0x7100167ea0 | | ChuchuPreAttackBase | GelJumpBase | GelEnemySystemHideChase – GelJumpTackle | 0x71001806dc | | GiantEnemyWalkWithVibration | GiantEnemyMoveWithVibration | GiantDownSwingAttack – GiantEnemyWalk | 0x71001892d4 | | GiantNavMeshWalkWithVibration | GiantNavMeshMoveWithVibration | GiantHandClapToTarget – GiantNavMeshWalk | 0x7100189c64 | | GuardianMoveTo | GuardianActionBase | GuardBreak – GuardianAimBeam | 0x71001926f4 | | AnimalFollowBase | HorseFollowBase | HorseFollow – HorseFreeze | 0x71001a082c | | HorseRide | HorseRideBase | HorseRideAttack – HorseRideCancelCommand | 0x71001ad7ac | | HorseRideCommandBase | HorseRideOneTimeCommandBase | HorseRideOneTimeASPlay – HorseRideOneTimeViewASPlay | 0x71001aff3c | | OctarockReloadWigBase | IgniteActorReloadBase | IceBroken – IgnitedThrown | 0x71001b5258 | | TakeHitImpactForce | KnockBackHitImpactForce | Kick* – KokkoCreateDrop* | 0x71001c9268 | | SiteBossSwordWhirlSlashChargeBase | LastBossSwordWhirlSlashChargeBase | LastBossStun – LastBossThunderAppear | 0x71001d8210 | | Move2HomePosBase | MoveHomePosBase | MoveByAnimeDrivenToTarget – MoveKeyFramed | 0x71001ea488 | | MultiVacuumRotScaleTimeByDistWithTgtBase | MultiVacuumBase | Msg2CameraResetNoConnect – MultiVacuumRotBase | 0x71001edb88 | | MultiVacuumRotScaleTimeByDistWithTgt | MultiVacuumRotBase | MultiVacuumBase – MultiVacuumRotScaleTimeByDist | 0x71001eec0c | | NavMeshAction | NavMeshMoveBase | NavMeshLiftWalk – NavMeshMoveWithAS | 0x71001f0518 | | BackWalkEx | NormalBackWalk | NoDeleteCurrentActor – Notice | 0x71001f2f78 | | GiantOneHandActionWithLegTurn | OneHandActionWithLegTurn | OnCorrect – OnEnterSwapActorBase | 0x7100211194 | | ForkOnEnterSwapDropTableActorBase | OnEnterSwapActorBase | OneHandActionWithLegTurn – OnEnterSwapDropTable | 0x71002117ec | | ForkOnEnterSwapDropTableActor | OnEnterSwapDropTable | OnEnterSwapActorBase – OnEnterSwapDropTableActor | 0x7100211d0c | | RegistedActorDeadCheckBase | RegistedActorAllDeadCheckBase | ReflectThrown – RegistedActorBroadCastMessage | 0x7100229a34 | | RegistedActorActionBase | RegistedActorSetActionBase | RegistedActorDeadCheck – ReloadArrow | 0x710022a3a8 | | SendPlayerNoticeMessageBase | SendNoticeMessageBase | SendMessageBroadCast – SendPlayerNoticeMessage | 0x7100243cf0 | | SendMessageToTargetActor | SendTargetActorMessageBase | SendSignalForSignalFlowAct – SendTargetActorRequestShareAwn | 0x710024487c | | SideWalkBase | SideMoveBase | ShutterOpenWait – SideStep | 0x71002525a0 | | SimpleGrabWithASBase | SimpleGrabBase | SilentKilled – SimpleGrabWithAS | 0x71002544d4 | | KnockBackShock | SimpleKnockBackShock | SimpleGrabWithAS – SimpleLineBeam | 0x7100254ac8 | | SlippedCircleWalkBase | SlippedCircleMoveBase | SlippedBackWalkBase – SlippedCircleWalk | 0x710026fe88 | | SlippedWalkBase | SlippedMoveBase | SlippedCircleWalk – SlippedWalk | 0x7100270b68 | | ActionWithPosAngReduce | StopBase | StopASPlay – StopCliffTongueAttack | 0x710027e328 | | AttackBase | StoppingAttackBase | StopOnObj – StorePlayerPosAndRotate | 0x7100280554 | | SwimEnemyAnmBackBlownOffBase | SwimEnemyBlownOffBase | SwimEnemyAnmBackBlownOffToPL – SwimGetUp | 0x71002890d0 | | LookAtObjectBase | TurnAndLookToObjBase | TurnAndLookAtToObjectNow – TurnAndLookToObject | 0x710029e794 | | GiantAttack | TurnGiantAttack | TurnBase – TurnIgnite | 0x71002a1738 | | WillBallAction | WillBallBase | WillBallAvoidCenterDist – WillBallParabolaAttack | 0x71002bb4ec | \* The nearest correctly placed neighbour; the TUs in between are still misnamed. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5)
2026-10-09 13:37:01 -04:00 · 2026-09-28 03:39:31 +02:00
parent 86a48df10b
commit 950e78e940
415 changed files with 3218 additions and 3230 deletions
@@ -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
@@ -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
@@ -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);

@@ -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
@@ -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
@@ -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;
@@ -17,7 +17,7 @@ void Angry::leave_() {
 }

 void Angry::loadParams_() {
-    ActionWithPosAngReduce::loadParams_();
+    StopBase::loadParams_();
 }

 void Angry::calc_() {
@@ -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
@@ -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;
@@ -19,7 +19,7 @@ void AnmDamage::leave_() {
 }

 void AnmDamage::loadParams_() {
-    TakeHitImpactForce::loadParams_();
+    KnockBackHitImpactForce::loadParams_();
    getStaticParam(&mAS_s, "AS");
 }

@@ -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
@@ -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;
@@ -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
@@ -2,6 +2,6 @@

 namespace uking::action {

-AreaFireObserve::AreaFireObserve(const InitArg& arg) : AreaFireObserveBase(arg) {}
+AreaFireObserve::AreaFireObserve(const InitArg& arg) : FireObserveBase(arg) {}

 }  // namespace uking::action
@@ -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);

@@ -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
@@ -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;
@@ -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
@@ -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
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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);

@@ -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
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -16,7 +16,7 @@ void BattleCloseExplosivesAvoidRun::leave_() {
 }

 void BattleCloseExplosivesAvoidRun::loadParams_() {
-    BattleCloseMoveActionBase::loadParams_();
+    AvoidingCloseMoveActionBase::loadParams_();
    getStaticParam(&mDamageIgnoreDist_s, "DamageIgnoreDist");
 }

@@ -17,7 +17,7 @@ void BattleCloseGuardWalk::leave_() {
 }

 void BattleCloseGuardWalk::loadParams_() {
-    BattleCloseMoveActionBase::loadParams_();
+    AvoidingCloseMoveActionBase::loadParams_();
 }

 void BattleCloseGuardWalk::calc_() {
@@ -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");
@@ -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
@@ -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);

@@ -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
@@ -17,7 +17,7 @@ void BattleCloseWalk::leave_() {
 }

 void BattleCloseWalk::loadParams_() {
-    BattleCloseMoveActionBase::loadParams_();
+    AvoidingCloseMoveActionBase::loadParams_();
 }

 void BattleCloseWalk::calc_() {
@@ -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_();
 }

@@ -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;
@@ -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
@@ -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;
@@ -0,0 +1,7 @@
+#include "Game/Actor/Action/actionBindPlayerNodeEx.h"
+
+namespace uking::action {
+
+BindPlayerNodeEx::BindPlayerNodeEx(const InitArg& arg) : BindPlayerNodeBase(arg) {}
+
+}  // namespace uking::action
@@ -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
@@ -19,7 +19,7 @@ void CapturedActKnockBack::leave_() {
 }

 void CapturedActKnockBack::loadParams_() {
-    TakeHitImpactForce::loadParams_();
+    KnockBackHitImpactForce::loadParams_();
 }

 void CapturedActKnockBack::calc_() {
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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_();
 }

@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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_();
 }

@@ -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;
@@ -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
@@ -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;
@@ -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");
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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_();
 }

@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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();
    }
@@ -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;
@@ -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_();
 }

@@ -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;
@@ -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
@@ -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;
@@ -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
@@ -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;
@@ -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_();
 }

@@ -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;
@@ -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
@@ -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;
@@ -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
--- a/Show More
+++ b/Show More