From b12306210c1c9e40e0ccfc0f11ff64e0b7a0e8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 28 Sep 2026 03:39:30 +0200 Subject: [PATCH] AI: rename misordered base classes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AI and Action TUs link in case-insensitive file-name order, so a guessed base name that breaks it is wrong. Each new name sorts into the slot where the class's TU sits (neighbouring TUs and an address in the TU below) and comes from the class's params, child states and derived classes. ai:: | Old | New | Links between | In TU | |---|---|---|---| | AddViewTargetPosBase | AddViewTarget | AddSwarmMove – AddViewTargetPos | 0x71002f9c68 | | AncientNecklaceBallBase | PlayASSwitch | PipeDrawing – PlayerSetTarget | 0x71004f6a78 | | AnimalRoamBase | AnimalRndMove | AnimalRangeKeepMoveWithLOS – AnimalRoam | 0x710030a6c0 | | AppearNearTarget | AppearFromTarget | AnimalTimelineAI – AppearFromTargetFrontAfterChase | 0x710030d868 | | AssassinFieldShooterBattleBase | AssassinShooterBattle | AssassinRoot – AssassinShooterJuniorAzitoRoot | 0x7100321dc4 | | AssassinMagicTgtSelect | TargetHeightAreaSelect | TargetExistSelect – TargetHomeDir | 0x71005bef5c | | AssassinNormal | GuardHomePosNormal | GuardFrequencySelect – GuardianAI | 0x710040cd68 | | BeamExplodeBase | SimpleBeamExplode | SimpleASBridge – SimpleEnemyNormal | 0x710056c5fc | | ChildFavoriteSelectorBase | ChildSelector | ChildHaveSelect – ChmCheck | 0x710034aad0 | | DragonRootBase | ControlRailRoot | ConditionMoveActionSelect – CookPotRoot | 0x7100356664 | | EnemyChemTargetActionBase | EnemyTargetAction | EnemySyncAttack – EnemyTargetGearSelect | 0x71003bf75c | | FlyingEnemyKeepMove | FlyingEnemyDistanceKeepMove | FlyingEnemyDiagonallyKeepMove – FlyingEnemyFindPlayer | 0x71003d1694 | | GoronCannonBase | BigCannon | BezierRailMove – BirdDead | 0x710032cd80 | | GuardNearTarget | InvincibleNearTargetBase | InvincibleNearTarget – InvisibleKorokRailMove | 0x710044c6b8 | | GuardianBeamAttackBase | GuardianCommonBeamAttack | GuardianCloseBattle – GuardianDown | 0x7100411da0 | | HorseCheckLineOfSightSelectorBase | CheckLineOfSightSelector | ChaseSound – ChemicalEnemyFindPlayer | 0x7100346868 | | LargeEnemyFindPlayer | GiantEnemyFindPlayer | GiantEarthReleaseAttack – GiantEscapeFromDamageWater | 0x71003f69c8 | | MimicCliffStopEnemyNormalBase | CliffStopEnemyNormal | CliffDistanceSelectThreeAction – CloseSmallAttackBase | 0x71003522f4 | | MiniBeamAttack | GuideBeamAttackEnemyBattle | GuardianWait – GyroActivateTerminal | 0x710042cae8 | | MotorcycleRootBase | HorseRiddenStatusSelector | HorseRiddenByNPC – HorseRideChargeAttack | 0x710043ea88 | | NPCTravelBase | NPCScheduleMove | NPCRunaway – NPCSearch | 0x71004df66c | | NonPlayerHorseRide | RideHorseNonPlayer | RideHorseAI – WildHorseDefWanderAI (Horse) | 0x7100e60178 | | OctarockEscape | OctarockHideEscapeBase | OctarockHideEscape – OctarockOptionRoot | 0x71004ec368 | | OctarockRootBase | VacuumEnemyRoot | VacuumedBombDamageSelect – VehicleSelector | 0x71005e3348 | | OneMemoryMagicBattleBase | MagicBattle | LynelWarp – MagneGearRoot | 0x710049d0d8 | | PriestBossMode | PriestBoss | PreyStun – PriestBossActorCloneRoot | 0x7100505b7c | | RailMove | BezierRailMove | BeeSwarmRoot – BigCannon | 0x710032bbf0 | | RangeSelect | NewRangeSelect | NewMannequinRoot – NormalHumanEquipableShield | 0x71004bc0e8 | | RegistedActorNumTwoSelectBase | RegistedActor | ReflectableThrown – RegistedActorNumTwoSelect | 0x710053dfcc | | RemainElectricCannonRootBase | LargeCannonRoot | LargeCannonAttackRoot – LastAttackerSelect | 0x71004741e4 | | SandwormNormalBase | AwnSeal | AwarenessScale – BackAttackEnemyBattle | 0x71003258b4 | | SeqTwoLineReachableTargetActionBase | SeqTwoLineReachableTarget | SeqTwoAction – SeqTwoLineReachableTargetAction | 0x7100567460 | | SimpleWildlifeRoot | CapturedActorRoot | CapturedActorReactionChemical – CarryBox | 0x7100342690 | | SiteBossChemicalProjectile | GanonFlameBall | GanonFarAttackRootOnWall – GanonGrudgeNormal | 0x71003e996c | | SiteBossRecognizeRootBase | LastBossRecognizeRoot | LastBossRailWarpRoot – LastBossRoot | 0x7100478930 | | SpecialEnemySleep | SleepNormal | SleepBedRoot – SleepSelect | 0x710059a8c0 | | TargetAttackAttitudeTgtSelectBase | TargetAttackAttitudeTgt | TargetAngerSelect – TargetAttackAttitudeTgtSelect | 0x71005bb3ac | | TargetPosAI | TargetActorPos | TargetActorGrabAdapter – TargetAngerSelect | 0x71005bab4c | | TargetPosDynParamRot | TargetPosDynParamRotFromMyPos | TargetPosDynParamRotFromCtrPos – TargetPosLostCheck | 0x71005c4f8c | | TargetPosOffset | OffsetTargetPos | OctarockWaterWait – OnCliffEnemyBattle | 0x71004f16d8 | | TimedGuardNearTarget | InvincibleNearTarget | InvincibleHiddenOctarock – InvincibleNearTargetBase | 0x710044c1a4 | | UnarmedEnemySearch | NavMove | NavMeshTurnAwayFromHitPos – NavMoveNearTarget | 0x71004b5ec0 | | UnarmedEnemySearchWeapon | EnemySearch | EnemyRoot – EnemySearchHorse | 0x71003b6460 | | WholeDungeonRotateTag | DungeonRotateTagApp | DungeonRotateTag4WindApp – DungeonRotateTagCont | 0x7100379554 | action:: | Old | New | Links between | In TU | |---|---|---|---| | AirOctaFloatBase | AirOctaMoveBase | AirOctaMgr – AirOctaNoticeTurn | 0x71000880f8 | | AtkTackleMove | TackleAttack | SystemWarp – TackleMove | 0x71002910a4 | | BasicSignalEnemy | BasicSignalEnemyNotice | BasicSignalEnemyForceNotice – BattleCloseDangerAvoidRun* | 0x71000ba65c | | BattleCloseAction | AvoidingCloseMoveBase | AvoidingCloseMoveActionWithAcc – AwarenessShareOnePartsASPlay | 0x71000aed44 | | BattleCloseActionWithAcc | AvoidingCloseMoveActionWithAcc | AttackPartBind – AvoidingCloseMoveBase* | 0x71000ae8ec | | BattleCloseSlippedWalkBase | BattleCloseSlippedMoveBase | BattleCloseMoveAction – BattleCloseSlippedWalk | 0x71000becc8 | | CameraLockOnBase | CameraTrackBase | CameraTail – CameraWakeboard (Camera) | 0x71007850e4 | | ChargeAndShoot | ArrowChargeAndShoot | AreaRoot – ArrowShootHoming | 0x71000a17a4 | | ChemicalAttack | EmitAttackBase | ElectricParalysis – EmitElectricWaterBall | 0x7100104f54 | | ChemicalAttackBall | ChemicalAttack | CheckHorseCustomizeEdit – ChemicalElectricWaterBall | 0x71000db0e8 | | FlyingCharacterReaction | FlyingCharacterFreeFallBase | FlyingCharacterFreeFall – FlyingCharacterFreeFallDie | 0x7100132590 | | FollowChallenge | AppearFollowChallenge | AnimeDrivenTurn – AppearNumHeroSeal | 0x710004d0b4 | | ForkASTrgEmitShockWave | ForkEmitShockWave | ForkEmitExpandFieldWithCreate – ForkEmitShockWaveByContact | 0x710014f188 | | GolemThrowPartsToTargetBase | GolemThrowPartsBase | GolemRepairParts – GolemThrowPartsToTarget | 0x710018d678 | | HorseRideMoveCommand | HorseRideSetGearCommand | HorseRideSearch – HorseRideShoot | 0x71001b0828 | | OctarockBalloonBase | BalloonRopeBase | BalloonBase – BasicSignalBossAwakeSleep | 0x71000b8b9c | | PlayerGlide | PlayerParashawlGlideBase | PlayerParashawlGlide – PlayerPickUp (Player) | 0x710080352c | | PriestBossWarpOrVanish | PriestBossCloneFastWarp | PreJumpAttack – PriestBossClonesSpawn | 0x7100221304 | | RotateTurnToTarget | ASPlayRotateTurnToTarget | AscendingCurrentFixedSize – ASPlaySimpleAnmDriven | 0x71000a7bec | | SetGetFlagBase | SetFlag | SetExtraLifeOfPlayer – SetFrameASPlay | 0x7100247990 | | SimpleMessageDialogCtrl | ForkBasicMessageDialogCtrl | ForkAttackWithWeaponOrWithout – ForkBattleNodeForAttackGround | 0x71001471cc | | SiteBossBlowOff | LastBossBlowOff | LargeDamage – LastBossChemicalPillarAttack | 0x71001cf0ec | | SiteBossLswordAtk | SiteBossLswordAttack | SiteBossLswordAtkWithChemical – SiteBossLswordFireBall | 0x710025c470 | | WaitOnObjBase | StopOnObj | StopJump – StorePlayerPosAndRotate* | 0x710027f974 | | WaterUpDownMoveBase | WaterDepthMoveBase | WarpToStaticAnchor – WaterEmitter | 0x71002b33cc | Neighbours marked * are the nearest correctly placed TU; a TU that is itself still misnamed sits in between. (AI assisted using Claude Fable 5.1 and Claude Opus 5.5) --- data/aidef_action_params.yml | 52 +- data/aidef_action_vtables.yml | 50 +- data/aidef_ai_params.yml | 130 +- data/aidef_ai_vtables.yml | 88 +- data/uking_functions.csv | 1990 ++++++++--------- src/Game/Actor/AI/CMakeLists.txt | 172 +- src/Game/Actor/AI/aiAddViewTarget.cpp | 23 + .../{aiNPCTravelBase.h => aiAddViewTarget.h} | 8 +- src/Game/Actor/AI/aiAddViewTargetPos.cpp | 10 +- src/Game/Actor/AI/aiAddViewTargetPos.h | 6 +- src/Game/Actor/AI/aiAddViewTargetPosBase.cpp | 23 - src/Game/Actor/AI/aiAncientNecklaceBall.cpp | 10 +- src/Game/Actor/AI/aiAncientNecklaceBall.h | 6 +- .../Actor/AI/aiAncientNecklaceBallBase.cpp | 28 - src/Game/Actor/AI/aiAnimalEscapeAI.cpp | 10 +- src/Game/Actor/AI/aiAnimalEscapeAI.h | 6 +- ...AnimalRoamBase.cpp => aiAnimalRndMove.cpp} | 14 +- .../{aiAnimalRoamBase.h => aiAnimalRndMove.h} | 8 +- src/Game/Actor/AI/aiAnimalRoam.cpp | 10 +- src/Game/Actor/AI/aiAnimalRoam.h | 6 +- ...rNearTarget.cpp => aiAppearFromTarget.cpp} | 14 +- ...ppearNearTarget.h => aiAppearFromTarget.h} | 8 +- .../AI/aiAppearFromTargetFrontAfterChase.cpp | 8 +- .../AI/aiAppearFromTargetFrontAfterChase.h | 6 +- .../AI/aiAppearFromTargetFrontGround.cpp | 10 +- .../Actor/AI/aiAppearFromTargetFrontGround.h | 6 +- .../AI/aiAppearNearTargetOutOfScrnGnd.cpp | 10 +- .../Actor/AI/aiAppearNearTargetOutOfScrnGnd.h | 6 +- .../Actor/AI/aiAssassinFieldShooterBattle.cpp | 10 +- .../Actor/AI/aiAssassinFieldShooterBattle.h | 6 +- .../Actor/AI/aiAssassinMagicTgtSelect.cpp | 26 - .../Actor/AI/aiAssassinMiddleAzitoRoot.cpp | 10 +- src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.h | 6 +- .../Actor/AI/aiAssassinMiddleMagicAfter.cpp | 10 +- .../Actor/AI/aiAssassinMiddleMagicAfter.h | 6 +- src/Game/Actor/AI/aiAssassinNormal.cpp | 25 - ...leBase.cpp => aiAssassinShooterBattle.cpp} | 15 +- ...BattleBase.h => aiAssassinShooterBattle.h} | 8 +- ...aiSandwormNormalBase.cpp => aiAwnSeal.cpp} | 14 +- .../{aiSandwormNormalBase.h => aiAwnSeal.h} | 8 +- src/Game/Actor/AI/aiBeamExplode.cpp | 10 +- src/Game/Actor/AI/aiBeamExplode.h | 6 +- src/Game/Actor/AI/aiBeamExplodeBase.cpp | 26 - src/Game/Actor/AI/aiBezierRailMove.cpp | 25 + .../AI/{aiRailMove.h => aiBezierRailMove.h} | 8 +- ...{aiGoronCannonBase.cpp => aiBigCannon.cpp} | 14 +- .../AI/{aiGoronCannonBase.h => aiBigCannon.h} | 8 +- ...ldlifeRoot.cpp => aiCapturedActorRoot.cpp} | 14 +- ...leWildlifeRoot.h => aiCapturedActorRoot.h} | 8 +- .../Actor/AI/aiCheckLineOfSightSelector.cpp | 28 + ...torBase.h => aiCheckLineOfSightSelector.h} | 8 +- src/Game/Actor/AI/aiChildFavoriteSelector.cpp | 10 +- src/Game/Actor/AI/aiChildFavoriteSelector.h | 6 +- .../Actor/AI/aiChildFavoriteSelectorBase.cpp | 26 - src/Game/Actor/AI/aiChildSelector.cpp | 26 + ...voriteSelectorBase.h => aiChildSelector.h} | 8 +- ...malBase.cpp => aiCliffStopEnemyNormal.cpp} | 15 +- ...yNormalBase.h => aiCliffStopEnemyNormal.h} | 8 +- src/Game/Actor/AI/aiControlRailRoot.cpp | 23 + ...aiDragonRootBase.h => aiControlRailRoot.h} | 8 +- src/Game/Actor/AI/aiDragonRoot.cpp | 10 +- src/Game/Actor/AI/aiDragonRoot.h | 6 +- src/Game/Actor/AI/aiDragonRootBase.cpp | 23 - .../Actor/AI/aiDungeonRotateTag4FireApp.cpp | 11 +- .../Actor/AI/aiDungeonRotateTag4FireApp.h | 6 +- .../Actor/AI/aiDungeonRotateTag4WindApp.cpp | 11 +- .../Actor/AI/aiDungeonRotateTag4WindApp.h | 6 +- src/Game/Actor/AI/aiDungeonRotateTagApp.cpp | 25 + ...eonRotateTag.h => aiDungeonRotateTagApp.h} | 8 +- .../Actor/AI/aiEnemyChaseTargetAndAction.cpp | 9 +- .../Actor/AI/aiEnemyChaseTargetAndAction.h | 6 +- src/Game/Actor/AI/aiEnemyChemTargetAction.cpp | 10 +- src/Game/Actor/AI/aiEnemyChemTargetAction.h | 6 +- .../Actor/AI/aiEnemyChemTargetActionBase.cpp | 26 - src/Game/Actor/AI/aiEnemyHorseRide.cpp | 10 +- src/Game/Actor/AI/aiEnemyHorseRide.h | 6 +- src/Game/Actor/AI/aiEnemySearch.cpp | 27 + ...medEnemySearchWeapon.h => aiEnemySearch.h} | 10 +- src/Game/Actor/AI/aiEnemyTargetAction.cpp | 26 + ...rgetActionBase.h => aiEnemyTargetAction.h} | 6 +- .../AI/aiEquipShieldEnemySearchWeapon.cpp | 9 +- .../Actor/AI/aiEquipShieldEnemySearchWeapon.h | 6 +- src/Game/Actor/AI/aiFishRoot.cpp | 10 +- src/Game/Actor/AI/aiFishRoot.h | 6 +- .../Actor/AI/aiFlyingEnemyBackKeepMove.cpp | 11 +- src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.h | 6 +- ....cpp => aiFlyingEnemyDistanceKeepMove.cpp} | 15 +- ...Move.h => aiFlyingEnemyDistanceKeepMove.h} | 8 +- .../Actor/AI/aiFlyingEnemyFrontKeepMove.cpp | 11 +- .../Actor/AI/aiFlyingEnemyFrontKeepMove.h | 6 +- .../Actor/AI/aiFlyingEnemySideKeepMove.cpp | 11 +- src/Game/Actor/AI/aiFlyingEnemySideKeepMove.h | 6 +- src/Game/Actor/AI/aiForestGiantFindPlayer.cpp | 10 +- src/Game/Actor/AI/aiForestGiantFindPlayer.h | 6 +- ...calProjectile.cpp => aiGanonFlameBall.cpp} | 15 +- ...hemicalProjectile.h => aiGanonFlameBall.h} | 8 +- src/Game/Actor/AI/aiGiantEnemyFindPlayer.cpp | 25 + ...yFindPlayer.h => aiGiantEnemyFindPlayer.h} | 8 +- src/Game/Actor/AI/aiGiantSleepNormal.cpp | 10 +- src/Game/Actor/AI/aiGiantSleepNormal.h | 6 +- src/Game/Actor/AI/aiGolemFindPlayer.cpp | 10 +- src/Game/Actor/AI/aiGolemFindPlayer.h | 6 +- src/Game/Actor/AI/aiGolemSleepNormal.cpp | 10 +- src/Game/Actor/AI/aiGolemSleepNormal.h | 6 +- src/Game/Actor/AI/aiGoronCannon.cpp | 10 +- src/Game/Actor/AI/aiGoronCannon.h | 6 +- src/Game/Actor/AI/aiGuardHomePosNormal.cpp | 25 + ...ssassinNormal.h => aiGuardHomePosNormal.h} | 8 +- src/Game/Actor/AI/aiGuardNearTarget.cpp | 29 - src/Game/Actor/AI/aiGuardianBeamAttack.cpp | 10 +- src/Game/Actor/AI/aiGuardianBeamAttack.h | 6 +- .../Actor/AI/aiGuardianBeamAttackBase.cpp | 23 - .../Actor/AI/aiGuardianCommonBeamAttack.cpp | 23 + ...PosBase.h => aiGuardianCommonBeamAttack.h} | 8 +- src/Game/Actor/AI/aiGuardianMiniBeam.cpp | 8 +- src/Game/Actor/AI/aiGuardianMiniBeam.h | 6 +- .../Actor/AI/aiGuardianMiniBeamAttack.cpp | 9 +- src/Game/Actor/AI/aiGuardianMiniBeamAttack.h | 6 +- ...k.cpp => aiGuideBeamAttackEnemyBattle.cpp} | 15 +- ...ttack.h => aiGuideBeamAttackEnemyBattle.h} | 8 +- .../AI/aiHorseCheckLineOfSightSelector.cpp | 10 +- .../AI/aiHorseCheckLineOfSightSelector.h | 6 +- .../aiHorseCheckLineOfSightSelectorBase.cpp | 29 - .../Actor/AI/aiHorseRiddenStatusSelector.cpp | 23 + ...ckBase.h => aiHorseRiddenStatusSelector.h} | 8 +- src/Game/Actor/AI/aiInsectRoot.cpp | 10 +- src/Game/Actor/AI/aiInsectRoot.h | 6 +- src/Game/Actor/AI/aiInvincibleNearTarget.cpp | 28 + ...dNearTarget.h => aiInvincibleNearTarget.h} | 10 +- .../Actor/AI/aiInvincibleNearTargetBase.cpp | 29 + ...rTarget.h => aiInvincibleNearTargetBase.h} | 8 +- src/Game/Actor/AI/aiLandHumEnemyFindBait.cpp | 8 +- src/Game/Actor/AI/aiLandHumEnemyFindBait.h | 6 +- .../Actor/AI/aiLandHumEnemyUnarmedBattle.cpp | 9 +- .../Actor/AI/aiLandHumEnemyUnarmedBattle.h | 6 +- src/Game/Actor/AI/aiLargeCannonRoot.cpp | 25 + ...icCannonRootBase.h => aiLargeCannonRoot.h} | 6 +- src/Game/Actor/AI/aiLargeEnemyFindPlayer.cpp | 25 - ...otBase.cpp => aiLastBossRecognizeRoot.cpp} | 14 +- ...zeRootBase.h => aiLastBossRecognizeRoot.h} | 8 +- ...yMagicBattleBase.cpp => aiMagicBattle.cpp} | 14 +- ...emoryMagicBattleBase.h => aiMagicBattle.h} | 8 +- .../AI/aiMagneGrabbedPartsRangeSelector.cpp | 10 +- .../AI/aiMagneGrabbedPartsRangeSelector.h | 6 +- .../Actor/AI/aiMimicCliffStopEnemyNormal.cpp | 10 +- .../Actor/AI/aiMimicCliffStopEnemyNormal.h | 6 +- src/Game/Actor/AI/aiMiniGolemSleep.cpp | 10 +- src/Game/Actor/AI/aiMiniGolemSleep.h | 6 +- src/Game/Actor/AI/aiMotorcycleRoot.cpp | 10 +- src/Game/Actor/AI/aiMotorcycleRoot.h | 6 +- src/Game/Actor/AI/aiMotorcycleRootBase.cpp | 23 - .../Actor/AI/aiMoveAndFreeFallGondola.cpp | 10 +- src/Game/Actor/AI/aiMoveAndFreeFallGondola.h | 6 +- src/Game/Actor/AI/aiNPCHorseRide.cpp | 8 +- src/Game/Actor/AI/aiNPCHorseRide.h | 6 +- src/Game/Actor/AI/aiNPCScheduleMove.cpp | 23 + .../aiNPCScheduleMove.h} | 8 +- src/Game/Actor/AI/aiNPCTravel.cpp | 10 +- src/Game/Actor/AI/aiNPCTravel.h | 6 +- src/Game/Actor/AI/aiNPCTravelBase.cpp | 23 - src/Game/Actor/AI/aiNPCWander.cpp | 10 +- src/Game/Actor/AI/aiNPCWander.h | 6 +- src/Game/Actor/AI/aiNavMove.cpp | 27 + .../{aiUnarmedEnemySearch.h => aiNavMove.h} | 8 +- src/Game/Actor/AI/aiNewRangeSelect.cpp | 27 + .../{aiRangeSelect.h => aiNewRangeSelect.h} | 8 +- .../Actor/AI/aiNoticePartsRangeSelector.cpp | 10 +- .../Actor/AI/aiNoticePartsRangeSelector.h | 6 +- src/Game/Actor/AI/aiOctarockEscape.cpp | 25 - src/Game/Actor/AI/aiOctarockHideEscape.cpp | 10 +- src/Game/Actor/AI/aiOctarockHideEscape.h | 6 +- .../Actor/AI/aiOctarockHideEscapeBase.cpp | 25 + ...ockEscape.h => aiOctarockHideEscapeBase.h} | 8 +- src/Game/Actor/AI/aiOctarockRoot.cpp | 10 +- src/Game/Actor/AI/aiOctarockRoot.h | 6 +- src/Game/Actor/AI/aiOctarockRootBase.cpp | 25 - src/Game/Actor/AI/aiOffsetTargetPos.cpp | 30 + ...iTargetPosOffset.h => aiOffsetTargetPos.h} | 10 +- src/Game/Actor/AI/aiOneMemoryMagicBattle.cpp | 10 +- src/Game/Actor/AI/aiOneMemoryMagicBattle.h | 6 +- src/Game/Actor/AI/aiPlayASSwitch.cpp | 28 + ...entNecklaceBallBase.h => aiPlayASSwitch.h} | 8 +- src/Game/Actor/AI/aiPriestBoss.cpp | 25 + .../AI/{aiPriestBossMode.h => aiPriestBoss.h} | 8 +- .../Actor/AI/aiPriestBossActorNormalMode.cpp | 10 +- .../Actor/AI/aiPriestBossActorNormalMode.h | 6 +- src/Game/Actor/AI/aiPriestBossActorRoot.cpp | 10 +- src/Game/Actor/AI/aiPriestBossActorRoot.h | 6 +- src/Game/Actor/AI/aiPriestBossBananaMode.cpp | 10 +- src/Game/Actor/AI/aiPriestBossBananaMode.h | 6 +- .../Actor/AI/aiPriestBossCloneBulletRoot.cpp | 10 +- .../Actor/AI/aiPriestBossCloneBulletRoot.h | 6 +- .../Actor/AI/aiPriestBossGiantDownSeq.cpp | 10 +- src/Game/Actor/AI/aiPriestBossGiantDownSeq.h | 6 +- .../AI/aiPriestBossGiantStageRotRoot.cpp | 11 +- .../Actor/AI/aiPriestBossGiantStageRotRoot.h | 6 +- .../Actor/AI/aiPriestBossGiantStageRotate.cpp | 10 +- .../Actor/AI/aiPriestBossGiantStageRotate.h | 6 +- .../Actor/AI/aiPriestBossIronBallRoot.cpp | 10 +- src/Game/Actor/AI/aiPriestBossIronBallRoot.h | 6 +- src/Game/Actor/AI/aiPriestBossMode.cpp | 25 - .../AI/aiPriestBossNormalMoveSelector.cpp | 11 +- .../Actor/AI/aiPriestBossNormalMoveSelector.h | 6 +- .../AI/aiPriestBossNormalQuickRecover.cpp | 11 +- .../Actor/AI/aiPriestBossNormalQuickRecover.h | 6 +- .../Actor/AI/aiPriestBossPhaseSelector.cpp | 10 +- src/Game/Actor/AI/aiPriestBossPhaseSelector.h | 6 +- .../AI/aiPriestBossStageRotationSelector.cpp | 10 +- .../AI/aiPriestBossStageRotationSelector.h | 6 +- src/Game/Actor/AI/aiPriestBossSynchroMode.cpp | 10 +- src/Game/Actor/AI/aiPriestBossSynchroMode.h | 6 +- .../Actor/AI/aiPriestBossWarpToSafePos.cpp | 10 +- src/Game/Actor/AI/aiPriestBossWarpToSafePos.h | 6 +- src/Game/Actor/AI/aiRailMove.cpp | 25 - src/Game/Actor/AI/aiRailMoveWithClose.cpp | 10 +- src/Game/Actor/AI/aiRailMoveWithClose.h | 6 +- src/Game/Actor/AI/aiRangeSelect.cpp | 27 - src/Game/Actor/AI/aiRegistedActor.cpp | 25 + ...orNumTwoSelectBase.h => aiRegistedActor.h} | 8 +- .../Actor/AI/aiRegistedActorNumTwoSelect.cpp | 11 +- .../Actor/AI/aiRegistedActorNumTwoSelect.h | 6 +- .../AI/aiRegistedActorNumTwoSelectBase.cpp | 26 - .../Actor/AI/aiRemainElectricCannonRoot.cpp | 11 +- .../Actor/AI/aiRemainElectricCannonRoot.h | 6 +- .../AI/aiRemainElectricCannonRootBase.cpp | 26 - .../Actor/AI/aiRemainsFireDroneNormal.cpp | 10 +- src/Game/Actor/AI/aiRemainsFireDroneNormal.h | 6 +- .../Actor/AI/aiRemainsWindBatteryAttack.cpp | 10 +- .../Actor/AI/aiRemainsWindBatteryAttack.h | 6 +- src/Game/Actor/AI/aiSandwormNormal.cpp | 10 +- src/Game/Actor/AI/aiSandwormNormal.h | 6 +- .../Actor/AI/aiSeqTwoLineReachableTarget.cpp | 26 + ...onBase.h => aiSeqTwoLineReachableTarget.h} | 8 +- .../AI/aiSeqTwoLineReachableTargetAction.cpp | 10 +- .../AI/aiSeqTwoLineReachableTargetAction.h | 6 +- .../aiSeqTwoLineReachableTargetActionBase.cpp | 27 - src/Game/Actor/AI/aiSimpleBeamExplode.cpp | 26 + ...eamExplodeBase.h => aiSimpleBeamExplode.h} | 8 +- src/Game/Actor/AI/aiSiteBossFlameBall.cpp | 10 +- src/Game/Actor/AI/aiSiteBossFlameBall.h | 6 +- .../Actor/AI/aiSiteBossIceSplinterRoot.cpp | 11 +- src/Game/Actor/AI/aiSiteBossIceSplinterRoot.h | 6 +- src/Game/Actor/AI/aiSiteBossRecognizeRoot.cpp | 10 +- src/Game/Actor/AI/aiSiteBossRecognizeRoot.h | 6 +- src/Game/Actor/AI/aiSleepNormal.cpp | 27 + ...{aiSpecialEnemySleep.h => aiSleepNormal.h} | 8 +- src/Game/Actor/AI/aiSpecialEnemySleep.cpp | 27 - src/Game/Actor/AI/aiStalEnemySleep.cpp | 10 +- src/Game/Actor/AI/aiStalEnemySleep.h | 6 +- .../AI/aiStoneOctarockGuardNearTarget.cpp | 10 +- .../Actor/AI/aiStoneOctarockGuardNearTarget.h | 6 +- src/Game/Actor/AI/aiTargetAbsolutePos.cpp | 10 +- src/Game/Actor/AI/aiTargetAbsolutePos.h | 6 +- src/Game/Actor/AI/aiTargetActorPos.cpp | 25 + .../{aiTargetPosAI.h => aiTargetActorPos.h} | 8 +- .../Actor/AI/aiTargetAttackAttitudeTgt.cpp | 19 + src/Game/Actor/AI/aiTargetAttackAttitudeTgt.h | 20 + .../AI/aiTargetAttackAttitudeTgtSelect.cpp | 4 +- .../AI/aiTargetAttackAttitudeTgtSelect.h | 6 +- .../aiTargetAttackAttitudeTgtSelectBase.cpp | 20 - .../AI/aiTargetAttackAttitudeTgtSelectBase.h | 20 - src/Game/Actor/AI/aiTargetDynamicActorPos.cpp | 10 +- src/Game/Actor/AI/aiTargetDynamicActorPos.h | 6 +- .../Actor/AI/aiTargetHeightAreaSelect.cpp | 26 + ...TgtSelect.h => aiTargetHeightAreaSelect.h} | 8 +- src/Game/Actor/AI/aiTargetHomeDir.cpp | 10 +- src/Game/Actor/AI/aiTargetHomeDir.h | 6 +- src/Game/Actor/AI/aiTargetHomePos.cpp | 10 +- src/Game/Actor/AI/aiTargetHomePos.h | 6 +- src/Game/Actor/AI/aiTargetHomeRangeSelect.cpp | 10 +- src/Game/Actor/AI/aiTargetHomeRangeSelect.h | 6 +- .../Actor/AI/aiTargetKnockBackBasePos.cpp | 10 +- src/Game/Actor/AI/aiTargetKnockBackBasePos.h | 6 +- src/Game/Actor/AI/aiTargetLastAttackedPos.cpp | 10 +- src/Game/Actor/AI/aiTargetLastAttackedPos.h | 6 +- src/Game/Actor/AI/aiTargetLastAttackerPos.cpp | 10 +- src/Game/Actor/AI/aiTargetLastAttackerPos.h | 6 +- src/Game/Actor/AI/aiTargetLastDamagedPos.cpp | 10 +- src/Game/Actor/AI/aiTargetLastDamagedPos.h | 6 +- src/Game/Actor/AI/aiTargetPartsPos.cpp | 10 +- src/Game/Actor/AI/aiTargetPartsPos.h | 6 +- src/Game/Actor/AI/aiTargetPlayerPos.cpp | 10 +- src/Game/Actor/AI/aiTargetPlayerPos.h | 6 +- src/Game/Actor/AI/aiTargetPosAI.cpp | 25 - .../Actor/AI/aiTargetPosAnchorOffsetSelf.cpp | 10 +- .../Actor/AI/aiTargetPosAnchorOffsetSelf.h | 6 +- .../AI/aiTargetPosAnchorOffsetTarget.cpp | 11 +- .../Actor/AI/aiTargetPosAnchorOffsetTarget.h | 6 +- src/Game/Actor/AI/aiTargetPosDynParamRot.cpp | 28 - .../AI/aiTargetPosDynParamRotFromCtrPos.cpp | 10 +- .../AI/aiTargetPosDynParamRotFromCtrPos.h | 6 +- .../AI/aiTargetPosDynParamRotFromMyPos.cpp | 29 + ...ot.h => aiTargetPosDynParamRotFromMyPos.h} | 10 +- src/Game/Actor/AI/aiTargetPosOffset.cpp | 30 - .../Actor/AI/aiTargetPosOffsetFromMyPos.cpp | 10 +- .../Actor/AI/aiTargetPosOffsetFromMyPos.h | 6 +- src/Game/Actor/AI/aiTargetPosRotFromMyPos.cpp | 10 +- src/Game/Actor/AI/aiTargetPosRotFromMyPos.h | 6 +- .../AI/aiTargetPredictRotSpdTargetPos.cpp | 11 +- .../Actor/AI/aiTargetPredictRotSpdTargetPos.h | 6 +- src/Game/Actor/AI/aiTargetRangeSelect.cpp | 4 +- src/Game/Actor/AI/aiTargetRangeSelect.h | 6 +- src/Game/Actor/AI/aiTargetTargetPos.cpp | 10 +- src/Game/Actor/AI/aiTargetTargetPos.h | 6 +- src/Game/Actor/AI/aiTimedGuardNearTarget.cpp | 28 - .../Actor/AI/aiUnarmedEnemyNoiseTarget.cpp | 8 +- src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.h | 6 +- src/Game/Actor/AI/aiUnarmedEnemySearch.cpp | 27 - .../Actor/AI/aiUnarmedEnemySearchWeapon.cpp | 27 - .../AI/aiUnarmedWeaponEquipableEnemyAct.cpp | 10 +- .../AI/aiUnarmedWeaponEquipableEnemyAct.h | 6 +- src/Game/Actor/AI/aiVacuumEnemyRoot.cpp | 25 + ...OctarockRootBase.h => aiVacuumEnemyRoot.h} | 8 +- src/Game/Actor/AI/aiWholeDungeonRotateTag.cpp | 25 - src/Game/Actor/AI/aiYunBoCannon.cpp | 10 +- src/Game/Actor/AI/aiYunBoCannon.h | 6 +- src/Game/Actor/Action/CMakeLists.txt | 88 +- .../Action/actionASPlayRotateTurnToTarget.cpp | 34 + ...get.h => actionASPlayRotateTurnToTarget.h} | 8 +- src/Game/Actor/Action/actionAirOctaFloat.cpp | 12 +- src/Game/Actor/Action/actionAirOctaFloat.h | 6 +- ...loatBase.cpp => actionAirOctaMoveBase.cpp} | 16 +- ...ctaFloatBase.h => actionAirOctaMoveBase.h} | 8 +- .../Action/actionAppearFollowChallenge.cpp | 30 + ...llenge.h => actionAppearFollowChallenge.h} | 8 +- .../Action/actionArrowChargeAndShoot.cpp | 29 + ...AndShoot.h => actionArrowChargeAndShoot.h} | 8 +- src/Game/Actor/Action/actionAtkTackleMove.cpp | 30 - .../actionAvoidingCloseMoveActionWithAcc.cpp | 31 + ...=> actionAvoidingCloseMoveActionWithAcc.h} | 10 +- ...on.cpp => actionAvoidingCloseMoveBase.cpp} | 16 +- ...Action.h => actionAvoidingCloseMoveBase.h} | 8 +- src/Game/Actor/Action/actionBackFlip.cpp | 12 +- src/Game/Actor/Action/actionBackFlip.h | 6 +- ...loonBase.cpp => actionBalloonRopeBase.cpp} | 16 +- ...kBalloonBase.h => actionBalloonRopeBase.h} | 8 +- .../actionBasicSignalBossAwakeSleep.cpp | 13 +- .../Action/actionBasicSignalBossAwakeSleep.h | 6 +- .../Actor/Action/actionBasicSignalEnemy.cpp | 27 - .../actionBasicSignalEnemyForceNotice.cpp | 12 +- .../actionBasicSignalEnemyForceNotice.h | 6 +- .../Action/actionBasicSignalEnemyNotice.cpp | 27 + ...Enemy.h => actionBasicSignalEnemyNotice.h} | 8 +- .../Action/actionBattleCloseActionWithAcc.cpp | 30 - .../actionBattleCloseMoveActionBase.cpp | 13 +- .../Action/actionBattleCloseMoveActionBase.h | 6 +- .../actionBattleCloseSlippedMoveBase.cpp | 30 + ...e.h => actionBattleCloseSlippedMoveBase.h} | 10 +- .../Action/actionBattleCloseSlippedWalk.cpp | 12 +- .../Action/actionBattleCloseSlippedWalk.h | 6 +- .../actionBattleCloseSlippedWalkBase.cpp | 30 - .../Actor/Action/actionChallengeChainRing.cpp | 12 +- .../Actor/Action/actionChallengeChainRing.h | 6 +- .../Actor/Action/actionChargeAndShoot.cpp | 29 - .../Actor/Action/actionChemicalAttack.cpp | 20 +- src/Game/Actor/Action/actionChemicalAttack.h | 23 +- .../Actor/Action/actionChemicalAttackBall.cpp | 31 - .../Actor/Action/actionChemicalAttackBall.h | 28 - .../actionChemicalElectricWaterBall.cpp | 13 +- .../Action/actionChemicalElectricWaterBall.h | 6 +- .../Actor/Action/actionChemicalPhysBall.cpp | 12 +- .../Actor/Action/actionChemicalPhysBall.h | 6 +- src/Game/Actor/Action/actionDragonFollow.cpp | 12 +- src/Game/Actor/Action/actionDragonFollow.h | 6 +- .../Actor/Action/actionEmitAttackBase.cpp | 35 + src/Game/Actor/Action/actionEmitAttackBase.h | 37 + .../Action/actionFlyingCharacterBlownOff.cpp | 12 +- .../Action/actionFlyingCharacterBlownOff.h | 6 +- .../actionFlyingCharacterDamageBase.cpp | 12 +- .../Action/actionFlyingCharacterDamageBase.h | 6 +- .../Action/actionFlyingCharacterFreeFall.cpp | 12 +- .../Action/actionFlyingCharacterFreeFall.h | 6 +- .../actionFlyingCharacterFreeFallBase.cpp | 33 + ....h => actionFlyingCharacterFreeFallBase.h} | 8 +- .../actionFlyingCharacterFreeFallDie.cpp | 12 +- .../Action/actionFlyingCharacterFreeFallDie.h | 6 +- .../Action/actionFlyingCharacterFreeze.cpp | 13 +- .../Action/actionFlyingCharacterFreeze.h | 6 +- .../Action/actionFlyingCharacterReaction.cpp | 32 - src/Game/Actor/Action/actionFollowAttack.cpp | 12 +- src/Game/Actor/Action/actionFollowAttack.h | 6 +- .../Actor/Action/actionFollowChallenge.cpp | 30 - .../Action/actionFollowIgniteToBonePos.cpp | 12 +- .../Action/actionFollowIgniteToBonePos.h | 6 +- .../Action/actionFollowIgniteToSelfPos.cpp | 12 +- .../Action/actionFollowIgniteToSelfPos.h | 6 +- .../actionForkASTrgEmitShockWaveAtEnter.cpp | 12 +- .../actionForkASTrgEmitShockWaveAtEnter.h | 6 +- .../actionForkASTrgEmitShockWavePos.cpp | 13 +- .../Action/actionForkASTrgEmitShockWavePos.h | 6 +- .../actionForkBasicMessageDialogCtrl.cpp | 30 + ...l.h => actionForkBasicMessageDialogCtrl.h} | 8 +- .../actionForkBeastGanonMessageDialogCtrl.cpp | 12 +- .../actionForkBeastGanonMessageDialogCtrl.h | 6 +- ...ckWave.cpp => actionForkEmitShockWave.cpp} | 16 +- ...tShockWave.h => actionForkEmitShockWave.h} | 8 +- .../actionForkEmitShockWaveByContact.cpp | 12 +- .../Action/actionForkEmitShockWaveByContact.h | 6 +- ...Base.cpp => actionGolemThrowPartsBase.cpp} | 16 +- ...rgetBase.h => actionGolemThrowPartsBase.h} | 8 +- .../Action/actionGolemThrowPartsToTarget.cpp | 13 +- .../Action/actionGolemThrowPartsToTarget.h | 6 +- .../Action/actionHorseRideChargeCommand.cpp | 12 +- .../Action/actionHorseRideChargeCommand.h | 6 +- .../Action/actionHorseRideChaseCommand.cpp | 12 +- .../Action/actionHorseRideChaseCommand.h | 6 +- .../Action/actionHorseRideMoveCommand.cpp | 30 - .../Action/actionHorseRideMoveToCommand.cpp | 12 +- .../Action/actionHorseRideMoveToCommand.h | 6 +- .../Action/actionHorseRideSetGearCommand.cpp | 30 + ...mand.h => actionHorseRideSetGearCommand.h} | 8 +- .../Actor/Action/actionLastBossBlowOff.cpp | 29 + ...eBossBlowOff.h => actionLastBossBlowOff.h} | 8 +- src/Game/Actor/Action/actionLyzalfosFlame.cpp | 12 +- src/Game/Actor/Action/actionLyzalfosFlame.h | 6 +- src/Game/Actor/Action/actionNoticeTurn.cpp | 12 +- src/Game/Actor/Action/actionNoticeTurn.h | 6 +- .../Actor/Action/actionOctarockBalloon.cpp | 12 +- src/Game/Actor/Action/actionOctarockBalloon.h | 6 +- .../Action/actionPriestBossCloneFastWarp.cpp | 29 + ...nish.h => actionPriestBossCloneFastWarp.h} | 8 +- .../Action/actionPriestBossFastWarpMove.cpp | 12 +- .../Action/actionPriestBossFastWarpMove.h | 6 +- .../actionPriestBossShadowCloneVanish.cpp | 12 +- .../actionPriestBossShadowCloneVanish.h | 6 +- .../Action/actionPriestBossWarpOrVanish.cpp | 29 - .../Actor/Action/actionRotateTurnToTarget.cpp | 33 - .../Actor/Action/actionSandwormTackleMove.cpp | 12 +- .../Actor/Action/actionSandwormTackleMove.h | 6 +- src/Game/Actor/Action/actionSetFlag.cpp | 15 + ...actionSetGetFlagBase.h => actionSetFlag.h} | 8 +- src/Game/Actor/Action/actionSetGetFlag.cpp | 6 +- src/Game/Actor/Action/actionSetGetFlag.h | 6 +- .../Actor/Action/actionSetGetFlagBase.cpp | 15 - .../Action/actionSetGetFlagByActorName.cpp | 6 +- .../Action/actionSetGetFlagByActorName.h | 6 +- .../Action/actionSimpleMessageDialogCtrl.cpp | 29 - .../Actor/Action/actionSiteBossBlowOff.cpp | 29 - .../Actor/Action/actionSiteBossBowBlowOff.cpp | 12 +- .../Actor/Action/actionSiteBossBowBlowOff.h | 6 +- .../actionSiteBossLswordAtkWithChemical.cpp | 12 +- .../actionSiteBossLswordAtkWithChemical.h | 6 +- ...Atk.cpp => actionSiteBossLswordAttack.cpp} | 16 +- ...wordAtk.h => actionSiteBossLswordAttack.h} | 8 +- src/Game/Actor/Action/actionStopOnObj.cpp | 30 + ...ctionWaitOnObjBase.h => actionStopOnObj.h} | 8 +- src/Game/Actor/Action/actionTackleAttack.cpp | 30 + ...onAtkTackleMove.h => actionTackleAttack.h} | 8 +- .../Action/actionTurnAndChargeAndShoot.cpp | 12 +- .../Action/actionTurnAndChargeAndShoot.h | 6 +- src/Game/Actor/Action/actionWaitOnObj.cpp | 12 +- src/Game/Actor/Action/actionWaitOnObj.h | 6 +- src/Game/Actor/Action/actionWaitOnObjBase.cpp | 30 - ...eBase.cpp => actionWaterDepthMoveBase.cpp} | 16 +- ...nMoveBase.h => actionWaterDepthMoveBase.h} | 8 +- .../Actor/Action/actionWaterUpDownMove.cpp | 12 +- src/Game/Actor/Action/actionWaterUpDownMove.h | 6 +- src/Game/Actor/Action/actionWindCutter.cpp | 12 +- src/Game/Actor/Action/actionWindCutter.h | 6 +- src/Game/Actor/Camera/Action/CMakeLists.txt | 4 +- .../Camera/Action/actionCameraLockOn.cpp | 2 +- .../Actor/Camera/Action/actionCameraLockOn.h | 6 +- .../Camera/Action/actionCameraLockOnBase.cpp | 9 - .../Camera/Action/actionCameraMagneCatch.cpp | 2 +- .../Camera/Action/actionCameraMagneCatch.h | 6 +- .../Camera/Action/actionCameraTrackBase.cpp | 9 + ...raLockOnBase.h => actionCameraTrackBase.h} | 8 +- src/Game/Actor/Horse/AI/CMakeLists.txt | 4 +- .../Actor/Horse/AI/aiNonPlayerHorseRide.cpp | 23 - .../Actor/Horse/AI/aiRideHorseNonPlayer.cpp | 23 + .../AI/aiRideHorseNonPlayer.h} | 8 +- src/Game/Actor/Player/Action/CMakeLists.txt | 4 +- .../Player/Action/actionPlayerKokkoGlide.cpp | 10 +- .../Player/Action/actionPlayerKokkoGlide.h | 6 +- .../Action/actionPlayerParashawlGlide.cpp | 10 +- .../Action/actionPlayerParashawlGlide.h | 6 +- ...cpp => actionPlayerParashawlGlideBase.cpp} | 12 +- ...ide.h => actionPlayerParashawlGlideBase.h} | 6 +- 478 files changed, 4186 insertions(+), 4192 deletions(-) create mode 100644 src/Game/Actor/AI/aiAddViewTarget.cpp rename src/Game/Actor/AI/{aiNPCTravelBase.h => aiAddViewTarget.h} (62%) delete mode 100644 src/Game/Actor/AI/aiAddViewTargetPosBase.cpp delete mode 100644 src/Game/Actor/AI/aiAncientNecklaceBallBase.cpp rename src/Game/Actor/AI/{aiAnimalRoamBase.cpp => aiAnimalRndMove.cpp} (75%) rename src/Game/Actor/AI/{aiAnimalRoamBase.h => aiAnimalRndMove.h} (87%) rename src/Game/Actor/AI/{aiAppearNearTarget.cpp => aiAppearFromTarget.cpp} (54%) rename src/Game/Actor/AI/{aiAppearNearTarget.h => aiAppearFromTarget.h} (74%) delete mode 100644 src/Game/Actor/AI/aiAssassinMagicTgtSelect.cpp delete mode 100644 src/Game/Actor/AI/aiAssassinNormal.cpp rename src/Game/Actor/AI/{aiAssassinFieldShooterBattleBase.cpp => aiAssassinShooterBattle.cpp} (52%) rename src/Game/Actor/AI/{aiAssassinFieldShooterBattleBase.h => aiAssassinShooterBattle.h} (75%) rename src/Game/Actor/AI/{aiSandwormNormalBase.cpp => aiAwnSeal.cpp} (51%) rename src/Game/Actor/AI/{aiSandwormNormalBase.h => aiAwnSeal.h} (76%) delete mode 100644 src/Game/Actor/AI/aiBeamExplodeBase.cpp create mode 100644 src/Game/Actor/AI/aiBezierRailMove.cpp rename src/Game/Actor/AI/{aiRailMove.h => aiBezierRailMove.h} (67%) rename src/Game/Actor/AI/{aiGoronCannonBase.cpp => aiBigCannon.cpp} (69%) rename src/Game/Actor/AI/{aiGoronCannonBase.h => aiBigCannon.h} (86%) rename src/Game/Actor/AI/{aiSimpleWildlifeRoot.cpp => aiCapturedActorRoot.cpp} (68%) rename src/Game/Actor/AI/{aiSimpleWildlifeRoot.h => aiCapturedActorRoot.h} (83%) create mode 100644 src/Game/Actor/AI/aiCheckLineOfSightSelector.cpp rename src/Game/Actor/AI/{aiHorseCheckLineOfSightSelectorBase.h => aiCheckLineOfSightSelector.h} (68%) delete mode 100644 src/Game/Actor/AI/aiChildFavoriteSelectorBase.cpp create mode 100644 src/Game/Actor/AI/aiChildSelector.cpp rename src/Game/Actor/AI/{aiChildFavoriteSelectorBase.h => aiChildSelector.h} (66%) rename src/Game/Actor/AI/{aiMimicCliffStopEnemyNormalBase.cpp => aiCliffStopEnemyNormal.cpp} (54%) rename src/Game/Actor/AI/{aiMimicCliffStopEnemyNormalBase.h => aiCliffStopEnemyNormal.h} (76%) create mode 100644 src/Game/Actor/AI/aiControlRailRoot.cpp rename src/Game/Actor/AI/{aiDragonRootBase.h => aiControlRailRoot.h} (61%) delete mode 100644 src/Game/Actor/AI/aiDragonRootBase.cpp create mode 100644 src/Game/Actor/AI/aiDungeonRotateTagApp.cpp rename src/Game/Actor/AI/{aiWholeDungeonRotateTag.h => aiDungeonRotateTagApp.h} (63%) delete mode 100644 src/Game/Actor/AI/aiEnemyChemTargetActionBase.cpp create mode 100644 src/Game/Actor/AI/aiEnemySearch.cpp rename src/Game/Actor/AI/{aiUnarmedEnemySearchWeapon.h => aiEnemySearch.h} (71%) create mode 100644 src/Game/Actor/AI/aiEnemyTargetAction.cpp rename src/Game/Actor/AI/{aiEnemyChemTargetActionBase.h => aiEnemyTargetAction.h} (75%) rename src/Game/Actor/AI/{aiFlyingEnemyKeepMove.cpp => aiFlyingEnemyDistanceKeepMove.cpp} (56%) rename src/Game/Actor/AI/{aiFlyingEnemyKeepMove.h => aiFlyingEnemyDistanceKeepMove.h} (79%) rename src/Game/Actor/AI/{aiSiteBossChemicalProjectile.cpp => aiGanonFlameBall.cpp} (67%) rename src/Game/Actor/AI/{aiSiteBossChemicalProjectile.h => aiGanonFlameBall.h} (84%) create mode 100644 src/Game/Actor/AI/aiGiantEnemyFindPlayer.cpp rename src/Game/Actor/AI/{aiLargeEnemyFindPlayer.h => aiGiantEnemyFindPlayer.h} (62%) create mode 100644 src/Game/Actor/AI/aiGuardHomePosNormal.cpp rename src/Game/Actor/AI/{aiAssassinNormal.h => aiGuardHomePosNormal.h} (62%) delete mode 100644 src/Game/Actor/AI/aiGuardNearTarget.cpp delete mode 100644 src/Game/Actor/AI/aiGuardianBeamAttackBase.cpp create mode 100644 src/Game/Actor/AI/aiGuardianCommonBeamAttack.cpp rename src/Game/Actor/AI/{aiAddViewTargetPosBase.h => aiGuardianCommonBeamAttack.h} (56%) rename src/Game/Actor/AI/{aiMiniBeamAttack.cpp => aiGuideBeamAttackEnemyBattle.cpp} (59%) rename src/Game/Actor/AI/{aiMiniBeamAttack.h => aiGuideBeamAttackEnemyBattle.h} (79%) delete mode 100644 src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.cpp create mode 100644 src/Game/Actor/AI/aiHorseRiddenStatusSelector.cpp rename src/Game/Actor/AI/{aiGuardianBeamAttackBase.h => aiHorseRiddenStatusSelector.h} (56%) create mode 100644 src/Game/Actor/AI/aiInvincibleNearTarget.cpp rename src/Game/Actor/AI/{aiTimedGuardNearTarget.h => aiInvincibleNearTarget.h} (64%) create mode 100644 src/Game/Actor/AI/aiInvincibleNearTargetBase.cpp rename src/Game/Actor/AI/{aiGuardNearTarget.h => aiInvincibleNearTargetBase.h} (74%) create mode 100644 src/Game/Actor/AI/aiLargeCannonRoot.cpp rename src/Game/Actor/AI/{aiRemainElectricCannonRootBase.h => aiLargeCannonRoot.h} (72%) delete mode 100644 src/Game/Actor/AI/aiLargeEnemyFindPlayer.cpp rename src/Game/Actor/AI/{aiSiteBossRecognizeRootBase.cpp => aiLastBossRecognizeRoot.cpp} (51%) rename src/Game/Actor/AI/{aiSiteBossRecognizeRootBase.h => aiLastBossRecognizeRoot.h} (73%) rename src/Game/Actor/AI/{aiOneMemoryMagicBattleBase.cpp => aiMagicBattle.cpp} (53%) rename src/Game/Actor/AI/{aiOneMemoryMagicBattleBase.h => aiMagicBattle.h} (77%) delete mode 100644 src/Game/Actor/AI/aiMotorcycleRootBase.cpp create mode 100644 src/Game/Actor/AI/aiNPCScheduleMove.cpp rename src/Game/Actor/{Horse/AI/aiNonPlayerHorseRide.h => AI/aiNPCScheduleMove.h} (59%) delete mode 100644 src/Game/Actor/AI/aiNPCTravelBase.cpp create mode 100644 src/Game/Actor/AI/aiNavMove.cpp rename src/Game/Actor/AI/{aiUnarmedEnemySearch.h => aiNavMove.h} (71%) create mode 100644 src/Game/Actor/AI/aiNewRangeSelect.cpp rename src/Game/Actor/AI/{aiRangeSelect.h => aiNewRangeSelect.h} (73%) delete mode 100644 src/Game/Actor/AI/aiOctarockEscape.cpp create mode 100644 src/Game/Actor/AI/aiOctarockHideEscapeBase.cpp rename src/Game/Actor/AI/{aiOctarockEscape.h => aiOctarockHideEscapeBase.h} (62%) delete mode 100644 src/Game/Actor/AI/aiOctarockRootBase.cpp create mode 100644 src/Game/Actor/AI/aiOffsetTargetPos.cpp rename src/Game/Actor/AI/{aiTargetPosOffset.h => aiOffsetTargetPos.h} (73%) create mode 100644 src/Game/Actor/AI/aiPlayASSwitch.cpp rename src/Game/Actor/AI/{aiAncientNecklaceBallBase.h => aiPlayASSwitch.h} (74%) create mode 100644 src/Game/Actor/AI/aiPriestBoss.cpp rename src/Game/Actor/AI/{aiPriestBossMode.h => aiPriestBoss.h} (66%) delete mode 100644 src/Game/Actor/AI/aiPriestBossMode.cpp delete mode 100644 src/Game/Actor/AI/aiRailMove.cpp delete mode 100644 src/Game/Actor/AI/aiRangeSelect.cpp create mode 100644 src/Game/Actor/AI/aiRegistedActor.cpp rename src/Game/Actor/AI/{aiRegistedActorNumTwoSelectBase.h => aiRegistedActor.h} (60%) delete mode 100644 src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.cpp delete mode 100644 src/Game/Actor/AI/aiRemainElectricCannonRootBase.cpp create mode 100644 src/Game/Actor/AI/aiSeqTwoLineReachableTarget.cpp rename src/Game/Actor/AI/{aiSeqTwoLineReachableTargetActionBase.h => aiSeqTwoLineReachableTarget.h} (62%) delete mode 100644 src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.cpp create mode 100644 src/Game/Actor/AI/aiSimpleBeamExplode.cpp rename src/Game/Actor/AI/{aiBeamExplodeBase.h => aiSimpleBeamExplode.h} (68%) create mode 100644 src/Game/Actor/AI/aiSleepNormal.cpp rename src/Game/Actor/AI/{aiSpecialEnemySleep.h => aiSleepNormal.h} (72%) delete mode 100644 src/Game/Actor/AI/aiSpecialEnemySleep.cpp create mode 100644 src/Game/Actor/AI/aiTargetActorPos.cpp rename src/Game/Actor/AI/{aiTargetPosAI.h => aiTargetActorPos.h} (66%) create mode 100644 src/Game/Actor/AI/aiTargetAttackAttitudeTgt.cpp create mode 100644 src/Game/Actor/AI/aiTargetAttackAttitudeTgt.h delete mode 100644 src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.cpp delete mode 100644 src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.h create mode 100644 src/Game/Actor/AI/aiTargetHeightAreaSelect.cpp rename src/Game/Actor/AI/{aiAssassinMagicTgtSelect.h => aiTargetHeightAreaSelect.h} (65%) delete mode 100644 src/Game/Actor/AI/aiTargetPosAI.cpp delete mode 100644 src/Game/Actor/AI/aiTargetPosDynParamRot.cpp create mode 100644 src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.cpp rename src/Game/Actor/AI/{aiTargetPosDynParamRot.h => aiTargetPosDynParamRotFromMyPos.h} (63%) delete mode 100644 src/Game/Actor/AI/aiTargetPosOffset.cpp delete mode 100644 src/Game/Actor/AI/aiTimedGuardNearTarget.cpp delete mode 100644 src/Game/Actor/AI/aiUnarmedEnemySearch.cpp delete mode 100644 src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.cpp create mode 100644 src/Game/Actor/AI/aiVacuumEnemyRoot.cpp rename src/Game/Actor/AI/{aiOctarockRootBase.h => aiVacuumEnemyRoot.h} (65%) delete mode 100644 src/Game/Actor/AI/aiWholeDungeonRotateTag.cpp create mode 100644 src/Game/Actor/Action/actionASPlayRotateTurnToTarget.cpp rename src/Game/Actor/Action/{actionRotateTurnToTarget.h => actionASPlayRotateTurnToTarget.h} (74%) rename src/Game/Actor/Action/{actionAirOctaFloatBase.cpp => actionAirOctaMoveBase.cpp} (52%) rename src/Game/Actor/Action/{actionAirOctaFloatBase.h => actionAirOctaMoveBase.h} (75%) create mode 100644 src/Game/Actor/Action/actionAppearFollowChallenge.cpp rename src/Game/Actor/Action/{actionFollowChallenge.h => actionAppearFollowChallenge.h} (68%) create mode 100644 src/Game/Actor/Action/actionArrowChargeAndShoot.cpp rename src/Game/Actor/Action/{actionChargeAndShoot.h => actionArrowChargeAndShoot.h} (66%) delete mode 100644 src/Game/Actor/Action/actionAtkTackleMove.cpp create mode 100644 src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.cpp rename src/Game/Actor/Action/{actionBattleCloseActionWithAcc.h => actionAvoidingCloseMoveActionWithAcc.h} (56%) rename src/Game/Actor/Action/{actionBattleCloseAction.cpp => actionAvoidingCloseMoveBase.cpp} (54%) rename src/Game/Actor/Action/{actionBattleCloseAction.h => actionAvoidingCloseMoveBase.h} (78%) rename src/Game/Actor/Action/{actionOctarockBalloonBase.cpp => actionBalloonRopeBase.cpp} (58%) rename src/Game/Actor/Action/{actionOctarockBalloonBase.h => actionBalloonRopeBase.h} (81%) delete mode 100644 src/Game/Actor/Action/actionBasicSignalEnemy.cpp create mode 100644 src/Game/Actor/Action/actionBasicSignalEnemyNotice.cpp rename src/Game/Actor/Action/{actionBasicSignalEnemy.h => actionBasicSignalEnemyNotice.h} (59%) delete mode 100644 src/Game/Actor/Action/actionBattleCloseActionWithAcc.cpp create mode 100644 src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.cpp rename src/Game/Actor/Action/{actionBattleCloseSlippedWalkBase.h => actionBattleCloseSlippedMoveBase.h} (50%) delete mode 100644 src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.cpp delete mode 100644 src/Game/Actor/Action/actionChargeAndShoot.cpp delete mode 100644 src/Game/Actor/Action/actionChemicalAttackBall.cpp delete mode 100644 src/Game/Actor/Action/actionChemicalAttackBall.h create mode 100644 src/Game/Actor/Action/actionEmitAttackBase.cpp create mode 100644 src/Game/Actor/Action/actionEmitAttackBase.h create mode 100644 src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.cpp rename src/Game/Actor/Action/{actionFlyingCharacterReaction.h => actionFlyingCharacterFreeFallBase.h} (71%) delete mode 100644 src/Game/Actor/Action/actionFlyingCharacterReaction.cpp delete mode 100644 src/Game/Actor/Action/actionFollowChallenge.cpp create mode 100644 src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.cpp rename src/Game/Actor/Action/{actionSimpleMessageDialogCtrl.h => actionForkBasicMessageDialogCtrl.h} (62%) rename src/Game/Actor/Action/{actionForkASTrgEmitShockWave.cpp => actionForkEmitShockWave.cpp} (65%) rename src/Game/Actor/Action/{actionForkASTrgEmitShockWave.h => actionForkEmitShockWave.h} (83%) rename src/Game/Actor/Action/{actionGolemThrowPartsToTargetBase.cpp => actionGolemThrowPartsBase.cpp} (52%) rename src/Game/Actor/Action/{actionGolemThrowPartsToTargetBase.h => actionGolemThrowPartsBase.h} (74%) delete mode 100644 src/Game/Actor/Action/actionHorseRideMoveCommand.cpp create mode 100644 src/Game/Actor/Action/actionHorseRideSetGearCommand.cpp rename src/Game/Actor/Action/{actionHorseRideMoveCommand.h => actionHorseRideSetGearCommand.h} (67%) create mode 100644 src/Game/Actor/Action/actionLastBossBlowOff.cpp rename src/Game/Actor/Action/{actionSiteBossBlowOff.h => actionLastBossBlowOff.h} (68%) create mode 100644 src/Game/Actor/Action/actionPriestBossCloneFastWarp.cpp rename src/Game/Actor/Action/{actionPriestBossWarpOrVanish.h => actionPriestBossCloneFastWarp.h} (64%) delete mode 100644 src/Game/Actor/Action/actionPriestBossWarpOrVanish.cpp delete mode 100644 src/Game/Actor/Action/actionRotateTurnToTarget.cpp create mode 100644 src/Game/Actor/Action/actionSetFlag.cpp rename src/Game/Actor/Action/{actionSetGetFlagBase.h => actionSetFlag.h} (52%) delete mode 100644 src/Game/Actor/Action/actionSetGetFlagBase.cpp delete mode 100644 src/Game/Actor/Action/actionSimpleMessageDialogCtrl.cpp delete mode 100644 src/Game/Actor/Action/actionSiteBossBlowOff.cpp rename src/Game/Actor/Action/{actionSiteBossLswordAtk.cpp => actionSiteBossLswordAttack.cpp} (71%) rename src/Game/Actor/Action/{actionSiteBossLswordAtk.h => actionSiteBossLswordAttack.h} (87%) create mode 100644 src/Game/Actor/Action/actionStopOnObj.cpp rename src/Game/Actor/Action/{actionWaitOnObjBase.h => actionStopOnObj.h} (71%) create mode 100644 src/Game/Actor/Action/actionTackleAttack.cpp rename src/Game/Actor/Action/{actionAtkTackleMove.h => actionTackleAttack.h} (73%) delete mode 100644 src/Game/Actor/Action/actionWaitOnObjBase.cpp rename src/Game/Actor/Action/{actionWaterUpDownMoveBase.cpp => actionWaterDepthMoveBase.cpp} (58%) rename src/Game/Actor/Action/{actionWaterUpDownMoveBase.h => actionWaterDepthMoveBase.h} (79%) delete mode 100644 src/Game/Actor/Camera/Action/actionCameraLockOnBase.cpp create mode 100644 src/Game/Actor/Camera/Action/actionCameraTrackBase.cpp rename src/Game/Actor/Camera/Action/{actionCameraLockOnBase.h => actionCameraTrackBase.h} (51%) delete mode 100644 src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.cpp create mode 100644 src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.cpp rename src/Game/Actor/{AI/aiMotorcycleRootBase.h => Horse/AI/aiRideHorseNonPlayer.h} (59%) rename src/Game/Actor/Player/Action/{actionPlayerGlide.cpp => actionPlayerParashawlGlideBase.cpp} (69%) rename src/Game/Actor/Player/Action/{actionPlayerGlide.h => actionPlayerParashawlGlideBase.h} (87%) diff --git a/data/aidef_action_params.yml b/data/aidef_action_params.yml index 21ffaad1..e2e561d2 100644 --- a/data/aidef_action_params.yml +++ b/data/aidef_action_params.yml @@ -48,7 +48,7 @@ AdvanceTime: - {type: dynamic_param, param_type: int*, param_name: DirectTime, param_offset: 0x28} - {type: dynamic_param, param_type: int*, param_name: PassTime, param_offset: 0x30} - {type: dynamic_param, param_type: bool*, param_name: ActReset, param_offset: 0x38} -AirOctaFloatBase: +AirOctaMoveBase: - {type: static_param, param_type: const float*, param_name: Amplitude, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: GoalDistance, param_offset: 0x28} - {type: static_param, param_type: const bool*, param_name: GoalInSuccessEnd, param_offset: 0x30} @@ -62,7 +62,7 @@ AirOctaMgr: - {type: static_param, param_type: const float*, param_name: PlayerLostTime, param_offset: 0x38} - {type: map_unit_param, param_type: const float*, param_name: MoveDis, param_offset: 0x40} - {type: map_unit_param, param_type: const bool*, param_name: ReactHorn, param_offset: 0x48} -RotateTurnToTarget: +ASPlayRotateTurnToTarget: - {type: static_param, param_type: const float*, param_name: AngSpd, param_offset: 0x20} - {type: static_param, param_type: const bool*, param_name: IsJumpType, param_offset: 0x28} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38} @@ -643,7 +643,7 @@ Balloon: - {type: static_param, param_type: const float*, param_name: Length, param_offset: 0xf0} - {type: static_param, param_type: 'sead::SafeString', param_name: RopeActorName, param_offset: 0xf8} - {type: map_unit_param, param_type: 'const sead::Vector3f*', param_name: RopeHungActOffset, param_offset: 0x108} -BasicSignalEnemy: [] +BasicSignalEnemyNotice: [] BasicSignalBossAwakeSleep: - {type: call, fn: _ZN5uking6action16BasicSignalEnemy11loadParams_Ev, addr: 0x71000ba788} BasicSignalChangeDamping: @@ -652,7 +652,7 @@ BasicSignalChangeDamping: BasicSignalEnemyForceNotice: - {type: call, fn: _ZN5uking6action16BasicSignalEnemy11loadParams_Ev, addr: 0x71000ba788} - {type: static_param, param_type: const int*, param_name: Interval, param_offset: 0x20} -BattleCloseAction: +AvoidingCloseMoveBase: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: Speed, param_offset: 0x28} - {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x30} @@ -695,10 +695,10 @@ BattleCloseMeanderRun: - {type: static_param, param_type: const float*, param_name: JumpUpSpeedReduceRatio, param_offset: 0xb8} BattleCloseMeanderGuardRun: [] BattleCloseMove: [] -BattleCloseActionWithAcc: +AvoidingCloseMoveActionWithAcc: - {type: call, fn: _ZN5uking6action17BattleCloseAction11loadParams_Ev, addr: 0x71000afda4} - {type: static_param, param_type: const float*, param_name: AccRatio, param_offset: 0x98} -BattleCloseSlippedWalkBase: +BattleCloseSlippedMoveBase: - {type: call, fn: _ZN5uking6action24BattleCloseActionWithAcc11loadParams_Ev, addr: 0x71000ae924} BattleCloseSlippedWalk: - {type: call, fn: _ZN5uking6action26BattleCloseSlippedWalkBase11loadParams_Ev, addr: 0x71000bed30} @@ -1026,7 +1026,7 @@ CameraFinder: [] CameraHorse: [] CameraHorseLockOnEmpty: [] CameraKeep: [] -CameraLockOnBase: [] +CameraTrackBase: [] CameraLockOn: [] CameraLockOnAimingAt: [] CameraMagneCatch: [] @@ -1097,7 +1097,7 @@ Catch: - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetWeapon, param_offset: 0x30} - {type: static_param, param_type: const float*, param_name: RotSpd, param_offset: 0x28} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38} -FollowChallenge: +AppearFollowChallenge: - {type: map_unit_param, param_type: const float*, param_name: GimmickTimeLimit, param_offset: 0x20} - {type: map_unit_param, param_type: const bool*, param_name: IsBillboard, param_offset: 0x28} ChallengeChainRing: @@ -1146,7 +1146,7 @@ CheckExistenceOfParticipant: - {type: dynamic_param, param_type: 'sead::SafeString', param_name: ActorName, param_offset: 0x20} - {type: dynamic_param, param_type: 'sead::SafeString', param_name: InstanceName, param_offset: 0x30} CheckHorseCustomizeEdit: [] -ChemicalAttack: +EmitAttackBase: - {type: static_param, param_type: const int*, param_name: AttackIntensity, param_offset: 0x20} - {type: static_param, param_type: const int*, param_name: AttackMinPower, param_offset: 0x28} - {type: map_unit_param, param_type: const int*, param_name: AttackPower, param_offset: 0x30} @@ -1154,7 +1154,7 @@ ChemicalAttack: - {type: map_unit_param, param_type: const float*, param_name: ScaleTime, param_offset: 0x40} - {type: map_unit_param, param_type: const float*, param_name: Range, param_offset: 0x48} - {type: map_unit_param, param_type: 'sead::SafeString', param_name: RigidBodyName, param_offset: 0x50} -ChemicalAttackBall: +ChemicalAttack: - {type: call, fn: _ZN5uking6action14ChemicalAttack11loadParams_Ev, addr: 0x71001053c4} - {type: static_param, param_type: const bool*, param_name: IsUseMyRange, param_offset: 0x80} - {type: static_param, param_type: const int*, param_name: AttackType, param_offset: 0x88} @@ -2285,7 +2285,7 @@ FlyMove: - {type: call, fn: _ZN5uking6action11FlyMoveBase11loadParams_Ev, addr: 0x71001349e8} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0xc0} FlyingBalloonObserverTag: [] -FlyingCharacterReaction: +FlyingCharacterFreeFallBase: - {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x28} - {type: static_param, param_type: const bool*, param_name: IsControlRotation, param_offset: 0x30} @@ -2482,7 +2482,7 @@ ForkEmitChmField: ForkASTrgEmitChmFieldPos: - {type: call, fn: _ZN5uking6action16ForkEmitChmField11loadParams_Ev, addr: 0x7100167f88} - {type: static_param, param_type: 'const sead::Vector3f*', param_name: OffsetPos, param_offset: 0xa8} -ForkASTrgEmitShockWave: +ForkEmitShockWave: - {type: static_param, param_type: const int*, param_name: Power, param_offset: 0x20} - {type: static_param, param_type: const int*, param_name: AttackIntensity, param_offset: 0x28} - {type: static_param, param_type: const int*, param_name: EmitIntervalTime, param_offset: 0x30} @@ -2644,7 +2644,7 @@ ForkAnimReset: ForkBattleNodeForAttackGround: - {type: static_param, param_type: const bool*, param_name: IsOffsetFromBaseBone, param_offset: 0x20} - {type: static_param, param_type: 'const sead::Vector3f*', param_name: AttackPosOffset, param_offset: 0x28} -SimpleMessageDialogCtrl: +ForkBasicMessageDialogCtrl: - {type: aitree_variable, param_type: void*, param_name: SimpleDialogUnit, param_offset: 0x20} ForkBeastGanonMessageDialogCtrl: - {type: call, fn: _ZN5uking6action23SimpleMessageDialogCtrl11loadParams_Ev, addr: 0x710014752c} @@ -3769,7 +3769,7 @@ GolemRepairParts: - {type: call, fn: sub_71005E1BE8, addr: 0x71005e1be8} - {type: call, fn: sub_71005E1BE8, addr: 0x71005e1be8} - {type: aitree_variable, param_type: void*, param_name: GolemChemicalController, param_offset: 0xe0} -GolemThrowPartsToTargetBase: +GolemThrowPartsBase: - {type: call, fn: _ZN5uking6action22ActionWithPosAngReduce11loadParams_Ev, addr: 0x710027e3ec} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x30} - {type: static_param, param_type: 'sead::SafeString', param_name: TgtBodyName, param_offset: 0x40} @@ -4121,7 +4121,7 @@ HorseRideAttack: - {type: static_param, param_type: const float*, param_name: JustAvoidAngle, param_offset: 0x68} HorseRideCancelCommand: - {type: call, fn: _ZN5uking6action16HorseRideCommand11loadParams_Ev, addr: 0x71001ae9e8} -HorseRideMoveCommand: +HorseRideSetGearCommand: - {type: call, fn: _ZN5uking6action16HorseRideCommand11loadParams_Ev, addr: 0x71001ae9e8} - {type: static_param, param_type: const int*, param_name: Gear, param_offset: 0x58} HorseRideChargeCommand: @@ -5147,7 +5147,7 @@ NpcTebaFly: ObjBoardWoodTriangle01: [] ObservationPointAction: - {type: map_unit_param, param_type: 'sead::SafeString', param_name: PointName, param_offset: 0x20} -OctarockBalloonBase: +BalloonRopeBase: - {type: call, fn: _ZN5uking6action11BalloonBase11loadParams_Ev, addr: 0x71000b82bc} - {type: static_param, param_type: const float*, param_name: ConnectReleaseTimer, param_offset: 0xf0} - {type: static_param, param_type: const float*, param_name: ClampWindForceScale, param_offset: 0xf8} @@ -5156,7 +5156,7 @@ OctarockBalloonBase: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: ConnectRigidOffset, param_offset: 0x118} - {type: dynamic_param, param_type: 'ksys::act::BaseProcHandle**', param_name: RopeActorHandle, param_offset: 0x120} OctarockBalloon: -- {type: call, fn: _ZN5uking6action19OctarockBalloonBase11loadParams_Ev, addr: 0x71000b8ff0} +- {type: call, fn: _ZN5uking6action15BalloonRopeBase11loadParams_Ev, addr: 0x71000b8ff0} - {type: static_param, param_type: const float*, param_name: TargetScale, param_offset: 0x138} - {type: static_param, param_type: const float*, param_name: StartSignTimer, param_offset: 0x140} - {type: static_param, param_type: 'sead::SafeString', param_name: StartASName, param_offset: 0x148} @@ -5665,7 +5665,7 @@ PlayerJump: - {type: static_param, param_type: const float*, param_name: EnergyUseDiam1, param_offset: 0x58} - {type: static_param, param_type: const float*, param_name: EnergyUseDiam2, param_offset: 0x60} - {type: static_param, param_type: const float*, param_name: EnergyUseDiam3, param_offset: 0x68} -PlayerGlide: +PlayerParashawlGlideBase: - {type: static_param, param_type: const float*, param_name: GlideSpeedMax, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: Lv2GlideSpeedMax, param_offset: 0x28} - {type: static_param, param_type: const float*, param_name: GlideBodyFrontX, param_offset: 0x30} @@ -6090,7 +6090,7 @@ PriestBossClonesSpawn: - {type: call, fn: _ZN5uking6action28PriestBossClonesSpawnForDemo11loadParams_Ev, addr: 0x7100066bb4} - {type: static_param, param_type: 'sead::SafeString', param_name: ASNameForAITree, param_offset: 0x88} - {type: dynamic_param, param_type: int*, param_name: DelayFrame, param_offset: 0x98} -PriestBossWarpOrVanish: +PriestBossCloneFastWarp: - {type: aitree_variable, param_type: void*, param_name: PriestBossMetaAIUnit, param_offset: 0x20} PriestBossFastWarpMove: - {type: call, fn: _ZN5uking6action22PriestBossWarpOrVanish11loadParams_Ev, addr: 0x7100221408} @@ -6409,7 +6409,7 @@ SandwormNavMove: - {type: static_param, param_type: const float*, param_name: VibrateCheckFrame, param_offset: 0xd8} - {type: static_param, param_type: const float*, param_name: VibrateMemoryStep, param_offset: 0xe0} - {type: aitree_variable, param_type: void*, param_name: RefPosVibrateChecker, param_offset: 0xe8} -AtkTackleMove: +TackleAttack: - {type: call, fn: _ZN5uking6action10TackleMove11loadParams_Ev, addr: 0x7100291bf0} - {type: static_param, param_type: 'sead::SafeString', param_name: AtkSensorName, param_offset: 0x88} SandwormTackleMove: @@ -6515,7 +6515,7 @@ SetFrameASPlay: - {type: static_param, param_type: const bool*, param_name: IsIgnoreSame, param_offset: 0x30} - {type: static_param, param_type: 'sead::SafeString', param_name: ASName, param_offset: 0x38} - {type: map_unit_param, param_type: const float*, param_name: ASFrame, param_offset: 0x48} -SetGetFlagBase: [] +SetFlag: [] SetGetFlag: - {type: call, fn: _ZN5uking6action14SetGetFlagBase11loadParams_Ev, addr: 0x7100247c00} SetGetFlagByActorName: @@ -6675,7 +6675,7 @@ SiteBossAvoid: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x48} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: AvoidVec, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: PlayerPos, param_offset: 0x58} -SiteBossBlowOff: +LastBossBlowOff: - {type: call, fn: _ZN5uking6action8BlownOff11loadParams_Ev, addr: 0x71000c86c4} SiteBossBowBlowOff: - {type: call, fn: _ZN5uking6action15SiteBossBlowOff11loadParams_Ev, addr: 0x71001cf1b4} @@ -6722,7 +6722,7 @@ SiteBossGetUpLinear: - {type: static_param, param_type: const bool*, param_name: IsRestoreRigidBody, param_offset: 0x160} - {type: static_param, param_type: 'const sead::Vector3f*', param_name: ForceRecoverOffset, param_offset: 0x168} - {type: static_param, param_type: 'const sead::Vector3f*', param_name: ForceRecoverDist, param_offset: 0x170} -SiteBossLswordAtk: +SiteBossLswordAttack: - {type: static_param, param_type: const int*, param_name: AtMinDamage, param_offset: 0x20} - {type: static_param, param_type: const int*, param_name: AttackPower, param_offset: 0x28} - {type: static_param, param_type: const int*, param_name: AddAttackPower, param_offset: 0x30} @@ -7478,7 +7478,7 @@ TreasureBoxOpenWait: - {type: aitree_variable, param_type: bool*, param_name: IsOpenTreasureBox, param_offset: 0x58} TriggerAllPartsSleep: [] Tumble: [] -ChargeAndShoot: +ArrowChargeAndShoot: - {type: call, fn: _ZN5uking6action10ShootArrow11loadParams_Ev, addr: 0x710024e61c} TurnAndChargeAndShoot: - {type: call, fn: _ZN5uking6action14ChargeAndShoot11loadParams_Ev, addr: 0x71000a1954} @@ -7566,7 +7566,7 @@ WaitForStaminaUpDemoEnd: [] WaitHeartDemo: [] WaitMagneGear: [] WaitMessageDialogEnd: [] -WaitOnObjBase: +StopOnObj: - {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x28} WaitOnObj: @@ -7719,7 +7719,7 @@ WaterUpDownDrivenPreAttack: - {type: call, fn: _ZN5uking6action24WaterUpDownAnmDrivenMove11loadParams_Ev, addr: 0x71002b7e34} - {type: static_param, param_type: const float*, param_name: TurnSpeed, param_offset: 0x68} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x70} -WaterUpDownMoveBase: +WaterDepthMoveBase: - {type: static_param, param_type: const float*, param_name: InWaterDepth, param_offset: 0x20} - {type: static_param, param_type: const float*, param_name: PosReduceRatio, param_offset: 0x28} - {type: static_param, param_type: const float*, param_name: RotReduceRatio, param_offset: 0x30} diff --git a/data/aidef_action_vtables.yml b/data/aidef_action_vtables.yml index b60b6624..dc13aeea 100644 --- a/data/aidef_action_vtables.yml +++ b/data/aidef_action_vtables.yml @@ -1760,7 +1760,7 @@ 0x71025129f0: Action 0x7102513278: Ai -0x7102362f08: AirOctaFloatBase +0x7102362f08: AirOctaMoveBase 0x71024e8fa0: AnimalMoveGuidedBase 0x7102372a28: MoveToTargetCurveBase 0x71023c4f00: TargetCircle @@ -1768,7 +1768,7 @@ 0x710239b910: HorseRide 0x710239c4e8: HorseRideCommandBase 0x710239bdf8: HorseRideCommand -0x710239c858: HorseRideMoveCommand +0x710239c858: HorseRideSetGearCommand 0x71024e9910: HorseSwim 0x71023a2a18: LevelFlyMoveBase 0x7102372548: KokkoCreateDropBase @@ -1781,9 +1781,9 @@ 0x71023a61c8: MultiVacuumRotScaleTimeByDistWithTgtBase 0x71023a8160: NPCAnchorWait 0x71023c4a78: TackleMove -0x71023c4930: AtkTackleMove +0x71023c4930: TackleAttack 0x71023af460: OpenMessageDialogBase -0x71023b1640: PriestBossWarpOrVanish +0x71023b1640: PriestBossCloneFastWarp 0x71023747e8: RailMoveBase 0x71023b2c78: RegistedActorActionBase 0x71023b2908: RegistedActorDeadCheckBase @@ -1791,8 +1791,8 @@ 0x71023b39a0: RemainsWaterBulletAction 0x71023b6ad0: SendMessage 0x71023b7188: SendMessageToTargetActor -0x71023b8298: SetGetFlagBase -0x71023bc748: SiteBossLswordAtk +0x71023b8298: SetFlag +0x71023bc748: SiteBossLswordAttack 0x71023a2330: SiteBossSwordWhirlSlashChargeBase 0x71023bf3a0: SlippedCircleWalkBase 0x71023bf5d8: SlippedWalkBase @@ -1801,28 +1801,28 @@ 0x71023c2510: SwarmDamagedBase 0x71023c2f88: SwimEnemyAnmBackBlownOffBase 0x71023c4ba8: TakeoffFromCeilLook -0x71023c1780: WaitOnObjBase +0x71023c1780: StopOnObj 0x71023746b0: WarpPlayerBase 0x71024e3570: AreaActorObserve 0x71024e3038: AreaTagAction 0x7102367500: ActorAreaInOutSendMessage -0x71023cb148: WaterUpDownMoveBase +0x71023cb148: WaterDepthMoveBase 0x71023cc750: WillBallAction 0x71024e3ac8: AreaFireObserveBase -0x71023683d0: RotateTurnToTarget +0x71023683d0: ASPlayRotateTurnToTarget 0x710239fa98: JumpTo 0x71023c3408: SwimMoveBase 0x71023c3af0: SwimTurnBase 0x71023c3748: SwimRotateBase 0x71023cb8e8: WaterFloatImmobile -0x710236aa60: OctarockBalloonBase +0x710236aa60: BalloonRopeBase 0x710236a930: BalloonBase -0x710236af68: BasicSignalEnemy +0x710236af68: BasicSignalEnemyNotice 0x7102395570: GiantBattleCloseAction 0x710236bf18: BattleCloseMoveAction -0x710236c068: BattleCloseSlippedWalkBase -0x7102369528: BattleCloseAction -0x71023693d8: BattleCloseActionWithAcc +0x710236c068: BattleCloseSlippedMoveBase +0x7102369528: AvoidingCloseMoveBase +0x71023693d8: AvoidingCloseMoveActionWithAcc 0x7102369270: BattleCloseMoveActionBase 0x710236b9f0: BattleCloseLevelFlyMoveBase 0x710239d570: HoverBase @@ -1830,7 +1830,7 @@ 0x710236c708: BattleLevelFlyMoveBase 0x71023836f0: FlyMoveBase 0x71024e0588: BindAction -0x71023a1568: SiteBossBlowOff +0x71023a1568: LastBossBlowOff 0x71023b2020: Ragdoll 0x7102453130: CameraEventAnimFlowBase 0x7102452a30: CameraEventAnimBase @@ -1841,11 +1841,11 @@ 0x71024552c0: CameraEventPolarCoordPlayer 0x7102455ea0: CameraEventTalkManualCtrlBase 0x7102451f58: CameraAction -0x7102457878: CameraLockOnBase -0x710235bd70: FollowChallenge +0x7102457878: CameraTrackBase +0x710235bd70: AppearFollowChallenge 0x7102370548: ChangeSceneBase -0x7102370bc8: ChemicalAttackBall -0x7102378f58: ChemicalAttack +0x7102370bc8: ChemicalAttack +0x7102378f58: EmitAttackBase 0x710238fac0: ForkTimerBase 0x7102389ee0: ForkDynActorNoTargetSelfBase 0x710238ae10: ForkGanonBeastWeakPoint @@ -1884,7 +1884,7 @@ 0x7102395ba0: GiantEnemyWalkWithVibration 0x7102395f40: GiantNavMeshWalkWithVibration 0x71023a70a0: NavMeshAction -0x7102396b80: GolemThrowPartsToTargetBase +0x7102396b80: GolemThrowPartsBase 0x71023c79e0: TurnBase 0x710236cab8: NeckSpinBeam 0x71023a7980: NeckSpin @@ -1892,7 +1892,7 @@ 0x71023c75d0: LookAtObjectBase 0x710239dc38: OctarockReloadWigBase 0x710245ef40: PlayerGuidedMove -0x7102463620: PlayerGlide +0x7102463620: PlayerParashawlGlideBase 0x710236dae8: PlayerStoleOpenEx 0x710236d9b8: PlayerStoleOpenBase 0x71023b6e30: SendPlayerNoticeMessageBase @@ -1901,22 +1901,22 @@ 0x71023bf280: SlippedBackWalkBase 0x71023a00b8: SmallDamageBackwardBase 0x71023c61b0: ThrowWeapon -0x7102367920: ChargeAndShoot +0x7102367920: ArrowChargeAndShoot 0x7102379730: EnemyFortressChatTurnBase 0x7102379fa0: EnemyRigidBodyDieBase 0x710237cc38: EventFade 0x710237d818: EventHoverNullASPlayBase 0x7102380ab8: EventVariableFade -0x7102382f38: FlyingCharacterReaction +0x7102382f38: FlyingCharacterFreeFallBase 0x7102382df0: FlyingCharacterFreeFall 0x7102382420: FlyingCharacterDamageBase 0x7102386888: ForkASPlayBase 0x7102386bc8: ForkASTrgDelete 0x710238fd00: ForkEmitChmField 0x7102389a70: ForkEmitExpandField -0x7102389ca0: ForkASTrgEmitShockWave -0x7102387f08: SimpleMessageDialogCtrl +0x7102389ca0: ForkEmitShockWave +0x7102387f08: ForkBasicMessageDialogCtrl 0x710239ae40: AnimalFollowBase 0x710238d608: ForkNoWeaponAttackBase 0x7102390520: ForkWeaponAttackBase diff --git a/data/aidef_ai_params.yml b/data/aidef_ai_params.yml index 7660c6c5..15a2a8e6 100644 --- a/data/aidef_ai_params.yml +++ b/data/aidef_ai_params.yml @@ -43,7 +43,7 @@ AddSwarmMove: - {type: static_param, param_type: const bool*, param_name: IsEndBySensor, param_offset: 0x58} - {type: static_param, param_type: 'sead::SafeString', param_name: AnimName, param_offset: 0x60} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x70} -AddViewTargetPosBase: [] +AddViewTarget: [] AddViewTargetPos: - {type: call, fn: _ZN5uking2ai20AddViewTargetPosBase11loadParams_Ev, addr: 0x71002f9d24} SeqTwoAction: @@ -137,7 +137,7 @@ AnchorRangeSelectTwoAction: - {type: static_param, param_type: const float*, param_name: FarDist, param_offset: 0x70} - {type: static_param, param_type: 'sead::SafeString', param_name: AnchorName, param_offset: 0x78} SimpleLiftable: [] -AncientNecklaceBallBase: +PlayASSwitch: - {type: static_param, param_type: const bool*, param_name: IsIgnoreSameOnAS, param_offset: 0xc8} - {type: static_param, param_type: const bool*, param_name: IsIgnoreSameOffAS, param_offset: 0xd0} - {type: static_param, param_type: 'sead::SafeString', param_name: OnAS, param_offset: 0xd8} @@ -169,7 +169,7 @@ AnimalBattleAggressive: AnimalBattleMoveLeave: - {type: static_param, param_type: const float*, param_name: CheckForwardDist, param_offset: 0x38} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x40} -AnimalRoamBase: +AnimalRndMove: - {type: static_param, param_type: const float*, param_name: SearchNextPathRadius, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: RadiusLimit, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: ForwardDirDistCoefficient, param_offset: 0x48} @@ -271,18 +271,18 @@ TimelineAI: AnimalTimelineAI: - {type: call, fn: _ZN5uking2ai10TimelineAI11loadParams_Ev, addr: 0x7100e1c440} - {type: aitree_variable, param_type: 'sead::SafeString*', param_name: DomesticAnimalRailName, param_offset: 0x40} -AppearNearTarget: +AppearFromTarget: - {type: static_param, param_type: const float*, param_name: Dist, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: TeraDist, param_offset: 0x40} - {type: map_unit_param, param_type: const int*, param_name: NearCreateAppearID, param_offset: 0x48} - {type: aitree_variable, param_type: bool*, param_name: IsStopFallCheck, param_offset: 0x50} AppearFromTargetFrontAfterChase: -- {type: call, fn: _ZN5uking2ai16AppearNearTarget11loadParams_Ev, addr: 0x710030e73c} +- {type: call, fn: _ZN5uking2ai16AppearFromTarget11loadParams_Ev, addr: 0x710030e73c} - {type: static_param, param_type: const float*, param_name: AppearDist, param_offset: 0x90} AppearFromTargetFrontGround: -- {type: call, fn: _ZN5uking2ai16AppearNearTarget11loadParams_Ev, addr: 0x710030e73c} +- {type: call, fn: _ZN5uking2ai16AppearFromTarget11loadParams_Ev, addr: 0x710030e73c} AppearNearTargetOutOfScrnGnd: -- {type: call, fn: _ZN5uking2ai16AppearNearTarget11loadParams_Ev, addr: 0x710030e73c} +- {type: call, fn: _ZN5uking2ai16AppearFromTarget11loadParams_Ev, addr: 0x710030e73c} ArmorSearchKorokRoot: - {type: static_param, param_type: const float*, param_name: SearchKorokDis, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: SearchRefreshFrame, param_offset: 0x40} @@ -403,7 +403,7 @@ AssassinCallSelect: - {type: call, fn: _ZN5uking2ai17EnemyCalledAppear11loadParams_Ev, addr: 0x710038306c} - {type: static_param, param_type: 'sead::SafeString', param_name: ChangeDemoName, param_offset: 0x38} - {type: static_param, param_type: 'sead::SafeString', param_name: ChangeDemoEPName, param_offset: 0x48} -AssassinFieldShooterBattleBase: +AssassinShooterBattle: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} - {type: static_param, param_type: const int*, param_name: TiredTime, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: WarpDistNear, param_offset: 0x48} @@ -412,7 +412,7 @@ AssassinFieldShooterBattleBase: - {type: static_param, param_type: const float*, param_name: TiredGrHeight, param_offset: 0x60} - {type: static_param, param_type: const float*, param_name: IntervalIntensity, param_offset: 0x68} AssassinFieldShooterBattle: -- {type: call, fn: _ZN5uking2ai30AssassinFieldShooterBattleBase11loadParams_Ev, addr: 0x710032267c} +- {type: call, fn: _ZN5uking2ai21AssassinShooterBattle11loadParams_Ev, addr: 0x710032267c} EnemyNormal: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x70} - {type: static_param, param_type: const int*, param_name: SoundLostTimer, param_offset: 0x78} @@ -443,7 +443,7 @@ LandHumEnemyNormal: - {type: static_param, param_type: const float*, param_name: ExplosivesSearchDist, param_offset: 0x3d8} - {type: static_param, param_type: const float*, param_name: ExplosivesSearchSpeed, param_offset: 0x3e0} - {type: static_param, param_type: const float*, param_name: ExplosivesSearchAng, param_offset: 0x3e8} -AssassinNormal: +GuardHomePosNormal: - {type: call, fn: _ZN5uking2ai18LandHumEnemyNormal11loadParams_Ev, addr: 0x7100462d90} AssassinMiddleAzitoRoot: - {type: call, fn: _ZN5uking2ai14AssassinNormal11loadParams_Ev, addr: 0x710040ce80} @@ -472,7 +472,7 @@ AssassinMiddleDlcGrabAdapter: - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x40} TargetInAreaSelect: - {type: static_param, param_type: const int*, param_name: Option, param_offset: 0x38} -AssassinMagicTgtSelect: +TargetHeightAreaSelect: - {type: call, fn: _ZN5uking2ai18TargetInAreaSelect11loadParams_Ev, addr: 0x71005bfe60} - {type: static_param, param_type: const float*, param_name: Height, param_offset: 0x40} AssassinMiddleMagicAfter: @@ -529,11 +529,11 @@ BarrelBomb: - {type: map_unit_param, param_type: const bool*, param_name: IsFixedPlace, param_offset: 0xc8} BasicStatusRoot: [] BattleBgmRequestFinishTag: [] -BeamExplodeBase: +SimpleBeamExplode: - {type: static_param, param_type: const float*, param_name: MaxDistance, param_offset: 0x38} - {type: static_param, param_type: const bool*, param_name: IsDelete, param_offset: 0x40} BeamExplode: -- {type: call, fn: _ZN5uking2ai15BeamExplodeBase11loadParams_Ev, addr: 0x710056cae0} +- {type: call, fn: _ZN5uking2ai17SimpleBeamExplode11loadParams_Ev, addr: 0x710056cae0} BeamExplodeEitherHit: - {type: call, fn: _ZN5uking2ai11BeamExplode11loadParams_Ev, addr: 0x7100328d08} - {type: aitree_variable, param_type: bool*, param_name: IsReflectThrownBullet, param_offset: 0x58} @@ -818,7 +818,7 @@ ChildDeviceReflectArrow: - {type: static_param, param_type: const int*, param_name: ReflectCountMax, param_offset: 0x140} - {type: static_param, param_type: const float*, param_name: ReflectAimSpeed, param_offset: 0x148} - {type: static_param, param_type: const float*, param_name: ReflectAccel, param_offset: 0x150} -ChildFavoriteSelectorBase: +ChildSelector: - {type: static_param, param_type: const bool*, param_name: IsNoChildForceEnd, param_offset: 0x38} - {type: static_param, param_type: const bool*, param_name: IsCheckEveryFrame, param_offset: 0x40} ChildFavoriteSelector: @@ -1097,7 +1097,7 @@ DoorRoot: - {type: aitree_variable, param_type: bool*, param_name: IsOpenToInside, param_offset: 0xa0} DoubtItemSubTargetSelect: [] DragonDropItemTargetRootAI: [] -DragonRootBase: [] +ControlRailRoot: [] DragonRoot: - {type: call, fn: _ZN5uking2ai14DragonRootBase11loadParams_Ev, addr: 0x710035714c} - {type: static_param, param_type: const int*, param_name: ChemicalBulletRate, param_offset: 0xc0} @@ -1236,7 +1236,7 @@ DungeonRotateTag3D: DungeonRotateTag4ElecApp: - {type: map_unit_param, param_type: const int*, param_name: CtrlDgnRemainsElectricBodyPart, param_offset: 0x38} - {type: map_unit_param, param_type: const float*, param_name: InitDgnRotRad, param_offset: 0x40} -WholeDungeonRotateTag: +DungeonRotateTagApp: - {type: map_unit_param, param_type: const float*, param_name: TiltAngle, param_offset: 0x38} DungeonRotateTag4FireApp: - {type: call, fn: _ZN5uking2ai21WholeDungeonRotateTag11loadParams_Ev, addr: 0x71003797ac} @@ -1312,7 +1312,7 @@ EnemyChaseShield: - {type: static_param, param_type: const int*, param_name: EquipItemSearchIdx, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: TurnAng, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: ShieldReachDist, param_offset: 0x50} -UnarmedEnemySearch: +NavMove: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: ReachTargetArea, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: TurnStartAng, param_offset: 0x48} @@ -1323,13 +1323,13 @@ EnemyChaseTargetAndAction: - {type: static_param, param_type: const float*, param_name: LostSpeed, param_offset: 0x78} - {type: static_param, param_type: const float*, param_name: LostAng, param_offset: 0x80} - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x88} -EnemyChemTargetActionBase: +EnemyTargetAction: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: ActionDist, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: ActionDir, param_offset: 0x48} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x50} EnemyChemTargetAction: -- {type: call, fn: _ZN5uking2ai25EnemyChemTargetActionBase11loadParams_Ev, addr: 0x71003c0010} +- {type: call, fn: _ZN5uking2ai17EnemyTargetAction11loadParams_Ev, addr: 0x71003c0010} - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x58} EnemyChemicalPowerSelect: [] EnemyChemicalSelect: @@ -1418,9 +1418,9 @@ EnemyHideGrass: - {type: static_param, param_type: const float*, param_name: HearingRatio, param_offset: 0x40} EnemyHideShootingBattle: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x38} -NonPlayerHorseRide: [] +RideHorseNonPlayer: [] EnemyHorseRide: -- {type: call, fn: _ZN5uking2ai18NonPlayerHorseRide11loadParams_Ev, addr: 0x7100e605d8} +- {type: call, fn: _ZN5uking2ai18RideHorseNonPlayer11loadParams_Ev, addr: 0x7100e605d8} - {type: static_param, param_type: const int*, param_name: UpperBodyASSlot, param_offset: 0xe0} - {type: static_param, param_type: const int*, param_name: LowerBodyASSlot, param_offset: 0xe8} EnemyLifeSelect: @@ -1692,7 +1692,7 @@ EquipConditionSelect: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} EquipHaveSelector: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} -UnarmedEnemySearchWeapon: +EnemySearch: - {type: call, fn: _ZN5uking2ai18UnarmedEnemySearch11loadParams_Ev, addr: 0x71004b64a0} - {type: static_param, param_type: const int*, param_name: EquipItemSearchIdx, param_offset: 0x6b8} - {type: static_param, param_type: const int*, param_name: RepathTime, param_offset: 0x6c0} @@ -1701,7 +1701,7 @@ UnarmedEnemySearchWeapon: - {type: static_param, param_type: const bool*, param_name: IsUseSight, param_offset: 0x6d8} - {type: static_param, param_type: const float*, param_name: LineReachableWeaponDist, param_offset: 0x6e0} EquipShieldEnemySearchWeapon: -- {type: call, fn: _ZN5uking2ai24UnarmedEnemySearchWeapon11loadParams_Ev, addr: 0x71003b777c} +- {type: call, fn: _ZN5uking2ai11EnemySearch11loadParams_Ev, addr: 0x71003b777c} EquipStand: - {type: static_param, param_type: 'sead::SafeString', param_name: DisplayAttKey, param_offset: 0x78} - {type: static_param, param_type: 'sead::SafeString', param_name: TakeOutAttKey, param_offset: 0x88} @@ -1749,7 +1749,7 @@ FishGoToAndNibble: - {type: static_param, param_type: const float*, param_name: DepthGiveUp, param_offset: 0x58} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x60} - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TargetActor, param_offset: 0x68} -SimpleWildlifeRoot: +CapturedActorRoot: - {type: static_param, param_type: const int*, param_name: InvalidTgtTimerVal, param_offset: 0x68} - {type: static_param, param_type: const int*, param_name: InvalidEscapeTimerVal, param_offset: 0x70} - {type: static_param, param_type: const bool*, param_name: IsDeleteWhenDead, param_offset: 0x78} @@ -1804,7 +1804,7 @@ FlyMoveToTarget: - {type: static_param, param_type: const float*, param_name: OutDist, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: OffsetHeight, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -FlyingEnemyKeepMove: +FlyingEnemyDistanceKeepMove: - {type: static_param, param_type: const float*, param_name: LostDistance, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: AngleRange, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: SpaceDistance, param_offset: 0x48} @@ -1842,10 +1842,10 @@ ForestGiantClosestAttackSelect: - {type: static_param, param_type: const int*, param_name: HipDropRate, param_offset: 0x38} - {type: static_param, param_type: const int*, param_name: HipDropRateFar, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: FarDist, param_offset: 0x48} -LargeEnemyFindPlayer: +GiantEnemyFindPlayer: - {type: call, fn: _ZN5uking2ai19EnemyBaseFindPlayer11loadParams_Ev, addr: 0x71003815ac} ForestGiantFindPlayer: -- {type: call, fn: _ZN5uking2ai20LargeEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30} +- {type: call, fn: _ZN5uking2ai20GiantEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30} ForestGiantNormal: - {type: call, fn: _ZN5uking2ai11EnemyNormal11loadParams_Ev, addr: 0x71003a3e2c} - {type: static_param, param_type: const float*, param_name: SleepingHearAwnRatio, param_offset: 0x3d0} @@ -2121,12 +2121,12 @@ GiantNavMoveWithFirstAction: - {type: call, fn: _ZN5uking2ai18GiantNavMoveTarget11loadParams_Ev, addr: 0x71003f8fb4} GiantRoamSelect: - {type: map_unit_param, param_type: const int*, param_name: GiantRoamType, param_offset: 0x38} -SpecialEnemySleep: +SleepNormal: - {type: static_param, param_type: const float*, param_name: AwakeDelayTime, param_offset: 0x38} - {type: static_param, param_type: const bool*, param_name: IsAwakenByHearing, param_offset: 0x40} - {type: static_param, param_type: const bool*, param_name: IsWaitAfterAwaken, param_offset: 0x48} GiantSleepNormal: -- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c} +- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c} - {type: static_param, param_type: const float*, param_name: ForceAwakeDist, param_offset: 0x60} - {type: static_param, param_type: 'sead::SafeString', param_name: AwakeRbName, param_offset: 0x68} GiantSleepReaction: [] @@ -2145,7 +2145,7 @@ GolemClimbedTimeSelect: - {type: static_param, param_type: const int*, param_name: LimitTime, param_offset: 0x38} - {type: aitree_variable, param_type: float*, param_name: GolemClimbedTime, param_offset: 0x40} GolemFindPlayer: -- {type: call, fn: _ZN5uking2ai20LargeEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30} +- {type: call, fn: _ZN5uking2ai20GiantEnemyFindPlayer11loadParams_Ev, addr: 0x71003f6a30} - {type: static_param, param_type: const float*, param_name: SearchExplosiveDist, param_offset: 0x140} GolemFireREnemyBattle: - {type: call, fn: _ZN5uking2ai11EnemyBattle11loadParams_Ev, addr: 0x71003827ec} @@ -2227,7 +2227,7 @@ GolemRoot: - {type: map_unit_param, param_type: 'sead::SafeString', param_name: GolemWeakPointActor, param_offset: 0x348} - {type: aitree_variable, param_type: float*, param_name: GolemClimbedTime, param_offset: 0x358} GolemSleepNormal: -- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c} +- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c} - {type: aitree_variable, param_type: void*, param_name: GolemChemicalController, param_offset: 0x60} GolemSleepTypeSelect: - {type: map_unit_param, param_type: 'sead::SafeString', param_name: GolemSleepType, param_offset: 0x38} @@ -2236,7 +2236,7 @@ GolfBallRoot: - {type: static_param, param_type: const int*, param_name: IntSmashContinueFrame, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: FloatJudgeSmash, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: FloatJudgeStop, param_offset: 0x50} -GoronCannonBase: +BigCannon: - {type: static_param, param_type: const float*, param_name: RotRadAccel, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: RotBrake, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: ShotCannonBallScale, param_offset: 0x48} @@ -2283,7 +2283,7 @@ GuardianBattleBeamAttack: - {type: call, fn: _ZN5uking2ai10GuardianAI11loadParams_Ev, addr: 0x710040da68} GuardianBeam: - {type: static_param, param_type: const float*, param_name: MaxDistance, param_offset: 0x38} -GuardianBeamAttackBase: [] +GuardianCommonBeamAttack: [] GuardianBeamAttack: - {type: call, fn: _ZN5uking2ai22GuardianBeamAttackBase11loadParams_Ev, addr: 0x7100411ddc} - {type: static_param, param_type: const float*, param_name: LightRadius, param_offset: 0x80} @@ -2291,7 +2291,7 @@ GuardianBeamAttack: - {type: static_param, param_type: const float*, param_name: LightLengthOffset, param_offset: 0x90} - {type: static_param, param_type: const float*, param_name: EarSpeed, param_offset: 0x98} - {type: static_param, param_type: const bool*, param_name: AdjustRadius, param_offset: 0xa0} -RailMove: +BezierRailMove: - {type: static_param, param_type: const bool*, param_name: IsIgnoreNoWaitStopPoint, param_offset: 0x38} RailMoveWithClose: - {type: call, fn: _ZN5uking2ai8RailMove11loadParams_Ev, addr: 0x710032c528} @@ -2340,8 +2340,8 @@ GuardianMiniBattleStateSelect: - {type: static_param, param_type: const float*, param_name: FinalLifeRatio, param_offset: 0x40} - {type: static_param, param_type: const bool*, param_name: IsEnterOnly, param_offset: 0x48} GuardianMiniBeam: -- {type: call, fn: _ZN5uking2ai15BeamExplodeBase11loadParams_Ev, addr: 0x710056cae0} -MiniBeamAttack: +- {type: call, fn: _ZN5uking2ai17SimpleBeamExplode11loadParams_Ev, addr: 0x710056cae0} +GuideBeamAttackEnemyBattle: - {type: call, fn: _ZN5uking2ai23BreathAttackEnemyBattle11loadParams_Ev, addr: 0x710033f664} - {type: static_param, param_type: const float*, param_name: FluctuationRange, param_offset: 0xb0} - {type: static_param, param_type: const float*, param_name: FluctuationSpan, param_offset: 0xb8} @@ -2538,13 +2538,13 @@ HomePosDistanceSelector: Horse: - {type: static_param, param_type: const float*, param_name: DistanceFall, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: DistanceFallDie, param_offset: 0x40} -HorseCheckLineOfSightSelectorBase: +CheckLineOfSightSelector: - {type: static_param, param_type: const int*, param_name: DirectionNum, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: DirectionAngle, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: Distance, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: RadiusScale, param_offset: 0x50} HorseCheckLineOfSightSelector: -- {type: call, fn: _ZN5uking2ai33HorseCheckLineOfSightSelectorBase11loadParams_Ev, addr: 0x7100346d88} +- {type: call, fn: _ZN5uking2ai24CheckLineOfSightSelector11loadParams_Ev, addr: 0x7100346d88} HorseDamageTypeSelect: [] HorseEscapeRouteRailAI: - {type: static_param, param_type: const int*, param_name: Count, param_offset: 0x38} @@ -3164,7 +3164,7 @@ LynelThreeBreathAttack: LynelWarp: [] MagneGearRoot: [] MagneGrabSelect: [] -RangeSelect: +NewRangeSelect: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: FarDist, param_offset: 0x40} - {type: static_param, param_type: const bool*, param_name: IsSelectEveryFrame, param_offset: 0x48} @@ -3244,7 +3244,7 @@ MetalObjectBuried: - {type: map_unit_param, param_type: const bool*, param_name: EnableRevival, param_offset: 0x68} MetalObjectFixed: - {type: map_unit_param, param_type: const bool*, param_name: IsFixedPlace, param_offset: 0x38} -MimicCliffStopEnemyNormalBase: +CliffStopEnemyNormal: - {type: static_param, param_type: const int*, param_name: NoticeSoundTime, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: OffsetHand, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: OffsetTail, param_offset: 0x48} @@ -3253,7 +3253,7 @@ MimicCliffStopEnemyNormalBase: - {type: aitree_variable, param_type: bool*, param_name: IsStartResetMimicry, param_offset: 0x60} - {type: aitree_variable, param_type: bool*, param_name: IsCliffFreeze, param_offset: 0x68} MimicCliffStopEnemyNormal: -- {type: call, fn: _ZN5uking2ai29MimicCliffStopEnemyNormalBase11loadParams_Ev, addr: 0x7100352f8c} +- {type: call, fn: _ZN5uking2ai20CliffStopEnemyNormal11loadParams_Ev, addr: 0x7100352f8c} - {type: static_param, param_type: const float*, param_name: JumpDistXZ, param_offset: 0x1e0} MimicEnemyFindPlayer: - {type: call, fn: _ZN5uking2ai19EnemyBaseFindPlayer11loadParams_Ev, addr: 0x71003815ac} @@ -3282,7 +3282,7 @@ MiniGolemRoot: - {type: static_param, param_type: const int*, param_name: LiftDeadTime, param_offset: 0x318} - {type: aitree_variable, param_type: bool*, param_name: IsAllowReactionLift, param_offset: 0x310} MiniGolemSleep: -- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c} +- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c} - {type: aitree_variable, param_type: void*, param_name: GolemChemicalController, param_offset: 0x60} MoonAI: [] MoonNameTag: @@ -3313,7 +3313,7 @@ MoriblinUnarmedBattle: - {type: static_param, param_type: const float*, param_name: AttackStartRotate, param_offset: 0x60} - {type: static_param, param_type: const int*, param_name: PursuingAttackInterval, param_offset: 0x70} - {type: static_param, param_type: const float*, param_name: PursuingAttackStartAng, param_offset: 0x78} -MotorcycleRootBase: [] +HorseRiddenStatusSelector: [] MotorcycleRoot: - {type: call, fn: _ZN5uking2ai18MotorcycleRootBase11loadParams_Ev, addr: 0x710043ec84} - {type: static_param, param_type: const float*, param_name: InWaterRateForDisappear, param_offset: 0x38} @@ -3517,7 +3517,7 @@ NPCTerrorAI: - {type: dynamic_param, param_type: 'ksys::act::BaseProcLink*', param_name: TerrorEmitter, param_offset: 0x78} NPCTimeline: - {type: call, fn: _ZN5uking2ai10TimelineAI11loadParams_Ev, addr: 0x7100e1c440} -NPCTravelBase: [] +NPCScheduleMove: [] NPCTravel: - {type: call, fn: _ZN5uking2ai13NPCTravelBase11loadParams_Ev, addr: 0x71004df788} - {type: static_param, param_type: const float*, param_name: WaitHorseReturnDist, param_offset: 0x78} @@ -3596,7 +3596,7 @@ OctarockBattle: - {type: static_param, param_type: const bool*, param_name: IsLostAttack, param_offset: 0xf0} - {type: static_param, param_type: 'sead::SafeString', param_name: ShootActorKey, param_offset: 0xf8} - {type: static_param, param_type: 'sead::SafeString', param_name: VacuumPartsKey, param_offset: 0x108} -OctarockEscape: +OctarockHideEscapeBase: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x38} OctarockHideEscape: - {type: call, fn: _ZN5uking2ai14OctarockEscape11loadParams_Ev, addr: 0x71004ec950} @@ -3608,7 +3608,7 @@ OctarockReaction: - {type: call, fn: _ZN5uking2ai20EnemyDefaultReaction11loadParams_Ev, addr: 0x7100388294} - {type: static_param, param_type: const bool*, param_name: IsWigBreackByGust, param_offset: 0x68} - {type: aitree_variable, param_type: void*, param_name: OctarockFormChangeUnit, param_offset: 0x70} -OctarockRootBase: +VacuumEnemyRoot: - {type: call, fn: _ZN5uking2ai9EnemyRoot11loadParams_Ev, addr: 0x71003b6090} OctarockRoot: - {type: call, fn: _ZN5uking2ai16OctarockRootBase11loadParams_Ev, addr: 0x71005e3400} @@ -3672,7 +3672,7 @@ OnCliffViewWait: OnEnterEventModeSelect: [] OnNavFaceSelect: [] OnRagdollSelect: [] -OneMemoryMagicBattleBase: +MagicBattle: - {type: call, fn: _ZN5uking2ai11EnemyBattle11loadParams_Ev, addr: 0x71003827ec} - {type: static_param, param_type: const int*, param_name: EnlargeTime, param_offset: 0x90} - {type: static_param, param_type: const float*, param_name: AttackRatio, param_offset: 0xa8} @@ -3681,7 +3681,7 @@ OneMemoryMagicBattleBase: - {type: static_param, param_type: const int*, param_name: MagicPer, param_offset: 0x98} - {type: static_param, param_type: const int*, param_name: AttackPowDirect, param_offset: 0xa0} OneMemoryMagicBattle: -- {type: call, fn: _ZN5uking2ai24OneMemoryMagicBattleBase11loadParams_Ev, addr: 0x710049d940} +- {type: call, fn: _ZN5uking2ai11MagicBattle11loadParams_Ev, addr: 0x710049d940} - {type: static_param, param_type: 'sead::SafeString', param_name: MemoryPartsName, param_offset: 0xe0} OptionalWeaponAI: [] OutOfScreen: @@ -3850,7 +3850,7 @@ PreyLookAtTarget: PreyReaction: [] PreyStun: - {type: static_param, param_type: const int*, param_name: StunTime, param_offset: 0x38} -PriestBossMode: +PriestBoss: - {type: aitree_variable, param_type: void*, param_name: PriestBossMetaAIUnit, param_offset: 0x38} PriestBossActorRoot: - {type: call, fn: _ZN5uking2ai14PriestBossMode11loadParams_Ev, addr: 0x7100505e7c} @@ -4277,18 +4277,18 @@ ReflectableEscape: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x50} ReflectableIgnitedThrown: - {type: call, fn: _ZN5uking2ai17ReflectableThrown11loadParams_Ev, addr: 0x710053dda4} -RegistedActorNumTwoSelectBase: +RegistedActor: - {type: aitree_variable, param_type: void*, param_name: RegistedActorUnit, param_offset: 0x38} RegistedActorNumTwoSelect: - {type: call, fn: _ZN5uking2ai29RegistedActorNumTwoSelectBase11loadParams_Ev, addr: 0x710053e124} - {type: static_param, param_type: const int*, param_name: Num, param_offset: 0x40} RemainElectricCannonBeamAttack: [] -RemainElectricCannonRootBase: +LargeCannonRoot: - {type: static_param, param_type: const float*, param_name: SearchMaxDist, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: SearchMinDist, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: SearchDistMargin, param_offset: 0x48} RemainElectricCannonRoot: -- {type: call, fn: _ZN5uking2ai28RemainElectricCannonRootBase11loadParams_Ev, addr: 0x71004743b4} +- {type: call, fn: _ZN5uking2ai15LargeCannonRoot11loadParams_Ev, addr: 0x71004743b4} - {type: static_param, param_type: const float*, param_name: SearchMaxDistLoiter, param_offset: 0x60} RemainsElectricBGCamera: - {type: call, fn: _ZN5uking2ai23RailMoveRemainsBGCamera11loadParams_Ev, addr: 0x7100536b3c} @@ -4444,7 +4444,7 @@ SandwormLost: - {type: static_param, param_type: const float*, param_name: DiveSandOffset, param_offset: 0x60} SandwormNavSearchWait: - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x38} -SandwormNormalBase: +AwnSeal: - {type: call, fn: _ZN5uking2ai11EnemyNormal11loadParams_Ev, addr: 0x71003a3e2c} - {type: static_param, param_type: const bool*, param_name: SealedSight, param_offset: 0x3d0} - {type: static_param, param_type: const bool*, param_name: SealedHearing, param_offset: 0x3d8} @@ -4546,7 +4546,7 @@ SeqTrgPartsNotice: - {type: call, fn: _ZN5uking2ai12SeqTwoAction11loadParams_Ev, addr: 0x710056706c} - {type: static_param, param_type: 'sead::SafeString', param_name: PartsName, param_offset: 0x58} - {type: static_param, param_type: const bool*, param_name: IsFinishByNoNoticeActionEnd, param_offset: 0x50} -SeqTwoLineReachableTargetActionBase: +SeqTwoLineReachableTarget: - {type: static_param, param_type: const int*, param_name: ReachableCheckType1, param_offset: 0x38} - {type: static_param, param_type: const int*, param_name: ReachableCheckType2, param_offset: 0x40} SeqTwoLineReachableTargetAction: @@ -4652,7 +4652,7 @@ SiteBossArrowRainAttack: - {type: call, fn: _ZN5uking2ai24SiteBossReflectArrowRoot11loadParams_Ev, addr: 0x71005829f0} SiteBossAttackRoot: - {type: static_param, param_type: const int*, param_name: EquipWeapon, param_offset: 0x38} -SiteBossChemicalProjectile: +GanonFlameBall: - {type: static_param, param_type: const float*, param_name: ExplosionTime, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: ChaseAngleLimit, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: ReflectSpeedRate, param_offset: 0x48} @@ -4782,14 +4782,14 @@ SiteBossPierceBulletAttack: [] SiteBossReaction: - {type: call, fn: _ZN5uking2ai20EnemyDefaultReaction11loadParams_Ev, addr: 0x7100388294} - {type: static_param, param_type: const bool*, param_name: IsChangeEffectiveDamage, param_offset: 0x68} -SiteBossRecognizeRootBase: +LastBossRecognizeRoot: - {type: static_param, param_type: const int*, param_name: AttackNum, param_offset: 0x38} - {type: static_param, param_type: const int*, param_name: AttackRandNum, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: WarpStartDist, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: ForceWarpRetryDist, param_offset: 0x50} - {type: dynamic_param, param_type: bool*, param_name: IsAttackPatternFixed, param_offset: 0x58} SiteBossRecognizeRoot: -- {type: call, fn: _ZN5uking2ai25SiteBossRecognizeRootBase11loadParams_Ev, addr: 0x7100478ff8} +- {type: call, fn: _ZN5uking2ai21LastBossRecognizeRoot11loadParams_Ev, addr: 0x7100478ff8} - {type: static_param, param_type: const int*, param_name: IgnoreWaprDistMax, param_offset: 0x68} - {type: static_param, param_type: const bool*, param_name: IsCheckChildDevice, param_offset: 0x70} - {type: static_param, param_type: const bool*, param_name: IgnoreWarpDistRetFromDamage, param_offset: 0x78} @@ -4970,7 +4970,7 @@ StalEnemyRoot: - {type: aitree_variable, param_type: bool*, param_name: IsStopFallCheck, param_offset: 0xc0} - {type: aitree_variable, param_type: void*, param_name: StalEnemyUnit, param_offset: 0xc8} StalEnemySleep: -- {type: call, fn: _ZN5uking2ai17SpecialEnemySleep11loadParams_Ev, addr: 0x710059ad6c} +- {type: call, fn: _ZN5uking2ai11SleepNormal11loadParams_Ev, addr: 0x710059ad6c} - {type: static_param, param_type: const bool*, param_name: UseAwarenessWakeUp, param_offset: 0x60} - {type: static_param, param_type: const bool*, param_name: UseNoticeActiveWakeUp, param_offset: 0x68} StalGiantEnemyReaction: @@ -5072,13 +5072,13 @@ StoneBall_BRoot: - {type: static_param, param_type: const float*, param_name: DoubleBombImpulseAmplifyPower, param_offset: 0x48} StoneOctarockBattle: - {type: call, fn: _ZN5uking2ai19ShootingEnemyBattle11loadParams_Ev, addr: 0x7100569bd8} -GuardNearTarget: +InvincibleNearTargetBase: - {type: static_param, param_type: const int*, param_name: WeaponIdx, param_offset: 0x38} - {type: static_param, param_type: const float*, param_name: BaseDist, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: GuardStartDist, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: GuardEndDist, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -TimedGuardNearTarget: +InvincibleNearTarget: - {type: call, fn: _ZN5uking2ai15GuardNearTarget11loadParams_Ev, addr: 0x710044d110} - {type: static_param, param_type: const int*, param_name: GuardEndTime, param_offset: 0x88} - {type: static_param, param_type: const float*, param_name: GuardStartAngle, param_offset: 0x90} @@ -5194,7 +5194,7 @@ SwitchWheel: SwitchWindHit: - {type: call, fn: _ZN5uking2ai8SwitchAI11loadParams_Ev, addr: 0x71005b5e1c} - {type: static_param, param_type: const float*, param_name: WaitTime, param_offset: 0x38} -TargetPosAI: +TargetActorPos: - {type: static_param, param_type: const bool*, param_name: OnEnterOnly, param_offset: 0x38} TargetAbsolutePos: - {type: call, fn: _ZN5uking2ai11TargetPosAI11loadParams_Ev, addr: 0x71005bad1c} @@ -5207,7 +5207,7 @@ TargetDistanceSelect: TargetActorDistanceSelect: - {type: call, fn: _ZN5uking2ai20TargetDistanceSelect11loadParams_Ev, addr: 0x71005be408} TargetAngerSelect: [] -TargetAttackAttitudeTgtSelectBase: [] +TargetAttackAttitudeTgt: [] TargetAttackAttitudeTgtSelect: - {type: call, fn: _ZN5uking2ai33TargetAttackAttitudeTgtSelectBase11loadParams_Ev, addr: 0x71005bb700} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x48} @@ -5282,7 +5282,7 @@ TargetPosAnchorOffsetTarget: TargetPosDirLRSelect: - {type: static_param, param_type: const bool*, param_name: IsCheckEveryFrame, param_offset: 0x38} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x40} -TargetPosDynParamRot: +TargetPosDynParamRotFromMyPos: - {type: call, fn: _ZN5uking2ai11TargetPosAI11loadParams_Ev, addr: 0x71005bad1c} - {type: static_param, param_type: const float*, param_name: MinDist, param_offset: 0x40} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: Angle, param_offset: 0x48} @@ -5296,7 +5296,7 @@ TargetPosLostCheck: - {type: static_param, param_type: const float*, param_name: LostVMax, param_offset: 0x48} - {type: static_param, param_type: const float*, param_name: LostRange, param_offset: 0x50} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0x58} -TargetPosOffset: +OffsetTargetPos: - {type: call, fn: _ZN5uking2ai11TargetPosAI11loadParams_Ev, addr: 0x71005bad1c} - {type: static_param, param_type: const int*, param_name: Dir, param_offset: 0x40} - {type: static_param, param_type: const float*, param_name: Offset, param_offset: 0x48} @@ -5444,7 +5444,7 @@ UnarmedEnemyNoiseTarget: - {type: static_param, param_type: const float*, param_name: SearchWeaponTargetDist, param_offset: 0xb8} - {type: dynamic_param, param_type: 'sead::Vector3f*', param_name: TargetPos, param_offset: 0xc0} UnarmedWeaponEquipableEnemyAct: -- {type: call, fn: _ZN5uking2ai24UnarmedEnemySearchWeapon11loadParams_Ev, addr: 0x71003b777c} +- {type: call, fn: _ZN5uking2ai11EnemySearch11loadParams_Ev, addr: 0x71003b777c} UnderWaterDepthSelect: - {type: static_param, param_type: const float*, param_name: DeepDepth, param_offset: 0x38} - {type: static_param, param_type: const bool*, param_name: OnEnterOnly, param_offset: 0x40} diff --git a/data/aidef_ai_vtables.yml b/data/aidef_ai_vtables.yml index 76d7c47b..a6dedf50 100644 --- a/data/aidef_ai_vtables.yml +++ b/data/aidef_ai_vtables.yml @@ -1177,88 +1177,88 @@ 0x7102513278: Ai 0x71023d3390: AddCarriedBase -0x7102406420: OneMemoryMagicBattleBase -0x710240a5f8: RangeSelect +0x7102406420: MagicBattle +0x710240a5f8: NewRangeSelect 0x7102406b28: MagneShaftRootBase -0x71023df790: MimicCliffStopEnemyNormalBase -0x71023fb8a8: MotorcycleRootBase -0x710240c608: NPCTravelBase -0x710240d7b8: OctarockEscape +0x71023df790: CliffStopEnemyNormal +0x71023fb8a8: HorseRiddenStatusSelector +0x710240c608: NPCScheduleMove +0x710240d7b8: OctarockHideEscapeBase 0x7102411aa8: PriestBossActorRoot -0x7102410d20: PriestBossMode +0x7102410d20: PriestBoss 0x7102413228: PriestBossFormation -0x71023d58c0: AnimalRoamBase +0x71023d58c0: AnimalRndMove 0x7102412ae0: PriestBossEyeBeam 0x7102414fa8: PriestBossPhase 0x7102414948: PriestBossMeta 0x71024171d0: RandomSelectThreeActionBase 0x7102417458: RandomSelectTwoActionBase 0x7102418608: ReflectableThrown -0x7102418738: RegistedActorNumTwoSelectBase -0x7102401b28: RemainElectricCannonRootBase +0x7102418738: RegistedActor +0x7102401b28: LargeCannonRoot 0x71024195d0: RemainsRoot -0x710241e630: SeqTwoLineReachableTargetActionBase -0x71023f1ee8: SiteBossChemicalProjectile +0x710241e630: SeqTwoLineReachableTarget +0x71023f1ee8: GanonFlameBall 0x7102421d88: SiteBossRoot -0x7102402508: SiteBossRecognizeRootBase +0x7102402508: LastBossRecognizeRoot 0x71024e2758: TimelineAI -0x71023fdea0: TimedGuardNearTarget -0x71023fe008: GuardNearTarget +0x71023fdea0: InvincibleNearTarget +0x71023fe008: InvincibleNearTargetBase 0x7102427220: SwitchAI -0x71024286d8: TargetPosAI -0x710242b290: TargetPosDynParamRot -0x710240dfe8: TargetPosOffset -0x7102428928: TargetAttackAttitudeTgtSelectBase +0x71024286d8: TargetActorPos +0x710242b290: TargetPosDynParamRotFromMyPos +0x710240dfe8: OffsetTargetPos +0x7102428928: TargetAttackAttitudeTgt 0x710242c8f0: Towing -0x71023d5f40: AppearNearTarget +0x71023d5f40: AppearFromTarget 0x710242fab0: WaterSurfaceBase 0x7102430d68: WillBallFollowAttack -0x71023d3aa0: AddViewTargetPosBase -0x71023d8fb8: AssassinFieldShooterBattleBase -0x71023f6888: AssassinNormal +0x71023d3aa0: AddViewTarget +0x71023d8fb8: AssassinShooterBattle +0x71023f6888: GuardHomePosNormal 0x71023e8d58: EnemyNormal -0x71023d99c0: SandwormNormalBase -0x7102429738: AssassinMagicTgtSelect +0x71023d99c0: AwnSeal +0x7102429738: TargetHeightAreaSelect 0x7102429c18: TargetInAreaSelect -0x710241f608: BeamExplodeBase -0x71023f39d0: LargeEnemyFindPlayer -0x71023f9d88: MiniBeamAttack +0x710241f608: SimpleBeamExplode +0x71023f39d0: GiantEnemyFindPlayer +0x71023f9d88: GuideBeamAttackEnemyBattle 0x7102458950: CameraEventTalk 0x7102458428: CameraEvent 0x7102458020: CameraAI 0x71023f3770: GiantArmorRoot -0x71023ddff8: ChildFavoriteSelectorBase +0x71023ddff8: ChildSelector 0x71023dec48: CircleMoveInFluid 0x71023deb00: CircleMove 0x71023df8b0: CloseSmallAttackBase 0x71023e0578: CreateActor 0x71024dc0b0: ForkAI 0x71023e38c0: DragonRoot -0x71023e0180: DragonRootBase -0x71023e4e00: WholeDungeonRotateTag -0x71023eaf28: UnarmedEnemySearchWeapon -0x7102409ae0: UnarmedEnemySearch -0x71023ebb00: EnemyChemTargetActionBase +0x71023e0180: ControlRailRoot +0x71023e4e00: DungeonRotateTagApp +0x71023eaf28: EnemySearch +0x7102409ae0: NavMove +0x71023ebb00: EnemyTargetAction 0x71023d7cc0: AssassinBossRootBase 0x71023f54e8: GolemRootBase -0x710242de98: OctarockRootBase +0x710242de98: VacuumEnemyRoot 0x71023ea688: EnemyRecognizeTargetBase -0x71024eaa00: NonPlayerHorseRide +0x71024eaa00: RideHorseNonPlayer 0x71023e9788: EnemyNoticeSoundSensitive 0x71023ec5f8: EnemyVacuumBombSelectBase 0x71023e0a40: CreationNestOnTree 0x71023ed328: EscapeFromTargetFront -0x71023dcaa8: SimpleWildlifeRoot -0x71023ee798: FlyingEnemyKeepMove +0x71023dcaa8: CapturedActorRoot +0x71023ee798: FlyingEnemyDistanceKeepMove 0x71023eebc0: FlyingEnemySideKeepMove 0x7102417b78: RangeSelectAction -0x71024232c8: SpecialEnemySleep -0x71023daf50: GoronCannonBase +0x71024232c8: SleepNormal +0x71023daf50: BigCannon 0x71023f6af8: GuardianAI -0x71023f73c0: GuardianBeamAttackBase -0x71023dadf8: RailMove -0x71023dd248: HorseCheckLineOfSightSelectorBase -0x710240f2c8: AncientNecklaceBallBase +0x71023f73c0: GuardianCommonBeamAttack +0x71023dadf8: BezierRailMove +0x71023dd248: CheckLineOfSightSelector +0x710240f2c8: PlayASSwitch 0x7102518ba0: HorseLoopTarget 0x71024e84a8: HorseRiddenByNPCBase 0x71023fbda0: HorseRideChaseBattleMoveBase diff --git a/data/uking_functions.csv b/data/uking_functions.csv index 913929c7..fd4760b3 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -1352,12 +1352,12 @@ Address,Quality,Size,Name 0x000000710004d078,U,000060, 0x000000710004d0b4,U,000536,AI_ActionDragonFollowOrChallengeRing::ctor 0x000000710004d2cc,U,000684, -0x000000710004d578,W,000068,_ZN5uking6action15FollowChallengeD1Ev -0x000000710004d5bc,W,000076,_ZN5uking6action15FollowChallengeD0Ev -0x000000710004d608,W,000032,_ZN5uking6action15FollowChallenge5init_EPN4sead4HeapE -0x000000710004d628,W,000724,_ZN5uking6action15FollowChallenge6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710004d8fc,W,000080,_ZN5uking6action15FollowChallenge5calc_Ev -0x000000710004d94c,O,000004,_ZN5uking6action15FollowChallenge6leave_Ev +0x000000710004d578,W,000068,_ZN5uking6action21AppearFollowChallengeD1Ev +0x000000710004d5bc,W,000076,_ZN5uking6action21AppearFollowChallengeD0Ev +0x000000710004d608,W,000032,_ZN5uking6action21AppearFollowChallenge5init_EPN4sead4HeapE +0x000000710004d628,W,000724,_ZN5uking6action21AppearFollowChallenge6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710004d8fc,W,000080,_ZN5uking6action21AppearFollowChallenge5calc_Ev +0x000000710004d94c,O,000004,_ZN5uking6action21AppearFollowChallenge6leave_Ev 0x000000710004d950,U,000084, 0x000000710004d9a4,U,000088, 0x000000710004d9fc,U,001396, @@ -1365,15 +1365,15 @@ Address,Quality,Size,Name 0x000000710004dff4,U,000176, 0x000000710004e0a4,U,000100, 0x000000710004e108,U,000020, -0x000000710004e11c,U,000408,uking::action::FollowChallenge::m32 +0x000000710004e11c,U,000408,uking::action::AppearFollowChallenge::m32 0x000000710004e2b4,U,001184, 0x000000710004e754,U,003108, 0x000000710004f378,U,001324, 0x000000710004f8a4,U,000408, 0x000000710004fa3c,U,000008, -0x000000710004fa44,O,000100,_ZN5uking6action15FollowChallenge11loadParams_Ev -0x000000710004faa8,O,000288,_ZNK5uking6action15FollowChallenge27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710004fbc8,O,000092,_ZNK5uking6action15FollowChallenge18getRuntimeTypeInfoEv +0x000000710004fa44,O,000100,_ZN5uking6action21AppearFollowChallenge11loadParams_Ev +0x000000710004faa8,O,000288,_ZNK5uking6action21AppearFollowChallenge27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710004fbc8,O,000092,_ZNK5uking6action21AppearFollowChallenge18getRuntimeTypeInfoEv 0x000000710004fc24,O,000052,_ZN5uking6action17AppearNumHeroSealC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710004fc58,O,000020,_ZN5uking6action17AppearNumHeroSealD1Ev 0x000000710004fc6c,O,000052,_ZN5uking6action17AppearNumHeroSealD0Ev @@ -1460,7 +1460,7 @@ Address,Quality,Size,Name 0x0000007100053204,O,000092,_ZNK5uking6action18ChallengeChainRing18getRuntimeTypeInfoEv 0x0000007100053260,U,000060,uking::action::ChallengeChainRing::m35 0x000000710005329c,O,000372,_ZN5uking6action18ChallengeChainRing33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100053410,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15FollowChallengeEE9isDerivedEPKNS0_9InterfaceE +0x0000007100053410,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21AppearFollowChallengeEE9isDerivedEPKNS0_9InterfaceE 0x000000710005349c,O,000052,_ZN5uking6action23ChangeFreeMovingForDemoC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000534d0,O,000020,_ZN5uking6action23ChangeFreeMovingForDemoD1Ev 0x00000071000534e4,O,000052,_ZN5uking6action23ChangeFreeMovingForDemoD0Ev @@ -1561,7 +1561,7 @@ Address,Quality,Size,Name 0x0000007100057074,O,000092,_ZNK5uking6action25DgnObjDlcGondolaCreateTag18getRuntimeTypeInfoEv 0x00000071000570d0,U,000092, 0x000000710005712c,U,000004,nullsub_102 -0x0000007100057130,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai8RailMoveEE9isDerivedEPKNS0_9InterfaceE +0x0000007100057130,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14BezierRailMoveEE9isDerivedEPKNS0_9InterfaceE 0x00000071000571bc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN4ksys3act2ai2AiEE9isDerivedEPKNS0_9InterfaceE 0x0000007100057248,U,000072,AI_Action_DgnObjDLCSpurGearB01::ctor 0x0000007100057290,O,000004,_ZN5uking6action20DgnObjDLCSpurGearB01D1Ev @@ -1714,7 +1714,7 @@ Address,Quality,Size,Name 0x000000710005b350,O,000008,_ZNK5uking6action21FollowIgniteToBonePos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710005b358,O,000092,_ZNK5uking6action21FollowIgniteToBonePos18getRuntimeTypeInfoEv 0x000000710005b3b4,O,000372,_ZN5uking6action21FollowIgniteToBonePos33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710005b528,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18RotateTurnToTargetEE9isDerivedEPKNS0_9InterfaceE +0x000000710005b528,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action24ASPlayRotateTurnToTargetEE9isDerivedEPKNS0_9InterfaceE 0x000000710005b5b4,U,000064, 0x000000710005b5f4,U,000092, 0x000000710005b650,U,000008, @@ -2077,7 +2077,7 @@ Address,Quality,Size,Name 0x00000071000684a0,O,000008,_ZNK5uking6action27PriestBossShadowCloneVanish27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000684a8,O,000092,_ZNK5uking6action27PriestBossShadowCloneVanish18getRuntimeTypeInfoEv 0x0000007100068504,O,000372,_ZN5uking6action27PriestBossShadowCloneVanish33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100068678,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action22PriestBossWarpOrVanishEE9isDerivedEPKNS0_9InterfaceE +0x0000007100068678,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23PriestBossCloneFastWarpEE9isDerivedEPKNS0_9InterfaceE 0x0000007100068704,U,000084,AI_Action_PriestBossSideMove::ctor 0x0000007100068758,W,000020,_ZN5uking6action18PriestBossSideMoveD1Ev 0x000000710006876c,W,000052,_ZN5uking6action18PriestBossSideMoveD0Ev @@ -2523,7 +2523,7 @@ Address,Quality,Size,Name 0x0000007100083ea0,O,000288,_ZNK5uking6action11AdvanceTime27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100083fc0,O,000092,_ZNK5uking6action11AdvanceTime18getRuntimeTypeInfoEv 0x000000710008401c,U,000008,_ZNK5uking6action10ShootArrow12isChangeableEv -0x0000007100084024,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14ChargeAndShootEE9isDerivedEPKNS0_9InterfaceE +0x0000007100084024,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19ArrowChargeAndShootEE9isDerivedEPKNS0_9InterfaceE 0x00000071000840b0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action10ShootArrowEE9isDerivedEPKNS0_9InterfaceE 0x000000710008413c,O,000372,_ZN5uking6action10ShootArrow33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000842b0,U,000064,AI_Action_AirOctaFloat::ctor @@ -2542,7 +2542,7 @@ Address,Quality,Size,Name 0x00000071000850f0,O,000008,_ZNK5uking6action12AirOctaFloat27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000850f8,O,000092,_ZNK5uking6action12AirOctaFloat18getRuntimeTypeInfoEv 0x0000007100085154,O,000372,_ZN5uking6action12AirOctaFloat33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000852c8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16AirOctaFloatBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000852c8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15AirOctaMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100085354,U,000708,AI_Action_AirOctaMgr::ctor 0x0000007100085618,W,000264,_ZN5uking6action10AirOctaMgrD1Ev 0x0000007100085720,U,000064, @@ -2570,25 +2570,25 @@ Address,Quality,Size,Name 0x0000007100088014,U,000036, 0x0000007100088038,U,000192, 0x00000071000880f8,U,000136,AI_ActionAirOctaFloat::ctor -0x0000007100088180,W,000128,_ZN5uking6action16AirOctaFloatBaseD1Ev -0x0000007100088200,W,000136,_ZN5uking6action16AirOctaFloatBaseD0Ev -0x0000007100088288,O,000008,_ZN5uking6action16AirOctaFloatBase5init_EPN4sead4HeapE -0x0000007100088290,W,000212,_ZN5uking6action16AirOctaFloatBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100088364,W,000156,_ZN5uking6action16AirOctaFloatBase5calc_Ev +0x0000007100088180,W,000128,_ZN5uking6action15AirOctaMoveBaseD1Ev +0x0000007100088200,W,000136,_ZN5uking6action15AirOctaMoveBaseD0Ev +0x0000007100088288,O,000008,_ZN5uking6action15AirOctaMoveBase5init_EPN4sead4HeapE +0x0000007100088290,W,000212,_ZN5uking6action15AirOctaMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100088364,W,000156,_ZN5uking6action15AirOctaMoveBase5calc_Ev 0x0000007100088400,U,000432, 0x00000071000885b0,U,000264, 0x00000071000886b8,U,001188, -0x0000007100088b5c,W,000048,_ZN5uking6action16AirOctaFloatBase6leave_Ev -0x0000007100088b8c,O,000156,_ZN5uking6action16AirOctaFloatBase11loadParams_Ev -0x0000007100088c28,U,000384,uking::action::AirOctaFloatBase::m32 +0x0000007100088b5c,W,000048,_ZN5uking6action15AirOctaMoveBase6leave_Ev +0x0000007100088b8c,O,000156,_ZN5uking6action15AirOctaMoveBase11loadParams_Ev +0x0000007100088c28,U,000384,uking::action::AirOctaMoveBase::m32 0x0000007100088da8,U,000144, 0x0000007100088e38,U,000872, -0x00000071000891a0,U,000040,uking::action::AirOctaFloatBase::m33 +0x00000071000891a0,U,000040,uking::action::AirOctaMoveBase::m33 0x00000071000891c8,U,000352, 0x0000007100089328,U,000144, -0x00000071000893b8,O,000288,_ZNK5uking6action16AirOctaFloatBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000894d8,O,000092,_ZNK5uking6action16AirOctaFloatBase18getRuntimeTypeInfoEv -0x0000007100089534,U,000012,uking::action::AirOctaFloatBase::m34 +0x00000071000893b8,O,000288,_ZNK5uking6action15AirOctaMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000894d8,O,000092,_ZNK5uking6action15AirOctaMoveBase18getRuntimeTypeInfoEv +0x0000007100089534,U,000012,uking::action::AirOctaMoveBase::m34 0x0000007100089540,O,000048,_ZN5uking6action17AirOctaNoticeTurnC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100089570,O,000004,_ZN5uking6action17AirOctaNoticeTurnD1Ev 0x0000007100089574,O,000036,_ZN5uking6action17AirOctaNoticeTurnD0Ev @@ -3313,15 +3313,15 @@ Address,Quality,Size,Name 0x00000071000a172c,O,000020,_ZN5uking6action8AreaRootD1Ev 0x00000071000a1740,O,000052,_ZN5uking6action8AreaRootD0Ev 0x00000071000a1774,U,000048,AI_ActionTurnAndChargeAndShoot::ctor -0x00000071000a17a4,W,000020,_ZN5uking6action14ChargeAndShootD1Ev -0x00000071000a17b8,W,000052,_ZN5uking6action14ChargeAndShootD0Ev -0x00000071000a17ec,O,000008,_ZN5uking6action14ChargeAndShoot5init_EPN4sead4HeapE -0x00000071000a17f4,O,000004,_ZN5uking6action14ChargeAndShoot6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000a17f8,W,000180,_ZN5uking6action14ChargeAndShoot5calc_Ev -0x00000071000a18ac,W,000168,_ZN5uking6action14ChargeAndShoot6leave_Ev -0x00000071000a1954,O,000004,_ZN5uking6action14ChargeAndShoot11loadParams_Ev -0x00000071000a1958,O,000132,_ZNK5uking6action14ChargeAndShoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000a19dc,O,000092,_ZNK5uking6action14ChargeAndShoot18getRuntimeTypeInfoEv +0x00000071000a17a4,W,000020,_ZN5uking6action19ArrowChargeAndShootD1Ev +0x00000071000a17b8,W,000052,_ZN5uking6action19ArrowChargeAndShootD0Ev +0x00000071000a17ec,O,000008,_ZN5uking6action19ArrowChargeAndShoot5init_EPN4sead4HeapE +0x00000071000a17f4,O,000004,_ZN5uking6action19ArrowChargeAndShoot6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000a17f8,W,000180,_ZN5uking6action19ArrowChargeAndShoot5calc_Ev +0x00000071000a18ac,W,000168,_ZN5uking6action19ArrowChargeAndShoot6leave_Ev +0x00000071000a1954,O,000004,_ZN5uking6action19ArrowChargeAndShoot11loadParams_Ev +0x00000071000a1958,O,000132,_ZNK5uking6action19ArrowChargeAndShoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000a19dc,O,000092,_ZNK5uking6action19ArrowChargeAndShoot18getRuntimeTypeInfoEv 0x00000071000a1a38,U,000064,AI_Action_ArrowShootHoming::ctor 0x00000071000a1a78,W,000020,_ZN5uking6action16ArrowShootHomingD1Ev 0x00000071000a1a8c,W,000052,_ZN5uking6action16ArrowShootHomingD0Ev @@ -3438,18 +3438,18 @@ Address,Quality,Size,Name 0x00000071000a7a60,U,000024,uking::action::AscendingCurrentFixedSize::m33 0x00000071000a7a78,O,000372,_ZN5uking6action25AscendingCurrentFixedSize33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000a7bec,U,000116,AI_ActionFollowOrBackflipOrNoticeTurn::ctor -0x00000071000a7c60,O,000020,_ZN5uking6action18RotateTurnToTargetD1Ev -0x00000071000a7c74,O,000052,_ZN5uking6action18RotateTurnToTargetD0Ev -0x00000071000a7ca8,O,000008,_ZN5uking6action18RotateTurnToTarget5init_EPN4sead4HeapE -0x00000071000a7cb0,W,000816,_ZN5uking6action18RotateTurnToTarget6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000a7fe0,W,000264,_ZN5uking6action18RotateTurnToTarget5calc_Ev -0x00000071000a80e8,O,000004,_ZN5uking6action18RotateTurnToTarget6leave_Ev -0x00000071000a80ec,U,000080,uking::action::RotateTurnToTarget::m32 -0x00000071000a813c,U,000952,uking::action::RotateTurnToTarget::m33 -0x00000071000a84f4,U,000992,uking::action::RotateTurnToTarget::m34 -0x00000071000a88d4,O,000220,_ZN5uking6action18RotateTurnToTarget11loadParams_Ev -0x00000071000a89b0,O,000288,_ZNK5uking6action18RotateTurnToTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000a8ad0,O,000092,_ZNK5uking6action18RotateTurnToTarget18getRuntimeTypeInfoEv +0x00000071000a7c60,O,000020,_ZN5uking6action24ASPlayRotateTurnToTargetD1Ev +0x00000071000a7c74,O,000052,_ZN5uking6action24ASPlayRotateTurnToTargetD0Ev +0x00000071000a7ca8,O,000008,_ZN5uking6action24ASPlayRotateTurnToTarget5init_EPN4sead4HeapE +0x00000071000a7cb0,W,000816,_ZN5uking6action24ASPlayRotateTurnToTarget6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000a7fe0,W,000264,_ZN5uking6action24ASPlayRotateTurnToTarget5calc_Ev +0x00000071000a80e8,O,000004,_ZN5uking6action24ASPlayRotateTurnToTarget6leave_Ev +0x00000071000a80ec,U,000080,uking::action::ASPlayRotateTurnToTarget::m32 +0x00000071000a813c,U,000952,uking::action::ASPlayRotateTurnToTarget::m33 +0x00000071000a84f4,U,000992,uking::action::ASPlayRotateTurnToTarget::m34 +0x00000071000a88d4,O,000220,_ZN5uking6action24ASPlayRotateTurnToTarget11loadParams_Ev +0x00000071000a89b0,O,000288,_ZNK5uking6action24ASPlayRotateTurnToTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000a8ad0,O,000092,_ZNK5uking6action24ASPlayRotateTurnToTarget18getRuntimeTypeInfoEv 0x00000071000a8b2c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action8WaitBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000a8bb8,O,000080,_ZN5uking6action21ASPlaySimpleAnmDrivenC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000a8c08,O,000020,_ZN5uking6action21ASPlaySimpleAnmDrivenD1Ev @@ -3601,38 +3601,38 @@ Address,Quality,Size,Name 0x00000071000ae464,U,000468,uking::action::BattleCloseMoveActionBase::m37 0x00000071000ae638,O,000008,_ZNK5uking6action25BattleCloseMoveActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000ae640,O,000092,_ZNK5uking6action25BattleCloseMoveActionBase18getRuntimeTypeInfoEv -0x00000071000ae69c,U,000008,uking::action::BattleCloseAction::m33 -0x00000071000ae6a4,U,000008,uking::action::BattleCloseAction::m34 -0x00000071000ae6ac,U,000012,uking::action::BattleCloseAction::m35 +0x00000071000ae69c,U,000008,uking::action::AvoidingCloseMoveBase::m33 +0x00000071000ae6a4,U,000008,uking::action::AvoidingCloseMoveBase::m34 +0x00000071000ae6ac,U,000012,uking::action::AvoidingCloseMoveBase::m35 0x00000071000ae6b8,O,000372,_ZN5uking6action25BattleCloseMoveActionBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ae82c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17BattleCloseActionEE9isDerivedEPKNS0_9InterfaceE +0x00000071000ae82c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action21AvoidingCloseMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000ae8b8,U,000052,AI_ActionBattleCloseSlippedWalkBase::ctor -0x00000071000ae8ec,O,000004,_ZN5uking6action24BattleCloseActionWithAccD1Ev -0x00000071000ae8f0,O,000036,_ZN5uking6action24BattleCloseActionWithAccD0Ev -0x00000071000ae914,O,000004,_ZN5uking6action24BattleCloseActionWithAcc5init_EPN4sead4HeapE -0x00000071000ae918,O,000004,_ZN5uking6action24BattleCloseActionWithAcc6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000ae91c,O,000004,_ZN5uking6action24BattleCloseActionWithAcc5calc_Ev -0x00000071000ae920,O,000004,_ZN5uking6action24BattleCloseActionWithAcc6leave_Ev -0x00000071000ae924,W,000084,_ZN5uking6action24BattleCloseActionWithAcc11loadParams_Ev -0x00000071000ae978,U,000428,uking::action::BattleCloseActionWithAcc::m37 -0x00000071000aeb24,O,000008,_ZNK5uking6action24BattleCloseActionWithAcc27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000aeb2c,O,000092,_ZNK5uking6action24BattleCloseActionWithAcc18getRuntimeTypeInfoEv -0x00000071000aeb88,O,000372,_ZN5uking6action24BattleCloseActionWithAcc33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ae8ec,O,000004,_ZN5uking6action30AvoidingCloseMoveActionWithAccD1Ev +0x00000071000ae8f0,O,000036,_ZN5uking6action30AvoidingCloseMoveActionWithAccD0Ev +0x00000071000ae914,O,000004,_ZN5uking6action30AvoidingCloseMoveActionWithAcc5init_EPN4sead4HeapE +0x00000071000ae918,O,000004,_ZN5uking6action30AvoidingCloseMoveActionWithAcc6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000ae91c,O,000004,_ZN5uking6action30AvoidingCloseMoveActionWithAcc5calc_Ev +0x00000071000ae920,O,000004,_ZN5uking6action30AvoidingCloseMoveActionWithAcc6leave_Ev +0x00000071000ae924,W,000084,_ZN5uking6action30AvoidingCloseMoveActionWithAcc11loadParams_Ev +0x00000071000ae978,U,000428,uking::action::AvoidingCloseMoveActionWithAcc::m37 +0x00000071000aeb24,O,000008,_ZNK5uking6action30AvoidingCloseMoveActionWithAcc27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000aeb2c,O,000092,_ZNK5uking6action30AvoidingCloseMoveActionWithAcc18getRuntimeTypeInfoEv +0x00000071000aeb88,O,000372,_ZN5uking6action30AvoidingCloseMoveActionWithAcc33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000aecfc,U,000072,AI_ActionBattleCloseCommon::ctor -0x00000071000aed44,O,000020,_ZN5uking6action17BattleCloseActionD1Ev -0x00000071000aed58,O,000052,_ZN5uking6action17BattleCloseActionD0Ev -0x00000071000aed8c,O,000008,_ZN5uking6action17BattleCloseAction5init_EPN4sead4HeapE -0x00000071000aed94,W,000156,_ZN5uking6action17BattleCloseAction6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000aee30,W,001896,_ZN5uking6action17BattleCloseAction5calc_Ev -0x00000071000af598,O,000004,_ZN5uking6action17BattleCloseAction6leave_Ev -0x00000071000af59c,U,000056,uking::action::BattleCloseAction::m36 -0x00000071000af5d4,U,001336,uking::action::BattleCloseAction::m32 -0x00000071000afb0c,U,000412,uking::action::BattleCloseAction::m38 -0x00000071000afca8,U,000252,uking::action::BattleCloseAction::m39 -0x00000071000afda4,O,000276,_ZN5uking6action17BattleCloseAction11loadParams_Ev -0x00000071000afeb8,O,000288,_ZNK5uking6action17BattleCloseAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000affd8,O,000092,_ZNK5uking6action17BattleCloseAction18getRuntimeTypeInfoEv -0x00000071000b0034,U,000008,uking::action::BattleCloseAction::m37 +0x00000071000aed44,O,000020,_ZN5uking6action21AvoidingCloseMoveBaseD1Ev +0x00000071000aed58,O,000052,_ZN5uking6action21AvoidingCloseMoveBaseD0Ev +0x00000071000aed8c,O,000008,_ZN5uking6action21AvoidingCloseMoveBase5init_EPN4sead4HeapE +0x00000071000aed94,W,000156,_ZN5uking6action21AvoidingCloseMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000aee30,W,001896,_ZN5uking6action21AvoidingCloseMoveBase5calc_Ev +0x00000071000af598,O,000004,_ZN5uking6action21AvoidingCloseMoveBase6leave_Ev +0x00000071000af59c,U,000056,uking::action::AvoidingCloseMoveBase::m36 +0x00000071000af5d4,U,001336,uking::action::AvoidingCloseMoveBase::m32 +0x00000071000afb0c,U,000412,uking::action::AvoidingCloseMoveBase::m38 +0x00000071000afca8,U,000252,uking::action::AvoidingCloseMoveBase::m39 +0x00000071000afda4,O,000276,_ZN5uking6action21AvoidingCloseMoveBase11loadParams_Ev +0x00000071000afeb8,O,000288,_ZNK5uking6action21AvoidingCloseMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000affd8,O,000092,_ZNK5uking6action21AvoidingCloseMoveBase18getRuntimeTypeInfoEv +0x00000071000b0034,U,000008,uking::action::AvoidingCloseMoveBase::m37 0x00000071000b003c,U,000168,AI_Action_AwarenessShareOnePartsASPlay::ctor 0x00000071000b00e4,W,000116,_ZN5uking6action28AwarenessShareOnePartsASPlayD1Ev 0x00000071000b0158,W,000124,_ZN5uking6action28AwarenessShareOnePartsASPlayD0Ev @@ -3841,21 +3841,21 @@ Address,Quality,Size,Name 0x00000071000b8b3c,O,000092,_ZNK5uking6action11BalloonBase18getRuntimeTypeInfoEv 0x00000071000b8b98,U,000004,uking::action::BalloonBase::m35 0x00000071000b8b9c,U,000088,AI_ActionOctarockBalloon::ctor -0x00000071000b8bf4,W,000020,_ZN5uking6action19OctarockBalloonBaseD1Ev -0x00000071000b8c08,W,000052,_ZN5uking6action19OctarockBalloonBaseD0Ev -0x00000071000b8c3c,O,000004,_ZN5uking6action19OctarockBalloonBase5init_EPN4sead4HeapE -0x00000071000b8c40,W,000464,_ZN5uking6action19OctarockBalloonBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000b8e10,W,000244,_ZN5uking6action19OctarockBalloonBase5calc_Ev -0x00000071000b8f04,U,000080,uking::action::OctarockBalloonBase::m33 -0x00000071000b8f54,U,000076,uking::action::OctarockBalloonBase::m34 -0x00000071000b8fa0,W,000080,_ZN5uking6action19OctarockBalloonBase6leave_Ev -0x00000071000b8ff0,W,000308,_ZN5uking6action19OctarockBalloonBase11loadParams_Ev -0x00000071000b9124,U,000156,uking::action::OctarockBalloonBase::m35 -0x00000071000b91c0,O,000008,_ZNK5uking6action19OctarockBalloonBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000b91c8,O,000092,_ZNK5uking6action19OctarockBalloonBase18getRuntimeTypeInfoEv +0x00000071000b8bf4,W,000020,_ZN5uking6action15BalloonRopeBaseD1Ev +0x00000071000b8c08,W,000052,_ZN5uking6action15BalloonRopeBaseD0Ev +0x00000071000b8c3c,O,000004,_ZN5uking6action15BalloonRopeBase5init_EPN4sead4HeapE +0x00000071000b8c40,W,000464,_ZN5uking6action15BalloonRopeBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000b8e10,W,000244,_ZN5uking6action15BalloonRopeBase5calc_Ev +0x00000071000b8f04,U,000080,uking::action::BalloonRopeBase::m33 +0x00000071000b8f54,U,000076,uking::action::BalloonRopeBase::m34 +0x00000071000b8fa0,W,000080,_ZN5uking6action15BalloonRopeBase6leave_Ev +0x00000071000b8ff0,W,000308,_ZN5uking6action15BalloonRopeBase11loadParams_Ev +0x00000071000b9124,U,000156,uking::action::BalloonRopeBase::m35 +0x00000071000b91c0,O,000008,_ZNK5uking6action15BalloonRopeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000b91c8,O,000092,_ZNK5uking6action15BalloonRopeBase18getRuntimeTypeInfoEv 0x00000071000b9224,O,000356,_ZNK4ksys3act2ai10ActionBase19getDynamicParamImplIPPNS0_14BaseProcHandleEEEbPT_RKN4sead14SafeStringBaseIcEEMNS1_9ParamPackEKFbS8_SD_ES8_ 0x00000071000b9388,U,000060,ai::ParamPack::getAITreeVarPointerWrapper -0x00000071000b93c4,O,000372,_ZN5uking6action19OctarockBalloonBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000b93c4,O,000372,_ZN5uking6action15BalloonRopeBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000b9538,U,000124,AI_Action_BasicSignalBossAwakeSleep::ctor 0x00000071000b95b4,W,000040,_ZN5uking6action25BasicSignalBossAwakeSleepD1Ev 0x00000071000b95dc,W,000072,_ZN5uking6action25BasicSignalBossAwakeSleepD0Ev @@ -3869,10 +3869,10 @@ Address,Quality,Size,Name 0x00000071000b9bcc,O,000004,_ZN5uking6action25BasicSignalBossAwakeSleep11loadParams_Ev 0x00000071000b9bd0,O,000008,_ZNK5uking6action25BasicSignalBossAwakeSleep27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000b9bd8,O,000092,_ZNK5uking6action25BasicSignalBossAwakeSleep18getRuntimeTypeInfoEv -0x00000071000b9c34,U,000004,uking::action::BasicSignalEnemy::m34 -0x00000071000b9c38,U,000004,uking::action::BasicSignalEnemy::m35 +0x00000071000b9c34,U,000004,uking::action::BasicSignalEnemyNotice::m34 +0x00000071000b9c38,U,000004,uking::action::BasicSignalEnemyNotice::m35 0x00000071000b9c3c,O,000372,_ZN5uking6action25BasicSignalBossAwakeSleep33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000b9db0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16BasicSignalEnemyEE9isDerivedEPKNS0_9InterfaceE +0x00000071000b9db0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action22BasicSignalEnemyNoticeEE9isDerivedEPKNS0_9InterfaceE 0x00000071000b9e3c,U,000004,j__ZdlPv_35 0x00000071000b9e40,U,000008, 0x00000071000b9e48,U,000004,j__ZdlPv_36 @@ -3900,19 +3900,19 @@ Address,Quality,Size,Name 0x00000071000ba430,U,000080,uking::action::BasicSignalEnemyForceNotice::m34 0x00000071000ba480,O,000008,_ZNK5uking6action27BasicSignalEnemyForceNotice27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000ba488,O,000092,_ZNK5uking6action27BasicSignalEnemyForceNotice18getRuntimeTypeInfoEv -0x00000071000ba4e4,U,000004,uking::action::BasicSignalEnemy::m33 +0x00000071000ba4e4,U,000004,uking::action::BasicSignalEnemyNotice::m33 0x00000071000ba4e8,O,000372,_ZN5uking6action27BasicSignalEnemyForceNotice33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000ba65c,U,000052,AI_ActionBasicSignal::ctor -0x00000071000ba690,O,000020,_ZN5uking6action16BasicSignalEnemyD1Ev -0x00000071000ba6a4,O,000052,_ZN5uking6action16BasicSignalEnemyD0Ev -0x00000071000ba6d8,O,000008,_ZN5uking6action16BasicSignalEnemy5init_EPN4sead4HeapE -0x00000071000ba6e0,W,000044,_ZN5uking6action16BasicSignalEnemy6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000ba70c,W,000120,_ZN5uking6action16BasicSignalEnemy5calc_Ev -0x00000071000ba784,O,000004,_ZN5uking6action16BasicSignalEnemy6leave_Ev -0x00000071000ba788,O,000004,_ZN5uking6action16BasicSignalEnemy11loadParams_Ev -0x00000071000ba78c,O,000288,_ZNK5uking6action16BasicSignalEnemy27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000ba8ac,O,000092,_ZNK5uking6action16BasicSignalEnemy18getRuntimeTypeInfoEv -0x00000071000ba908,U,000004,uking::action::BasicSignalEnemy::m32 +0x00000071000ba690,O,000020,_ZN5uking6action22BasicSignalEnemyNoticeD1Ev +0x00000071000ba6a4,O,000052,_ZN5uking6action22BasicSignalEnemyNoticeD0Ev +0x00000071000ba6d8,O,000008,_ZN5uking6action22BasicSignalEnemyNotice5init_EPN4sead4HeapE +0x00000071000ba6e0,W,000044,_ZN5uking6action22BasicSignalEnemyNotice6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000ba70c,W,000120,_ZN5uking6action22BasicSignalEnemyNotice5calc_Ev +0x00000071000ba784,O,000004,_ZN5uking6action22BasicSignalEnemyNotice6leave_Ev +0x00000071000ba788,O,000004,_ZN5uking6action22BasicSignalEnemyNotice11loadParams_Ev +0x00000071000ba78c,O,000288,_ZNK5uking6action22BasicSignalEnemyNotice27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000ba8ac,O,000092,_ZNK5uking6action22BasicSignalEnemyNotice18getRuntimeTypeInfoEv +0x00000071000ba908,U,000004,uking::action::BasicSignalEnemyNotice::m32 0x00000071000ba90c,O,000048,_ZN5uking6action9ForbidTagC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000ba93c,O,000020,_ZN5uking6action9ForbidTagD1Ev 0x00000071000ba950,O,000052,_ZN5uking6action9ForbidTagD0Ev @@ -4024,18 +4024,18 @@ Address,Quality,Size,Name 0x00000071000bec48,O,000092,_ZNK5uking6action21BattleCloseMoveAction18getRuntimeTypeInfoEv 0x00000071000beca4,O,000036,_ZN5uking6action21BattleCloseMoveActionD0Ev 0x00000071000becc8,U,000048,AI_ActionBattleCloseSlippedWalk::ctor -0x00000071000becf8,O,000004,_ZN5uking6action26BattleCloseSlippedWalkBaseD1Ev -0x00000071000becfc,O,000036,_ZN5uking6action26BattleCloseSlippedWalkBaseD0Ev -0x00000071000bed20,O,000004,_ZN5uking6action26BattleCloseSlippedWalkBase5init_EPN4sead4HeapE -0x00000071000bed24,O,000004,_ZN5uking6action26BattleCloseSlippedWalkBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000bed28,O,000004,_ZN5uking6action26BattleCloseSlippedWalkBase5calc_Ev -0x00000071000bed2c,O,000004,_ZN5uking6action26BattleCloseSlippedWalkBase6leave_Ev -0x00000071000bed30,O,000004,_ZN5uking6action26BattleCloseSlippedWalkBase11loadParams_Ev -0x00000071000bed34,U,000036,uking::action::BattleCloseSlippedWalkBase::m33 -0x00000071000bed58,U,000060,uking::action::BattleCloseSlippedWalkBase::m34 -0x00000071000bed94,O,000132,_ZNK5uking6action26BattleCloseSlippedWalkBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000bee18,O,000092,_ZNK5uking6action26BattleCloseSlippedWalkBase18getRuntimeTypeInfoEv -0x00000071000bee74,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action24BattleCloseActionWithAccEE9isDerivedEPKNS0_9InterfaceE +0x00000071000becf8,O,000004,_ZN5uking6action26BattleCloseSlippedMoveBaseD1Ev +0x00000071000becfc,O,000036,_ZN5uking6action26BattleCloseSlippedMoveBaseD0Ev +0x00000071000bed20,O,000004,_ZN5uking6action26BattleCloseSlippedMoveBase5init_EPN4sead4HeapE +0x00000071000bed24,O,000004,_ZN5uking6action26BattleCloseSlippedMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000bed28,O,000004,_ZN5uking6action26BattleCloseSlippedMoveBase5calc_Ev +0x00000071000bed2c,O,000004,_ZN5uking6action26BattleCloseSlippedMoveBase6leave_Ev +0x00000071000bed30,O,000004,_ZN5uking6action26BattleCloseSlippedMoveBase11loadParams_Ev +0x00000071000bed34,U,000036,uking::action::BattleCloseSlippedMoveBase::m33 +0x00000071000bed58,U,000060,uking::action::BattleCloseSlippedMoveBase::m34 +0x00000071000bed94,O,000132,_ZNK5uking6action26BattleCloseSlippedMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000bee18,O,000092,_ZNK5uking6action26BattleCloseSlippedMoveBase18getRuntimeTypeInfoEv +0x00000071000bee74,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action30AvoidingCloseMoveActionWithAccEE9isDerivedEPKNS0_9InterfaceE 0x00000071000bef00,U,000072,AI_Action_BattleCloseSlippedWalk::ctor 0x00000071000bef48,W,000020,_ZN5uking6action22BattleCloseSlippedWalkD1Ev 0x00000071000bef5c,W,000052,_ZN5uking6action22BattleCloseSlippedWalkD0Ev @@ -4046,7 +4046,7 @@ Address,Quality,Size,Name 0x00000071000befe4,W,000084,_ZN5uking6action22BattleCloseSlippedWalk11loadParams_Ev 0x00000071000bf038,O,000216,_ZNK5uking6action22BattleCloseSlippedWalk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000bf110,O,000092,_ZNK5uking6action22BattleCloseSlippedWalk18getRuntimeTypeInfoEv -0x00000071000bf16c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26BattleCloseSlippedWalkBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071000bf16c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26BattleCloseSlippedMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000bf1f8,O,000048,_ZN5uking6action15BattleCloseWalkC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000bf228,O,000004,_ZN5uking6action15BattleCloseWalk5init_EPN4sead4HeapE 0x00000071000bf22c,W,000060,_ZN5uking6action15BattleCloseWalk6enter_EPN4ksys3act2ai15InlineParamPackE @@ -4715,22 +4715,22 @@ Address,Quality,Size,Name 0x00000071000daf6c,O,000288,_ZNK5uking6action23CheckHorseCustomizeEdit27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071000db08c,O,000092,_ZNK5uking6action23CheckHorseCustomizeEdit18getRuntimeTypeInfoEv 0x00000071000db0e8,U,000052,AI_ActionChemicalBallOrLizalfosFlame::ctor -0x00000071000db11c,O,000004,_ZN5uking6action18ChemicalAttackBallD1Ev -0x00000071000db120,O,000036,_ZN5uking6action18ChemicalAttackBallD0Ev -0x00000071000db144,O,000004,_ZN5uking6action18ChemicalAttackBall5init_EPN4sead4HeapE -0x00000071000db148,W,000068,_ZN5uking6action18ChemicalAttackBall6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071000db18c,W,000108,_ZN5uking6action18ChemicalAttackBall5calc_Ev -0x00000071000db1f8,W,000068,_ZN5uking6action18ChemicalAttackBall6leave_Ev -0x00000071000db23c,W,000108,_ZN5uking6action18ChemicalAttackBall11loadParams_Ev -0x00000071000db2a8,U,000068,uking::action::ChemicalAttackBall::m34 -0x00000071000db2ec,U,000036,uking::action::ChemicalAttackBall::m35 -0x00000071000db310,U,000144,uking::action::ChemicalAttackBall::m36 -0x00000071000db3a0,O,000008,_ZNK5uking6action18ChemicalAttackBall27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000db3a8,O,000092,_ZNK5uking6action18ChemicalAttackBall18getRuntimeTypeInfoEv -0x00000071000db404,U,000012,uking::action::ChemicalAttack::m37 -0x00000071000db410,U,000012,uking::action::ChemicalAttack::m38 -0x00000071000db41c,O,000372,_ZN5uking6action18ChemicalAttackBall33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071000db590,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14ChemicalAttackEE9isDerivedEPKNS0_9InterfaceE +0x00000071000db11c,O,000004,_ZN5uking6action14ChemicalAttackD1Ev +0x00000071000db120,O,000036,_ZN5uking6action14ChemicalAttackD0Ev +0x00000071000db144,O,000004,_ZN5uking6action14ChemicalAttack5init_EPN4sead4HeapE +0x00000071000db148,W,000068,_ZN5uking6action14ChemicalAttack6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071000db18c,W,000108,_ZN5uking6action14ChemicalAttack5calc_Ev +0x00000071000db1f8,W,000068,_ZN5uking6action14ChemicalAttack6leave_Ev +0x00000071000db23c,W,000108,_ZN5uking6action14ChemicalAttack11loadParams_Ev +0x00000071000db2a8,U,000068,uking::action::ChemicalAttack::m34 +0x00000071000db2ec,U,000036,uking::action::ChemicalAttack::m35 +0x00000071000db310,U,000144,uking::action::ChemicalAttack::m36 +0x00000071000db3a0,O,000008,_ZNK5uking6action14ChemicalAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000db3a8,O,000092,_ZNK5uking6action14ChemicalAttack18getRuntimeTypeInfoEv +0x00000071000db404,U,000012,uking::action::EmitAttackBase::m37 +0x00000071000db410,U,000012,uking::action::EmitAttackBase::m38 +0x00000071000db41c,O,000372,_ZN5uking6action14ChemicalAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071000db590,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14EmitAttackBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071000db61c,U,000124,AI_Action_ChemicalElectricWaterBall::ctor 0x00000071000db698,W,000120,_ZN5uking6action25ChemicalElectricWaterBallD1Ev 0x00000071000db710,U,000020,ActorLink::m2 @@ -4753,7 +4753,7 @@ Address,Quality,Size,Name 0x00000071000dc124,U,000092,ActorLink::rtti2 0x00000071000dc180,U,000052,ActorLink::m3 0x00000071000dc1b4,U,000140, -0x00000071000dc240,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18ChemicalAttackBallEE9isDerivedEPKNS0_9InterfaceE +0x00000071000dc240,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14ChemicalAttackEE9isDerivedEPKNS0_9InterfaceE 0x00000071000dc2cc,M,000096,_ZN5uking6action16ChemicalPhysBallC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071000dc32c,O,000004,_ZN5uking6action16ChemicalPhysBallD1Ev 0x00000071000dc330,O,000036,_ZN5uking6action16ChemicalPhysBallD0Ev @@ -5991,23 +5991,23 @@ Address,Quality,Size,Name 0x0000007100104f0c,O,000020,_ZN5uking6action17ElectricParalysisD1Ev 0x0000007100104f20,O,000052,_ZN5uking6action17ElectricParalysisD0Ev 0x0000007100104f54,U,000092,AI_ActionChemicalBallOrLizalfosFlameOrWindCutter::ctor -0x0000007100104fb0,O,000020,_ZN5uking6action14ChemicalAttackD1Ev -0x0000007100104fc4,O,000052,_ZN5uking6action14ChemicalAttackD0Ev -0x0000007100104ff8,O,000008,_ZN5uking6action14ChemicalAttack5init_EPN4sead4HeapE -0x0000007100105000,W,000800,_ZN5uking6action14ChemicalAttack6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100105320,W,000120,_ZN5uking6action14ChemicalAttack5calc_Ev -0x0000007100105398,W,000044,_ZN5uking6action14ChemicalAttack6leave_Ev -0x00000071001053c4,O,000240,_ZN5uking6action14ChemicalAttack11loadParams_Ev -0x00000071001054b4,U,000044,uking::action::ChemicalAttack::m36 -0x00000071001054e0,U,000016,uking::action::ChemicalAttack::m32 -0x00000071001054f0,U,000160,uking::action::ChemicalAttack::m33 -0x0000007100105590,U,000012,uking::action::ChemicalAttack::m34 +0x0000007100104fb0,O,000020,_ZN5uking6action14EmitAttackBaseD1Ev +0x0000007100104fc4,O,000052,_ZN5uking6action14EmitAttackBaseD0Ev +0x0000007100104ff8,O,000008,_ZN5uking6action14EmitAttackBase5init_EPN4sead4HeapE +0x0000007100105000,W,000800,_ZN5uking6action14EmitAttackBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100105320,W,000120,_ZN5uking6action14EmitAttackBase5calc_Ev +0x0000007100105398,W,000044,_ZN5uking6action14EmitAttackBase6leave_Ev +0x00000071001053c4,O,000240,_ZN5uking6action14EmitAttackBase11loadParams_Ev +0x00000071001054b4,U,000044,uking::action::EmitAttackBase::m36 +0x00000071001054e0,U,000016,uking::action::EmitAttackBase::m32 +0x00000071001054f0,U,000160,uking::action::EmitAttackBase::m33 +0x0000007100105590,U,000012,uking::action::EmitAttackBase::m34 0x000000710010559c,U,000008, 0x00000071001055a4,U,000092, -0x0000007100105600,U,000008,uking::action::ChemicalAttack::m39 -0x0000007100105608,O,000288,_ZNK5uking6action14ChemicalAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100105728,O,000092,_ZNK5uking6action14ChemicalAttack18getRuntimeTypeInfoEv -0x0000007100105784,U,000008,uking::action::ChemicalAttack::m35 +0x0000007100105600,U,000008,uking::action::EmitAttackBase::m39 +0x0000007100105608,O,000288,_ZNK5uking6action14EmitAttackBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100105728,O,000092,_ZNK5uking6action14EmitAttackBase18getRuntimeTypeInfoEv +0x0000007100105784,U,000008,uking::action::EmitAttackBase::m35 0x000000710010578c,U,000076,AI_Action_EmitElectricWaterBall::ctor 0x00000071001057d8,W,000164,_ZN5uking6action21EmitElectricWaterBallD1Ev 0x000000710010587c,W,000036,_ZN5uking6action21EmitElectricWaterBallD0Ev @@ -7434,10 +7434,10 @@ Address,Quality,Size,Name 0x0000007100130f4c,U,000112,uking::action::FlyingCharacterDamageBase::m36 0x0000007100130fbc,O,000008,_ZNK5uking6action25FlyingCharacterDamageBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100130fc4,O,000092,_ZNK5uking6action25FlyingCharacterDamageBase18getRuntimeTypeInfoEv -0x0000007100131020,U,000004,uking::action::FlyingCharacterReaction::m32 -0x0000007100131024,U,000004,uking::action::FlyingCharacterReaction::m35 +0x0000007100131020,U,000004,uking::action::FlyingCharacterFreeFallBase::m32 +0x0000007100131024,U,000004,uking::action::FlyingCharacterFreeFallBase::m35 0x0000007100131028,O,000372,_ZN5uking6action25FlyingCharacterDamageBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710013119c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23FlyingCharacterReactionEE9isDerivedEPKNS0_9InterfaceE +0x000000710013119c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27FlyingCharacterFreeFallBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100131228,U,000056,AI_Action_FlyingBalloonObserverTag::ctor 0x0000007100131260,O,000004,_ZN5uking6action24FlyingBalloonObserverTagD1Ev 0x0000007100131264,U,000008, @@ -7477,8 +7477,8 @@ Address,Quality,Size,Name 0x0000007100131abc,U,000308,uking::action::FlyingCharacterBlownOff::m37 0x0000007100131bf0,O,000008,_ZNK5uking6action23FlyingCharacterBlownOff27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100131bf8,O,000092,_ZNK5uking6action23FlyingCharacterBlownOff18getRuntimeTypeInfoEv -0x0000007100131c54,U,000004,uking::action::FlyingCharacterReaction::m33 -0x0000007100131c58,U,000004,uking::action::FlyingCharacterReaction::m36 +0x0000007100131c54,U,000004,uking::action::FlyingCharacterFreeFallBase::m33 +0x0000007100131c58,U,000004,uking::action::FlyingCharacterFreeFallBase::m36 0x0000007100131c5c,O,000372,_ZN5uking6action23FlyingCharacterBlownOff33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100131dd0,O,000048,_ZN5uking6action26FlyingCharacterBlownOffDieC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100131e00,O,000004,_ZN5uking6action26FlyingCharacterBlownOffDieD1Ev @@ -7523,18 +7523,18 @@ Address,Quality,Size,Name 0x00000071001323c0,O,000092,_ZNK5uking6action23FlyingCharacterFreeFall18getRuntimeTypeInfoEv 0x000000710013241c,O,000372,_ZN5uking6action23FlyingCharacterFreeFall33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100132590,U,000064,AI_ActionFlyingCharacterBadThing::ctor -0x00000071001325d0,W,000068,_ZN5uking6action23FlyingCharacterReactionD1Ev -0x0000007100132614,W,000076,_ZN5uking6action23FlyingCharacterReactionD0Ev -0x0000007100132660,O,000008,_ZN5uking6action23FlyingCharacterReaction5init_EPN4sead4HeapE -0x0000007100132668,W,000268,_ZN5uking6action23FlyingCharacterReaction6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100132774,W,000320,_ZN5uking6action23FlyingCharacterReaction5calc_Ev -0x00000071001328b4,W,000064,_ZN5uking6action23FlyingCharacterReaction6leave_Ev -0x00000071001328f4,O,000156,_ZN5uking6action23FlyingCharacterReaction11loadParams_Ev -0x0000007100132990,U,000372,uking::action::FlyingCharacterReaction::m34 -0x0000007100132b04,U,000004,uking::action::FlyingCharacterReaction::m37 -0x0000007100132b08,U,000068,uking::action::FlyingCharacterReaction::m38 -0x0000007100132b4c,O,000288,_ZNK5uking6action23FlyingCharacterReaction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100132c6c,O,000092,_ZNK5uking6action23FlyingCharacterReaction18getRuntimeTypeInfoEv +0x00000071001325d0,W,000068,_ZN5uking6action27FlyingCharacterFreeFallBaseD1Ev +0x0000007100132614,W,000076,_ZN5uking6action27FlyingCharacterFreeFallBaseD0Ev +0x0000007100132660,O,000008,_ZN5uking6action27FlyingCharacterFreeFallBase5init_EPN4sead4HeapE +0x0000007100132668,W,000268,_ZN5uking6action27FlyingCharacterFreeFallBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100132774,W,000320,_ZN5uking6action27FlyingCharacterFreeFallBase5calc_Ev +0x00000071001328b4,W,000064,_ZN5uking6action27FlyingCharacterFreeFallBase6leave_Ev +0x00000071001328f4,O,000156,_ZN5uking6action27FlyingCharacterFreeFallBase11loadParams_Ev +0x0000007100132990,U,000372,uking::action::FlyingCharacterFreeFallBase::m34 +0x0000007100132b04,U,000004,uking::action::FlyingCharacterFreeFallBase::m37 +0x0000007100132b08,U,000068,uking::action::FlyingCharacterFreeFallBase::m38 +0x0000007100132b4c,O,000288,_ZNK5uking6action27FlyingCharacterFreeFallBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100132c6c,O,000092,_ZNK5uking6action27FlyingCharacterFreeFallBase18getRuntimeTypeInfoEv 0x0000007100132cc8,U,000080,AI_Action_FlyingCharacterFreeFallDie::ctor 0x0000007100132d18,W,000020,_ZN5uking6action26FlyingCharacterFreeFallDieD1Ev 0x0000007100132d2c,W,000052,_ZN5uking6action26FlyingCharacterFreeFallDieD0Ev @@ -8158,7 +8158,7 @@ Address,Quality,Size,Name 0x0000007100141bdc,O,000008,_ZNK5uking6action29ForkASTrgEmitShockWaveAtEnter27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100141be4,O,000092,_ZNK5uking6action29ForkASTrgEmitShockWaveAtEnter18getRuntimeTypeInfoEv 0x0000007100141c40,O,000372,_ZN5uking6action29ForkASTrgEmitShockWaveAtEnter33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100141db4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action22ForkASTrgEmitShockWaveEE9isDerivedEPKNS0_9InterfaceE +0x0000007100141db4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17ForkEmitShockWaveEE9isDerivedEPKNS0_9InterfaceE 0x0000007100141e40,U,000052,AI_Action_ForkASTrgEmitShockWavePos::ctor 0x0000007100141e74,O,000004,_ZN5uking6action25ForkASTrgEmitShockWavePosD1Ev 0x0000007100141e78,O,000036,_ZN5uking6action25ForkASTrgEmitShockWavePosD0Ev @@ -8300,15 +8300,15 @@ Address,Quality,Size,Name 0x000000710014701c,O,000288,_ZNK5uking6action29ForkAttackWithWeaponOrWithout27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710014713c,O,000092,_ZNK5uking6action29ForkAttackWithWeaponOrWithout18getRuntimeTypeInfoEv 0x0000007100147198,U,000052,AI_ActionForkBeastGanonMessageDialogCtrl::ctor -0x00000071001471cc,W,000224,_ZN5uking6action23SimpleMessageDialogCtrlD1Ev -0x00000071001472ac,W,000232,_ZN5uking6action23SimpleMessageDialogCtrlD0Ev -0x0000007100147394,W,000244,_ZN5uking6action23SimpleMessageDialogCtrl5init_EPN4sead4HeapE -0x0000007100147488,W,000016,_ZN5uking6action23SimpleMessageDialogCtrl6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100147498,W,000144,_ZN5uking6action23SimpleMessageDialogCtrl5calc_Ev -0x0000007100147528,O,000004,_ZN5uking6action23SimpleMessageDialogCtrl6leave_Ev -0x000000710014752c,O,000064,_ZN5uking6action23SimpleMessageDialogCtrl11loadParams_Ev -0x000000710014756c,O,000288,_ZNK5uking6action23SimpleMessageDialogCtrl27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710014768c,O,000092,_ZNK5uking6action23SimpleMessageDialogCtrl18getRuntimeTypeInfoEv +0x00000071001471cc,W,000224,_ZN5uking6action26ForkBasicMessageDialogCtrlD1Ev +0x00000071001472ac,W,000232,_ZN5uking6action26ForkBasicMessageDialogCtrlD0Ev +0x0000007100147394,W,000244,_ZN5uking6action26ForkBasicMessageDialogCtrl5init_EPN4sead4HeapE +0x0000007100147488,W,000016,_ZN5uking6action26ForkBasicMessageDialogCtrl6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100147498,W,000144,_ZN5uking6action26ForkBasicMessageDialogCtrl5calc_Ev +0x0000007100147528,O,000004,_ZN5uking6action26ForkBasicMessageDialogCtrl6leave_Ev +0x000000710014752c,O,000064,_ZN5uking6action26ForkBasicMessageDialogCtrl11loadParams_Ev +0x000000710014756c,O,000288,_ZNK5uking6action26ForkBasicMessageDialogCtrl27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710014768c,O,000092,_ZNK5uking6action26ForkBasicMessageDialogCtrl18getRuntimeTypeInfoEv 0x00000071001476e8,U,000140, 0x0000007100147774,U,000288, 0x0000007100147894,U,000092, @@ -8335,7 +8335,7 @@ Address,Quality,Size,Name 0x0000007100148054,O,000008,_ZNK5uking6action31ForkBeastGanonMessageDialogCtrl27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710014805c,O,000092,_ZNK5uking6action31ForkBeastGanonMessageDialogCtrl18getRuntimeTypeInfoEv 0x00000071001480b8,O,000372,_ZN5uking6action31ForkBeastGanonMessageDialogCtrl33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710014822c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23SimpleMessageDialogCtrlEE9isDerivedEPKNS0_9InterfaceE +0x000000710014822c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action26ForkBasicMessageDialogCtrlEE9isDerivedEPKNS0_9InterfaceE 0x00000071001482b8,M,000080,_ZN5uking6action29ForkBombIgniteCarriedByPlayerC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100148308,O,000020,_ZN5uking6action29ForkBombIgniteCarriedByPlayerD1Ev 0x000000710014831c,O,000052,_ZN5uking6action29ForkBombIgniteCarriedByPlayerD0Ev @@ -8605,19 +8605,19 @@ Address,Quality,Size,Name 0x000000710014efb8,O,000092,_ZNK5uking6action29ForkEmitExpandFieldWithCreate18getRuntimeTypeInfoEv 0x000000710014f014,O,000372,_ZN5uking6action29ForkEmitExpandFieldWithCreate33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710014f188,U,000112,AI_ActionEmitShockWave::ctor -0x000000710014f1f8,W,000264,_ZN5uking6action22ForkASTrgEmitShockWaveD1Ev -0x000000710014f300,W,000036,_ZN5uking6action22ForkASTrgEmitShockWaveD0Ev -0x000000710014f324,W,000408,_ZN5uking6action22ForkASTrgEmitShockWave5init_EPN4sead4HeapE +0x000000710014f1f8,W,000264,_ZN5uking6action17ForkEmitShockWaveD1Ev +0x000000710014f300,W,000036,_ZN5uking6action17ForkEmitShockWaveD0Ev +0x000000710014f324,W,000408,_ZN5uking6action17ForkEmitShockWave5init_EPN4sead4HeapE 0x000000710014f4bc,U,000708, 0x000000710014f780,U,000516, -0x000000710014f984,W,000032,_ZN5uking6action22ForkASTrgEmitShockWave6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710014f9a4,W,000132,_ZN5uking6action22ForkASTrgEmitShockWave5calc_Ev +0x000000710014f984,W,000032,_ZN5uking6action17ForkEmitShockWave6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710014f9a4,W,000132,_ZN5uking6action17ForkEmitShockWave5calc_Ev 0x000000710014fa28,U,000340, -0x000000710014fb7c,O,000004,_ZN5uking6action22ForkASTrgEmitShockWave6leave_Ev -0x000000710014fb80,O,000380,_ZN5uking6action22ForkASTrgEmitShockWave11loadParams_Ev -0x000000710014fcfc,U,000360,uking::action::ForkASTrgEmitShockWave::m32 -0x000000710014fe64,O,000288,_ZNK5uking6action22ForkASTrgEmitShockWave27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710014ff84,O,000092,_ZNK5uking6action22ForkASTrgEmitShockWave18getRuntimeTypeInfoEv +0x000000710014fb7c,O,000004,_ZN5uking6action17ForkEmitShockWave6leave_Ev +0x000000710014fb80,O,000380,_ZN5uking6action17ForkEmitShockWave11loadParams_Ev +0x000000710014fcfc,U,000360,uking::action::ForkEmitShockWave::m32 +0x000000710014fe64,O,000288,_ZNK5uking6action17ForkEmitShockWave27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710014ff84,O,000092,_ZNK5uking6action17ForkEmitShockWave18getRuntimeTypeInfoEv 0x000000710014ffe0,U,000072,AI_Action_ForkEmitShockWaveByContact::ctor 0x0000007100150028,W,000020,_ZN5uking6action26ForkEmitShockWaveByContactD1Ev 0x000000710015003c,W,000052,_ZN5uking6action26ForkEmitShockWaveByContactD0Ev @@ -10664,19 +10664,19 @@ Address,Quality,Size,Name 0x000000710018d66c,U,000004,j__ZdlPv_54 0x000000710018d670,U,000008, 0x000000710018d678,U,000144,AI_ActionGolemThrowPartsToTarget::ctor -0x000000710018d708,W,000104,_ZN5uking6action27GolemThrowPartsToTargetBaseD1Ev -0x000000710018d770,W,000112,_ZN5uking6action27GolemThrowPartsToTargetBaseD0Ev -0x000000710018d7e0,O,000008,_ZN5uking6action27GolemThrowPartsToTargetBase5init_EPN4sead4HeapE -0x000000710018d7e8,W,000108,_ZN5uking6action27GolemThrowPartsToTargetBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710018d854,W,000136,_ZN5uking6action27GolemThrowPartsToTargetBase5calc_Ev +0x000000710018d708,W,000104,_ZN5uking6action19GolemThrowPartsBaseD1Ev +0x000000710018d770,W,000112,_ZN5uking6action19GolemThrowPartsBaseD0Ev +0x000000710018d7e0,O,000008,_ZN5uking6action19GolemThrowPartsBase5init_EPN4sead4HeapE +0x000000710018d7e8,W,000108,_ZN5uking6action19GolemThrowPartsBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710018d854,W,000136,_ZN5uking6action19GolemThrowPartsBase5calc_Ev 0x000000710018d8dc,U,000188, 0x000000710018d998,U,000480, -0x000000710018db78,W,000048,_ZN5uking6action27GolemThrowPartsToTargetBase6leave_Ev -0x000000710018dba8,W,000200,_ZN5uking6action27GolemThrowPartsToTargetBase11loadParams_Ev +0x000000710018db78,W,000048,_ZN5uking6action19GolemThrowPartsBase6leave_Ev +0x000000710018dba8,W,000200,_ZN5uking6action19GolemThrowPartsBase11loadParams_Ev 0x000000710018dc70,U,000396, -0x000000710018ddfc,U,000168,uking::action::GolemThrowPartsToTargetBase::m32 -0x000000710018dea4,O,000216,_ZNK5uking6action27GolemThrowPartsToTargetBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710018df7c,O,000092,_ZNK5uking6action27GolemThrowPartsToTargetBase18getRuntimeTypeInfoEv +0x000000710018ddfc,U,000168,uking::action::GolemThrowPartsBase::m32 +0x000000710018dea4,O,000216,_ZNK5uking6action19GolemThrowPartsBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710018df7c,O,000092,_ZNK5uking6action19GolemThrowPartsBase18getRuntimeTypeInfoEv 0x000000710018dfd8,U,000056,AI_Action_GolemThrowPartsToTarget::ctor 0x000000710018e010,O,000004,_ZN5uking6action23GolemThrowPartsToTargetD1Ev 0x000000710018e014,O,000036,_ZN5uking6action23GolemThrowPartsToTargetD0Ev @@ -10688,7 +10688,7 @@ Address,Quality,Size,Name 0x000000710018e0f4,U,000560,uking::action::GolemThrowPartsToTarget::m32 0x000000710018e324,O,000300,_ZNK5uking6action23GolemThrowPartsToTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710018e450,O,000092,_ZNK5uking6action23GolemThrowPartsToTarget18getRuntimeTypeInfoEv -0x000000710018e4ac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action27GolemThrowPartsToTargetBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710018e4ac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19GolemThrowPartsBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710018e538,O,000048,_ZN5uking6action25GoronHeroDescendentAppearC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710018e568,O,000020,_ZN5uking6action25GoronHeroDescendentAppearD1Ev 0x000000710018e57c,O,000052,_ZN5uking6action25GoronHeroDescendentAppearD0Ev @@ -11434,7 +11434,7 @@ Address,Quality,Size,Name 0x00000071001ae15c,U,000064, 0x00000071001ae19c,U,000008, 0x00000071001ae1a4,O,000384,_ZN5uking6action22HorseRideChargeCommand33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001ae324,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20HorseRideMoveCommandEE9isDerivedEPKNS0_9InterfaceE +0x00000071001ae324,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action23HorseRideSetGearCommandEE9isDerivedEPKNS0_9InterfaceE 0x00000071001ae3b0,U,000112,AI_Action_HorseRideChaseCommand::ctor 0x00000071001ae420,W,000100,_ZN5uking6action21HorseRideChaseCommandD1Ev 0x00000071001ae484,U,000076, @@ -11560,16 +11560,16 @@ Address,Quality,Size,Name 0x00000071001b081c,U,000004,j__ZdlPv_61 0x00000071001b0820,U,000008, 0x00000071001b0828,U,000124,AI_ActionHorseRideMoveCommand::ctor -0x00000071001b08a4,W,000040,_ZN5uking6action20HorseRideMoveCommandD1Ev -0x00000071001b08cc,W,000072,_ZN5uking6action20HorseRideMoveCommandD0Ev -0x00000071001b0914,O,000004,_ZN5uking6action20HorseRideMoveCommand5init_EPN4sead4HeapE -0x00000071001b0918,O,000004,_ZN5uking6action20HorseRideMoveCommand6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001b091c,O,000004,_ZN5uking6action20HorseRideMoveCommand5calc_Ev -0x00000071001b0920,O,000004,_ZN5uking6action20HorseRideMoveCommand6leave_Ev -0x00000071001b0924,O,000084,_ZN5uking6action20HorseRideMoveCommand11loadParams_Ev -0x00000071001b0978,U,000056,uking::action::HorseRideMoveCommand::m32 -0x00000071001b09b0,O,000300,_ZNK5uking6action20HorseRideMoveCommand27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001b0adc,O,000092,_ZNK5uking6action20HorseRideMoveCommand18getRuntimeTypeInfoEv +0x00000071001b08a4,W,000040,_ZN5uking6action23HorseRideSetGearCommandD1Ev +0x00000071001b08cc,W,000072,_ZN5uking6action23HorseRideSetGearCommandD0Ev +0x00000071001b0914,O,000004,_ZN5uking6action23HorseRideSetGearCommand5init_EPN4sead4HeapE +0x00000071001b0918,O,000004,_ZN5uking6action23HorseRideSetGearCommand6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001b091c,O,000004,_ZN5uking6action23HorseRideSetGearCommand5calc_Ev +0x00000071001b0920,O,000004,_ZN5uking6action23HorseRideSetGearCommand6leave_Ev +0x00000071001b0924,O,000084,_ZN5uking6action23HorseRideSetGearCommand11loadParams_Ev +0x00000071001b0978,U,000056,uking::action::HorseRideSetGearCommand::m32 +0x00000071001b09b0,O,000300,_ZNK5uking6action23HorseRideSetGearCommand27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001b0adc,O,000092,_ZNK5uking6action23HorseRideSetGearCommand18getRuntimeTypeInfoEv 0x00000071001b0b38,U,000092,AI_Action_HorseRideShoot::ctor 0x00000071001b0b94,W,000020,_ZN5uking6action14HorseRideShootD1Ev 0x00000071001b0ba8,W,000052,_ZN5uking6action14HorseRideShootD0Ev @@ -12349,17 +12349,17 @@ Address,Quality,Size,Name 0x00000071001cef44,O,000052,_ZN5uking6action11LargeDamageD0Ev 0x00000071001cef78,O,000372,_ZN5uking6action11LargeDamage33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071001cf0ec,U,000056,AI_ActionSiteBossBlowOff::ctor -0x00000071001cf124,O,000004,_ZN5uking6action15SiteBossBlowOffD1Ev -0x00000071001cf128,O,000036,_ZN5uking6action15SiteBossBlowOffD0Ev -0x00000071001cf14c,O,000004,_ZN5uking6action15SiteBossBlowOff5init_EPN4sead4HeapE -0x00000071001cf150,W,000060,_ZN5uking6action15SiteBossBlowOff6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071001cf18c,W,000036,_ZN5uking6action15SiteBossBlowOff5calc_Ev -0x00000071001cf1b0,O,000004,_ZN5uking6action15SiteBossBlowOff6leave_Ev -0x00000071001cf1b4,O,000004,_ZN5uking6action15SiteBossBlowOff11loadParams_Ev -0x00000071001cf1b8,U,000004,uking::action::SiteBossBlowOff::m36 -0x00000071001cf1bc,U,000012,uking::action::SiteBossBlowOff::m40 -0x00000071001cf1c8,O,000132,_ZNK5uking6action15SiteBossBlowOff27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071001cf24c,O,000092,_ZNK5uking6action15SiteBossBlowOff18getRuntimeTypeInfoEv +0x00000071001cf124,O,000004,_ZN5uking6action15LastBossBlowOffD1Ev +0x00000071001cf128,O,000036,_ZN5uking6action15LastBossBlowOffD0Ev +0x00000071001cf14c,O,000004,_ZN5uking6action15LastBossBlowOff5init_EPN4sead4HeapE +0x00000071001cf150,W,000060,_ZN5uking6action15LastBossBlowOff6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071001cf18c,W,000036,_ZN5uking6action15LastBossBlowOff5calc_Ev +0x00000071001cf1b0,O,000004,_ZN5uking6action15LastBossBlowOff6leave_Ev +0x00000071001cf1b4,O,000004,_ZN5uking6action15LastBossBlowOff11loadParams_Ev +0x00000071001cf1b8,U,000004,uking::action::LastBossBlowOff::m36 +0x00000071001cf1bc,U,000012,uking::action::LastBossBlowOff::m40 +0x00000071001cf1c8,O,000132,_ZNK5uking6action15LastBossBlowOff27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071001cf24c,O,000092,_ZNK5uking6action15LastBossBlowOff18getRuntimeTypeInfoEv 0x00000071001cf2a8,U,000084,AI_Action_LastBossChemicalPillarAttack::ctor 0x00000071001cf2fc,O,000020,_ZN5uking6action28LastBossChemicalPillarAttackD1Ev 0x00000071001cf310,O,000052,_ZN5uking6action28LastBossChemicalPillarAttackD0Ev @@ -14000,7 +14000,7 @@ Address,Quality,Size,Name 0x000000710020f168,U,000240,uking::action::OctarockBalloon::m32 0x000000710020f258,O,000132,_ZNK5uking6action15OctarockBalloon27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710020f2dc,O,000092,_ZNK5uking6action15OctarockBalloon18getRuntimeTypeInfoEv -0x000000710020f338,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19OctarockBalloonBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710020f338,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15BalloonRopeBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710020f3c4,O,000048,_ZN5uking6action22OctarockBulletLExplodeC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710020f3f4,O,000004,_ZN5uking6action22OctarockBulletLExplodeD1Ev 0x000000710020f3f8,O,000036,_ZN5uking6action22OctarockBulletLExplodeD0Ev @@ -14696,16 +14696,16 @@ Address,Quality,Size,Name 0x0000007100221294,U,000052, 0x00000071002212c8,U,000008, 0x00000071002212d0,U,000052,AI_ActionPriestBossFastWarpOrCloneVanish::ctor -0x0000007100221304,O,000020,_ZN5uking6action22PriestBossWarpOrVanishD1Ev -0x0000007100221318,O,000052,_ZN5uking6action22PriestBossWarpOrVanishD0Ev +0x0000007100221304,O,000020,_ZN5uking6action23PriestBossCloneFastWarpD1Ev +0x0000007100221318,O,000052,_ZN5uking6action23PriestBossCloneFastWarpD0Ev 0x000000710022134c,U,000168, -0x00000071002213f4,O,000008,_ZN5uking6action22PriestBossWarpOrVanish5init_EPN4sead4HeapE -0x00000071002213fc,O,000004,_ZN5uking6action22PriestBossWarpOrVanish6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100221400,O,000004,_ZN5uking6action22PriestBossWarpOrVanish5calc_Ev -0x0000007100221404,O,000004,_ZN5uking6action22PriestBossWarpOrVanish6leave_Ev -0x0000007100221408,O,000064,_ZN5uking6action22PriestBossWarpOrVanish11loadParams_Ev -0x0000007100221448,O,000288,_ZNK5uking6action22PriestBossWarpOrVanish27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100221568,O,000092,_ZNK5uking6action22PriestBossWarpOrVanish18getRuntimeTypeInfoEv +0x00000071002213f4,O,000008,_ZN5uking6action23PriestBossCloneFastWarp5init_EPN4sead4HeapE +0x00000071002213fc,O,000004,_ZN5uking6action23PriestBossCloneFastWarp6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100221400,O,000004,_ZN5uking6action23PriestBossCloneFastWarp5calc_Ev +0x0000007100221404,O,000004,_ZN5uking6action23PriestBossCloneFastWarp6leave_Ev +0x0000007100221408,O,000064,_ZN5uking6action23PriestBossCloneFastWarp11loadParams_Ev +0x0000007100221448,O,000288,_ZNK5uking6action23PriestBossCloneFastWarp27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100221568,O,000092,_ZNK5uking6action23PriestBossCloneFastWarp18getRuntimeTypeInfoEv 0x00000071002215c4,U,000140,AI_Action_PriestBossClonesSpawn::ctor 0x0000007100221650,W,000088,_ZN5uking6action21PriestBossClonesSpawnD1Ev 0x00000071002216a8,U,000064, @@ -15508,8 +15508,8 @@ Address,Quality,Size,Name 0x000000710024253c,U,000004,uking::action::TackleMove::m33 0x0000007100242540,U,000020,uking::action::SandwormTackleMove::m34 0x0000007100242554,U,000012,uking::action::SandwormTackleMove::m35 -0x0000007100242560,O,000372,_ZN5uking6action13AtkTackleMove33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002426d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action13AtkTackleMoveEE9isDerivedEPKNS0_9InterfaceE +0x0000007100242560,O,000372,_ZN5uking6action12TackleAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002426d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action12TackleAttackEE9isDerivedEPKNS0_9InterfaceE 0x0000007100242760,O,000052,_ZN5uking6action10ScrapEquipC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100242794,O,000020,_ZN5uking6action10ScrapEquipD1Ev 0x00000071002427a8,O,000052,_ZN5uking6action10ScrapEquipD0Ev @@ -15756,14 +15756,14 @@ Address,Quality,Size,Name 0x00000071002477e4,O,000288,_ZNK5uking6action20SetExtraLifeOfPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100247904,O,000092,_ZNK5uking6action20SetExtraLifeOfPlayer18getRuntimeTypeInfoEv 0x0000007100247960,U,000048,AI_ActionSetGetFlag::ctor -0x0000007100247990,O,000020,_ZN5uking6action14SetGetFlagBaseD1Ev -0x00000071002479a4,O,000052,_ZN5uking6action14SetGetFlagBaseD0Ev -0x00000071002479d8,O,000008,_ZN5uking6action14SetGetFlagBase5init_EPN4sead4HeapE -0x00000071002479e0,U,000348,_ZN5uking6action14SetGetFlagBase8oneShot_Ev +0x0000007100247990,O,000020,_ZN5uking6action7SetFlagD1Ev +0x00000071002479a4,O,000052,_ZN5uking6action7SetFlagD0Ev +0x00000071002479d8,O,000008,_ZN5uking6action7SetFlag5init_EPN4sead4HeapE +0x00000071002479e0,U,000348,_ZN5uking6action7SetFlag8oneShot_Ev 0x0000007100247b3c,O,000196,_ZN4ksys3gdt7Manager14setBoolNoCheckEbNS0_10FlagHandleE -0x0000007100247c00,O,000004,_ZN5uking6action14SetGetFlagBase11loadParams_Ev -0x0000007100247c04,O,000288,_ZNK5uking6action14SetGetFlagBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100247d24,O,000092,_ZNK5uking6action14SetGetFlagBase18getRuntimeTypeInfoEv +0x0000007100247c00,O,000004,_ZN5uking6action7SetFlag11loadParams_Ev +0x0000007100247c04,O,000288,_ZNK5uking6action7SetFlag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100247d24,O,000092,_ZNK5uking6action7SetFlag18getRuntimeTypeInfoEv 0x0000007100247d80,O,000080,_ZN5uking6action14SetFrameASPlayC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100247dd0,O,000020,_ZN5uking6action14SetFrameASPlayD1Ev 0x0000007100247de4,O,000052,_ZN5uking6action14SetFrameASPlayD0Ev @@ -15785,7 +15785,7 @@ Address,Quality,Size,Name 0x0000007100248398,O,000092,_ZNK5uking6action10SetGetFlag18getRuntimeTypeInfoEv 0x00000071002483f4,U,000008,uking::action::SetGetFlag::m32 0x00000071002483fc,O,000372,_ZN5uking6action10SetGetFlag33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100248570,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14SetGetFlagBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100248570,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action7SetFlagEE9isDerivedEPKNS0_9InterfaceE 0x00000071002485fc,U,000152,AI_Action_SetGetFlagByActorName::ctor 0x0000007100248694,W,000020,_ZN5uking6action21SetGetFlagByActorNameD1Ev 0x00000071002486a8,W,000052,_ZN5uking6action21SetGetFlagByActorNameD0Ev @@ -16277,7 +16277,7 @@ Address,Quality,Size,Name 0x0000007100256d44,U,000204,uking::action::SiteBossBowBlowOff::m37 0x0000007100256e10,O,000216,_ZNK5uking6action18SiteBossBowBlowOff27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100256ee8,O,000092,_ZNK5uking6action18SiteBossBowBlowOff18getRuntimeTypeInfoEv -0x0000007100256f44,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15SiteBossBlowOffEE9isDerivedEPKNS0_9InterfaceE +0x0000007100256f44,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15LastBossBlowOffEE9isDerivedEPKNS0_9InterfaceE 0x0000007100256fd0,U,000060,AI_Action_SiteBossBowChildDeviceBreak::ctor 0x000000710025700c,O,000020,_ZN5uking6action27SiteBossBowChildDeviceBreakD1Ev 0x0000007100257020,O,000052,_ZN5uking6action27SiteBossBowChildDeviceBreakD0Ev @@ -16393,26 +16393,26 @@ Address,Quality,Size,Name 0x000000710025c1d8,U,000012,uking::action::SiteBossLswordAtkWithChemical::m38 0x000000710025c1e4,O,000008,_ZNK5uking6action29SiteBossLswordAtkWithChemical27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710025c1ec,O,000092,_ZNK5uking6action29SiteBossLswordAtkWithChemical18getRuntimeTypeInfoEv -0x000000710025c248,U,000012,_ZNK5uking6action17SiteBossLswordAtk10isFinishedEv -0x000000710025c254,U,000008,_ZNK5uking6action17SiteBossLswordAtk12isChangeableEv -0x000000710025c25c,U,000012,uking::action::SiteBossLswordAtk::m36 +0x000000710025c248,U,000012,_ZNK5uking6action20SiteBossLswordAttack10isFinishedEv +0x000000710025c254,U,000008,_ZNK5uking6action20SiteBossLswordAttack12isChangeableEv +0x000000710025c25c,U,000012,uking::action::SiteBossLswordAttack::m36 0x000000710025c268,U,000008,uking::action::SiteBossLswordAtkWithChemical::m39 0x000000710025c270,O,000372,_ZN5uking6action29SiteBossLswordAtkWithChemical33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710025c3e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action17SiteBossLswordAtkEE9isDerivedEPKNS0_9InterfaceE +0x000000710025c3e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20SiteBossLswordAttackEE9isDerivedEPKNS0_9InterfaceE 0x000000710025c470,U,000104,AI_ActionSiteBossLswordAtkWithChemical::ctor -0x000000710025c4d8,O,000020,_ZN5uking6action17SiteBossLswordAtkD1Ev -0x000000710025c4ec,O,000052,_ZN5uking6action17SiteBossLswordAtkD0Ev -0x000000710025c520,O,000008,_ZN5uking6action17SiteBossLswordAtk5init_EPN4sead4HeapE -0x000000710025c528,W,000528,_ZN5uking6action17SiteBossLswordAtk6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710025c738,W,001072,_ZN5uking6action17SiteBossLswordAtk5calc_Ev -0x000000710025cb68,U,000060,uking::action::SiteBossLswordAtk::m32 -0x000000710025cba4,W,000128,_ZN5uking6action17SiteBossLswordAtk6leave_Ev -0x000000710025cc24,O,000556,_ZN5uking6action17SiteBossLswordAtk11loadParams_Ev -0x000000710025ce50,U,000008,uking::action::SiteBossLswordAtk::m34 -0x000000710025ce58,U,000200,uking::action::SiteBossLswordAtk::m35 -0x000000710025cf20,U,001272,uking::action::SiteBossLswordAtk::m33 -0x000000710025d418,O,000288,_ZNK5uking6action17SiteBossLswordAtk27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710025d538,O,000092,_ZNK5uking6action17SiteBossLswordAtk18getRuntimeTypeInfoEv +0x000000710025c4d8,O,000020,_ZN5uking6action20SiteBossLswordAttackD1Ev +0x000000710025c4ec,O,000052,_ZN5uking6action20SiteBossLswordAttackD0Ev +0x000000710025c520,O,000008,_ZN5uking6action20SiteBossLswordAttack5init_EPN4sead4HeapE +0x000000710025c528,W,000528,_ZN5uking6action20SiteBossLswordAttack6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710025c738,W,001072,_ZN5uking6action20SiteBossLswordAttack5calc_Ev +0x000000710025cb68,U,000060,uking::action::SiteBossLswordAttack::m32 +0x000000710025cba4,W,000128,_ZN5uking6action20SiteBossLswordAttack6leave_Ev +0x000000710025cc24,O,000556,_ZN5uking6action20SiteBossLswordAttack11loadParams_Ev +0x000000710025ce50,U,000008,uking::action::SiteBossLswordAttack::m34 +0x000000710025ce58,U,000200,uking::action::SiteBossLswordAttack::m35 +0x000000710025cf20,U,001272,uking::action::SiteBossLswordAttack::m33 +0x000000710025d418,O,000288,_ZNK5uking6action20SiteBossLswordAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710025d538,O,000092,_ZNK5uking6action20SiteBossLswordAttack18getRuntimeTypeInfoEv 0x000000710025d594,U,000096,AI_Action_SiteBossLswordFireBall::ctor 0x000000710025d5f4,O,000020,_ZN5uking6action22SiteBossLswordFireBallD1Ev 0x000000710025d608,O,000052,_ZN5uking6action22SiteBossLswordFireBallD0Ev @@ -17203,15 +17203,15 @@ Address,Quality,Size,Name 0x000000710027f83c,O,000132,_ZNK5uking6action8StopJump27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710027f8c0,O,000092,_ZNK5uking6action8StopJump18getRuntimeTypeInfoEv 0x000000710027f91c,U,000088,AI_ActionWaitOnObj::ctor -0x000000710027f974,W,000068,_ZN5uking6action13WaitOnObjBaseD1Ev -0x000000710027f9b8,W,000076,_ZN5uking6action13WaitOnObjBaseD0Ev -0x000000710027fa04,O,000008,_ZN5uking6action13WaitOnObjBase5init_EPN4sead4HeapE -0x000000710027fa0c,W,000760,_ZN5uking6action13WaitOnObjBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710027fd04,W,001496,_ZN5uking6action13WaitOnObjBase5calc_Ev -0x00000071002802dc,W,000104,_ZN5uking6action13WaitOnObjBase6leave_Ev -0x0000007100280344,O,000100,_ZN5uking6action13WaitOnObjBase11loadParams_Ev -0x00000071002803a8,O,000288,_ZNK5uking6action13WaitOnObjBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002804c8,O,000092,_ZNK5uking6action13WaitOnObjBase18getRuntimeTypeInfoEv +0x000000710027f974,W,000068,_ZN5uking6action9StopOnObjD1Ev +0x000000710027f9b8,W,000076,_ZN5uking6action9StopOnObjD0Ev +0x000000710027fa04,O,000008,_ZN5uking6action9StopOnObj5init_EPN4sead4HeapE +0x000000710027fa0c,W,000760,_ZN5uking6action9StopOnObj6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710027fd04,W,001496,_ZN5uking6action9StopOnObj5calc_Ev +0x00000071002802dc,W,000104,_ZN5uking6action9StopOnObj6leave_Ev +0x0000007100280344,O,000100,_ZN5uking6action9StopOnObj11loadParams_Ev +0x00000071002803a8,O,000288,_ZNK5uking6action9StopOnObj27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002804c8,O,000092,_ZNK5uking6action9StopOnObj18getRuntimeTypeInfoEv 0x0000007100280524,U,000048,AI_ActionAttack::ctor 0x0000007100280554,O,000020,_ZN5uking6action10AttackBaseD1Ev 0x0000007100280568,O,000052,_ZN5uking6action10AttackBaseD0Ev @@ -17709,18 +17709,18 @@ Address,Quality,Size,Name 0x0000007100290f28,O,000288,_ZNK5uking6action10SystemWarp27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100291048,O,000092,_ZNK5uking6action10SystemWarp18getRuntimeTypeInfoEv 0x00000071002910a4,U,000100,AI_ActionSandwormTackleMove::ctor -0x0000007100291108,W,000088,_ZN5uking6action13AtkTackleMoveD1Ev -0x0000007100291160,W,000096,_ZN5uking6action13AtkTackleMoveD0Ev -0x00000071002911c0,O,000004,_ZN5uking6action13AtkTackleMove5init_EPN4sead4HeapE -0x00000071002911c4,W,000076,_ZN5uking6action13AtkTackleMove6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100291210,W,000108,_ZN5uking6action13AtkTackleMove5calc_Ev -0x000000710029127c,W,000056,_ZN5uking6action13AtkTackleMove6leave_Ev -0x00000071002912b4,W,000084,_ZN5uking6action13AtkTackleMove11loadParams_Ev -0x0000007100291308,U,000240,uking::action::AtkTackleMove::m36 -0x00000071002913f8,U,000136,uking::action::AtkTackleMove::m37 -0x0000007100291480,U,000008,uking::action::AtkTackleMove::m38 -0x0000007100291488,O,000008,_ZNK5uking6action13AtkTackleMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100291490,O,000092,_ZNK5uking6action13AtkTackleMove18getRuntimeTypeInfoEv +0x0000007100291108,W,000088,_ZN5uking6action12TackleAttackD1Ev +0x0000007100291160,W,000096,_ZN5uking6action12TackleAttackD0Ev +0x00000071002911c0,O,000004,_ZN5uking6action12TackleAttack5init_EPN4sead4HeapE +0x00000071002911c4,W,000076,_ZN5uking6action12TackleAttack6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100291210,W,000108,_ZN5uking6action12TackleAttack5calc_Ev +0x000000710029127c,W,000056,_ZN5uking6action12TackleAttack6leave_Ev +0x00000071002912b4,W,000084,_ZN5uking6action12TackleAttack11loadParams_Ev +0x0000007100291308,U,000240,uking::action::TackleAttack::m36 +0x00000071002913f8,U,000136,uking::action::TackleAttack::m37 +0x0000007100291480,U,000008,uking::action::TackleAttack::m38 +0x0000007100291488,O,000008,_ZNK5uking6action12TackleAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100291490,O,000092,_ZNK5uking6action12TackleAttack18getRuntimeTypeInfoEv 0x00000071002914ec,U,000064,AI_ActionTackleMoveOrNo::ctor 0x000000710029152c,O,000020,_ZN5uking6action10TackleMoveD1Ev 0x0000007100291540,O,000052,_ZN5uking6action10TackleMoveD0Ev @@ -18500,7 +18500,7 @@ Address,Quality,Size,Name 0x00000071002ab8ac,O,000008,_ZNK5uking6action9WaitOnObj27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002ab8b4,O,000092,_ZNK5uking6action9WaitOnObj18getRuntimeTypeInfoEv 0x00000071002ab910,O,000372,_ZN5uking6action9WaitOnObj33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002aba84,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action13WaitOnObjBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002aba84,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action9StopOnObjEE9isDerivedEPKNS0_9InterfaceE 0x00000071002abb10,U,000056,AI_Action_WaitTimer::ctor 0x00000071002abb48,O,000020,_ZN5uking6action9WaitTimerD1Ev 0x00000071002abb5c,O,000052,_ZN5uking6action9WaitTimerD0Ev @@ -18725,22 +18725,22 @@ Address,Quality,Size,Name 0x00000071002b3250,O,000288,_ZNK5uking6action18WarpToStaticAnchor27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002b3370,O,000092,_ZNK5uking6action18WarpToStaticAnchor18getRuntimeTypeInfoEv 0x00000071002b33cc,U,000104,AI_ActionWaterUpDownMove::ctor -0x00000071002b3434,W,000084,_ZN5uking6action19WaterUpDownMoveBaseD1Ev -0x00000071002b3488,W,000092,_ZN5uking6action19WaterUpDownMoveBaseD0Ev -0x00000071002b34e4,O,000008,_ZN5uking6action19WaterUpDownMoveBase5init_EPN4sead4HeapE -0x00000071002b34ec,W,000220,_ZN5uking6action19WaterUpDownMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002b35c8,W,000276,_ZN5uking6action19WaterUpDownMoveBase5calc_Ev -0x00000071002b36dc,W,000044,_ZN5uking6action19WaterUpDownMoveBase6leave_Ev -0x00000071002b3708,O,000240,_ZN5uking6action19WaterUpDownMoveBase11loadParams_Ev +0x00000071002b3434,W,000084,_ZN5uking6action18WaterDepthMoveBaseD1Ev +0x00000071002b3488,W,000092,_ZN5uking6action18WaterDepthMoveBaseD0Ev +0x00000071002b34e4,O,000008,_ZN5uking6action18WaterDepthMoveBase5init_EPN4sead4HeapE +0x00000071002b34ec,W,000220,_ZN5uking6action18WaterDepthMoveBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002b35c8,W,000276,_ZN5uking6action18WaterDepthMoveBase5calc_Ev +0x00000071002b36dc,W,000044,_ZN5uking6action18WaterDepthMoveBase6leave_Ev +0x00000071002b3708,O,000240,_ZN5uking6action18WaterDepthMoveBase11loadParams_Ev 0x00000071002b37f8,U,000208, -0x00000071002b38c8,U,000068,uking::action::WaterUpDownMoveBase::m32 +0x00000071002b38c8,U,000068,uking::action::WaterDepthMoveBase::m32 0x00000071002b390c,U,000400, -0x00000071002b3a9c,U,000048,uking::action::WaterUpDownMoveBase::m33 +0x00000071002b3a9c,U,000048,uking::action::WaterDepthMoveBase::m33 0x00000071002b3acc,U,001148, -0x00000071002b3f48,U,000048,uking::action::WaterUpDownMoveBase::m34 +0x00000071002b3f48,U,000048,uking::action::WaterDepthMoveBase::m34 0x00000071002b3f78,U,000636, -0x00000071002b41f4,O,000288,_ZNK5uking6action19WaterUpDownMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002b4314,O,000092,_ZNK5uking6action19WaterUpDownMoveBase18getRuntimeTypeInfoEv +0x00000071002b41f4,O,000288,_ZNK5uking6action18WaterDepthMoveBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002b4314,O,000092,_ZNK5uking6action18WaterDepthMoveBase18getRuntimeTypeInfoEv 0x00000071002b4370,U,000096,AI_Action_WaterEmitter::ctor 0x00000071002b43d0,O,000008,_ZN5uking6action12WaterEmitter5init_EPN4sead4HeapE 0x00000071002b43d8,W,000104,_ZN5uking6action12WaterEmitter6enter_EPN4ksys3act2ai15InlineParamPackE @@ -18879,7 +18879,7 @@ Address,Quality,Size,Name 0x00000071002b87c8,O,000008,_ZNK5uking6action15WaterUpDownMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002b87d0,O,000092,_ZNK5uking6action15WaterUpDownMove18getRuntimeTypeInfoEv 0x00000071002b882c,O,000372,_ZN5uking6action15WaterUpDownMove33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002b89a0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action19WaterUpDownMoveBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002b89a0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action18WaterDepthMoveBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071002b8a2c,O,000052,_ZN5uking6action11WeaponDrawnC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002b8a60,W,000020,_ZN5uking6action11WeaponDrawnD1Ev 0x00000071002b8a74,W,000052,_ZN5uking6action11WeaponDrawnD0Ev @@ -20229,19 +20229,19 @@ Address,Quality,Size,Name 0x00000071002f9b9c,O,000092,_ZNK5uking2ai12AddSwarmMove18getRuntimeTypeInfoEv 0x00000071002f9bf8,U,000060,_ZNK5uking2ai12AddSwarmMove8isFailedEv 0x00000071002f9c34,U,000052,_ZNK5uking2ai12AddSwarmMove10isFinishedEv -0x00000071002f9c68,O,000048,_ZN5uking2ai20AddViewTargetPosBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071002f9c98,O,000004,_ZN5uking2ai20AddViewTargetPosBaseD1Ev -0x00000071002f9c9c,O,000036,_ZN5uking2ai20AddViewTargetPosBaseD0Ev -0x00000071002f9cc0,O,000008,_ZN5uking2ai20AddViewTargetPosBase5init_EPN4sead4HeapE -0x00000071002f9cc8,W,000020,_ZN5uking2ai20AddViewTargetPosBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071002f9cdc,U,000064,_ZN5uking2ai20AddViewTargetPosBase5calc_Ev -0x00000071002f9d1c,W,000008,_ZN5uking2ai20AddViewTargetPosBase6leave_Ev -0x00000071002f9d24,O,000004,_ZN5uking2ai20AddViewTargetPosBase11loadParams_Ev -0x00000071002f9d28,O,000288,_ZNK5uking2ai20AddViewTargetPosBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002f9e48,O,000092,_ZNK5uking2ai20AddViewTargetPosBase18getRuntimeTypeInfoEv -0x00000071002f9ea4,U,000036,_ZNK5uking2ai20AddViewTargetPosBase8isFailedEv -0x00000071002f9ec8,U,000036,_ZNK5uking2ai20AddViewTargetPosBase10isFinishedEv -0x00000071002f9eec,U,000004,uking::ai::AddViewTargetPosBase::m34 +0x00000071002f9c68,O,000048,_ZN5uking2ai13AddViewTargetC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071002f9c98,O,000004,_ZN5uking2ai13AddViewTargetD1Ev +0x00000071002f9c9c,O,000036,_ZN5uking2ai13AddViewTargetD0Ev +0x00000071002f9cc0,O,000008,_ZN5uking2ai13AddViewTarget5init_EPN4sead4HeapE +0x00000071002f9cc8,W,000020,_ZN5uking2ai13AddViewTarget6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071002f9cdc,U,000064,_ZN5uking2ai13AddViewTarget5calc_Ev +0x00000071002f9d1c,W,000008,_ZN5uking2ai13AddViewTarget6leave_Ev +0x00000071002f9d24,O,000004,_ZN5uking2ai13AddViewTarget11loadParams_Ev +0x00000071002f9d28,O,000288,_ZNK5uking2ai13AddViewTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071002f9e48,O,000092,_ZNK5uking2ai13AddViewTarget18getRuntimeTypeInfoEv +0x00000071002f9ea4,U,000036,_ZNK5uking2ai13AddViewTarget8isFailedEv +0x00000071002f9ec8,U,000036,_ZNK5uking2ai13AddViewTarget10isFinishedEv +0x00000071002f9eec,U,000004,uking::ai::AddViewTarget::m34 0x00000071002f9ef0,O,000048,_ZN5uking2ai16AddViewTargetPosC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071002f9f20,O,000004,_ZN5uking2ai16AddViewTargetPosD1Ev 0x00000071002f9f24,O,000036,_ZN5uking2ai16AddViewTargetPosD0Ev @@ -20254,7 +20254,7 @@ Address,Quality,Size,Name 0x00000071002f9f98,O,000008,_ZNK5uking2ai16AddViewTargetPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071002f9fa0,O,000092,_ZNK5uking2ai16AddViewTargetPos18getRuntimeTypeInfoEv 0x00000071002f9ffc,O,000372,_ZN5uking2ai16AddViewTargetPos33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071002fa170,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20AddViewTargetPosBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071002fa170,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai13AddViewTargetEE9isDerivedEPKNS0_9InterfaceE 0x00000071002fa1fc,U,000008,uking::ai::PreyNormal::m42 0x00000071002fa204,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai10PreyNormalEE9isDerivedEPKNS0_9InterfaceE 0x00000071002fa290,O,000052,_ZN5uking2ai16AirOctaBoardBurnC1ERKN4ksys3act2ai10ActionBase7InitArgE @@ -20445,8 +20445,8 @@ Address,Quality,Size,Name 0x00000071003024f0,O,000092,_ZNK5uking2ai19AncientNecklaceBall18getRuntimeTypeInfoEv 0x000000710030254c,U,000052, 0x0000007100302580,U,000008, -0x0000007100302588,O,000372,_ZN5uking2ai23AncientNecklaceBallBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003026fc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai23AncientNecklaceBallBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100302588,O,000372,_ZN5uking2ai12PlayASSwitch33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003026fc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai12PlayASSwitchEE9isDerivedEPKNS0_9InterfaceE 0x0000007100302788,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14SimpleLiftableEE9isDerivedEPKNS0_9InterfaceE 0x0000007100302814,U,000092, 0x0000007100302870,U,000004,nullsub_965 @@ -20508,7 +20508,7 @@ Address,Quality,Size,Name 0x0000007100304b28,U,000004,uking::ai::AnimalEscapeAI::m38 0x0000007100304b2c,O,000372,_ZN5uking2ai14AnimalEscapeAI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100304ca0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14AnimalEscapeAIEE9isDerivedEPKNS0_9InterfaceE -0x0000007100304d2c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14AnimalRoamBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100304d2c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai13AnimalRndMoveEE9isDerivedEPKNS0_9InterfaceE 0x0000007100304db8,M,000132,_ZN5uking2ai14AnimalEscapeAIC2ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100304e3c,O,000004,_ZN5uking2ai14AnimalEscapeAID1Ev 0x0000007100304e40,O,000036,_ZN5uking2ai14AnimalEscapeAID0Ev @@ -20596,19 +20596,19 @@ Address,Quality,Size,Name 0x000000710030a4fc,O,000288,_ZNK5uking2ai26AnimalRangeKeepMoveWithLOS27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710030a61c,O,000092,_ZNK5uking2ai26AnimalRangeKeepMoveWithLOS18getRuntimeTypeInfoEv 0x000000710030a678,U,000072,AI_AIAnimalRoamOrEscape::ctor -0x000000710030a6c0,O,000004,_ZN5uking2ai14AnimalRoamBaseD1Ev -0x000000710030a6c4,O,000036,_ZN5uking2ai14AnimalRoamBaseD0Ev -0x000000710030a6e8,O,000008,_ZN5uking2ai14AnimalRoamBase5init_EPN4sead4HeapE -0x000000710030a6f0,W,000060,_ZN5uking2ai14AnimalRoamBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710030a72c,U,000004,_ZN5uking2ai14AnimalRoamBase5calc_Ev -0x000000710030a730,O,000004,_ZN5uking2ai14AnimalRoamBase6leave_Ev -0x000000710030a734,O,000408,_ZN5uking2ai14AnimalRoamBase11loadParams_Ev -0x000000710030a8cc,U,001332,uking::ai::AnimalRoamBase::m34 -0x000000710030ae00,U,000092,uking::ai::AnimalRoamBase::m35 +0x000000710030a6c0,O,000004,_ZN5uking2ai13AnimalRndMoveD1Ev +0x000000710030a6c4,O,000036,_ZN5uking2ai13AnimalRndMoveD0Ev +0x000000710030a6e8,O,000008,_ZN5uking2ai13AnimalRndMove5init_EPN4sead4HeapE +0x000000710030a6f0,W,000060,_ZN5uking2ai13AnimalRndMove6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710030a72c,U,000004,_ZN5uking2ai13AnimalRndMove5calc_Ev +0x000000710030a730,O,000004,_ZN5uking2ai13AnimalRndMove6leave_Ev +0x000000710030a734,O,000408,_ZN5uking2ai13AnimalRndMove11loadParams_Ev +0x000000710030a8cc,U,001332,uking::ai::AnimalRndMove::m34 +0x000000710030ae00,U,000092,uking::ai::AnimalRndMove::m35 0x000000710030ae5c,U,000532, 0x000000710030b070,U,000028, -0x000000710030b08c,O,000288,_ZNK5uking2ai14AnimalRoamBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710030b1ac,O,000092,_ZNK5uking2ai14AnimalRoamBase18getRuntimeTypeInfoEv +0x000000710030b08c,O,000288,_ZNK5uking2ai13AnimalRndMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710030b1ac,O,000092,_ZNK5uking2ai13AnimalRndMove18getRuntimeTypeInfoEv 0x000000710030b208,U,000072,AI_AI_AnimalRoam::ctor 0x000000710030b250,O,000004,_ZN5uking2ai10AnimalRoamD1Ev 0x000000710030b254,O,000036,_ZN5uking2ai10AnimalRoamD0Ev @@ -20671,29 +20671,29 @@ Address,Quality,Size,Name 0x000000710030d560,O,000372,_ZN5uking2ai16AnimalTimelineAI33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710030d6d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai10TimelineAIEE9isDerivedEPKNS0_9InterfaceE 0x000000710030d760,U,000108,uking::ai::EnemyRoot::m38 -0x000000710030d7cc,U,000008,_ZNK5uking2ai16AppearNearTarget12isChangeableEv -0x000000710030d7d4,U,000008,uking::ai::AppearNearTarget::m36 -0x000000710030d7dc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai16AppearNearTargetEE9isDerivedEPKNS0_9InterfaceE -0x000000710030d868,M,000096,_ZN5uking2ai16AppearNearTargetC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710030d8c8,W,000088,_ZN5uking2ai16AppearNearTargetD1Ev -0x000000710030d920,W,000096,_ZN5uking2ai16AppearNearTargetD0Ev -0x000000710030d980,O,000008,_ZN5uking2ai16AppearNearTarget5init_EPN4sead4HeapE -0x000000710030d988,W,000396,_ZN5uking2ai16AppearNearTarget6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710030d7cc,U,000008,_ZNK5uking2ai16AppearFromTarget12isChangeableEv +0x000000710030d7d4,U,000008,uking::ai::AppearFromTarget::m36 +0x000000710030d7dc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai16AppearFromTargetEE9isDerivedEPKNS0_9InterfaceE +0x000000710030d868,M,000096,_ZN5uking2ai16AppearFromTargetC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710030d8c8,W,000088,_ZN5uking2ai16AppearFromTargetD1Ev +0x000000710030d920,W,000096,_ZN5uking2ai16AppearFromTargetD0Ev +0x000000710030d980,O,000008,_ZN5uking2ai16AppearFromTarget5init_EPN4sead4HeapE +0x000000710030d988,W,000396,_ZN5uking2ai16AppearFromTarget6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710030db14,U,000232, 0x000000710030dbfc,U,000228, -0x000000710030dce0,U,000780,_ZN5uking2ai16AppearNearTarget5calc_Ev +0x000000710030dce0,U,000780,_ZN5uking2ai16AppearFromTarget5calc_Ev 0x000000710030dfec,U,000216, 0x000000710030e0c4,U,001276, -0x000000710030e5c0,W,000380,_ZN5uking2ai16AppearNearTarget6leave_Ev -0x000000710030e73c,O,000156,_ZN5uking2ai16AppearNearTarget11loadParams_Ev -0x000000710030e7d8,U,000344,uking::ai::AppearNearTarget::m37 +0x000000710030e5c0,W,000380,_ZN5uking2ai16AppearFromTarget6leave_Ev +0x000000710030e73c,O,000156,_ZN5uking2ai16AppearFromTarget11loadParams_Ev +0x000000710030e7d8,U,000344,uking::ai::AppearFromTarget::m37 0x000000710030e930,U,000280, -0x000000710030ea48,U,000264,uking::ai::AppearNearTarget::m38 -0x000000710030eb50,U,000060,uking::ai::AppearNearTarget::m34 -0x000000710030eb8c,U,000060,uking::ai::AppearNearTarget::m35 -0x000000710030ebc8,U,000136,_ZNK5uking2ai16AppearNearTarget10isFinishedEv -0x000000710030ec50,O,000288,_ZNK5uking2ai16AppearNearTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710030ed70,O,000092,_ZNK5uking2ai16AppearNearTarget18getRuntimeTypeInfoEv +0x000000710030ea48,U,000264,uking::ai::AppearFromTarget::m38 +0x000000710030eb50,U,000060,uking::ai::AppearFromTarget::m34 +0x000000710030eb8c,U,000060,uking::ai::AppearFromTarget::m35 +0x000000710030ebc8,U,000136,_ZNK5uking2ai16AppearFromTarget10isFinishedEv +0x000000710030ec50,O,000288,_ZNK5uking2ai16AppearFromTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710030ed70,O,000092,_ZNK5uking2ai16AppearFromTarget18getRuntimeTypeInfoEv 0x000000710030edcc,U,000060,AI_AI_AppearFromTargetFrontAfterChase::ctor 0x000000710030ee08,O,000004,_ZN5uking2ai31AppearFromTargetFrontAfterChaseD1Ev 0x000000710030ee0c,O,000036,_ZN5uking2ai31AppearFromTargetFrontAfterChaseD0Ev @@ -21036,7 +21036,7 @@ Address,Quality,Size,Name 0x000000710031ce30,O,000008,_ZNK5uking2ai26AssassinFieldShooterBattle27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710031ce38,O,000092,_ZNK5uking2ai26AssassinFieldShooterBattle18getRuntimeTypeInfoEv 0x000000710031ce94,O,000372,_ZN5uking2ai26AssassinFieldShooterBattle33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710031d008,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai30AssassinFieldShooterBattleBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710031d008,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai21AssassinShooterBattleEE9isDerivedEPKNS0_9InterfaceE 0x000000710031d094,O,000372,_ZN5uking2ai18AssassinMiddleRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710031d208,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18AssassinMiddleRootEE9isDerivedEPKNS0_9InterfaceE 0x000000710031d294,O,000048,_ZN5uking2ai26AssassinMiddleAzitoDlcRootC1ERKN4ksys3act2ai10ActionBase7InitArgE @@ -21053,11 +21053,11 @@ Address,Quality,Size,Name 0x000000710031d60c,O,000092,_ZNK5uking2ai26AssassinMiddleAzitoDlcRoot18getRuntimeTypeInfoEv 0x000000710031d668,U,000008,uking::ai::EnemyNormal::m44 0x000000710031d670,U,000008,uking::ai::AssassinMiddleAzitoRoot::m53 -0x000000710031d678,U,000096,uking::ai::AssassinNormal::m55 +0x000000710031d678,U,000096,uking::ai::GuardHomePosNormal::m55 0x000000710031d6d8,U,000004,uking::ai::AssassinMiddleAzitoRoot::m75 0x000000710031d6dc,U,000036, 0x000000710031d700,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai23AssassinMiddleAzitoRootEE9isDerivedEPKNS0_9InterfaceE -0x000000710031d78c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14AssassinNormalEE9isDerivedEPKNS0_9InterfaceE +0x000000710031d78c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18GuardHomePosNormalEE9isDerivedEPKNS0_9InterfaceE 0x000000710031d818,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18LandHumEnemyNormalEE9isDerivedEPKNS0_9InterfaceE 0x000000710031d8a4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai11EnemyNormalEE9isDerivedEPKNS0_9InterfaceE 0x000000710031d930,O,000372,_ZN5uking2ai18LandHumEnemyNormal33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE @@ -21143,8 +21143,8 @@ Address,Quality,Size,Name 0x0000007100320ab8,O,000092,_ZNK5uking2ai24AssassinMiddleMagicAfter18getRuntimeTypeInfoEv 0x0000007100320b14,U,000004,uking::ai::TargetInAreaSelect::m35 0x0000007100320b18,U,000004,uking::ai::TargetInAreaSelect::m36 -0x0000007100320b1c,O,000372,_ZN5uking2ai22AssassinMagicTgtSelect33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100320c90,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai22AssassinMagicTgtSelectEE9isDerivedEPKNS0_9InterfaceE +0x0000007100320b1c,O,000372,_ZN5uking2ai22TargetHeightAreaSelect33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100320c90,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai22TargetHeightAreaSelectEE9isDerivedEPKNS0_9InterfaceE 0x0000007100320d1c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18TargetInAreaSelectEE9isDerivedEPKNS0_9InterfaceE 0x0000007100320da8,U,000200, 0x0000007100320e70,U,000224,AI_AI_AssassinMiddleRoot::ctor @@ -21178,20 +21178,20 @@ Address,Quality,Size,Name 0x0000007100321bc0,U,000004,uking::ai::AssassinRoot::m35 0x0000007100321bc4,O,000372,_ZN5uking2ai12AssassinRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100321d38,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai7NPCRootEE9isDerivedEPKNS0_9InterfaceE -0x0000007100321dc4,M,000064,_ZN5uking2ai30AssassinFieldShooterBattleBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100321e04,O,000004,_ZN5uking2ai30AssassinFieldShooterBattleBaseD1Ev -0x0000007100321e08,O,000036,_ZN5uking2ai30AssassinFieldShooterBattleBaseD0Ev -0x0000007100321e2c,W,000052,_ZN5uking2ai30AssassinFieldShooterBattleBase5init_EPN4sead4HeapE -0x0000007100321e60,W,000344,_ZN5uking2ai30AssassinFieldShooterBattleBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100321fb8,U,001448,_ZN5uking2ai30AssassinFieldShooterBattleBase5calc_Ev +0x0000007100321dc4,M,000064,_ZN5uking2ai21AssassinShooterBattleC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100321e04,O,000004,_ZN5uking2ai21AssassinShooterBattleD1Ev +0x0000007100321e08,O,000036,_ZN5uking2ai21AssassinShooterBattleD0Ev +0x0000007100321e2c,W,000052,_ZN5uking2ai21AssassinShooterBattle5init_EPN4sead4HeapE +0x0000007100321e60,W,000344,_ZN5uking2ai21AssassinShooterBattle6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100321fb8,U,001448,_ZN5uking2ai21AssassinShooterBattle5calc_Ev 0x0000007100322560,U,000280, -0x0000007100322678,O,000004,_ZN5uking2ai30AssassinFieldShooterBattleBase6leave_Ev -0x000000710032267c,O,000240,_ZN5uking2ai30AssassinFieldShooterBattleBase11loadParams_Ev +0x0000007100322678,O,000004,_ZN5uking2ai21AssassinShooterBattle6leave_Ev +0x000000710032267c,O,000240,_ZN5uking2ai21AssassinShooterBattle11loadParams_Ev 0x000000710032276c,U,000268, -0x0000007100322878,U,000100,uking::ai::AssassinFieldShooterBattleBase::m34 +0x0000007100322878,U,000100,uking::ai::AssassinShooterBattle::m34 0x00000071003228dc,U,000084, -0x0000007100322930,O,000288,_ZNK5uking2ai30AssassinFieldShooterBattleBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100322a50,O,000092,_ZNK5uking2ai30AssassinFieldShooterBattleBase18getRuntimeTypeInfoEv +0x0000007100322930,O,000288,_ZNK5uking2ai21AssassinShooterBattle27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100322a50,O,000092,_ZNK5uking2ai21AssassinShooterBattle18getRuntimeTypeInfoEv 0x0000007100322aac,U,000200,AI_AI_AssassinShooterJuniorAzitoRoot::ctor 0x0000007100322b74,W,000128,_ZN5uking2ai30AssassinShooterJuniorAzitoRootD1Ev 0x0000007100322bf4,W,000136,_ZN5uking2ai30AssassinShooterJuniorAzitoRootD0Ev @@ -21280,21 +21280,21 @@ Address,Quality,Size,Name 0x0000007100325848,U,000036,_ZNK5uking2ai14AwarenessScale8isFailedEv 0x000000710032586c,U,000036,_ZNK5uking2ai14AwarenessScale10isFinishedEv 0x0000007100325890,U,000036,_ZNK5uking2ai14AwarenessScale12isChangeableEv -0x00000071003258b4,M,000072,_ZN5uking2ai18SandwormNormalBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071003258fc,O,000004,_ZN5uking2ai18SandwormNormalBaseD1Ev -0x0000007100325900,O,000036,_ZN5uking2ai18SandwormNormalBaseD0Ev -0x0000007100325924,O,000004,_ZN5uking2ai18SandwormNormalBase5init_EPN4sead4HeapE -0x0000007100325928,W,000276,_ZN5uking2ai18SandwormNormalBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100325a3c,U,000184,_ZN5uking2ai18SandwormNormalBase5calc_Ev -0x0000007100325af4,W,000180,_ZN5uking2ai18SandwormNormalBase6leave_Ev -0x0000007100325ba8,W,000164,_ZN5uking2ai18SandwormNormalBase11loadParams_Ev -0x0000007100325c4c,O,000008,_ZNK5uking2ai18SandwormNormalBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100325c54,O,000092,_ZNK5uking2ai18SandwormNormalBase18getRuntimeTypeInfoEv +0x00000071003258b4,M,000072,_ZN5uking2ai7AwnSealC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071003258fc,O,000004,_ZN5uking2ai7AwnSealD1Ev +0x0000007100325900,O,000036,_ZN5uking2ai7AwnSealD0Ev +0x0000007100325924,O,000004,_ZN5uking2ai7AwnSeal5init_EPN4sead4HeapE +0x0000007100325928,W,000276,_ZN5uking2ai7AwnSeal6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100325a3c,U,000184,_ZN5uking2ai7AwnSeal5calc_Ev +0x0000007100325af4,W,000180,_ZN5uking2ai7AwnSeal6leave_Ev +0x0000007100325ba8,W,000164,_ZN5uking2ai7AwnSeal11loadParams_Ev +0x0000007100325c4c,O,000008,_ZNK5uking2ai7AwnSeal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100325c54,O,000092,_ZNK5uking2ai7AwnSeal18getRuntimeTypeInfoEv 0x0000007100325cb0,U,000008,uking::ai::EnemyNormal::m53 0x0000007100325cb8,U,000008,uking::ai::EnemyNormal::m56 0x0000007100325cc0,U,000004,uking::ai::EnemyNormal::m58 0x0000007100325cc4,U,000008,uking::ai::EnemyNormal::m63 -0x0000007100325ccc,O,000372,_ZN5uking2ai18SandwormNormalBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100325ccc,O,000372,_ZN5uking2ai7AwnSeal33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100325e40,U,000080,AI_AI_BackAttackEnemyBattle::ctor 0x0000007100325e90,O,000008,_ZN5uking2ai21BackAttackEnemyBattle5init_EPN4sead4HeapE 0x0000007100325e98,W,000236,_ZN5uking2ai21BackAttackEnemyBattle6enter_EPN4ksys3act2ai15InlineParamPackE @@ -21366,7 +21366,7 @@ Address,Quality,Size,Name 0x0000007100328d1c,O,000008,_ZNK5uking2ai11BeamExplode27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100328d24,O,000092,_ZNK5uking2ai11BeamExplode18getRuntimeTypeInfoEv 0x0000007100328d80,O,000372,_ZN5uking2ai11BeamExplode33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100328ef4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15BeamExplodeBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100328ef4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai17SimpleBeamExplodeEE9isDerivedEPKNS0_9InterfaceE 0x0000007100328f80,U,000052,AI_AI_BeamExplodeEitherHit::ctor 0x0000007100328fb4,O,000004,_ZN5uking2ai20BeamExplodeEitherHitD1Ev 0x0000007100328fb8,O,000036,_ZN5uking2ai20BeamExplodeEitherHitD0Ev @@ -21406,10 +21406,10 @@ Address,Quality,Size,Name 0x0000007100329a1c,O,000008,_ZNK5uking2ai9BeeBattle27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100329a24,O,000092,_ZNK5uking2ai9BeeBattle18getRuntimeTypeInfoEv 0x0000007100329a80,O,000372,_ZN5uking2ai9BeeBattle33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100329bf4,U,000008,uking::ai::SimpleWildlifeRoot::m36 +0x0000007100329bf4,U,000008,uking::ai::CapturedActorRoot::m36 0x0000007100329bfc,O,000372,_ZN5uking2ai10InsectRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100329d70,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai10InsectRootEE9isDerivedEPKNS0_9InterfaceE -0x0000007100329dfc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18SimpleWildlifeRootEE9isDerivedEPKNS0_9InterfaceE +0x0000007100329dfc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai17CapturedActorRootEE9isDerivedEPKNS0_9InterfaceE 0x0000007100329e88,O,000048,_ZN5uking2ai18BeeSwarmFindPlayerC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100329eb8,O,000004,_ZN5uking2ai18BeeSwarmFindPlayerD1Ev 0x0000007100329ebc,O,000036,_ZN5uking2ai18BeeSwarmFindPlayerD0Ev @@ -21479,46 +21479,46 @@ Address,Quality,Size,Name 0x000000710032b9f0,O,000372,_ZN5uking2ai9SwarmRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710032bb64,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai9SwarmRootEE9isDerivedEPKNS0_9InterfaceE 0x000000710032bbf0,U,000056,AI_AIRailMove::ctor -0x000000710032bc28,O,000004,_ZN5uking2ai8RailMoveD1Ev -0x000000710032bc2c,O,000036,_ZN5uking2ai8RailMoveD0Ev -0x000000710032bc50,O,000008,_ZN5uking2ai8RailMove5init_EPN4sead4HeapE -0x000000710032bc58,W,000084,_ZN5uking2ai8RailMove6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710032bc28,O,000004,_ZN5uking2ai14BezierRailMoveD1Ev +0x000000710032bc2c,O,000036,_ZN5uking2ai14BezierRailMoveD0Ev +0x000000710032bc50,O,000008,_ZN5uking2ai14BezierRailMove5init_EPN4sead4HeapE +0x000000710032bc58,W,000084,_ZN5uking2ai14BezierRailMove6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710032bcac,U,000076, -0x000000710032bcf8,U,000912,_ZN5uking2ai8RailMove5calc_Ev +0x000000710032bcf8,U,000912,_ZN5uking2ai14BezierRailMove5calc_Ev 0x000000710032c088,U,000076, 0x000000710032c0d4,U,000476, 0x000000710032c2b0,U,000628, -0x000000710032c524,O,000004,_ZN5uking2ai8RailMove6leave_Ev -0x000000710032c528,O,000064,_ZN5uking2ai8RailMove11loadParams_Ev -0x000000710032c568,U,000004,uking::ai::RailMove::m34 +0x000000710032c524,O,000004,_ZN5uking2ai14BezierRailMove6leave_Ev +0x000000710032c528,O,000064,_ZN5uking2ai14BezierRailMove11loadParams_Ev +0x000000710032c568,U,000004,uking::ai::BezierRailMove::m34 0x000000710032c56c,U,000064, 0x000000710032c5ac,U,000016, 0x000000710032c5bc,U,000060, 0x000000710032c5f8,U,000612, -0x000000710032c85c,U,000012,uking::ai::RailMove::m36 -0x000000710032c868,U,000276,uking::ai::RailMove::m37 +0x000000710032c85c,U,000012,uking::ai::BezierRailMove::m36 +0x000000710032c868,U,000276,uking::ai::BezierRailMove::m37 0x000000710032c97c,U,000008, 0x000000710032c984,U,000116, -0x000000710032c9f8,U,000108,uking::ai::RailMove::m38 +0x000000710032c9f8,U,000108,uking::ai::BezierRailMove::m38 0x000000710032ca64,U,000276, -0x000000710032cb78,U,000132,uking::ai::RailMove::m39 -0x000000710032cbfc,O,000288,_ZNK5uking2ai8RailMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710032cd1c,O,000092,_ZNK5uking2ai8RailMove18getRuntimeTypeInfoEv -0x000000710032cd78,U,000008,uking::ai::RailMove::m40 -0x000000710032cd80,M,000220,_ZN5uking2ai15GoronCannonBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710032ce5c,W,000072,_ZN5uking2ai15GoronCannonBaseD1Ev -0x000000710032cea4,W,000080,_ZN5uking2ai15GoronCannonBaseD0Ev -0x000000710032cef4,O,000008,_ZN5uking2ai15GoronCannonBase5init_EPN4sead4HeapE -0x000000710032cefc,W,000284,_ZN5uking2ai15GoronCannonBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710032d018,U,001500,_ZN5uking2ai15GoronCannonBase5calc_Ev -0x000000710032d5f4,W,000008,_ZN5uking2ai15GoronCannonBase6leave_Ev +0x000000710032cb78,U,000132,uking::ai::BezierRailMove::m39 +0x000000710032cbfc,O,000288,_ZNK5uking2ai14BezierRailMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710032cd1c,O,000092,_ZNK5uking2ai14BezierRailMove18getRuntimeTypeInfoEv +0x000000710032cd78,U,000008,uking::ai::BezierRailMove::m40 +0x000000710032cd80,M,000220,_ZN5uking2ai9BigCannonC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710032ce5c,W,000072,_ZN5uking2ai9BigCannonD1Ev +0x000000710032cea4,W,000080,_ZN5uking2ai9BigCannonD0Ev +0x000000710032cef4,O,000008,_ZN5uking2ai9BigCannon5init_EPN4sead4HeapE +0x000000710032cefc,W,000284,_ZN5uking2ai9BigCannon6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710032d018,U,001500,_ZN5uking2ai9BigCannon5calc_Ev +0x000000710032d5f4,W,000008,_ZN5uking2ai9BigCannon6leave_Ev 0x000000710032d5fc,U,001112, -0x000000710032da54,U,000300,uking::ai::GoronCannonBase::m34 -0x000000710032db80,O,000408,_ZN5uking2ai15GoronCannonBase11loadParams_Ev -0x000000710032dd18,O,000288,_ZNK5uking2ai15GoronCannonBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710032de38,O,000092,_ZNK5uking2ai15GoronCannonBase18getRuntimeTypeInfoEv -0x000000710032de94,U,000004,uking::ai::GoronCannonBase::m35 -0x000000710032de98,U,000004,uking::ai::GoronCannonBase::m36 +0x000000710032da54,U,000300,uking::ai::BigCannon::m34 +0x000000710032db80,O,000408,_ZN5uking2ai9BigCannon11loadParams_Ev +0x000000710032dd18,O,000288,_ZNK5uking2ai9BigCannon27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710032de38,O,000092,_ZNK5uking2ai9BigCannon18getRuntimeTypeInfoEv +0x000000710032de94,U,000004,uking::ai::BigCannon::m35 +0x000000710032de98,U,000004,uking::ai::BigCannon::m36 0x000000710032de9c,U,000140, 0x000000710032df28,U,000140, 0x000000710032dfb4,U,000140, @@ -21830,30 +21830,30 @@ Address,Quality,Size,Name 0x0000007100342514,O,000288,_ZNK5uking2ai29CapturedActorReactionChemical27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100342634,O,000092,_ZNK5uking2ai29CapturedActorReactionChemical18getRuntimeTypeInfoEv 0x0000007100342690,U,000128,AI_AIFishOrInsectRoot::ctor -0x0000007100342710,W,000032,_ZN5uking2ai18SimpleWildlifeRoot5init_EPN4sead4HeapE -0x0000007100342730,W,000904,_ZN5uking2ai18SimpleWildlifeRoot6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100342ab8,U,000532,_ZN5uking2ai18SimpleWildlifeRoot5calc_Ev -0x0000007100342ccc,O,000004,_ZN5uking2ai18SimpleWildlifeRoot6leave_Ev -0x0000007100342cd0,W,000328,_ZN5uking2ai18SimpleWildlifeRoot11loadParams_Ev +0x0000007100342710,W,000032,_ZN5uking2ai17CapturedActorRoot5init_EPN4sead4HeapE +0x0000007100342730,W,000904,_ZN5uking2ai17CapturedActorRoot6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100342ab8,U,000532,_ZN5uking2ai17CapturedActorRoot5calc_Ev +0x0000007100342ccc,O,000004,_ZN5uking2ai17CapturedActorRoot6leave_Ev +0x0000007100342cd0,W,000328,_ZN5uking2ai17CapturedActorRoot11loadParams_Ev 0x0000007100342e18,U,000164,_ZN5uking2ai18SimpleWildlifeRoot2m9Ev -0x0000007100342ebc,U,000352,uking::ai::SimpleWildlifeRoot::m34 -0x000000710034301c,U,000172,uking::ai::SimpleWildlifeRoot::m35 -0x00000071003430c8,U,000240,uking::ai::SimpleWildlifeRoot::m37 -0x00000071003431b8,U,000232,uking::ai::SimpleWildlifeRoot::m38 -0x00000071003432a0,U,000396,uking::ai::SimpleWildlifeRoot::m39 +0x0000007100342ebc,U,000352,uking::ai::CapturedActorRoot::m34 +0x000000710034301c,U,000172,uking::ai::CapturedActorRoot::m35 +0x00000071003430c8,U,000240,uking::ai::CapturedActorRoot::m37 +0x00000071003431b8,U,000232,uking::ai::CapturedActorRoot::m38 +0x00000071003432a0,U,000396,uking::ai::CapturedActorRoot::m39 0x000000710034342c,U,000228, 0x0000007100343510,U,000164, -0x00000071003435b4,U,000148,uking::ai::SimpleWildlifeRoot::m40 -0x0000007100343648,U,000012,uking::ai::SimpleWildlifeRoot::m41 -0x0000007100343654,U,000092,uking::ai::SimpleWildlifeRoot::m42 -0x00000071003436b0,U,000048,uking::ai::SimpleWildlifeRoot::m43 -0x00000071003436e0,U,000088,uking::ai::SimpleWildlifeRoot::m44 +0x00000071003435b4,U,000148,uking::ai::CapturedActorRoot::m40 +0x0000007100343648,U,000012,uking::ai::CapturedActorRoot::m41 +0x0000007100343654,U,000092,uking::ai::CapturedActorRoot::m42 +0x00000071003436b0,U,000048,uking::ai::CapturedActorRoot::m43 +0x00000071003436e0,U,000088,uking::ai::CapturedActorRoot::m44 0x0000007100343738,U,000280, 0x0000007100343850,U,000036,_ZN3agl12RenderBufferD2Ev -0x0000007100343874,O,000288,_ZNK5uking2ai18SimpleWildlifeRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100343994,O,000092,_ZNK5uking2ai18SimpleWildlifeRoot18getRuntimeTypeInfoEv -0x00000071003439f0,O,000004,_ZN5uking2ai18SimpleWildlifeRootD1Ev -0x00000071003439f4,O,000036,_ZN5uking2ai18SimpleWildlifeRootD0Ev +0x0000007100343874,O,000288,_ZNK5uking2ai17CapturedActorRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100343994,O,000092,_ZNK5uking2ai17CapturedActorRoot18getRuntimeTypeInfoEv +0x00000071003439f0,O,000004,_ZN5uking2ai17CapturedActorRootD1Ev +0x00000071003439f4,O,000036,_ZN5uking2ai17CapturedActorRootD0Ev 0x0000007100343a18,U,000008, 0x0000007100343a20,U,000160,AI_AI_CarryBox::ctor 0x0000007100343ac0,W,000092,_ZN5uking2ai8CarryBoxD1Ev @@ -21916,20 +21916,20 @@ Address,Quality,Size,Name 0x00000071003467e4,O,000092,_ZNK5uking2ai10ChaseSound18getRuntimeTypeInfoEv 0x0000007100346840,O,000004,_ZN5uking2ai10ChaseSoundD1Ev 0x0000007100346844,O,000036,_ZN5uking2ai10ChaseSoundD0Ev -0x0000007100346868,O,000056,_ZN5uking2ai33HorseCheckLineOfSightSelectorBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071003468a0,O,000004,_ZN5uking2ai33HorseCheckLineOfSightSelectorBaseD1Ev -0x00000071003468a4,O,000036,_ZN5uking2ai33HorseCheckLineOfSightSelectorBaseD0Ev -0x00000071003468c8,O,000008,_ZN5uking2ai33HorseCheckLineOfSightSelectorBase5init_EPN4sead4HeapE -0x00000071003468d0,W,000468,_ZN5uking2ai33HorseCheckLineOfSightSelectorBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100346868,O,000056,_ZN5uking2ai24CheckLineOfSightSelectorC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071003468a0,O,000004,_ZN5uking2ai24CheckLineOfSightSelectorD1Ev +0x00000071003468a4,O,000036,_ZN5uking2ai24CheckLineOfSightSelectorD0Ev +0x00000071003468c8,O,000008,_ZN5uking2ai24CheckLineOfSightSelector5init_EPN4sead4HeapE +0x00000071003468d0,W,000468,_ZN5uking2ai24CheckLineOfSightSelector6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100346aa4,U,000616, -0x0000007100346d0c,U,000120,_ZN5uking2ai33HorseCheckLineOfSightSelectorBase5calc_Ev -0x0000007100346d84,O,000004,_ZN5uking2ai33HorseCheckLineOfSightSelectorBase6leave_Ev -0x0000007100346d88,O,000156,_ZN5uking2ai33HorseCheckLineOfSightSelectorBase11loadParams_Ev -0x0000007100346e24,O,000288,_ZNK5uking2ai33HorseCheckLineOfSightSelectorBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100346f44,O,000092,_ZNK5uking2ai33HorseCheckLineOfSightSelectorBase18getRuntimeTypeInfoEv -0x0000007100346fa0,U,000076,_ZNK5uking2ai33HorseCheckLineOfSightSelectorBase8isFailedEv -0x0000007100346fec,U,000076,_ZNK5uking2ai33HorseCheckLineOfSightSelectorBase10isFinishedEv -0x0000007100347038,U,000004,uking::ai::HorseCheckLineOfSightSelectorBase::m34 +0x0000007100346d0c,U,000120,_ZN5uking2ai24CheckLineOfSightSelector5calc_Ev +0x0000007100346d84,O,000004,_ZN5uking2ai24CheckLineOfSightSelector6leave_Ev +0x0000007100346d88,O,000156,_ZN5uking2ai24CheckLineOfSightSelector11loadParams_Ev +0x0000007100346e24,O,000288,_ZNK5uking2ai24CheckLineOfSightSelector27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100346f44,O,000092,_ZNK5uking2ai24CheckLineOfSightSelector18getRuntimeTypeInfoEv +0x0000007100346fa0,U,000076,_ZNK5uking2ai24CheckLineOfSightSelector8isFailedEv +0x0000007100346fec,U,000076,_ZNK5uking2ai24CheckLineOfSightSelector10isFinishedEv +0x0000007100347038,U,000004,uking::ai::CheckLineOfSightSelector::m34 0x000000710034703c,U,000056,AI_AI_ChemicalEnemyFindPlayer::ctor 0x0000007100347074,O,000004,_ZN5uking2ai23ChemicalEnemyFindPlayerD1Ev 0x0000007100347078,O,000036,_ZN5uking2ai23ChemicalEnemyFindPlayerD0Ev @@ -22045,10 +22045,10 @@ Address,Quality,Size,Name 0x000000710034a3a8,U,000008,uking::ai::ChildFavoriteSelector::m34 0x000000710034a3b0,O,000008,_ZNK5uking2ai21ChildFavoriteSelector27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710034a3b8,O,000092,_ZNK5uking2ai21ChildFavoriteSelector18getRuntimeTypeInfoEv -0x000000710034a414,U,000120,_ZNK5uking2ai25ChildFavoriteSelectorBase8isFailedEv -0x000000710034a48c,U,000036,_ZNK5uking2ai25ChildFavoriteSelectorBase10isFinishedEv +0x000000710034a414,U,000120,_ZNK5uking2ai13ChildSelector8isFailedEv +0x000000710034a48c,U,000036,_ZNK5uking2ai13ChildSelector10isFinishedEv 0x000000710034a4b0,O,000372,_ZN5uking2ai21ChildFavoriteSelector33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710034a624,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai25ChildFavoriteSelectorBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710034a624,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai13ChildSelectorEE9isDerivedEPKNS0_9InterfaceE 0x000000710034a6b0,O,000052,_ZN5uking2ai15ChildHaveSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710034a6e4,O,000004,_ZN5uking2ai15ChildHaveSelectD1Ev 0x000000710034a6e8,O,000036,_ZN5uking2ai15ChildHaveSelectD0Ev @@ -22061,17 +22061,17 @@ Address,Quality,Size,Name 0x000000710034a9b4,O,000092,_ZNK5uking2ai15ChildHaveSelect18getRuntimeTypeInfoEv 0x000000710034aa10,U,000096,_ZNK5uking2ai15ChildHaveSelect8isFailedEv 0x000000710034aa70,U,000096,_ZNK5uking2ai15ChildHaveSelect10isFinishedEv -0x000000710034aad0,O,000052,_ZN5uking2ai25ChildFavoriteSelectorBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710034ab04,O,000004,_ZN5uking2ai25ChildFavoriteSelectorBaseD1Ev -0x000000710034ab08,O,000036,_ZN5uking2ai25ChildFavoriteSelectorBaseD0Ev -0x000000710034ab2c,O,000008,_ZN5uking2ai25ChildFavoriteSelectorBase5init_EPN4sead4HeapE -0x000000710034ab34,W,000212,_ZN5uking2ai25ChildFavoriteSelectorBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710034ac08,U,000332,_ZN5uking2ai25ChildFavoriteSelectorBase5calc_Ev -0x000000710034ad54,O,000004,_ZN5uking2ai25ChildFavoriteSelectorBase6leave_Ev -0x000000710034ad58,O,000100,_ZN5uking2ai25ChildFavoriteSelectorBase11loadParams_Ev -0x000000710034adbc,O,000288,_ZNK5uking2ai25ChildFavoriteSelectorBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710034aedc,O,000092,_ZNK5uking2ai25ChildFavoriteSelectorBase18getRuntimeTypeInfoEv -0x000000710034af38,U,000008,uking::ai::ChildFavoriteSelectorBase::m34 +0x000000710034aad0,O,000052,_ZN5uking2ai13ChildSelectorC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710034ab04,O,000004,_ZN5uking2ai13ChildSelectorD1Ev +0x000000710034ab08,O,000036,_ZN5uking2ai13ChildSelectorD0Ev +0x000000710034ab2c,O,000008,_ZN5uking2ai13ChildSelector5init_EPN4sead4HeapE +0x000000710034ab34,W,000212,_ZN5uking2ai13ChildSelector6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710034ac08,U,000332,_ZN5uking2ai13ChildSelector5calc_Ev +0x000000710034ad54,O,000004,_ZN5uking2ai13ChildSelector6leave_Ev +0x000000710034ad58,O,000100,_ZN5uking2ai13ChildSelector11loadParams_Ev +0x000000710034adbc,O,000288,_ZNK5uking2ai13ChildSelector27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710034aedc,O,000092,_ZNK5uking2ai13ChildSelector18getRuntimeTypeInfoEv +0x000000710034af38,U,000008,uking::ai::ChildSelector::m34 0x000000710034af40,O,000052,_ZN5uking2ai8ChmCheckC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710034af74,O,000004,_ZN5uking2ai8ChmCheckD1Ev 0x000000710034af78,O,000036,_ZN5uking2ai8ChmCheckD0Ev @@ -22301,19 +22301,19 @@ Address,Quality,Size,Name 0x000000710035222c,U,000052,_ZNK5uking2ai30CliffDistanceSelectThreeAction8isFailedEv 0x0000007100352260,U,000052,_ZNK5uking2ai30CliffDistanceSelectThreeAction10isFinishedEv 0x0000007100352294,U,000096,AI_AIMimicCliffStopEnemyNormal::ctor -0x00000071003522f4,W,000112,_ZN5uking2ai29MimicCliffStopEnemyNormalBaseD1Ev -0x0000007100352364,W,000120,_ZN5uking2ai29MimicCliffStopEnemyNormalBaseD0Ev -0x00000071003523dc,O,000008,_ZN5uking2ai29MimicCliffStopEnemyNormalBase5init_EPN4sead4HeapE -0x00000071003523e4,W,000444,_ZN5uking2ai29MimicCliffStopEnemyNormalBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071003525a0,U,001012,_ZN5uking2ai29MimicCliffStopEnemyNormalBase5calc_Ev +0x00000071003522f4,W,000112,_ZN5uking2ai20CliffStopEnemyNormalD1Ev +0x0000007100352364,W,000120,_ZN5uking2ai20CliffStopEnemyNormalD0Ev +0x00000071003523dc,O,000008,_ZN5uking2ai20CliffStopEnemyNormal5init_EPN4sead4HeapE +0x00000071003523e4,W,000444,_ZN5uking2ai20CliffStopEnemyNormal6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003525a0,U,001012,_ZN5uking2ai20CliffStopEnemyNormal5calc_Ev 0x0000007100352994,U,000460, 0x0000007100352b60,U,000436, 0x0000007100352d14,U,000364, -0x0000007100352e80,W,000268,_ZN5uking2ai29MimicCliffStopEnemyNormalBase6leave_Ev -0x0000007100352f8c,O,000240,_ZN5uking2ai29MimicCliffStopEnemyNormalBase11loadParams_Ev +0x0000007100352e80,W,000268,_ZN5uking2ai20CliffStopEnemyNormal6leave_Ev +0x0000007100352f8c,O,000240,_ZN5uking2ai20CliffStopEnemyNormal11loadParams_Ev 0x000000710035307c,U,000288, -0x000000710035319c,O,000288,_ZNK5uking2ai29MimicCliffStopEnemyNormalBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003532bc,O,000092,_ZNK5uking2ai29MimicCliffStopEnemyNormalBase18getRuntimeTypeInfoEv +0x000000710035319c,O,000288,_ZNK5uking2ai20CliffStopEnemyNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003532bc,O,000092,_ZNK5uking2ai20CliffStopEnemyNormal18getRuntimeTypeInfoEv 0x0000007100353318,M,000088,_ZN5uking2ai20CloseSmallAttackBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100353370,O,000192,_ZN5uking2ai20CloseSmallAttackBase11loadParams_Ev 0x0000007100353430,W,000508,_ZN5uking2ai20CloseSmallAttackBase6enter_EPN4ksys3act2ai15InlineParamPackE @@ -22405,35 +22405,35 @@ Address,Quality,Size,Name 0x00000071003564e8,O,000288,_ZNK5uking2ai25ConditionMoveActionSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100356608,O,000092,_ZNK5uking2ai25ConditionMoveActionSelect18getRuntimeTypeInfoEv 0x0000007100356664,U,000072,AI_AIDragonRootBase::ctor -0x00000071003566ac,O,000004,_ZN5uking2ai14DragonRootBaseD1Ev +0x00000071003566ac,O,000004,_ZN5uking2ai15ControlRailRootD1Ev 0x00000071003566b0,U,000004,nullsub_1057 -0x00000071003566b4,O,000036,_ZN5uking2ai14DragonRootBaseD0Ev -0x00000071003566d8,O,000008,_ZN5uking2ai14DragonRootBase5init_EPN4sead4HeapE -0x00000071003566e0,W,000132,_ZN5uking2ai14DragonRootBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003566b4,O,000036,_ZN5uking2ai15ControlRailRootD0Ev +0x00000071003566d8,O,000008,_ZN5uking2ai15ControlRailRoot5init_EPN4sead4HeapE +0x00000071003566e0,W,000132,_ZN5uking2ai15ControlRailRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100356764,U,000080, 0x00000071003567b4,U,000172,_ZN5uking2ai14DragonRootBase8reenter_EPS2_b -0x0000007100356860,U,000540,_ZN5uking2ai14DragonRootBase5calc_Ev +0x0000007100356860,U,000540,_ZN5uking2ai15ControlRailRoot5calc_Ev 0x0000007100356a7c,U,000640, 0x0000007100356cfc,U,000076, 0x0000007100356d48,U,000488, 0x0000007100356f30,U,000536, -0x0000007100357148,O,000004,_ZN5uking2ai14DragonRootBase6leave_Ev -0x000000710035714c,O,000004,_ZN5uking2ai14DragonRootBase11loadParams_Ev +0x0000007100357148,O,000004,_ZN5uking2ai15ControlRailRoot6leave_Ev +0x000000710035714c,O,000004,_ZN5uking2ai15ControlRailRoot11loadParams_Ev 0x0000007100357150,U,000280, 0x0000007100357268,U,000172,AI_AIDragonRoot::x 0x0000007100357314,U,000132, 0x0000007100357398,U,000124, 0x0000007100357414,U,000044, 0x0000007100357440,U,000512, -0x0000007100357640,U,000012,uking::ai::DragonRootBase::m35 -0x000000710035764c,U,000816,uking::ai::DragonRootBase::m36 +0x0000007100357640,U,000012,uking::ai::ControlRailRoot::m35 +0x000000710035764c,U,000816,uking::ai::ControlRailRoot::m36 0x000000710035797c,U,000116, -0x00000071003579f0,U,000108,uking::ai::DragonRootBase::m37 +0x00000071003579f0,U,000108,uking::ai::ControlRailRoot::m37 0x0000007100357a5c,U,000276, -0x0000007100357b70,U,000048,uking::ai::DragonRootBase::m38 -0x0000007100357ba0,O,000288,_ZNK5uking2ai14DragonRootBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100357cc0,O,000092,_ZNK5uking2ai14DragonRootBase18getRuntimeTypeInfoEv -0x0000007100357d1c,U,000008,uking::ai::DragonRootBase::m39 +0x0000007100357b70,U,000048,uking::ai::ControlRailRoot::m38 +0x0000007100357ba0,O,000288,_ZNK5uking2ai15ControlRailRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100357cc0,O,000092,_ZNK5uking2ai15ControlRailRoot18getRuntimeTypeInfoEv +0x0000007100357d1c,U,000008,uking::ai::ControlRailRoot::m39 0x0000007100357d24,U,000004,j__ZdlPv_95 0x0000007100357d28,U,000176,AI_AI_CookPotRoot::ctor 0x0000007100357dd8,O,000596,_ZN4sead9SafeArrayIN5uking14CookIngredientELi5EEC2Ev @@ -22936,7 +22936,7 @@ Address,Quality,Size,Name 0x0000007100367a48,O,000092,_ZNK5uking2ai14DragonElecRoot18getRuntimeTypeInfoEv 0x0000007100367aa4,O,000372,_ZN5uking2ai10DragonRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100367c18,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai10DragonRootEE9isDerivedEPKNS0_9InterfaceE -0x0000007100367ca4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14DragonRootBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100367ca4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15ControlRailRootEE9isDerivedEPKNS0_9InterfaceE 0x0000007100367d30,O,000048,_ZN5uking2ai14DragonFireRootC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100367d60,W,000104,_ZN5uking2ai14DragonFireRootD1Ev 0x0000007100367dc8,W,000112,_ZN5uking2ai14DragonFireRootD0Ev @@ -23218,10 +23218,10 @@ Address,Quality,Size,Name 0x00000071003786fc,O,000004,_ZN5uking2ai24DungeonRotateTag4FireApp11loadParams_Ev 0x0000007100378700,O,000008,_ZNK5uking2ai24DungeonRotateTag4FireApp27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100378708,O,000092,_ZNK5uking2ai24DungeonRotateTag4FireApp18getRuntimeTypeInfoEv -0x0000007100378764,U,000016,uking::ai::WholeDungeonRotateTag::m38 -0x0000007100378774,U,000004,uking::ai::WholeDungeonRotateTag::m42 +0x0000007100378764,U,000016,uking::ai::DungeonRotateTagApp::m38 +0x0000007100378774,U,000004,uking::ai::DungeonRotateTagApp::m42 0x0000007100378778,O,000372,_ZN5uking2ai24DungeonRotateTag4FireApp33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003788ec,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai21WholeDungeonRotateTagEE9isDerivedEPKNS0_9InterfaceE +0x00000071003788ec,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai19DungeonRotateTagAppEE9isDerivedEPKNS0_9InterfaceE 0x0000007100378978,U,000064,AI_AI_DungeonRotateTag4WaterApp::ctor 0x00000071003789b8,O,000004,_ZN5uking2ai25DungeonRotateTag4WaterAppD1Ev 0x00000071003789bc,O,000036,_ZN5uking2ai25DungeonRotateTag4WaterAppD0Ev @@ -23253,26 +23253,26 @@ Address,Quality,Size,Name 0x000000710037937c,O,000008,_ZNK5uking2ai24DungeonRotateTag4WindApp27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100379384,O,000092,_ZNK5uking2ai24DungeonRotateTag4WindApp18getRuntimeTypeInfoEv 0x00000071003793e0,O,000372,_ZN5uking2ai24DungeonRotateTag4WindApp33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100379554,M,000064,_ZN5uking2ai21WholeDungeonRotateTagC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100379594,O,000004,_ZN5uking2ai21WholeDungeonRotateTagD1Ev -0x0000007100379598,O,000036,_ZN5uking2ai21WholeDungeonRotateTagD0Ev -0x00000071003795bc,O,000008,_ZN5uking2ai21WholeDungeonRotateTag5init_EPN4sead4HeapE -0x00000071003795c4,O,000004,_ZN5uking2ai21WholeDungeonRotateTag6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071003795c8,U,000260,_ZN5uking2ai21WholeDungeonRotateTag5calc_Ev -0x00000071003796cc,O,000004,_ZN5uking2ai21WholeDungeonRotateTag6leave_Ev -0x00000071003796d0,U,000016,uking::ai::WholeDungeonRotateTag::m44 -0x00000071003796e0,U,000204,uking::ai::WholeDungeonRotateTag::m45 -0x00000071003797ac,O,000064,_ZN5uking2ai21WholeDungeonRotateTag11loadParams_Ev -0x00000071003797ec,O,000288,_ZNK5uking2ai21WholeDungeonRotateTag27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710037990c,O,000092,_ZNK5uking2ai21WholeDungeonRotateTag18getRuntimeTypeInfoEv -0x0000007100379968,U,000008,uking::ai::WholeDungeonRotateTag::m34 -0x0000007100379970,U,000008,uking::ai::WholeDungeonRotateTag::m35 -0x0000007100379978,U,000008,uking::ai::WholeDungeonRotateTag::m36 -0x0000007100379980,U,000008,uking::ai::WholeDungeonRotateTag::m37 -0x0000007100379988,U,000004,uking::ai::WholeDungeonRotateTag::m39 -0x000000710037998c,U,000004,uking::ai::WholeDungeonRotateTag::m40 -0x0000007100379990,U,000004,uking::ai::WholeDungeonRotateTag::m41 -0x0000007100379994,U,000004,uking::ai::WholeDungeonRotateTag::m43 +0x0000007100379554,M,000064,_ZN5uking2ai19DungeonRotateTagAppC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100379594,O,000004,_ZN5uking2ai19DungeonRotateTagAppD1Ev +0x0000007100379598,O,000036,_ZN5uking2ai19DungeonRotateTagAppD0Ev +0x00000071003795bc,O,000008,_ZN5uking2ai19DungeonRotateTagApp5init_EPN4sead4HeapE +0x00000071003795c4,O,000004,_ZN5uking2ai19DungeonRotateTagApp6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003795c8,U,000260,_ZN5uking2ai19DungeonRotateTagApp5calc_Ev +0x00000071003796cc,O,000004,_ZN5uking2ai19DungeonRotateTagApp6leave_Ev +0x00000071003796d0,U,000016,uking::ai::DungeonRotateTagApp::m44 +0x00000071003796e0,U,000204,uking::ai::DungeonRotateTagApp::m45 +0x00000071003797ac,O,000064,_ZN5uking2ai19DungeonRotateTagApp11loadParams_Ev +0x00000071003797ec,O,000288,_ZNK5uking2ai19DungeonRotateTagApp27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710037990c,O,000092,_ZNK5uking2ai19DungeonRotateTagApp18getRuntimeTypeInfoEv +0x0000007100379968,U,000008,uking::ai::DungeonRotateTagApp::m34 +0x0000007100379970,U,000008,uking::ai::DungeonRotateTagApp::m35 +0x0000007100379978,U,000008,uking::ai::DungeonRotateTagApp::m36 +0x0000007100379980,U,000008,uking::ai::DungeonRotateTagApp::m37 +0x0000007100379988,U,000004,uking::ai::DungeonRotateTagApp::m39 +0x000000710037998c,U,000004,uking::ai::DungeonRotateTagApp::m40 +0x0000007100379990,U,000004,uking::ai::DungeonRotateTagApp::m41 +0x0000007100379994,U,000004,uking::ai::DungeonRotateTagApp::m43 0x0000007100379998,O,000052,_ZN5uking2ai20DungeonRotateTagContC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071003799cc,O,000004,_ZN5uking2ai20DungeonRotateTagContD1Ev 0x00000071003799d0,O,000036,_ZN5uking2ai20DungeonRotateTagContD0Ev @@ -23515,9 +23515,9 @@ Address,Quality,Size,Name 0x0000007100384f80,O,000008,_ZNK5uking2ai25EnemyChaseTargetAndAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100384f88,O,000092,_ZNK5uking2ai25EnemyChaseTargetAndAction18getRuntimeTypeInfoEv 0x0000007100384fe4,U,000036,_ZNK5uking2ai25EnemyChaseTargetAndAction12isChangeableEv -0x0000007100385008,U,000004,uking::ai::UnarmedEnemySearch::m36 +0x0000007100385008,U,000004,uking::ai::NavMove::m36 0x000000710038500c,O,000372,_ZN5uking2ai25EnemyChaseTargetAndAction33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100385180,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18UnarmedEnemySearchEE9isDerivedEPKNS0_9InterfaceE +0x0000007100385180,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai7NavMoveEE9isDerivedEPKNS0_9InterfaceE 0x000000710038520c,U,000296, 0x0000007100385334,O,000048,_ZN5uking2ai24EnemyChemicalPowerSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100385364,O,000004,_ZN5uking2ai24EnemyChemicalPowerSelectD1Ev @@ -23556,7 +23556,7 @@ Address,Quality,Size,Name 0x0000007100385b98,O,000008,_ZNK5uking2ai21EnemyChemTargetAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100385ba0,O,000092,_ZNK5uking2ai21EnemyChemTargetAction18getRuntimeTypeInfoEv 0x0000007100385bfc,O,000372,_ZN5uking2ai21EnemyChemTargetAction33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100385d70,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai25EnemyChemTargetActionBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100385d70,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai17EnemyTargetActionEE9isDerivedEPKNS0_9InterfaceE 0x0000007100385dfc,U,000056,AI_AI_EnemyConfuse::ctor 0x0000007100385e34,O,000004,_ZN5uking2ai12EnemyConfuseD1Ev 0x0000007100385e38,O,000036,_ZN5uking2ai12EnemyConfuseD0Ev @@ -23875,9 +23875,9 @@ Address,Quality,Size,Name 0x000000710039635c,U,000072, 0x00000071003963a4,O,000008,_ZNK5uking2ai14EnemyHorseRide27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003963ac,O,000092,_ZNK5uking2ai14EnemyHorseRide18getRuntimeTypeInfoEv -0x0000007100396408,U,000008,uking::ai::NonPlayerHorseRide::m35 +0x0000007100396408,U,000008,uking::ai::RideHorseNonPlayer::m35 0x0000007100396410,O,000372,_ZN5uking2ai14EnemyHorseRide33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100396584,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18NonPlayerHorseRideEE9isDerivedEPKNS0_9InterfaceE +0x0000007100396584,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18RideHorseNonPlayerEE9isDerivedEPKNS0_9InterfaceE 0x0000007100396610,O,000052,_ZN5uking2ai15EnemyLifeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100396644,O,000004,_ZN5uking2ai15EnemyLifeSelectD1Ev 0x0000007100396648,O,000036,_ZN5uking2ai15EnemyLifeSelectD0Ev @@ -24428,31 +24428,31 @@ Address,Quality,Size,Name 0x00000071003b6424,U,000052, 0x00000071003b6458,U,000008, 0x00000071003b6460,U,000184,AI_AIEnemySearchWeapon::ctor -0x00000071003b6518,W,000052,_ZN5uking2ai24UnarmedEnemySearchWeaponD1Ev -0x00000071003b654c,W,000060,_ZN5uking2ai24UnarmedEnemySearchWeaponD0Ev -0x00000071003b6588,W,000132,_ZN5uking2ai24UnarmedEnemySearchWeapon6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071003b660c,U,000140,uking::ai::UnarmedEnemySearchWeapon::m34 -0x00000071003b6698,U,000496,_ZN5uking2ai24UnarmedEnemySearchWeapon5calc_Ev +0x00000071003b6518,W,000052,_ZN5uking2ai11EnemySearchD1Ev +0x00000071003b654c,W,000060,_ZN5uking2ai11EnemySearchD0Ev +0x00000071003b6588,W,000132,_ZN5uking2ai11EnemySearch6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003b660c,U,000140,uking::ai::EnemySearch::m34 +0x00000071003b6698,U,000496,_ZN5uking2ai11EnemySearch5calc_Ev 0x00000071003b6888,U,003564, -0x00000071003b7674,W,000264,_ZN5uking2ai24UnarmedEnemySearchWeapon6leave_Ev -0x00000071003b777c,W,000220,_ZN5uking2ai24UnarmedEnemySearchWeapon11loadParams_Ev -0x00000071003b7858,U,000004,uking::ai::UnarmedEnemySearchWeapon::m44 -0x00000071003b785c,U,000004,uking::ai::UnarmedEnemySearchWeapon::m45 -0x00000071003b7860,U,000960,uking::ai::UnarmedEnemySearchWeapon::m37 -0x00000071003b7c20,U,001024,uking::ai::UnarmedEnemySearchWeapon::m38 +0x00000071003b7674,W,000264,_ZN5uking2ai11EnemySearch6leave_Ev +0x00000071003b777c,W,000220,_ZN5uking2ai11EnemySearch11loadParams_Ev +0x00000071003b7858,U,000004,uking::ai::EnemySearch::m44 +0x00000071003b785c,U,000004,uking::ai::EnemySearch::m45 +0x00000071003b7860,U,000960,uking::ai::EnemySearch::m37 +0x00000071003b7c20,U,001024,uking::ai::EnemySearch::m38 0x00000071003b8020,U,000216, 0x00000071003b80f8,U,000824, -0x00000071003b8430,U,000804,uking::ai::UnarmedEnemySearchWeapon::m39 -0x00000071003b8754,U,000044,uking::ai::UnarmedEnemySearchWeapon::m35 +0x00000071003b8430,U,000804,uking::ai::EnemySearch::m39 +0x00000071003b8754,U,000044,uking::ai::EnemySearch::m35 0x00000071003b8780,U,000204, 0x00000071003b884c,U,000792, 0x00000071003b8b64,U,000780, 0x00000071003b8e70,U,000280, -0x00000071003b8f88,O,000008,_ZNK5uking2ai24UnarmedEnemySearchWeapon27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003b8f90,O,000092,_ZNK5uking2ai24UnarmedEnemySearchWeapon18getRuntimeTypeInfoEv -0x00000071003b8fec,U,000004,uking::ai::UnarmedEnemySearchWeapon::m36 -0x00000071003b8ff0,U,000008,uking::ai::UnarmedEnemySearchWeapon::m46 -0x00000071003b8ff8,O,000372,_ZN5uking2ai24UnarmedEnemySearchWeapon33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003b8f88,O,000008,_ZNK5uking2ai11EnemySearch27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003b8f90,O,000092,_ZNK5uking2ai11EnemySearch18getRuntimeTypeInfoEv +0x00000071003b8fec,U,000004,uking::ai::EnemySearch::m36 +0x00000071003b8ff0,U,000008,uking::ai::EnemySearch::m46 +0x00000071003b8ff8,O,000372,_ZN5uking2ai11EnemySearch33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003b916c,U,000168,AI_AI_EnemySearchHorse::ctor 0x00000071003b9214,W,000132,_ZN5uking2ai16EnemySearchHorseD1Ev 0x00000071003b9298,W,000140,_ZN5uking2ai16EnemySearchHorseD0Ev @@ -24562,18 +24562,18 @@ Address,Quality,Size,Name 0x00000071003bf444,U,000412, 0x00000071003bf5e0,O,000288,_ZNK5uking2ai15EnemySyncAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003bf700,O,000092,_ZNK5uking2ai15EnemySyncAttack18getRuntimeTypeInfoEv -0x00000071003bf75c,O,000056,_ZN5uking2ai25EnemyChemTargetActionBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071003bf794,O,000008,_ZN5uking2ai25EnemyChemTargetActionBase5init_EPN4sead4HeapE -0x00000071003bf79c,W,000560,_ZN5uking2ai25EnemyChemTargetActionBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071003bf9cc,U,001244,_ZN5uking2ai25EnemyChemTargetActionBase5calc_Ev -0x00000071003bfea8,O,000004,_ZN5uking2ai25EnemyChemTargetActionBase6leave_Ev -0x00000071003bfeac,U,000208,uking::ai::EnemyChemTargetActionBase::m34 -0x00000071003bff7c,U,000148,uking::ai::EnemyChemTargetActionBase::m35 -0x00000071003c0010,O,000192,_ZN5uking2ai25EnemyChemTargetActionBase11loadParams_Ev -0x00000071003c00d0,O,000288,_ZNK5uking2ai25EnemyChemTargetActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003c01f0,O,000092,_ZNK5uking2ai25EnemyChemTargetActionBase18getRuntimeTypeInfoEv -0x00000071003c024c,O,000036,_ZN5uking2ai25EnemyChemTargetActionBaseD0Ev -0x00000071003c0270,U,000004,uking::ai::EnemyChemTargetActionBase::m36 +0x00000071003bf75c,O,000056,_ZN5uking2ai17EnemyTargetActionC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071003bf794,O,000008,_ZN5uking2ai17EnemyTargetAction5init_EPN4sead4HeapE +0x00000071003bf79c,W,000560,_ZN5uking2ai17EnemyTargetAction6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003bf9cc,U,001244,_ZN5uking2ai17EnemyTargetAction5calc_Ev +0x00000071003bfea8,O,000004,_ZN5uking2ai17EnemyTargetAction6leave_Ev +0x00000071003bfeac,U,000208,uking::ai::EnemyTargetAction::m34 +0x00000071003bff7c,U,000148,uking::ai::EnemyTargetAction::m35 +0x00000071003c0010,O,000192,_ZN5uking2ai17EnemyTargetAction11loadParams_Ev +0x00000071003c00d0,O,000288,_ZNK5uking2ai17EnemyTargetAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003c01f0,O,000092,_ZNK5uking2ai17EnemyTargetAction18getRuntimeTypeInfoEv +0x00000071003c024c,O,000036,_ZN5uking2ai17EnemyTargetActionD0Ev +0x00000071003c0270,U,000004,uking::ai::EnemyTargetAction::m36 0x00000071003c0274,O,000052,_ZN5uking2ai21EnemyTargetGearSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071003c02a8,O,000004,_ZN5uking2ai21EnemyTargetGearSelectD1Ev 0x00000071003c02ac,O,000036,_ZN5uking2ai21EnemyTargetGearSelectD0Ev @@ -24810,7 +24810,7 @@ Address,Quality,Size,Name 0x00000071003c7268,U,000276,uking::ai::EquipShieldEnemySearchWeapon::m46 0x00000071003c737c,O,000132,_ZNK5uking2ai28EquipShieldEnemySearchWeapon27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003c7400,O,000092,_ZNK5uking2ai28EquipShieldEnemySearchWeapon18getRuntimeTypeInfoEv -0x00000071003c745c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai24UnarmedEnemySearchWeaponEE9isDerivedEPKNS0_9InterfaceE +0x00000071003c745c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai11EnemySearchEE9isDerivedEPKNS0_9InterfaceE 0x00000071003c74e8,U,000184,AI_AI_EquipStand::ctor 0x00000071003c75a0,W,000184,_ZN5uking2ai10EquipStandD1Ev 0x00000071003c7658,W,000036,_ZN5uking2ai10EquipStandD0Ev @@ -25034,7 +25034,7 @@ Address,Quality,Size,Name 0x00000071003d0db0,O,000092,_ZNK5uking2ai23FlyingEnemyBackKeepMove18getRuntimeTypeInfoEv 0x00000071003d0e0c,U,000044,uking::ai::FlyingEnemyBackKeepMove::m34 0x00000071003d0e38,O,000372,_ZN5uking2ai23FlyingEnemyBackKeepMove33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003d0fac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai19FlyingEnemyKeepMoveEE9isDerivedEPKNS0_9InterfaceE +0x00000071003d0fac,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai27FlyingEnemyDistanceKeepMoveEE9isDerivedEPKNS0_9InterfaceE 0x00000071003d1038,U,000052,AI_AI_FlyingEnemyDiagonallyKeepMove::ctor 0x00000071003d106c,O,000004,_ZN5uking2ai29FlyingEnemyDiagonallyKeepMoveD1Ev 0x00000071003d1070,O,000036,_ZN5uking2ai29FlyingEnemyDiagonallyKeepMoveD0Ev @@ -25049,25 +25049,25 @@ Address,Quality,Size,Name 0x00000071003d1478,U,000028,uking::ai::FlyingEnemySideKeepMove::m34 0x00000071003d1494,O,000372,_ZN5uking2ai23FlyingEnemySideKeepMove33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003d1608,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai23FlyingEnemySideKeepMoveEE9isDerivedEPKNS0_9InterfaceE -0x00000071003d1694,M,000060,_ZN5uking2ai19FlyingEnemyKeepMoveC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071003d16d0,O,000004,_ZN5uking2ai19FlyingEnemyKeepMoveD1Ev -0x00000071003d16d4,O,000036,_ZN5uking2ai19FlyingEnemyKeepMoveD0Ev -0x00000071003d16f8,O,000008,_ZN5uking2ai19FlyingEnemyKeepMove5init_EPN4sead4HeapE -0x00000071003d1700,W,000220,_ZN5uking2ai19FlyingEnemyKeepMove6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071003d17dc,U,001132,_ZN5uking2ai19FlyingEnemyKeepMove5calc_Ev +0x00000071003d1694,M,000060,_ZN5uking2ai27FlyingEnemyDistanceKeepMoveC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071003d16d0,O,000004,_ZN5uking2ai27FlyingEnemyDistanceKeepMoveD1Ev +0x00000071003d16d4,O,000036,_ZN5uking2ai27FlyingEnemyDistanceKeepMoveD0Ev +0x00000071003d16f8,O,000008,_ZN5uking2ai27FlyingEnemyDistanceKeepMove5init_EPN4sead4HeapE +0x00000071003d1700,W,000220,_ZN5uking2ai27FlyingEnemyDistanceKeepMove6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003d17dc,U,001132,_ZN5uking2ai27FlyingEnemyDistanceKeepMove5calc_Ev 0x00000071003d1c48,U,000832, 0x00000071003d1f88,U,000296, 0x00000071003d20b0,U,000804, -0x00000071003d23d4,O,000004,_ZN5uking2ai19FlyingEnemyKeepMove6leave_Ev -0x00000071003d23d8,O,000296,_ZN5uking2ai19FlyingEnemyKeepMove11loadParams_Ev +0x00000071003d23d4,O,000004,_ZN5uking2ai27FlyingEnemyDistanceKeepMove6leave_Ev +0x00000071003d23d8,O,000296,_ZN5uking2ai27FlyingEnemyDistanceKeepMove11loadParams_Ev 0x00000071003d2500,U,000248, 0x00000071003d25f8,U,000248, 0x00000071003d26f0,U,000400, 0x00000071003d2880,U,000416, -0x00000071003d2a20,U,000200,uking::ai::FlyingEnemyKeepMove::m35 -0x00000071003d2ae8,U,000076,uking::ai::FlyingEnemyKeepMove::m36 -0x00000071003d2b34,O,000288,_ZNK5uking2ai19FlyingEnemyKeepMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003d2c54,O,000092,_ZNK5uking2ai19FlyingEnemyKeepMove18getRuntimeTypeInfoEv +0x00000071003d2a20,U,000200,uking::ai::FlyingEnemyDistanceKeepMove::m35 +0x00000071003d2ae8,U,000076,uking::ai::FlyingEnemyDistanceKeepMove::m36 +0x00000071003d2b34,O,000288,_ZNK5uking2ai27FlyingEnemyDistanceKeepMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003d2c54,O,000092,_ZNK5uking2ai27FlyingEnemyDistanceKeepMove18getRuntimeTypeInfoEv 0x00000071003d2cb0,O,000048,_ZN5uking2ai21FlyingEnemyFindPlayerC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071003d2ce0,W,000004,_ZN5uking2ai21FlyingEnemyFindPlayerD1Ev 0x00000071003d2ce4,W,000036,_ZN5uking2ai21FlyingEnemyFindPlayerD0Ev @@ -25209,8 +25209,8 @@ Address,Quality,Size,Name 0x00000071003d73b4,U,000008,uking::ai::ForestGiantFindPlayer::m52 0x00000071003d73bc,O,000132,_ZNK5uking2ai21ForestGiantFindPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003d7440,O,000092,_ZNK5uking2ai21ForestGiantFindPlayer18getRuntimeTypeInfoEv -0x00000071003d749c,O,000372,_ZN5uking2ai20LargeEnemyFindPlayer33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003d7610,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20LargeEnemyFindPlayerEE9isDerivedEPKNS0_9InterfaceE +0x00000071003d749c,O,000372,_ZN5uking2ai20GiantEnemyFindPlayer33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003d7610,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20GiantEnemyFindPlayerEE9isDerivedEPKNS0_9InterfaceE 0x00000071003d769c,U,000064,AI_AI_ForestGiantNormal::ctor 0x00000071003d76dc,O,000004,_ZN5uking2ai17ForestGiantNormalD1Ev 0x00000071003d76e0,O,000036,_ZN5uking2ai17ForestGiantNormalD0Ev @@ -25619,45 +25619,45 @@ Address,Quality,Size,Name 0x00000071003e97f0,O,000288,_ZNK5uking2ai24GanonFarAttackRootOnWall27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003e9910,O,000092,_ZNK5uking2ai24GanonFarAttackRootOnWall18getRuntimeTypeInfoEv 0x00000071003e996c,U,000264,AI_AISiteBossFireOrIceObject::ctor -0x00000071003e9a74,W,000104,_ZN5uking2ai26SiteBossChemicalProjectileD1Ev -0x00000071003e9adc,W,000112,_ZN5uking2ai26SiteBossChemicalProjectileD0Ev -0x00000071003e9b4c,O,000008,_ZN5uking2ai26SiteBossChemicalProjectile5init_EPN4sead4HeapE -0x00000071003e9b54,W,001368,_ZN5uking2ai26SiteBossChemicalProjectile6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003e9a74,W,000104,_ZN5uking2ai14GanonFlameBallD1Ev +0x00000071003e9adc,W,000112,_ZN5uking2ai14GanonFlameBallD0Ev +0x00000071003e9b4c,O,000008,_ZN5uking2ai14GanonFlameBall5init_EPN4sead4HeapE +0x00000071003e9b54,W,001368,_ZN5uking2ai14GanonFlameBall6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071003ea0ac,U,000368, 0x00000071003ea21c,U,000212, -0x00000071003ea2f0,U,005016,_ZN5uking2ai26SiteBossChemicalProjectile5calc_Ev +0x00000071003ea2f0,U,005016,_ZN5uking2ai14GanonFlameBall5calc_Ev 0x00000071003eb688,U,000320, 0x00000071003eb7c8,U,000224, 0x00000071003eb8a8,U,000392, -0x00000071003eba30,O,000004,_ZN5uking2ai26SiteBossChemicalProjectile6leave_Ev -0x00000071003eba34,O,000436,_ZN5uking2ai26SiteBossChemicalProjectile11loadParams_Ev -0x00000071003ebbe8,U,000288,uking::ai::SiteBossChemicalProjectile::m38 -0x00000071003ebd08,U,000152,uking::ai::SiteBossChemicalProjectile::m42 -0x00000071003ebda0,U,000580,uking::ai::SiteBossChemicalProjectile::m44 -0x00000071003ebfe4,U,000056,uking::ai::SiteBossChemicalProjectile::m52 -0x00000071003ec01c,U,000068,uking::ai::SiteBossChemicalProjectile::m53 -0x00000071003ec060,U,000460,_ZN5uking2ai26SiteBossChemicalProjectile14handleMessage_ERKN4ksys7MessageE -0x00000071003ec22c,O,000288,_ZNK5uking2ai26SiteBossChemicalProjectile27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003ec34c,O,000092,_ZNK5uking2ai26SiteBossChemicalProjectile18getRuntimeTypeInfoEv -0x00000071003ec3a8,U,000008,uking::ai::SiteBossChemicalProjectile::m34 -0x00000071003ec3b0,U,000016,uking::ai::SiteBossChemicalProjectile::m35 -0x00000071003ec3c0,U,000020,uking::ai::SiteBossChemicalProjectile::m36 -0x00000071003ec3d4,U,000004,uking::ai::SiteBossChemicalProjectile::m37 -0x00000071003ec3d8,U,000008,uking::ai::SiteBossChemicalProjectile::m39 -0x00000071003ec3e0,U,000008,uking::ai::SiteBossChemicalProjectile::m40 -0x00000071003ec3e8,U,000008,uking::ai::SiteBossChemicalProjectile::m41 -0x00000071003ec3f0,U,000004,uking::ai::SiteBossChemicalProjectile::m43 -0x00000071003ec3f4,U,000008,uking::ai::SiteBossChemicalProjectile::m45 -0x00000071003ec3fc,U,000104,uking::ai::SiteBossChemicalProjectile::m46 -0x00000071003ec464,U,000008,uking::ai::SiteBossChemicalProjectile::m47 -0x00000071003ec46c,U,000008,uking::ai::SiteBossChemicalProjectile::m48 -0x00000071003ec474,U,000028,uking::ai::SiteBossChemicalProjectile::m49 -0x00000071003ec490,U,000008,uking::ai::SiteBossChemicalProjectile::m50 -0x00000071003ec498,U,000008,uking::ai::SiteBossChemicalProjectile::m51 -0x00000071003ec4a0,U,000048,uking::ai::SiteBossChemicalProjectile::m54 -0x00000071003ec4d0,U,000008,uking::ai::SiteBossChemicalProjectile::m55 -0x00000071003ec4d8,U,000036,uking::ai::SiteBossChemicalProjectile::m56 -0x00000071003ec4fc,U,000012,uking::ai::SiteBossChemicalProjectile::m57 +0x00000071003eba30,O,000004,_ZN5uking2ai14GanonFlameBall6leave_Ev +0x00000071003eba34,O,000436,_ZN5uking2ai14GanonFlameBall11loadParams_Ev +0x00000071003ebbe8,U,000288,uking::ai::GanonFlameBall::m38 +0x00000071003ebd08,U,000152,uking::ai::GanonFlameBall::m42 +0x00000071003ebda0,U,000580,uking::ai::GanonFlameBall::m44 +0x00000071003ebfe4,U,000056,uking::ai::GanonFlameBall::m52 +0x00000071003ec01c,U,000068,uking::ai::GanonFlameBall::m53 +0x00000071003ec060,U,000460,_ZN5uking2ai14GanonFlameBall14handleMessage_ERKN4ksys7MessageE +0x00000071003ec22c,O,000288,_ZNK5uking2ai14GanonFlameBall27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003ec34c,O,000092,_ZNK5uking2ai14GanonFlameBall18getRuntimeTypeInfoEv +0x00000071003ec3a8,U,000008,uking::ai::GanonFlameBall::m34 +0x00000071003ec3b0,U,000016,uking::ai::GanonFlameBall::m35 +0x00000071003ec3c0,U,000020,uking::ai::GanonFlameBall::m36 +0x00000071003ec3d4,U,000004,uking::ai::GanonFlameBall::m37 +0x00000071003ec3d8,U,000008,uking::ai::GanonFlameBall::m39 +0x00000071003ec3e0,U,000008,uking::ai::GanonFlameBall::m40 +0x00000071003ec3e8,U,000008,uking::ai::GanonFlameBall::m41 +0x00000071003ec3f0,U,000004,uking::ai::GanonFlameBall::m43 +0x00000071003ec3f4,U,000008,uking::ai::GanonFlameBall::m45 +0x00000071003ec3fc,U,000104,uking::ai::GanonFlameBall::m46 +0x00000071003ec464,U,000008,uking::ai::GanonFlameBall::m47 +0x00000071003ec46c,U,000008,uking::ai::GanonFlameBall::m48 +0x00000071003ec474,U,000028,uking::ai::GanonFlameBall::m49 +0x00000071003ec490,U,000008,uking::ai::GanonFlameBall::m50 +0x00000071003ec498,U,000008,uking::ai::GanonFlameBall::m51 +0x00000071003ec4a0,U,000048,uking::ai::GanonFlameBall::m54 +0x00000071003ec4d0,U,000008,uking::ai::GanonFlameBall::m55 +0x00000071003ec4d8,U,000036,uking::ai::GanonFlameBall::m56 +0x00000071003ec4fc,U,000012,uking::ai::GanonFlameBall::m57 0x00000071003ec508,U,000056,AI_AI_GanonGrudgeNormal::ctor 0x00000071003ec540,O,000004,_ZN5uking2ai17GanonGrudgeNormalD1Ev 0x00000071003ec544,O,000036,_ZN5uking2ai17GanonGrudgeNormalD0Ev @@ -25918,19 +25918,19 @@ Address,Quality,Size,Name 0x00000071003f676c,O,000092,_ZNK5uking2ai23GiantEarthReleaseAttack18getRuntimeTypeInfoEv 0x00000071003f67c8,O,000372,_ZN5uking2ai23GiantEarthReleaseAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003f693c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18EarthReleaseAttackEE9isDerivedEPKNS0_9InterfaceE -0x00000071003f69c8,O,000048,_ZN5uking2ai20LargeEnemyFindPlayerC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071003f69f8,W,000004,_ZN5uking2ai20LargeEnemyFindPlayerD1Ev -0x00000071003f69fc,W,000036,_ZN5uking2ai20LargeEnemyFindPlayerD0Ev -0x00000071003f6a20,O,000004,_ZN5uking2ai20LargeEnemyFindPlayer5init_EPN4sead4HeapE -0x00000071003f6a24,O,000004,_ZN5uking2ai20LargeEnemyFindPlayer6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071003f6a28,U,000004,_ZN5uking2ai20LargeEnemyFindPlayer5calc_Ev -0x00000071003f6a2c,O,000004,_ZN5uking2ai20LargeEnemyFindPlayer6leave_Ev -0x00000071003f6a30,O,000004,_ZN5uking2ai20LargeEnemyFindPlayer11loadParams_Ev -0x00000071003f6a34,U,000064,uking::ai::LargeEnemyFindPlayer::m35 -0x00000071003f6a74,U,000244,uking::ai::LargeEnemyFindPlayer::m36 -0x00000071003f6b68,U,000100,uking::ai::LargeEnemyFindPlayer::m37 -0x00000071003f6bcc,O,000008,_ZNK5uking2ai20LargeEnemyFindPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003f6bd4,O,000092,_ZNK5uking2ai20LargeEnemyFindPlayer18getRuntimeTypeInfoEv +0x00000071003f69c8,O,000048,_ZN5uking2ai20GiantEnemyFindPlayerC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071003f69f8,W,000004,_ZN5uking2ai20GiantEnemyFindPlayerD1Ev +0x00000071003f69fc,W,000036,_ZN5uking2ai20GiantEnemyFindPlayerD0Ev +0x00000071003f6a20,O,000004,_ZN5uking2ai20GiantEnemyFindPlayer5init_EPN4sead4HeapE +0x00000071003f6a24,O,000004,_ZN5uking2ai20GiantEnemyFindPlayer6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071003f6a28,U,000004,_ZN5uking2ai20GiantEnemyFindPlayer5calc_Ev +0x00000071003f6a2c,O,000004,_ZN5uking2ai20GiantEnemyFindPlayer6leave_Ev +0x00000071003f6a30,O,000004,_ZN5uking2ai20GiantEnemyFindPlayer11loadParams_Ev +0x00000071003f6a34,U,000064,uking::ai::GiantEnemyFindPlayer::m35 +0x00000071003f6a74,U,000244,uking::ai::GiantEnemyFindPlayer::m36 +0x00000071003f6b68,U,000100,uking::ai::GiantEnemyFindPlayer::m37 +0x00000071003f6bcc,O,000008,_ZNK5uking2ai20GiantEnemyFindPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071003f6bd4,O,000092,_ZNK5uking2ai20GiantEnemyFindPlayer18getRuntimeTypeInfoEv 0x00000071003f6c30,U,000056,AI_AI_GiantEscapeFromDamageWater::ctor 0x00000071003f6c68,O,000004,_ZN5uking2ai26GiantEscapeFromDamageWaterD1Ev 0x00000071003f6c6c,O,000036,_ZN5uking2ai26GiantEscapeFromDamageWaterD0Ev @@ -26000,12 +26000,12 @@ Address,Quality,Size,Name 0x00000071003fa3f4,U,000036,uking::ai::GiantSleepNormal::m38 0x00000071003fa418,O,000008,_ZNK5uking2ai16GiantSleepNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071003fa420,O,000092,_ZNK5uking2ai16GiantSleepNormal18getRuntimeTypeInfoEv -0x00000071003fa47c,U,000268,_ZNK5uking2ai17SpecialEnemySleep12isChangeableEv +0x00000071003fa47c,U,000268,_ZNK5uking2ai11SleepNormal12isChangeableEv 0x00000071003fa588,U,000020,uking::ai::GiantSleepNormal::m36 -0x00000071003fa59c,U,000008,uking::ai::SpecialEnemySleep::m39 +0x00000071003fa59c,U,000008,uking::ai::SleepNormal::m39 0x00000071003fa5a4,U,000032, 0x00000071003fa5c4,O,000372,_ZN5uking2ai16GiantSleepNormal33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071003fa738,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai17SpecialEnemySleepEE9isDerivedEPKNS0_9InterfaceE +0x00000071003fa738,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai11SleepNormalEE9isDerivedEPKNS0_9InterfaceE 0x00000071003fa7c4,U,000052,AI_AI_GiantSleepReaction::ctor 0x00000071003fa7f8,O,000004,_ZN5uking2ai18GiantSleepReactionD1Ev 0x00000071003fa7fc,O,000036,_ZN5uking2ai18GiantSleepReactionD0Ev @@ -26248,8 +26248,8 @@ Address,Quality,Size,Name 0x00000071004034e0,U,000168,uking::ai::GolemSleepNormal::m34 0x0000007100403588,O,000008,_ZNK5uking2ai16GolemSleepNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100403590,O,000092,_ZNK5uking2ai16GolemSleepNormal18getRuntimeTypeInfoEv -0x00000071004035ec,U,000008,uking::ai::SpecialEnemySleep::m36 -0x00000071004035f4,U,000004,uking::ai::SpecialEnemySleep::m38 +0x00000071004035ec,U,000008,uking::ai::SleepNormal::m36 +0x00000071004035f4,U,000004,uking::ai::SleepNormal::m38 0x00000071004035f8,O,000372,_ZN5uking2ai16GolemSleepNormal33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710040376c,O,000072,_ZN5uking2ai20GolemSleepTypeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071004037b4,W,000020,_ZN5uking2ai20GolemSleepTypeSelectD1Ev @@ -26302,7 +26302,7 @@ Address,Quality,Size,Name 0x0000007100406a6c,O,000008,_ZNK5uking2ai11GoronCannon27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100406a74,O,000092,_ZNK5uking2ai11GoronCannon18getRuntimeTypeInfoEv 0x0000007100406ad0,O,000372,_ZN5uking2ai11GoronCannon33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100406c44,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15GoronCannonBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100406c44,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai9BigCannonEE9isDerivedEPKNS0_9InterfaceE 0x0000007100406cd0,U,000448,AI_AI_GoronHeroDescendentRoot::ctor 0x0000007100406e90,U,000620, 0x00000071004070fc,W,000192,_ZN5uking2ai23GoronHeroDescendentRootD1Ev @@ -26414,33 +26414,33 @@ Address,Quality,Size,Name 0x000000710040cbd8,O,000004,_ZN5uking2ai20GuardFrequencySelect11loadParams_Ev 0x000000710040cbdc,O,000288,_ZNK5uking2ai20GuardFrequencySelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710040ccfc,O,000092,_ZNK5uking2ai20GuardFrequencySelect18getRuntimeTypeInfoEv -0x000000710040cd58,U,000016,uking::ai::AssassinNormal::m52 +0x000000710040cd58,U,000016,uking::ai::GuardHomePosNormal::m52 0x000000710040cd68,U,000052,AI_AIAssassinMiddleAzitoRoot::ctor -0x000000710040cd9c,W,000056,_ZN5uking2ai14AssassinNormalD1Ev -0x000000710040cdd4,W,000064,_ZN5uking2ai14AssassinNormalD0Ev -0x000000710040ce14,O,000004,_ZN5uking2ai14AssassinNormal5init_EPN4sead4HeapE -0x000000710040ce18,W,000064,_ZN5uking2ai14AssassinNormal6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710040cd9c,W,000056,_ZN5uking2ai18GuardHomePosNormalD1Ev +0x000000710040cdd4,W,000064,_ZN5uking2ai18GuardHomePosNormalD0Ev +0x000000710040ce14,O,000004,_ZN5uking2ai18GuardHomePosNormal5init_EPN4sead4HeapE +0x000000710040ce18,W,000064,_ZN5uking2ai18GuardHomePosNormal6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710040ce58,U,000032, -0x000000710040ce78,U,000004,_ZN5uking2ai14AssassinNormal5calc_Ev -0x000000710040ce7c,O,000004,_ZN5uking2ai14AssassinNormal6leave_Ev -0x000000710040ce80,O,000004,_ZN5uking2ai14AssassinNormal11loadParams_Ev -0x000000710040ce84,U,000260,uking::ai::AssassinNormal::m59 +0x000000710040ce78,U,000004,_ZN5uking2ai18GuardHomePosNormal5calc_Ev +0x000000710040ce7c,O,000004,_ZN5uking2ai18GuardHomePosNormal6leave_Ev +0x000000710040ce80,O,000004,_ZN5uking2ai18GuardHomePosNormal11loadParams_Ev +0x000000710040ce84,U,000260,uking::ai::GuardHomePosNormal::m59 0x000000710040cf88,U,000192, 0x000000710040d048,U,000332, -0x000000710040d194,U,000328,uking::ai::AssassinNormal::m49 -0x000000710040d2dc,U,000204,uking::ai::AssassinNormal::m74 +0x000000710040d194,U,000328,uking::ai::GuardHomePosNormal::m49 +0x000000710040d2dc,U,000204,uking::ai::GuardHomePosNormal::m74 0x000000710040d3a8,U,000380, -0x000000710040d524,U,000028,uking::ai::AssassinNormal::m56 -0x000000710040d540,U,000276,uking::ai::AssassinNormal::m57 -0x000000710040d654,U,000020,uking::ai::AssassinNormal::m58 -0x000000710040d668,U,000104,uking::ai::AssassinNormal::m60 -0x000000710040d6d0,U,000308,uking::ai::AssassinNormal::m61 -0x000000710040d804,U,000024,uking::ai::AssassinNormal::m62 -0x000000710040d81c,U,000240,uking::ai::AssassinNormal::m63 -0x000000710040d90c,O,000132,_ZNK5uking2ai14AssassinNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710040d990,O,000092,_ZNK5uking2ai14AssassinNormal18getRuntimeTypeInfoEv -0x000000710040d9ec,U,000008,uking::ai::AssassinNormal::m53 -0x000000710040d9f4,U,000008,uking::ai::AssassinNormal::m75 +0x000000710040d524,U,000028,uking::ai::GuardHomePosNormal::m56 +0x000000710040d540,U,000276,uking::ai::GuardHomePosNormal::m57 +0x000000710040d654,U,000020,uking::ai::GuardHomePosNormal::m58 +0x000000710040d668,U,000104,uking::ai::GuardHomePosNormal::m60 +0x000000710040d6d0,U,000308,uking::ai::GuardHomePosNormal::m61 +0x000000710040d804,U,000024,uking::ai::GuardHomePosNormal::m62 +0x000000710040d81c,U,000240,uking::ai::GuardHomePosNormal::m63 +0x000000710040d90c,O,000132,_ZNK5uking2ai18GuardHomePosNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710040d990,O,000092,_ZNK5uking2ai18GuardHomePosNormal18getRuntimeTypeInfoEv +0x000000710040d9ec,U,000008,uking::ai::GuardHomePosNormal::m53 +0x000000710040d9f4,U,000008,uking::ai::GuardHomePosNormal::m75 0x000000710040d9fc,O,000048,_ZN5uking2ai10GuardianAIC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710040da2c,O,000004,_ZN5uking2ai10GuardianAID1Ev 0x000000710040da30,O,000036,_ZN5uking2ai10GuardianAID0Ev @@ -26508,7 +26508,7 @@ Address,Quality,Size,Name 0x0000007100410c70,U,000028, 0x0000007100410c8c,U,000012, 0x0000007100410c98,O,000372,_ZN5uking2ai18GuardianBeamAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100410e0c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai22GuardianBeamAttackBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100410e0c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai24GuardianCommonBeamAttackEE9isDerivedEPKNS0_9InterfaceE 0x0000007100410e98,O,000048,_ZN5uking2ai22GuardianBezierRailMoveC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100410ec8,O,000004,_ZN5uking2ai22GuardianBezierRailMoveD1Ev 0x0000007100410ecc,O,000036,_ZN5uking2ai22GuardianBezierRailMoveD0Ev @@ -26545,18 +26545,18 @@ Address,Quality,Size,Name 0x0000007100411ba0,O,000092,_ZNK5uking2ai19GuardianCloseBattle18getRuntimeTypeInfoEv 0x0000007100411bfc,O,000372,_ZN5uking2ai19GuardianCloseBattle33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100411d70,U,000048,AI_AIGuardianBeamAttack::ctor -0x0000007100411da0,O,000004,_ZN5uking2ai22GuardianBeamAttackBaseD1Ev -0x0000007100411da4,O,000036,_ZN5uking2ai22GuardianBeamAttackBaseD0Ev -0x0000007100411dc8,O,000008,_ZN5uking2ai22GuardianBeamAttackBase5init_EPN4sead4HeapE -0x0000007100411dd0,O,000004,_ZN5uking2ai22GuardianBeamAttackBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100411dd4,U,000004,_ZN5uking2ai22GuardianBeamAttackBase5calc_Ev -0x0000007100411dd8,O,000004,_ZN5uking2ai22GuardianBeamAttackBase6leave_Ev -0x0000007100411ddc,O,000004,_ZN5uking2ai22GuardianBeamAttackBase11loadParams_Ev +0x0000007100411da0,O,000004,_ZN5uking2ai24GuardianCommonBeamAttackD1Ev +0x0000007100411da4,O,000036,_ZN5uking2ai24GuardianCommonBeamAttackD0Ev +0x0000007100411dc8,O,000008,_ZN5uking2ai24GuardianCommonBeamAttack5init_EPN4sead4HeapE +0x0000007100411dd0,O,000004,_ZN5uking2ai24GuardianCommonBeamAttack6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100411dd4,U,000004,_ZN5uking2ai24GuardianCommonBeamAttack5calc_Ev +0x0000007100411dd8,O,000004,_ZN5uking2ai24GuardianCommonBeamAttack6leave_Ev +0x0000007100411ddc,O,000004,_ZN5uking2ai24GuardianCommonBeamAttack11loadParams_Ev 0x0000007100411de0,U,000148, 0x0000007100411e74,U,000140, 0x0000007100411f00,U,000156, -0x0000007100411f9c,O,000288,_ZNK5uking2ai22GuardianBeamAttackBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004120bc,O,000092,_ZNK5uking2ai22GuardianBeamAttackBase18getRuntimeTypeInfoEv +0x0000007100411f9c,O,000288,_ZNK5uking2ai24GuardianCommonBeamAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004120bc,O,000092,_ZNK5uking2ai24GuardianCommonBeamAttack18getRuntimeTypeInfoEv 0x0000007100412118,O,000048,_ZN5uking2ai12GuardianDownC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100412148,O,000004,_ZN5uking2ai12GuardianDownD1Ev 0x000000710041214c,O,000036,_ZN5uking2ai12GuardianDownD0Ev @@ -26668,8 +26668,8 @@ Address,Quality,Size,Name 0x0000007100418024,U,000132,uking::ai::GuardianMiniBeamAttack::m36 0x00000071004180a8,O,000132,_ZNK5uking2ai22GuardianMiniBeamAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710041812c,O,000092,_ZNK5uking2ai22GuardianMiniBeamAttack18getRuntimeTypeInfoEv -0x0000007100418188,O,000372,_ZN5uking2ai14MiniBeamAttack33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004182fc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14MiniBeamAttackEE9isDerivedEPKNS0_9InterfaceE +0x0000007100418188,O,000372,_ZN5uking2ai26GuideBeamAttackEnemyBattle33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004182fc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai26GuideBeamAttackEnemyBattleEE9isDerivedEPKNS0_9InterfaceE 0x0000007100418388,U,000108,AI_AI_GuardianMiniBeamAttackMove::ctor 0x00000071004183f4,W,000052,_ZN5uking2ai26GuardianMiniBeamAttackMoveD1Ev 0x0000007100418428,W,000060,_ZN5uking2ai26GuardianMiniBeamAttackMoveD0Ev @@ -27024,22 +27024,22 @@ Address,Quality,Size,Name 0x000000710042c880,O,000092,_ZNK5uking2ai12GuardianWait18getRuntimeTypeInfoEv 0x000000710042c8dc,O,000372,_ZN5uking2ai12GuardianWait33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710042ca50,U,000152,AI_AIGuardianMiniBeamAttackBase::ctor -0x000000710042cae8,W,000096,_ZN5uking2ai14MiniBeamAttackD1Ev -0x000000710042cb48,W,000104,_ZN5uking2ai14MiniBeamAttackD0Ev -0x000000710042cbb0,O,000004,_ZN5uking2ai14MiniBeamAttack5init_EPN4sead4HeapE -0x000000710042cbb4,W,000464,_ZN5uking2ai14MiniBeamAttack6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710042cae8,W,000096,_ZN5uking2ai26GuideBeamAttackEnemyBattleD1Ev +0x000000710042cb48,W,000104,_ZN5uking2ai26GuideBeamAttackEnemyBattleD0Ev +0x000000710042cbb0,O,000004,_ZN5uking2ai26GuideBeamAttackEnemyBattle5init_EPN4sead4HeapE +0x000000710042cbb4,W,000464,_ZN5uking2ai26GuideBeamAttackEnemyBattle6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710042cd84,U,000300, -0x000000710042ceb0,U,000244,_ZN5uking2ai14MiniBeamAttack5calc_Ev +0x000000710042ceb0,U,000244,_ZN5uking2ai26GuideBeamAttackEnemyBattle5calc_Ev 0x000000710042cfa4,U,000448, -0x000000710042d164,W,000068,_ZN5uking2ai14MiniBeamAttack6leave_Ev -0x000000710042d1a8,U,000096,uking::ai::MiniBeamAttack::m41 -0x000000710042d208,U,000144,uking::ai::MiniBeamAttack::m45 -0x000000710042d298,U,000068,uking::ai::MiniBeamAttack::m37 -0x000000710042d2dc,U,000024,uking::ai::MiniBeamAttack::m35 -0x000000710042d2f4,W,000276,_ZN5uking2ai14MiniBeamAttack11loadParams_Ev -0x000000710042d408,U,000024,_ZNK5uking2ai14MiniBeamAttack12isChangeableEv -0x000000710042d420,O,000008,_ZNK5uking2ai14MiniBeamAttack27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710042d428,O,000092,_ZNK5uking2ai14MiniBeamAttack18getRuntimeTypeInfoEv +0x000000710042d164,W,000068,_ZN5uking2ai26GuideBeamAttackEnemyBattle6leave_Ev +0x000000710042d1a8,U,000096,uking::ai::GuideBeamAttackEnemyBattle::m41 +0x000000710042d208,U,000144,uking::ai::GuideBeamAttackEnemyBattle::m45 +0x000000710042d298,U,000068,uking::ai::GuideBeamAttackEnemyBattle::m37 +0x000000710042d2dc,U,000024,uking::ai::GuideBeamAttackEnemyBattle::m35 +0x000000710042d2f4,W,000276,_ZN5uking2ai26GuideBeamAttackEnemyBattle11loadParams_Ev +0x000000710042d408,U,000024,_ZNK5uking2ai26GuideBeamAttackEnemyBattle12isChangeableEv +0x000000710042d420,O,000008,_ZNK5uking2ai26GuideBeamAttackEnemyBattle27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710042d428,O,000092,_ZNK5uking2ai26GuideBeamAttackEnemyBattle18getRuntimeTypeInfoEv 0x000000710042d484,U,000124,AI_AI_GyroActivateTerminal::ctor 0x000000710042d500,W,000084,_ZN5uking2ai20GyroActivateTerminalD1Ev 0x000000710042d554,W,000092,_ZN5uking2ai20GyroActivateTerminalD0Ev @@ -27216,7 +27216,7 @@ Address,Quality,Size,Name 0x0000007100435c38,O,000008,_ZNK5uking2ai29HorseCheckLineOfSightSelector27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100435c40,O,000092,_ZNK5uking2ai29HorseCheckLineOfSightSelector18getRuntimeTypeInfoEv 0x0000007100435c9c,O,000372,_ZN5uking2ai29HorseCheckLineOfSightSelector33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100435e10,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai33HorseCheckLineOfSightSelectorBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100435e10,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai24CheckLineOfSightSelectorEE9isDerivedEPKNS0_9InterfaceE 0x0000007100435e9c,O,000048,_ZN5uking2ai21HorseDamageTypeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100435ecc,O,000004,_ZN5uking2ai21HorseDamageTypeSelectD1Ev 0x0000007100435ed0,O,000036,_ZN5uking2ai21HorseDamageTypeSelectD0Ev @@ -27311,18 +27311,18 @@ Address,Quality,Size,Name 0x000000710043e858,O,000372,_ZN5uking2ai16HorseRiddenByNPC33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710043e9cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20HorseRiddenByNPCBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710043ea58,U,000048,AI_AIMotorcycleRoot::ctor -0x000000710043ea88,O,000004,_ZN5uking2ai18MotorcycleRootBaseD1Ev -0x000000710043ea8c,O,000036,_ZN5uking2ai18MotorcycleRootBaseD0Ev -0x000000710043eab0,O,000008,_ZN5uking2ai18MotorcycleRootBase5init_EPN4sead4HeapE -0x000000710043eab8,W,000004,_ZN5uking2ai18MotorcycleRootBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710043ea88,O,000004,_ZN5uking2ai25HorseRiddenStatusSelectorD1Ev +0x000000710043ea8c,O,000036,_ZN5uking2ai25HorseRiddenStatusSelectorD0Ev +0x000000710043eab0,O,000008,_ZN5uking2ai25HorseRiddenStatusSelector5init_EPN4sead4HeapE +0x000000710043eab8,W,000004,_ZN5uking2ai25HorseRiddenStatusSelector6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710043eabc,U,000332, -0x000000710043ec08,U,000120,_ZN5uking2ai18MotorcycleRootBase5calc_Ev -0x000000710043ec80,O,000004,_ZN5uking2ai18MotorcycleRootBase6leave_Ev -0x000000710043ec84,O,000004,_ZN5uking2ai18MotorcycleRootBase11loadParams_Ev -0x000000710043ec88,O,000288,_ZNK5uking2ai18MotorcycleRootBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710043eda8,O,000092,_ZNK5uking2ai18MotorcycleRootBase18getRuntimeTypeInfoEv -0x000000710043ee04,U,000052,_ZNK5uking2ai18MotorcycleRootBase8isFailedEv -0x000000710043ee38,U,000036,_ZNK5uking2ai18MotorcycleRootBase10isFinishedEv +0x000000710043ec08,U,000120,_ZN5uking2ai25HorseRiddenStatusSelector5calc_Ev +0x000000710043ec80,O,000004,_ZN5uking2ai25HorseRiddenStatusSelector6leave_Ev +0x000000710043ec84,O,000004,_ZN5uking2ai25HorseRiddenStatusSelector11loadParams_Ev +0x000000710043ec88,O,000288,_ZNK5uking2ai25HorseRiddenStatusSelector27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710043eda8,O,000092,_ZNK5uking2ai25HorseRiddenStatusSelector18getRuntimeTypeInfoEv +0x000000710043ee04,U,000052,_ZNK5uking2ai25HorseRiddenStatusSelector8isFailedEv +0x000000710043ee38,U,000036,_ZNK5uking2ai25HorseRiddenStatusSelector10isFinishedEv 0x000000710043ee5c,U,000124,AI_AI_HorseRideChargeAttack::ctor 0x000000710043eed8,W,000084,_ZN5uking2ai21HorseRideChargeAttackD1Ev 0x000000710043ef2c,W,000092,_ZN5uking2ai21HorseRideChargeAttackD0Ev @@ -27692,40 +27692,40 @@ Address,Quality,Size,Name 0x000000710044c028,O,000288,_ZNK5uking2ai24InvincibleHiddenOctarock27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710044c148,O,000092,_ZNK5uking2ai24InvincibleHiddenOctarock18getRuntimeTypeInfoEv 0x000000710044c1a4,U,000060,AI_AIStoneOctarockGuardNearTarget::ctor -0x000000710044c1e0,O,000004,_ZN5uking2ai20TimedGuardNearTargetD1Ev -0x000000710044c1e4,O,000036,_ZN5uking2ai20TimedGuardNearTargetD0Ev -0x000000710044c208,O,000004,_ZN5uking2ai20TimedGuardNearTarget5init_EPN4sead4HeapE -0x000000710044c20c,W,000024,_ZN5uking2ai20TimedGuardNearTarget6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710044c224,U,000132,_ZN5uking2ai20TimedGuardNearTarget5calc_Ev -0x000000710044c2a8,O,000004,_ZN5uking2ai20TimedGuardNearTarget6leave_Ev -0x000000710044c2ac,W,000136,_ZN5uking2ai20TimedGuardNearTarget11loadParams_Ev -0x000000710044c334,U,000140,uking::ai::TimedGuardNearTarget::m35 -0x000000710044c3c0,U,000016,uking::ai::TimedGuardNearTarget::m36 -0x000000710044c3d0,U,000124,uking::ai::TimedGuardNearTarget::m39 -0x000000710044c44c,O,000008,_ZNK5uking2ai20TimedGuardNearTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710044c454,O,000092,_ZNK5uking2ai20TimedGuardNearTarget18getRuntimeTypeInfoEv -0x000000710044c4b0,U,000008,uking::ai::TimedGuardNearTarget::m38 -0x000000710044c4b8,O,000372,_ZN5uking2ai20TimedGuardNearTarget33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710044c62c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15GuardNearTargetEE9isDerivedEPKNS0_9InterfaceE +0x000000710044c1e0,O,000004,_ZN5uking2ai20InvincibleNearTargetD1Ev +0x000000710044c1e4,O,000036,_ZN5uking2ai20InvincibleNearTargetD0Ev +0x000000710044c208,O,000004,_ZN5uking2ai20InvincibleNearTarget5init_EPN4sead4HeapE +0x000000710044c20c,W,000024,_ZN5uking2ai20InvincibleNearTarget6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710044c224,U,000132,_ZN5uking2ai20InvincibleNearTarget5calc_Ev +0x000000710044c2a8,O,000004,_ZN5uking2ai20InvincibleNearTarget6leave_Ev +0x000000710044c2ac,W,000136,_ZN5uking2ai20InvincibleNearTarget11loadParams_Ev +0x000000710044c334,U,000140,uking::ai::InvincibleNearTarget::m35 +0x000000710044c3c0,U,000016,uking::ai::InvincibleNearTarget::m36 +0x000000710044c3d0,U,000124,uking::ai::InvincibleNearTarget::m39 +0x000000710044c44c,O,000008,_ZNK5uking2ai20InvincibleNearTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710044c454,O,000092,_ZNK5uking2ai20InvincibleNearTarget18getRuntimeTypeInfoEv +0x000000710044c4b0,U,000008,uking::ai::InvincibleNearTarget::m38 +0x000000710044c4b8,O,000372,_ZN5uking2ai20InvincibleNearTarget33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710044c62c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai24InvincibleNearTargetBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710044c6b8,U,000092,AI_AIStoneOctarockGuardNearTargetBase::ctor -0x000000710044c714,W,000088,_ZN5uking2ai15GuardNearTargetD1Ev -0x000000710044c76c,W,000096,_ZN5uking2ai15GuardNearTargetD0Ev -0x000000710044c7cc,O,000008,_ZN5uking2ai15GuardNearTarget5init_EPN4sead4HeapE -0x000000710044c7d4,W,000532,_ZN5uking2ai15GuardNearTarget6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710044c714,W,000088,_ZN5uking2ai24InvincibleNearTargetBaseD1Ev +0x000000710044c76c,W,000096,_ZN5uking2ai24InvincibleNearTargetBaseD0Ev +0x000000710044c7cc,O,000008,_ZN5uking2ai24InvincibleNearTargetBase5init_EPN4sead4HeapE +0x000000710044c7d4,W,000532,_ZN5uking2ai24InvincibleNearTargetBase6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710044c9e8,U,000084, 0x000000710044ca3c,U,000244, -0x000000710044cb30,U,001244,_ZN5uking2ai15GuardNearTarget5calc_Ev +0x000000710044cb30,U,001244,_ZN5uking2ai24InvincibleNearTargetBase5calc_Ev 0x000000710044d00c,U,000244, -0x000000710044d100,W,000016,_ZN5uking2ai15GuardNearTarget6leave_Ev -0x000000710044d110,O,000220,_ZN5uking2ai15GuardNearTarget11loadParams_Ev -0x000000710044d1ec,U,000116,_ZNK5uking2ai15GuardNearTarget12isChangeableEv -0x000000710044d260,U,000072,uking::ai::GuardNearTarget::m34 -0x000000710044d2a8,U,000072,uking::ai::GuardNearTarget::m36 -0x000000710044d2f0,U,000112,uking::ai::GuardNearTarget::m37 -0x000000710044d360,O,000288,_ZNK5uking2ai15GuardNearTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710044d480,O,000092,_ZNK5uking2ai15GuardNearTarget18getRuntimeTypeInfoEv -0x000000710044d4dc,U,000008,uking::ai::GuardNearTarget::m35 -0x000000710044d4e4,U,000008,uking::ai::GuardNearTarget::m38 +0x000000710044d100,W,000016,_ZN5uking2ai24InvincibleNearTargetBase6leave_Ev +0x000000710044d110,O,000220,_ZN5uking2ai24InvincibleNearTargetBase11loadParams_Ev +0x000000710044d1ec,U,000116,_ZNK5uking2ai24InvincibleNearTargetBase12isChangeableEv +0x000000710044d260,U,000072,uking::ai::InvincibleNearTargetBase::m34 +0x000000710044d2a8,U,000072,uking::ai::InvincibleNearTargetBase::m36 +0x000000710044d2f0,U,000112,uking::ai::InvincibleNearTargetBase::m37 +0x000000710044d360,O,000288,_ZNK5uking2ai24InvincibleNearTargetBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710044d480,O,000092,_ZNK5uking2ai24InvincibleNearTargetBase18getRuntimeTypeInfoEv +0x000000710044d4dc,U,000008,uking::ai::InvincibleNearTargetBase::m35 +0x000000710044d4e4,U,000008,uking::ai::InvincibleNearTargetBase::m38 0x000000710044d4ec,U,000064,AI_AI_InvisibleKorokRailMove::ctor 0x000000710044d52c,O,000004,_ZN5uking2ai22InvisibleKorokRailMoveD1Ev 0x000000710044d530,O,000036,_ZN5uking2ai22InvisibleKorokRailMoveD0Ev @@ -28378,23 +28378,23 @@ Address,Quality,Size,Name 0x0000007100474068,O,000288,_ZNK5uking2ai21LargeCannonAttackRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100474188,O,000092,_ZNK5uking2ai21LargeCannonAttackRoot18getRuntimeTypeInfoEv 0x00000071004741e4,U,000060,AI_AIRemainElectricCannonRoot::ctor -0x0000007100474220,O,000008,_ZN5uking2ai28RemainElectricCannonRootBase5init_EPN4sead4HeapE -0x0000007100474228,W,000052,_ZN5uking2ai28RemainElectricCannonRootBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710047425c,U,000340,_ZN5uking2ai28RemainElectricCannonRootBase5calc_Ev -0x00000071004743b0,O,000004,_ZN5uking2ai28RemainElectricCannonRootBase6leave_Ev -0x00000071004743b4,O,000128,_ZN5uking2ai28RemainElectricCannonRootBase11loadParams_Ev -0x0000007100474434,U,000216,uking::ai::RemainElectricCannonRootBase::m35 -0x000000710047450c,U,000280,uking::ai::RemainElectricCannonRootBase::m36 -0x0000007100474624,U,000104,uking::ai::RemainElectricCannonRootBase::m38 -0x000000710047468c,U,000024,uking::ai::RemainElectricCannonRootBase::m40 -0x00000071004746a4,U,000008,_ZN5uking2ai28RemainElectricCannonRootBase14handleMessage_ERKN4ksys7MessageE -0x00000071004746ac,O,000288,_ZNK5uking2ai28RemainElectricCannonRootBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004747cc,O,000092,_ZNK5uking2ai28RemainElectricCannonRootBase18getRuntimeTypeInfoEv -0x0000007100474828,O,000036,_ZN5uking2ai28RemainElectricCannonRootBaseD0Ev -0x000000710047484c,U,000008,uking::ai::RemainElectricCannonRootBase::m34 -0x0000007100474854,U,000012,uking::ai::RemainElectricCannonRootBase::m37 -0x0000007100474860,U,000064,uking::ai::RemainElectricCannonRootBase::m39 -0x00000071004748a0,U,000012,uking::ai::RemainElectricCannonRootBase::m41 +0x0000007100474220,O,000008,_ZN5uking2ai15LargeCannonRoot5init_EPN4sead4HeapE +0x0000007100474228,W,000052,_ZN5uking2ai15LargeCannonRoot6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710047425c,U,000340,_ZN5uking2ai15LargeCannonRoot5calc_Ev +0x00000071004743b0,O,000004,_ZN5uking2ai15LargeCannonRoot6leave_Ev +0x00000071004743b4,O,000128,_ZN5uking2ai15LargeCannonRoot11loadParams_Ev +0x0000007100474434,U,000216,uking::ai::LargeCannonRoot::m35 +0x000000710047450c,U,000280,uking::ai::LargeCannonRoot::m36 +0x0000007100474624,U,000104,uking::ai::LargeCannonRoot::m38 +0x000000710047468c,U,000024,uking::ai::LargeCannonRoot::m40 +0x00000071004746a4,U,000008,_ZN5uking2ai15LargeCannonRoot14handleMessage_ERKN4ksys7MessageE +0x00000071004746ac,O,000288,_ZNK5uking2ai15LargeCannonRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004747cc,O,000092,_ZNK5uking2ai15LargeCannonRoot18getRuntimeTypeInfoEv +0x0000007100474828,O,000036,_ZN5uking2ai15LargeCannonRootD0Ev +0x000000710047484c,U,000008,uking::ai::LargeCannonRoot::m34 +0x0000007100474854,U,000012,uking::ai::LargeCannonRoot::m37 +0x0000007100474860,U,000064,uking::ai::LargeCannonRoot::m39 +0x00000071004748a0,U,000012,uking::ai::LargeCannonRoot::m41 0x00000071004748ac,U,000076, 0x00000071004748f8,O,000048,_ZN5uking2ai18LastAttackerSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x0000007100474928,O,000004,_ZN5uking2ai18LastAttackerSelectD1Ev @@ -28491,26 +28491,26 @@ Address,Quality,Size,Name 0x0000007100478730,O,000372,_ZN5uking2ai20LastBossRailWarpRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004788a4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai22LastBossNormalWarpRootEE9isDerivedEPKNS0_9InterfaceE 0x0000007100478930,U,000060,AI_AISiteBossRecognizeRoot::ctor -0x000000710047896c,O,000004,_ZN5uking2ai25SiteBossRecognizeRootBaseD1Ev -0x0000007100478970,O,000036,_ZN5uking2ai25SiteBossRecognizeRootBaseD0Ev -0x0000007100478994,O,000008,_ZN5uking2ai25SiteBossRecognizeRootBase5init_EPN4sead4HeapE -0x000000710047899c,W,000192,_ZN5uking2ai25SiteBossRecognizeRootBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710047896c,O,000004,_ZN5uking2ai21LastBossRecognizeRootD1Ev +0x0000007100478970,O,000036,_ZN5uking2ai21LastBossRecognizeRootD0Ev +0x0000007100478994,O,000008,_ZN5uking2ai21LastBossRecognizeRoot5init_EPN4sead4HeapE +0x000000710047899c,W,000192,_ZN5uking2ai21LastBossRecognizeRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100478a5c,U,000288,siteBossStuff 0x0000007100478b7c,U,000292, -0x0000007100478ca0,U,000728,_ZN5uking2ai25SiteBossRecognizeRootBase5calc_Ev +0x0000007100478ca0,U,000728,_ZN5uking2ai21LastBossRecognizeRoot5calc_Ev 0x0000007100478f78,U,000124, -0x0000007100478ff4,O,000004,_ZN5uking2ai25SiteBossRecognizeRootBase6leave_Ev -0x0000007100478ff8,O,000220,_ZN5uking2ai25SiteBossRecognizeRootBase11loadParams_Ev -0x00000071004790d4,U,000496,uking::ai::SiteBossRecognizeRootBase::m40 -0x00000071004792c4,U,000004,uking::ai::SiteBossRecognizeRootBase::m34 -0x00000071004792c8,U,000140,uking::ai::SiteBossRecognizeRootBase::m35 -0x0000007100479354,U,000036,uking::ai::SiteBossRecognizeRootBase::m36 -0x0000007100479378,U,000144,uking::ai::SiteBossRecognizeRootBase::m37 -0x0000007100479408,U,000220,uking::ai::SiteBossRecognizeRootBase::m38 -0x00000071004794e4,U,000012,uking::ai::SiteBossRecognizeRootBase::m41 -0x00000071004794f0,O,000288,_ZNK5uking2ai25SiteBossRecognizeRootBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100479610,O,000092,_ZNK5uking2ai25SiteBossRecognizeRootBase18getRuntimeTypeInfoEv -0x000000710047966c,U,000124,uking::ai::SiteBossRecognizeRootBase::m39 +0x0000007100478ff4,O,000004,_ZN5uking2ai21LastBossRecognizeRoot6leave_Ev +0x0000007100478ff8,O,000220,_ZN5uking2ai21LastBossRecognizeRoot11loadParams_Ev +0x00000071004790d4,U,000496,uking::ai::LastBossRecognizeRoot::m40 +0x00000071004792c4,U,000004,uking::ai::LastBossRecognizeRoot::m34 +0x00000071004792c8,U,000140,uking::ai::LastBossRecognizeRoot::m35 +0x0000007100479354,U,000036,uking::ai::LastBossRecognizeRoot::m36 +0x0000007100479378,U,000144,uking::ai::LastBossRecognizeRoot::m37 +0x0000007100479408,U,000220,uking::ai::LastBossRecognizeRoot::m38 +0x00000071004794e4,U,000012,uking::ai::LastBossRecognizeRoot::m41 +0x00000071004794f0,O,000288,_ZNK5uking2ai21LastBossRecognizeRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100479610,O,000092,_ZNK5uking2ai21LastBossRecognizeRoot18getRuntimeTypeInfoEv +0x000000710047966c,U,000124,uking::ai::LastBossRecognizeRoot::m39 0x00000071004796e8,U,000124,AI_AI_LastBossRoot::ctor 0x0000007100479764,W,000060,_ZN5uking2ai12LastBossRoot5init_EPN4sead4HeapE 0x00000071004797a0,W,000712,_ZN5uking2ai12LastBossRoot6enter_EPN4ksys3act2ai15InlineParamPackE @@ -29204,19 +29204,19 @@ Address,Quality,Size,Name 0x000000710049cf5c,O,000288,_ZNK5uking2ai9LynelWarp27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710049d07c,O,000092,_ZNK5uking2ai9LynelWarp18getRuntimeTypeInfoEv 0x000000710049d0d8,U,000096,AI_AIOneMemoryMagicBattle::ctor -0x000000710049d138,W,000052,_ZN5uking2ai24OneMemoryMagicBattleBaseD1Ev -0x000000710049d16c,W,000060,_ZN5uking2ai24OneMemoryMagicBattleBaseD0Ev -0x000000710049d1a8,O,000008,_ZN5uking2ai24OneMemoryMagicBattleBase5init_EPN4sead4HeapE -0x000000710049d1b0,W,000356,_ZN5uking2ai24OneMemoryMagicBattleBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710049d314,U,000748,_ZN5uking2ai24OneMemoryMagicBattleBase5calc_Ev +0x000000710049d138,W,000052,_ZN5uking2ai11MagicBattleD1Ev +0x000000710049d16c,W,000060,_ZN5uking2ai11MagicBattleD0Ev +0x000000710049d1a8,O,000008,_ZN5uking2ai11MagicBattle5init_EPN4sead4HeapE +0x000000710049d1b0,W,000356,_ZN5uking2ai11MagicBattle6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710049d314,U,000748,_ZN5uking2ai11MagicBattle5calc_Ev 0x000000710049d600,U,000248, -0x000000710049d6f8,W,000036,_ZN5uking2ai24OneMemoryMagicBattleBase6leave_Ev -0x000000710049d71c,U,000548,uking::ai::OneMemoryMagicBattleBase::m44 -0x000000710049d940,W,000220,_ZN5uking2ai24OneMemoryMagicBattleBase11loadParams_Ev -0x000000710049da1c,U,000180,uking::ai::OneMemoryMagicBattleBase::m45 -0x000000710049dad0,O,000008,_ZNK5uking2ai24OneMemoryMagicBattleBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710049dad8,O,000092,_ZNK5uking2ai24OneMemoryMagicBattleBase18getRuntimeTypeInfoEv -0x000000710049db34,O,000372,_ZN5uking2ai24OneMemoryMagicBattleBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710049d6f8,W,000036,_ZN5uking2ai11MagicBattle6leave_Ev +0x000000710049d71c,U,000548,uking::ai::MagicBattle::m44 +0x000000710049d940,W,000220,_ZN5uking2ai11MagicBattle11loadParams_Ev +0x000000710049da1c,U,000180,uking::ai::MagicBattle::m45 +0x000000710049dad0,O,000008,_ZNK5uking2ai11MagicBattle27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710049dad8,O,000092,_ZNK5uking2ai11MagicBattle18getRuntimeTypeInfoEv +0x000000710049db34,O,000372,_ZN5uking2ai11MagicBattle33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710049dca8,U,000052,AI_AI_MagneGearRoot::ctor 0x000000710049dcdc,O,000004,_ZN5uking2ai13MagneGearRootD1Ev 0x000000710049dce0,O,000036,_ZN5uking2ai13MagneGearRootD0Ev @@ -29238,13 +29238,13 @@ Address,Quality,Size,Name 0x000000710049e358,U,000340,uking::ai::MagneGrabbedPartsRangeSelector::m38 0x000000710049e4ac,O,000008,_ZNK5uking2ai30MagneGrabbedPartsRangeSelector27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710049e4b4,O,000092,_ZNK5uking2ai30MagneGrabbedPartsRangeSelector18getRuntimeTypeInfoEv -0x000000710049e510,U,000052,_ZNK5uking2ai11RangeSelect8isFailedEv -0x000000710049e544,U,000052,_ZNK5uking2ai11RangeSelect10isFinishedEv -0x000000710049e578,U,000008,uking::ai::RangeSelect::m35 -0x000000710049e580,U,000004,uking::ai::RangeSelect::m36 -0x000000710049e584,U,000004,uking::ai::RangeSelect::m37 +0x000000710049e510,U,000052,_ZNK5uking2ai14NewRangeSelect8isFailedEv +0x000000710049e544,U,000052,_ZNK5uking2ai14NewRangeSelect10isFinishedEv +0x000000710049e578,U,000008,uking::ai::NewRangeSelect::m35 +0x000000710049e580,U,000004,uking::ai::NewRangeSelect::m36 +0x000000710049e584,U,000004,uking::ai::NewRangeSelect::m37 0x000000710049e588,O,000372,_ZN5uking2ai30MagneGrabbedPartsRangeSelector33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710049e6fc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai11RangeSelectEE9isDerivedEPKNS0_9InterfaceE +0x000000710049e6fc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14NewRangeSelectEE9isDerivedEPKNS0_9InterfaceE 0x000000710049e788,O,000048,_ZN5uking2ai15MagneGrabSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710049e7b8,O,000004,_ZN5uking2ai15MagneGrabSelectD1Ev 0x000000710049e7bc,O,000036,_ZN5uking2ai15MagneGrabSelectD0Ev @@ -29484,7 +29484,7 @@ Address,Quality,Size,Name 0x00000071004a6af0,O,000008,_ZNK5uking2ai25MimicCliffStopEnemyNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004a6af8,O,000092,_ZNK5uking2ai25MimicCliffStopEnemyNormal18getRuntimeTypeInfoEv 0x00000071004a6b54,O,000372,_ZN5uking2ai25MimicCliffStopEnemyNormal33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004a6cc8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai29MimicCliffStopEnemyNormalBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071004a6cc8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20CliffStopEnemyNormalEE9isDerivedEPKNS0_9InterfaceE 0x00000071004a6d54,U,000056,AI_AI_MimicEnemyFindPlayer::ctor 0x00000071004a6d8c,W,000004,_ZN5uking2ai20MimicEnemyFindPlayerD1Ev 0x00000071004a6d90,W,000036,_ZN5uking2ai20MimicEnemyFindPlayerD0Ev @@ -29590,7 +29590,7 @@ Address,Quality,Size,Name 0x00000071004a9c78,U,000008,_ZN5uking2ai14MiniGolemSleep14handleMessage_ERKN4ksys7MessageE 0x00000071004a9c80,O,000008,_ZNK5uking2ai14MiniGolemSleep27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004a9c88,O,000092,_ZNK5uking2ai14MiniGolemSleep18getRuntimeTypeInfoEv -0x00000071004a9ce4,U,000016,uking::ai::SpecialEnemySleep::m34 +0x00000071004a9ce4,U,000016,uking::ai::SleepNormal::m34 0x00000071004a9cf4,U,000008,uking::ai::MiniGolemSleep::m36 0x00000071004a9cfc,O,000372,_ZN5uking2ai14MiniGolemSleep33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004a9e70,O,000048,_ZN5uking2ai6MoonAIC1ERKN4ksys3act2ai10ActionBase7InitArgE @@ -29673,7 +29673,7 @@ Address,Quality,Size,Name 0x00000071004af264,O,000008,_ZNK5uking2ai14MotorcycleRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004af26c,O,000092,_ZNK5uking2ai14MotorcycleRoot18getRuntimeTypeInfoEv 0x00000071004af2c8,O,000372,_ZN5uking2ai14MotorcycleRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004af43c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18MotorcycleRootBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071004af43c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai25HorseRiddenStatusSelectorEE9isDerivedEPKNS0_9InterfaceE 0x00000071004af4c8,U,000208,AI_AI_MoveAndFreeFallGondola::ctor 0x00000071004af598,W,000096,_ZN5uking2ai22MoveAndFreeFallGondolaD1Ev 0x00000071004af5f8,W,000104,_ZN5uking2ai22MoveAndFreeFallGondolaD0Ev @@ -29784,35 +29784,35 @@ Address,Quality,Size,Name 0x00000071004b5d44,O,000288,_ZNK5uking2ai25NavMeshTurnAwayFromHitPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004b5e64,O,000092,_ZNK5uking2ai25NavMeshTurnAwayFromHitPos18getRuntimeTypeInfoEv 0x00000071004b5ec0,U,000064,AI_AIEnemySearchOrChase::ctor -0x00000071004b5f00,W,000028,_ZN5uking2ai18UnarmedEnemySearch5init_EPN4sead4HeapE -0x00000071004b5f1c,O,000004,_ZN5uking2ai18UnarmedEnemySearchD1Ev -0x00000071004b5f20,O,000036,_ZN5uking2ai18UnarmedEnemySearchD0Ev -0x00000071004b5f44,W,000116,_ZN5uking2ai18UnarmedEnemySearch6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071004b5f00,W,000028,_ZN5uking2ai7NavMove5init_EPN4sead4HeapE +0x00000071004b5f1c,O,000004,_ZN5uking2ai7NavMoveD1Ev +0x00000071004b5f20,O,000036,_ZN5uking2ai7NavMoveD0Ev +0x00000071004b5f44,W,000116,_ZN5uking2ai7NavMove6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004b5fb8,U,000016, -0x00000071004b5fc8,U,000116,uking::ai::UnarmedEnemySearch::m34 -0x00000071004b603c,U,000680,_ZN5uking2ai18UnarmedEnemySearch5calc_Ev +0x00000071004b5fc8,U,000116,uking::ai::NavMove::m34 +0x00000071004b603c,U,000680,_ZN5uking2ai7NavMove5calc_Ev 0x00000071004b62e4,W,000024,_ZNK4sead13ControllerMgr12getFrameworkEv 0x00000071004b62fc,U,000116, 0x00000071004b6370,U,000116, 0x00000071004b63e4,U,000020, -0x00000071004b63f8,W,000168,_ZN5uking2ai18UnarmedEnemySearch6leave_Ev -0x00000071004b64a0,O,000128,_ZN5uking2ai18UnarmedEnemySearch11loadParams_Ev -0x00000071004b6520,U,000036,_ZNK5uking2ai18UnarmedEnemySearch12isChangeableEv +0x00000071004b63f8,W,000168,_ZN5uking2ai7NavMove6leave_Ev +0x00000071004b64a0,O,000128,_ZN5uking2ai7NavMove11loadParams_Ev +0x00000071004b6520,U,000036,_ZNK5uking2ai7NavMove12isChangeableEv 0x00000071004b6544,U,000512, 0x00000071004b6744,U,000064, -0x00000071004b6784,U,000256,uking::ai::UnarmedEnemySearch::m35 -0x00000071004b6884,U,000584,uking::ai::UnarmedEnemySearch::m37 -0x00000071004b6acc,U,000004,uking::ai::UnarmedEnemySearch::m39 -0x00000071004b6ad0,U,000148,uking::ai::UnarmedEnemySearch::m40 -0x00000071004b6b64,U,000088,uking::ai::UnarmedEnemySearch::m41 -0x00000071004b6bbc,U,000004,uking::ai::UnarmedEnemySearch::m42 +0x00000071004b6784,U,000256,uking::ai::NavMove::m35 +0x00000071004b6884,U,000584,uking::ai::NavMove::m37 +0x00000071004b6acc,U,000004,uking::ai::NavMove::m39 +0x00000071004b6ad0,U,000148,uking::ai::NavMove::m40 +0x00000071004b6b64,U,000088,uking::ai::NavMove::m41 +0x00000071004b6bbc,U,000004,uking::ai::NavMove::m42 0x00000071004b6bc0,U,000048, 0x00000071004b6bf0,U,000064, 0x00000071004b6c30,U,000108, -0x00000071004b6c9c,U,000144,uking::ai::UnarmedEnemySearch::m43 -0x00000071004b6d2c,O,000288,_ZNK5uking2ai18UnarmedEnemySearch27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004b6e4c,O,000092,_ZNK5uking2ai18UnarmedEnemySearch18getRuntimeTypeInfoEv -0x00000071004b6ea8,U,000004,uking::ai::UnarmedEnemySearch::m38 +0x00000071004b6c9c,U,000144,uking::ai::NavMove::m43 +0x00000071004b6d2c,O,000288,_ZNK5uking2ai7NavMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004b6e4c,O,000092,_ZNK5uking2ai7NavMove18getRuntimeTypeInfoEv +0x00000071004b6ea8,U,000004,uking::ai::NavMove::m38 0x00000071004b6eac,U,000056,AI_AI_NavMoveNearTarget::ctor 0x00000071004b6ee4,O,000004,_ZN5uking2ai17NavMoveNearTargetD1Ev 0x00000071004b6ee8,O,000036,_ZN5uking2ai17NavMoveNearTargetD0Ev @@ -29923,19 +29923,19 @@ Address,Quality,Size,Name 0x00000071004bbf08,O,000100,_ZN5uking2ai16NewMannequinRoot11loadParams_Ev 0x00000071004bbf6c,O,000288,_ZNK5uking2ai16NewMannequinRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004bc08c,O,000092,_ZNK5uking2ai16NewMannequinRoot18getRuntimeTypeInfoEv -0x00000071004bc0e8,O,000056,_ZN5uking2ai11RangeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071004bc120,O,000004,_ZN5uking2ai11RangeSelectD1Ev -0x00000071004bc124,O,000036,_ZN5uking2ai11RangeSelectD0Ev -0x00000071004bc148,O,000008,_ZN5uking2ai11RangeSelect5init_EPN4sead4HeapE -0x00000071004bc150,W,000004,_ZN5uking2ai11RangeSelect6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071004bc0e8,O,000056,_ZN5uking2ai14NewRangeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071004bc120,O,000004,_ZN5uking2ai14NewRangeSelectD1Ev +0x00000071004bc124,O,000036,_ZN5uking2ai14NewRangeSelectD0Ev +0x00000071004bc148,O,000008,_ZN5uking2ai14NewRangeSelect5init_EPN4sead4HeapE +0x00000071004bc150,W,000004,_ZN5uking2ai14NewRangeSelect6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004bc154,U,000300, -0x00000071004bc280,U,000132,_ZN5uking2ai11RangeSelect5calc_Ev -0x00000071004bc304,O,000004,_ZN5uking2ai11RangeSelect6leave_Ev -0x00000071004bc308,O,000128,_ZN5uking2ai11RangeSelect11loadParams_Ev -0x00000071004bc388,U,000008,uking::ai::RangeSelect::m38 -0x00000071004bc390,U,000048,uking::ai::RangeSelect::m34 -0x00000071004bc3c0,O,000288,_ZNK5uking2ai11RangeSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004bc4e0,O,000092,_ZNK5uking2ai11RangeSelect18getRuntimeTypeInfoEv +0x00000071004bc280,U,000132,_ZN5uking2ai14NewRangeSelect5calc_Ev +0x00000071004bc304,O,000004,_ZN5uking2ai14NewRangeSelect6leave_Ev +0x00000071004bc308,O,000128,_ZN5uking2ai14NewRangeSelect11loadParams_Ev +0x00000071004bc388,U,000008,uking::ai::NewRangeSelect::m38 +0x00000071004bc390,U,000048,uking::ai::NewRangeSelect::m34 +0x00000071004bc3c0,O,000288,_ZNK5uking2ai14NewRangeSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004bc4e0,O,000092,_ZNK5uking2ai14NewRangeSelect18getRuntimeTypeInfoEv 0x00000071004bc53c,O,000052,_ZN5uking2ai26NormalHumanEquipableShieldC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071004bc570,O,000004,_ZN5uking2ai26NormalHumanEquipableShieldD1Ev 0x00000071004bc574,O,000036,_ZN5uking2ai26NormalHumanEquipableShieldD0Ev @@ -30310,13 +30310,13 @@ Address,Quality,Size,Name 0x00000071004df480,O,000288,_ZNK5uking2ai10NPCRunaway27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004df5a0,O,000092,_ZNK5uking2ai10NPCRunaway18getRuntimeTypeInfoEv 0x00000071004df5fc,U,000112,AI_AINPCTravelOrWander::ctor -0x00000071004df66c,W,000088,_ZN5uking2ai13NPCTravelBaseD1Ev -0x00000071004df6c4,W,000096,_ZN5uking2ai13NPCTravelBaseD0Ev -0x00000071004df724,O,000008,_ZN5uking2ai13NPCTravelBase5init_EPN4sead4HeapE -0x00000071004df72c,W,000024,_ZN5uking2ai13NPCTravelBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071004df744,U,000028,_ZN5uking2ai13NPCTravelBase5calc_Ev -0x00000071004df760,W,000040,_ZN5uking2ai13NPCTravelBase6leave_Ev -0x00000071004df788,O,000004,_ZN5uking2ai13NPCTravelBase11loadParams_Ev +0x00000071004df66c,W,000088,_ZN5uking2ai15NPCScheduleMoveD1Ev +0x00000071004df6c4,W,000096,_ZN5uking2ai15NPCScheduleMoveD0Ev +0x00000071004df724,O,000008,_ZN5uking2ai15NPCScheduleMove5init_EPN4sead4HeapE +0x00000071004df72c,W,000024,_ZN5uking2ai15NPCScheduleMove6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071004df744,U,000028,_ZN5uking2ai15NPCScheduleMove5calc_Ev +0x00000071004df760,W,000040,_ZN5uking2ai15NPCScheduleMove6leave_Ev +0x00000071004df788,O,000004,_ZN5uking2ai15NPCScheduleMove11loadParams_Ev 0x00000071004df78c,U,000096, 0x00000071004df7ec,U,000396, 0x00000071004df978,U,000148, @@ -30324,8 +30324,8 @@ Address,Quality,Size,Name 0x00000071004dfa90,U,000268, 0x00000071004dfb9c,U,000160, 0x00000071004dfc3c,U,001384, -0x00000071004e01a4,O,000288,_ZNK5uking2ai13NPCTravelBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004e02c4,O,000092,_ZNK5uking2ai13NPCTravelBase18getRuntimeTypeInfoEv +0x00000071004e01a4,O,000288,_ZNK5uking2ai15NPCScheduleMove27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004e02c4,O,000092,_ZNK5uking2ai15NPCScheduleMove18getRuntimeTypeInfoEv 0x00000071004e0320,U,000060,AI_AI_NPCSearch::ctor 0x00000071004e035c,O,000004,_ZN5uking2ai9NPCSearchD1Ev 0x00000071004e0360,O,000036,_ZN5uking2ai9NPCSearchD0Ev @@ -30420,7 +30420,7 @@ Address,Quality,Size,Name 0x00000071004e5e98,O,000092,_ZNK5uking2ai9NPCTravel18getRuntimeTypeInfoEv 0x00000071004e5ef4,U,000008,_ZN5uking2ai9NPCTravel14hasPreDeleteCbEv 0x00000071004e5efc,O,000372,_ZN5uking2ai9NPCTravel33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004e6070,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai13NPCTravelBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071004e6070,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15NPCScheduleMoveEE9isDerivedEPKNS0_9InterfaceE 0x00000071004e60fc,U,000096,AI_AI_NPCTravelerRoot::ctor 0x00000071004e615c,W,000068,_ZN5uking2ai15NPCTravelerRootD1Ev 0x00000071004e61a0,W,000076,_ZN5uking2ai15NPCTravelerRootD0Ev @@ -30502,27 +30502,27 @@ Address,Quality,Size,Name 0x00000071004ebe08,U,000748, 0x00000071004ec0f4,O,000008,_ZNK5uking2ai18OctarockHideEscape27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004ec0fc,O,000092,_ZNK5uking2ai18OctarockHideEscape18getRuntimeTypeInfoEv -0x00000071004ec158,U,000008,_ZNK5uking2ai14OctarockEscape12isChangeableEv +0x00000071004ec158,U,000008,_ZNK5uking2ai22OctarockHideEscapeBase12isChangeableEv 0x00000071004ec160,U,000008,uking::ai::OctarockHideEscape::m34 0x00000071004ec168,O,000372,_ZN5uking2ai18OctarockHideEscape33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004ec2dc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14OctarockEscapeEE9isDerivedEPKNS0_9InterfaceE +0x00000071004ec2dc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai22OctarockHideEscapeBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071004ec368,U,000068,AI_AIOctarockHideEscape::ctor -0x00000071004ec3ac,W,000052,_ZN5uking2ai14OctarockEscapeD1Ev -0x00000071004ec3e0,W,000060,_ZN5uking2ai14OctarockEscapeD0Ev -0x00000071004ec41c,O,000008,_ZN5uking2ai14OctarockEscape5init_EPN4sead4HeapE -0x00000071004ec424,W,000072,_ZN5uking2ai14OctarockEscape6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071004ec46c,U,000644,_ZN5uking2ai14OctarockEscape5calc_Ev +0x00000071004ec3ac,W,000052,_ZN5uking2ai22OctarockHideEscapeBaseD1Ev +0x00000071004ec3e0,W,000060,_ZN5uking2ai22OctarockHideEscapeBaseD0Ev +0x00000071004ec41c,O,000008,_ZN5uking2ai22OctarockHideEscapeBase5init_EPN4sead4HeapE +0x00000071004ec424,W,000072,_ZN5uking2ai22OctarockHideEscapeBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071004ec46c,U,000644,_ZN5uking2ai22OctarockHideEscapeBase5calc_Ev 0x00000071004ec6f0,U,000176, 0x00000071004ec7a0,U,000300, -0x00000071004ec8cc,W,000132,_ZN5uking2ai14OctarockEscape6leave_Ev -0x00000071004ec950,O,000108,_ZN5uking2ai14OctarockEscape11loadParams_Ev +0x00000071004ec8cc,W,000132,_ZN5uking2ai22OctarockHideEscapeBase6leave_Ev +0x00000071004ec950,O,000108,_ZN5uking2ai22OctarockHideEscapeBase11loadParams_Ev 0x00000071004ec9bc,U,000120, -0x00000071004eca34,U,000208,uking::ai::OctarockEscape::m35 +0x00000071004eca34,U,000208,uking::ai::OctarockHideEscapeBase::m35 0x00000071004ecb04,U,000176, 0x00000071004ecbb4,U,000236, -0x00000071004ecca0,O,000288,_ZNK5uking2ai14OctarockEscape27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004ecdc0,O,000092,_ZNK5uking2ai14OctarockEscape18getRuntimeTypeInfoEv -0x00000071004ece1c,U,000008,uking::ai::OctarockEscape::m34 +0x00000071004ecca0,O,000288,_ZNK5uking2ai22OctarockHideEscapeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004ecdc0,O,000092,_ZNK5uking2ai22OctarockHideEscapeBase18getRuntimeTypeInfoEv +0x00000071004ece1c,U,000008,uking::ai::OctarockHideEscapeBase::m34 0x00000071004ece24,U,000052,AI_AI_OctarockOptionRoot::ctor 0x00000071004ece58,W,000136,_ZN5uking2ai18OctarockOptionRootD1Ev 0x00000071004ecee0,W,000144,_ZN5uking2ai18OctarockOptionRootD0Ev @@ -30574,8 +30574,8 @@ Address,Quality,Size,Name 0x00000071004ef1d4,O,000132,_ZNK5uking2ai12OctarockRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004ef258,O,000092,_ZNK5uking2ai12OctarockRoot18getRuntimeTypeInfoEv 0x00000071004ef2b4,U,000108,uking::ai::OctarockRoot::m41 -0x00000071004ef320,O,000372,_ZN5uking2ai16OctarockRootBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004ef494,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai16OctarockRootBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071004ef320,O,000372,_ZN5uking2ai15VacuumEnemyRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004ef494,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15VacuumEnemyRootEE9isDerivedEPKNS0_9InterfaceE 0x00000071004ef520,U,000092, 0x00000071004ef57c,U,000004,nullsub_1491 0x00000071004ef580,U,000072,AI_AI_OctarockServiceHideWait::ctor @@ -30606,23 +30606,23 @@ Address,Quality,Size,Name 0x00000071004f14e8,O,000288,_ZNK5uking2ai17OctarockWaterWait27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004f1608,O,000092,_ZNK5uking2ai17OctarockWaterWait18getRuntimeTypeInfoEv 0x00000071004f1664,U,000116,_ZNK5uking2ai17OctarockWaterWait12isChangeableEv -0x00000071004f16d8,O,000060,_ZN5uking2ai15TargetPosOffsetC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071004f1714,O,000004,_ZN5uking2ai15TargetPosOffsetD1Ev -0x00000071004f1718,O,000036,_ZN5uking2ai15TargetPosOffsetD0Ev -0x00000071004f173c,O,000004,_ZN5uking2ai15TargetPosOffset5init_EPN4sead4HeapE -0x00000071004f1740,O,000004,_ZN5uking2ai15TargetPosOffset6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071004f1744,U,000004,_ZN5uking2ai15TargetPosOffset5calc_Ev -0x00000071004f1748,O,000004,_ZN5uking2ai15TargetPosOffset6leave_Ev -0x00000071004f174c,O,000192,_ZN5uking2ai15TargetPosOffset11loadParams_Ev -0x00000071004f180c,U,000468,uking::ai::TargetPosOffset::m35 -0x00000071004f19e0,O,000008,_ZNK5uking2ai15TargetPosOffset27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004f19e8,O,000092,_ZNK5uking2ai15TargetPosOffset18getRuntimeTypeInfoEv -0x00000071004f1a44,U,000036,_ZNK5uking2ai11TargetPosAI8isFailedEv -0x00000071004f1a68,U,000036,_ZNK5uking2ai11TargetPosAI10isFinishedEv -0x00000071004f1a8c,U,000036,uking::ai::TargetPosAI::m34 -0x00000071004f1ab0,U,000004,uking::ai::TargetPosOffset::m36 -0x00000071004f1ab4,O,000372,_ZN5uking2ai15TargetPosOffset33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004f1c28,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai11TargetPosAIEE9isDerivedEPKNS0_9InterfaceE +0x00000071004f16d8,O,000060,_ZN5uking2ai15OffsetTargetPosC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071004f1714,O,000004,_ZN5uking2ai15OffsetTargetPosD1Ev +0x00000071004f1718,O,000036,_ZN5uking2ai15OffsetTargetPosD0Ev +0x00000071004f173c,O,000004,_ZN5uking2ai15OffsetTargetPos5init_EPN4sead4HeapE +0x00000071004f1740,O,000004,_ZN5uking2ai15OffsetTargetPos6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071004f1744,U,000004,_ZN5uking2ai15OffsetTargetPos5calc_Ev +0x00000071004f1748,O,000004,_ZN5uking2ai15OffsetTargetPos6leave_Ev +0x00000071004f174c,O,000192,_ZN5uking2ai15OffsetTargetPos11loadParams_Ev +0x00000071004f180c,U,000468,uking::ai::OffsetTargetPos::m35 +0x00000071004f19e0,O,000008,_ZNK5uking2ai15OffsetTargetPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004f19e8,O,000092,_ZNK5uking2ai15OffsetTargetPos18getRuntimeTypeInfoEv +0x00000071004f1a44,U,000036,_ZNK5uking2ai14TargetActorPos8isFailedEv +0x00000071004f1a68,U,000036,_ZNK5uking2ai14TargetActorPos10isFinishedEv +0x00000071004f1a8c,U,000036,uking::ai::TargetActorPos::m34 +0x00000071004f1ab0,U,000004,uking::ai::OffsetTargetPos::m36 +0x00000071004f1ab4,O,000372,_ZN5uking2ai15OffsetTargetPos33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004f1c28,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14TargetActorPosEE9isDerivedEPKNS0_9InterfaceE 0x00000071004f1cb4,U,000068,AI_AI_OnCliffEnemyBattle::ctor 0x00000071004f1cf8,O,000004,_ZN5uking2ai18OnCliffEnemyBattleD1Ev 0x00000071004f1cfc,O,000036,_ZN5uking2ai18OnCliffEnemyBattleD0Ev @@ -30671,7 +30671,7 @@ Address,Quality,Size,Name 0x00000071004f3568,U,000176,uking::ai::OneMemoryMagicBattle::m45 0x00000071004f3618,O,000132,_ZNK5uking2ai20OneMemoryMagicBattle27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004f369c,O,000092,_ZNK5uking2ai20OneMemoryMagicBattle18getRuntimeTypeInfoEv -0x00000071004f36f8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai24OneMemoryMagicBattleBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071004f36f8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai11MagicBattleEE9isDerivedEPKNS0_9InterfaceE 0x00000071004f3784,O,000048,_ZN5uking2ai22OnEnterEventModeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071004f37b4,O,000004,_ZN5uking2ai22OnEnterEventModeSelectD1Ev 0x00000071004f37b8,O,000036,_ZN5uking2ai22OnEnterEventModeSelectD0Ev @@ -30801,16 +30801,16 @@ Address,Quality,Size,Name 0x00000071004f68a8,O,000288,_ZNK5uking2ai11PipeDrawing27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004f69c8,O,000092,_ZNK5uking2ai11PipeDrawing18getRuntimeTypeInfoEv 0x00000071004f6a24,U,000084,AI_AIAncientNecklaceBall::ctor -0x00000071004f6a78,W,000136,_ZN5uking2ai23AncientNecklaceBallBaseD1Ev -0x00000071004f6b00,W,000144,_ZN5uking2ai23AncientNecklaceBallBaseD0Ev -0x00000071004f6b90,O,000008,_ZN5uking2ai23AncientNecklaceBallBase5init_EPN4sead4HeapE -0x00000071004f6b98,W,000076,_ZN5uking2ai23AncientNecklaceBallBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071004f6be4,U,000140,_ZN5uking2ai23AncientNecklaceBallBase5calc_Ev -0x00000071004f6c70,O,000004,_ZN5uking2ai23AncientNecklaceBallBase6leave_Ev -0x00000071004f6c74,U,000084,_ZN5uking2ai23AncientNecklaceBallBase14handleMessage_ERKN4ksys7MessageE -0x00000071004f6cc8,W,000156,_ZN5uking2ai23AncientNecklaceBallBase11loadParams_Ev -0x00000071004f6d64,O,000008,_ZNK5uking2ai23AncientNecklaceBallBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071004f6d6c,O,000092,_ZNK5uking2ai23AncientNecklaceBallBase18getRuntimeTypeInfoEv +0x00000071004f6a78,W,000136,_ZN5uking2ai12PlayASSwitchD1Ev +0x00000071004f6b00,W,000144,_ZN5uking2ai12PlayASSwitchD0Ev +0x00000071004f6b90,O,000008,_ZN5uking2ai12PlayASSwitch5init_EPN4sead4HeapE +0x00000071004f6b98,W,000076,_ZN5uking2ai12PlayASSwitch6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071004f6be4,U,000140,_ZN5uking2ai12PlayASSwitch5calc_Ev +0x00000071004f6c70,O,000004,_ZN5uking2ai12PlayASSwitch6leave_Ev +0x00000071004f6c74,U,000084,_ZN5uking2ai12PlayASSwitch14handleMessage_ERKN4ksys7MessageE +0x00000071004f6cc8,W,000156,_ZN5uking2ai12PlayASSwitch11loadParams_Ev +0x00000071004f6d64,O,000008,_ZNK5uking2ai12PlayASSwitch27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071004f6d6c,O,000092,_ZNK5uking2ai12PlayASSwitch18getRuntimeTypeInfoEv 0x00000071004f6dc8,O,000048,_ZN5uking2ai15PlayerSetTargetC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071004f6df8,O,000004,_ZN5uking2ai15PlayerSetTargetD1Ev 0x00000071004f6dfc,O,000036,_ZN5uking2ai15PlayerSetTargetD0Ev @@ -31120,20 +31120,20 @@ Address,Quality,Size,Name 0x00000071005059c0,O,000064,_ZN5uking2ai8PreyStun11loadParams_Ev 0x0000007100505a00,O,000288,_ZNK5uking2ai8PreyStun27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100505b20,O,000092,_ZNK5uking2ai8PreyStun18getRuntimeTypeInfoEv -0x0000007100505b7c,O,000052,_ZN5uking2ai14PriestBossModeC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100505bb0,O,000004,_ZN5uking2ai14PriestBossModeD1Ev -0x0000007100505bb4,O,000036,_ZN5uking2ai14PriestBossModeD0Ev +0x0000007100505b7c,O,000052,_ZN5uking2ai10PriestBossC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100505bb0,O,000004,_ZN5uking2ai10PriestBossD1Ev +0x0000007100505bb4,O,000036,_ZN5uking2ai10PriestBossD0Ev 0x0000007100505bd8,U,000012, 0x0000007100505be4,U,000144, 0x0000007100505c74,U,000200, -0x0000007100505d3c,U,000300,uking::ai::PriestBossMode::m34 -0x0000007100505e68,O,000008,_ZN5uking2ai14PriestBossMode5init_EPN4sead4HeapE -0x0000007100505e70,O,000004,_ZN5uking2ai14PriestBossMode6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100505e74,U,000004,_ZN5uking2ai14PriestBossMode5calc_Ev -0x0000007100505e78,O,000004,_ZN5uking2ai14PriestBossMode6leave_Ev -0x0000007100505e7c,O,000064,_ZN5uking2ai14PriestBossMode11loadParams_Ev -0x0000007100505ebc,O,000288,_ZNK5uking2ai14PriestBossMode27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100505fdc,O,000092,_ZNK5uking2ai14PriestBossMode18getRuntimeTypeInfoEv +0x0000007100505d3c,U,000300,uking::ai::PriestBoss::m34 +0x0000007100505e68,O,000008,_ZN5uking2ai10PriestBoss5init_EPN4sead4HeapE +0x0000007100505e70,O,000004,_ZN5uking2ai10PriestBoss6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100505e74,U,000004,_ZN5uking2ai10PriestBoss5calc_Ev +0x0000007100505e78,O,000004,_ZN5uking2ai10PriestBoss6leave_Ev +0x0000007100505e7c,O,000064,_ZN5uking2ai10PriestBoss11loadParams_Ev +0x0000007100505ebc,O,000288,_ZNK5uking2ai10PriestBoss27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100505fdc,O,000092,_ZNK5uking2ai10PriestBoss18getRuntimeTypeInfoEv 0x0000007100506038,U,000072,AI_AI_PriestBossActorCloneRoot::ctor 0x0000007100506080,W,000020,_ZN5uking2ai24PriestBossActorCloneRootD1Ev 0x0000007100506094,W,000052,_ZN5uking2ai24PriestBossActorCloneRootD0Ev @@ -31147,7 +31147,7 @@ Address,Quality,Size,Name 0x0000007100506370,O,000092,_ZNK5uking2ai24PriestBossActorCloneRoot18getRuntimeTypeInfoEv 0x00000071005063cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai25PriestBossActorNormalRootEE9isDerivedEPKNS0_9InterfaceE 0x0000007100506458,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai19PriestBossActorRootEE9isDerivedEPKNS0_9InterfaceE -0x00000071005064e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14PriestBossModeEE9isDerivedEPKNS0_9InterfaceE +0x00000071005064e4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai10PriestBossEE9isDerivedEPKNS0_9InterfaceE 0x0000007100506570,O,000372,_ZN5uking2ai19PriestBossActorRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071005066e4,U,000124,AI_AI_PriestBossActorEnemyRoot::ctor 0x0000007100506760,W,000088,_ZN5uking2ai24PriestBossActorEnemyRootD1Ev @@ -32487,19 +32487,19 @@ Address,Quality,Size,Name 0x000000710053de40,U,000016,uking::ai::ReflectableThrown::m34 0x000000710053de50,O,000288,_ZNK5uking2ai17ReflectableThrown27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710053df70,O,000092,_ZNK5uking2ai17ReflectableThrown18getRuntimeTypeInfoEv -0x000000710053dfcc,O,000052,_ZN5uking2ai29RegistedActorNumTwoSelectBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710053e000,O,000004,_ZN5uking2ai29RegistedActorNumTwoSelectBaseD1Ev -0x000000710053e004,O,000036,_ZN5uking2ai29RegistedActorNumTwoSelectBaseD0Ev -0x000000710053e028,O,000008,_ZN5uking2ai29RegistedActorNumTwoSelectBase5init_EPN4sead4HeapE -0x000000710053e030,W,000232,_ZN5uking2ai29RegistedActorNumTwoSelectBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710053e118,U,000004,_ZN5uking2ai29RegistedActorNumTwoSelectBase5calc_Ev -0x000000710053e11c,O,000004,_ZN5uking2ai29RegistedActorNumTwoSelectBase6leave_Ev -0x000000710053e120,U,000004,uking::ai::RegistedActorNumTwoSelectBase::m34 -0x000000710053e124,O,000064,_ZN5uking2ai29RegistedActorNumTwoSelectBase11loadParams_Ev -0x000000710053e164,O,000288,_ZNK5uking2ai29RegistedActorNumTwoSelectBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710053e284,O,000092,_ZNK5uking2ai29RegistedActorNumTwoSelectBase18getRuntimeTypeInfoEv -0x000000710053e2e0,U,000072,_ZNK5uking2ai29RegistedActorNumTwoSelectBase8isFailedEv -0x000000710053e328,U,000072,_ZNK5uking2ai29RegistedActorNumTwoSelectBase10isFinishedEv +0x000000710053dfcc,O,000052,_ZN5uking2ai13RegistedActorC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710053e000,O,000004,_ZN5uking2ai13RegistedActorD1Ev +0x000000710053e004,O,000036,_ZN5uking2ai13RegistedActorD0Ev +0x000000710053e028,O,000008,_ZN5uking2ai13RegistedActor5init_EPN4sead4HeapE +0x000000710053e030,W,000232,_ZN5uking2ai13RegistedActor6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710053e118,U,000004,_ZN5uking2ai13RegistedActor5calc_Ev +0x000000710053e11c,O,000004,_ZN5uking2ai13RegistedActor6leave_Ev +0x000000710053e120,U,000004,uking::ai::RegistedActor::m34 +0x000000710053e124,O,000064,_ZN5uking2ai13RegistedActor11loadParams_Ev +0x000000710053e164,O,000288,_ZNK5uking2ai13RegistedActor27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710053e284,O,000092,_ZNK5uking2ai13RegistedActor18getRuntimeTypeInfoEv +0x000000710053e2e0,U,000072,_ZNK5uking2ai13RegistedActor8isFailedEv +0x000000710053e328,U,000072,_ZNK5uking2ai13RegistedActor10isFinishedEv 0x000000710053e370,O,000052,_ZN5uking2ai25RegistedActorNumTwoSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710053e3a4,O,000004,_ZN5uking2ai25RegistedActorNumTwoSelectD1Ev 0x000000710053e3a8,O,000036,_ZN5uking2ai25RegistedActorNumTwoSelectD0Ev @@ -32512,7 +32512,7 @@ Address,Quality,Size,Name 0x000000710053e458,O,000008,_ZNK5uking2ai25RegistedActorNumTwoSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710053e460,O,000092,_ZNK5uking2ai25RegistedActorNumTwoSelect18getRuntimeTypeInfoEv 0x000000710053e4bc,O,000372,_ZN5uking2ai25RegistedActorNumTwoSelect33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710053e630,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai29RegistedActorNumTwoSelectBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710053e630,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai13RegistedActorEE9isDerivedEPKNS0_9InterfaceE 0x000000710053e6bc,U,000084,AI_AI_RemainElectricCannonBeamAttack::ctor 0x000000710053e710,W,000128,_ZN5uking2ai30RemainElectricCannonBeamAttackD1Ev 0x000000710053e790,W,000036,_ZN5uking2ai30RemainElectricCannonBeamAttackD0Ev @@ -32540,7 +32540,7 @@ Address,Quality,Size,Name 0x000000710053f7e4,O,000008,_ZNK5uking2ai24RemainElectricCannonRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710053f7ec,O,000092,_ZNK5uking2ai24RemainElectricCannonRoot18getRuntimeTypeInfoEv 0x000000710053f848,O,000372,_ZN5uking2ai24RemainElectricCannonRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710053f9bc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai28RemainElectricCannonRootBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710053f9bc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15LargeCannonRootEE9isDerivedEPKNS0_9InterfaceE 0x000000710053fa48,U,000004,nullsub_5401 0x000000710053fa4c,U,000356, 0x000000710053fbb0,U,000116,AI_AI_RemainsElectricBGCamera::ctor @@ -33100,7 +33100,7 @@ Address,Quality,Size,Name 0x000000710055ba34,U,000092,_ZN5uking2ai14SandwormNormal14handleMessage_ERKN4ksys7MessageE 0x000000710055ba90,O,000132,_ZNK5uking2ai14SandwormNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710055bb14,O,000092,_ZNK5uking2ai14SandwormNormal18getRuntimeTypeInfoEv -0x000000710055bb70,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18SandwormNormalBaseEE9isDerivedEPKNS0_9InterfaceE +0x000000710055bb70,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai7AwnSealEE9isDerivedEPKNS0_9InterfaceE 0x000000710055bbfc,U,000068,AI_AI_SandwormNoticeSound::ctor 0x000000710055bc40,W,000052,_ZN5uking2ai19SandwormNoticeSoundD1Ev 0x000000710055bc74,W,000060,_ZN5uking2ai19SandwormNoticeSoundD0Ev @@ -33474,19 +33474,19 @@ Address,Quality,Size,Name 0x0000007100567234,O,000288,_ZNK5uking2ai12SeqTwoAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100567354,O,000092,_ZNK5uking2ai12SeqTwoAction18getRuntimeTypeInfoEv 0x00000071005673b0,O,000036,_ZN5uking2ai12SeqTwoActionD0Ev -0x00000071005673d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai35SeqTwoLineReachableTargetActionBaseEE9isDerivedEPKNS0_9InterfaceE -0x0000007100567460,O,000052,_ZN5uking2ai35SeqTwoLineReachableTargetActionBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x0000007100567494,O,000004,_ZN5uking2ai35SeqTwoLineReachableTargetActionBaseD1Ev -0x0000007100567498,O,000036,_ZN5uking2ai35SeqTwoLineReachableTargetActionBaseD0Ev -0x00000071005674bc,O,000008,_ZN5uking2ai35SeqTwoLineReachableTargetActionBase5init_EPN4sead4HeapE -0x00000071005674c4,W,000012,_ZN5uking2ai35SeqTwoLineReachableTargetActionBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071005674d0,U,000460,_ZN5uking2ai35SeqTwoLineReachableTargetActionBase5calc_Ev -0x000000710056769c,O,000004,_ZN5uking2ai35SeqTwoLineReachableTargetActionBase6leave_Ev -0x00000071005676a0,O,000100,_ZN5uking2ai35SeqTwoLineReachableTargetActionBase11loadParams_Ev -0x0000007100567704,U,000020,uking::ai::SeqTwoLineReachableTargetActionBase::m34 -0x0000007100567718,U,000016,uking::ai::SeqTwoLineReachableTargetActionBase::m35 -0x0000007100567728,O,000288,_ZNK5uking2ai35SeqTwoLineReachableTargetActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100567848,O,000092,_ZNK5uking2ai35SeqTwoLineReachableTargetActionBase18getRuntimeTypeInfoEv +0x00000071005673d4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai25SeqTwoLineReachableTargetEE9isDerivedEPKNS0_9InterfaceE +0x0000007100567460,O,000052,_ZN5uking2ai25SeqTwoLineReachableTargetC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x0000007100567494,O,000004,_ZN5uking2ai25SeqTwoLineReachableTargetD1Ev +0x0000007100567498,O,000036,_ZN5uking2ai25SeqTwoLineReachableTargetD0Ev +0x00000071005674bc,O,000008,_ZN5uking2ai25SeqTwoLineReachableTarget5init_EPN4sead4HeapE +0x00000071005674c4,W,000012,_ZN5uking2ai25SeqTwoLineReachableTarget6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071005674d0,U,000460,_ZN5uking2ai25SeqTwoLineReachableTarget5calc_Ev +0x000000710056769c,O,000004,_ZN5uking2ai25SeqTwoLineReachableTarget6leave_Ev +0x00000071005676a0,O,000100,_ZN5uking2ai25SeqTwoLineReachableTarget11loadParams_Ev +0x0000007100567704,U,000020,uking::ai::SeqTwoLineReachableTarget::m34 +0x0000007100567718,U,000016,uking::ai::SeqTwoLineReachableTarget::m35 +0x0000007100567728,O,000288,_ZNK5uking2ai25SeqTwoLineReachableTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100567848,O,000092,_ZNK5uking2ai25SeqTwoLineReachableTarget18getRuntimeTypeInfoEv 0x00000071005678a4,O,000048,_ZN5uking2ai31SeqTwoLineReachableTargetActionC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071005678d4,O,000004,_ZN5uking2ai31SeqTwoLineReachableTargetActionD1Ev 0x00000071005678d8,O,000036,_ZN5uking2ai31SeqTwoLineReachableTargetActionD0Ev @@ -33638,19 +33638,19 @@ Address,Quality,Size,Name 0x000000710056c578,O,000092,_ZNK5uking2ai14SimpleASBridge18getRuntimeTypeInfoEv 0x000000710056c5d4,O,000004,_ZN5uking2ai14SimpleASBridgeD1Ev 0x000000710056c5d8,O,000036,_ZN5uking2ai14SimpleASBridgeD0Ev -0x000000710056c5fc,M,000056,_ZN5uking2ai15BeamExplodeBaseC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x000000710056c634,O,000004,_ZN5uking2ai15BeamExplodeBaseD1Ev -0x000000710056c638,O,000036,_ZN5uking2ai15BeamExplodeBaseD0Ev -0x000000710056c65c,W,000068,_ZN5uking2ai15BeamExplodeBase5init_EPN4sead4HeapE -0x000000710056c6a0,W,000364,_ZN5uking2ai15BeamExplodeBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710056c80c,U,000492,_ZN5uking2ai15BeamExplodeBase5calc_Ev -0x000000710056c9f8,O,000004,_ZN5uking2ai15BeamExplodeBase6leave_Ev -0x000000710056c9fc,U,000004,uking::ai::BeamExplodeBase::m34 +0x000000710056c5fc,M,000056,_ZN5uking2ai17SimpleBeamExplodeC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x000000710056c634,O,000004,_ZN5uking2ai17SimpleBeamExplodeD1Ev +0x000000710056c638,O,000036,_ZN5uking2ai17SimpleBeamExplodeD0Ev +0x000000710056c65c,W,000068,_ZN5uking2ai17SimpleBeamExplode5init_EPN4sead4HeapE +0x000000710056c6a0,W,000364,_ZN5uking2ai17SimpleBeamExplode6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710056c80c,U,000492,_ZN5uking2ai17SimpleBeamExplode5calc_Ev +0x000000710056c9f8,O,000004,_ZN5uking2ai17SimpleBeamExplode6leave_Ev +0x000000710056c9fc,U,000004,uking::ai::SimpleBeamExplode::m34 0x000000710056ca00,U,000140, 0x000000710056ca8c,U,000084, -0x000000710056cae0,O,000100,_ZN5uking2ai15BeamExplodeBase11loadParams_Ev -0x000000710056cb44,O,000288,_ZNK5uking2ai15BeamExplodeBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710056cc64,O,000092,_ZNK5uking2ai15BeamExplodeBase18getRuntimeTypeInfoEv +0x000000710056cae0,O,000100,_ZN5uking2ai17SimpleBeamExplode11loadParams_Ev +0x000000710056cb44,O,000288,_ZNK5uking2ai17SimpleBeamExplode27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710056cc64,O,000092,_ZNK5uking2ai17SimpleBeamExplode18getRuntimeTypeInfoEv 0x000000710056ccc0,O,000048,_ZN5uking2ai17SimpleEnemyNormalC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710056ccf0,O,000004,_ZN5uking2ai17SimpleEnemyNormalD1Ev 0x000000710056ccf4,O,000036,_ZN5uking2ai17SimpleEnemyNormalD0Ev @@ -33821,7 +33821,7 @@ Address,Quality,Size,Name 0x0000007100572e30,U,000016,uking::ai::SiteBossBigFlameBall::m58 0x0000007100572e40,O,000372,_ZN5uking2ai17SiteBossFlameBall33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100572fb4,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai17SiteBossFlameBallEE9isDerivedEPKNS0_9InterfaceE -0x0000007100573040,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai26SiteBossChemicalProjectileEE9isDerivedEPKNS0_9InterfaceE +0x0000007100573040,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai14GanonFlameBallEE9isDerivedEPKNS0_9InterfaceE 0x00000071005730cc,U,000056,AI_AI_SiteBossBlowOff::ctor 0x0000007100573104,O,000004,_ZN5uking2ai15SiteBossBlowOffD1Ev 0x0000007100573108,O,000036,_ZN5uking2ai15SiteBossBlowOffD0Ev @@ -34048,7 +34048,7 @@ Address,Quality,Size,Name 0x00000071005820f4,O,000008,_ZNK5uking2ai21SiteBossRecognizeRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071005820fc,O,000092,_ZNK5uking2ai21SiteBossRecognizeRoot18getRuntimeTypeInfoEv 0x0000007100582158,O,000372,_ZN5uking2ai21SiteBossRecognizeRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005822cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai25SiteBossRecognizeRootBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071005822cc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai21LastBossRecognizeRootEE9isDerivedEPKNS0_9InterfaceE 0x0000007100582358,U,000080,AI_AI_SiteBossReflectArrowRoot::ctor 0x00000071005823a8,W,000056,_ZN5uking2ai24SiteBossReflectArrowRootD1Ev 0x00000071005823e0,U,000184, @@ -34336,17 +34336,17 @@ Address,Quality,Size,Name 0x000000710059a838,U,000068, 0x000000710059a87c,U,000068,evt::BaseProcLinkForEvent::dtorDelete 0x000000710059a8c0,U,000072,AI_AIEnemySleepNormal::ctor -0x000000710059a908,O,000004,_ZN5uking2ai17SpecialEnemySleepD1Ev -0x000000710059a90c,O,000036,_ZN5uking2ai17SpecialEnemySleepD0Ev -0x000000710059a930,O,000008,_ZN5uking2ai17SpecialEnemySleep5init_EPN4sead4HeapE -0x000000710059a938,W,000208,_ZN5uking2ai17SpecialEnemySleep6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710059aa08,U,000764,_ZN5uking2ai17SpecialEnemySleep5calc_Ev -0x000000710059ad04,W,000104,_ZN5uking2ai17SpecialEnemySleep6leave_Ev -0x000000710059ad6c,O,000128,_ZN5uking2ai17SpecialEnemySleep11loadParams_Ev -0x000000710059adec,U,000564,uking::ai::SpecialEnemySleep::m37 -0x000000710059b020,U,000280,uking::ai::SpecialEnemySleep::m35 -0x000000710059b138,O,000288,_ZNK5uking2ai17SpecialEnemySleep27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x000000710059b258,O,000092,_ZNK5uking2ai17SpecialEnemySleep18getRuntimeTypeInfoEv +0x000000710059a908,O,000004,_ZN5uking2ai11SleepNormalD1Ev +0x000000710059a90c,O,000036,_ZN5uking2ai11SleepNormalD0Ev +0x000000710059a930,O,000008,_ZN5uking2ai11SleepNormal5init_EPN4sead4HeapE +0x000000710059a938,W,000208,_ZN5uking2ai11SleepNormal6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710059aa08,U,000764,_ZN5uking2ai11SleepNormal5calc_Ev +0x000000710059ad04,W,000104,_ZN5uking2ai11SleepNormal6leave_Ev +0x000000710059ad6c,O,000128,_ZN5uking2ai11SleepNormal11loadParams_Ev +0x000000710059adec,U,000564,uking::ai::SleepNormal::m37 +0x000000710059b020,U,000280,uking::ai::SleepNormal::m35 +0x000000710059b138,O,000288,_ZNK5uking2ai11SleepNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x000000710059b258,O,000092,_ZNK5uking2ai11SleepNormal18getRuntimeTypeInfoEv 0x000000710059b2b4,O,000048,_ZN5uking2ai11SleepSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710059b2e4,O,000004,_ZN5uking2ai11SleepSelectD1Ev 0x000000710059b2e8,O,000036,_ZN5uking2ai11SleepSelectD0Ev @@ -34686,7 +34686,7 @@ Address,Quality,Size,Name 0x00000071005aa2dc,U,000116,uking::ai::StoneOctarockGuardNearTarget::m39 0x00000071005aa350,O,000132,_ZNK5uking2ai28StoneOctarockGuardNearTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071005aa3d4,O,000092,_ZNK5uking2ai28StoneOctarockGuardNearTarget18getRuntimeTypeInfoEv -0x00000071005aa430,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20TimedGuardNearTargetEE9isDerivedEPKNS0_9InterfaceE +0x00000071005aa430,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20InvincibleNearTargetEE9isDerivedEPKNS0_9InterfaceE 0x00000071005aa4bc,U,000096,AI_AI_StoneOctarockWait::ctor 0x00000071005aa51c,W,000088,_ZN5uking2ai17StoneOctarockWaitD1Ev 0x00000071005aa574,W,000096,_ZN5uking2ai17StoneOctarockWaitD0Ev @@ -35206,17 +35206,17 @@ Address,Quality,Size,Name 0x00000071005ba8d8,O,000108,_ZN5uking2ai22TargetActorGrabAdapter11loadParams_Ev 0x00000071005ba944,O,000288,_ZNK5uking2ai22TargetActorGrabAdapter27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071005baa64,O,000092,_ZNK5uking2ai22TargetActorGrabAdapter18getRuntimeTypeInfoEv -0x00000071005baac0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15TargetPosOffsetEE9isDerivedEPKNS0_9InterfaceE -0x00000071005bab4c,O,000052,_ZN5uking2ai11TargetPosAIC2ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071005bab80,O,000004,_ZN5uking2ai11TargetPosAID1Ev -0x00000071005bab84,O,000036,_ZN5uking2ai11TargetPosAID0Ev -0x00000071005baba8,O,000008,_ZN5uking2ai11TargetPosAI5init_EPN4sead4HeapE -0x00000071005babb0,W,000224,_ZN5uking2ai11TargetPosAI6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071005bac90,U,000136,_ZN5uking2ai11TargetPosAI5calc_Ev -0x00000071005bad18,O,000004,_ZN5uking2ai11TargetPosAI6leave_Ev -0x00000071005bad1c,O,000064,_ZN5uking2ai11TargetPosAI11loadParams_Ev -0x00000071005bad5c,O,000288,_ZNK5uking2ai11TargetPosAI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005bae7c,O,000092,_ZNK5uking2ai11TargetPosAI18getRuntimeTypeInfoEv +0x00000071005baac0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai15OffsetTargetPosEE9isDerivedEPKNS0_9InterfaceE +0x00000071005bab4c,O,000052,_ZN5uking2ai14TargetActorPosC2ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071005bab80,O,000004,_ZN5uking2ai14TargetActorPosD1Ev +0x00000071005bab84,O,000036,_ZN5uking2ai14TargetActorPosD0Ev +0x00000071005baba8,O,000008,_ZN5uking2ai14TargetActorPos5init_EPN4sead4HeapE +0x00000071005babb0,W,000224,_ZN5uking2ai14TargetActorPos6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071005bac90,U,000136,_ZN5uking2ai14TargetActorPos5calc_Ev +0x00000071005bad18,O,000004,_ZN5uking2ai14TargetActorPos6leave_Ev +0x00000071005bad1c,O,000064,_ZN5uking2ai14TargetActorPos11loadParams_Ev +0x00000071005bad5c,O,000288,_ZNK5uking2ai14TargetActorPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071005bae7c,O,000092,_ZNK5uking2ai14TargetActorPos18getRuntimeTypeInfoEv 0x00000071005baed8,O,000048,_ZN5uking2ai17TargetAngerSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071005baf08,O,000004,_ZN5uking2ai17TargetAngerSelectD1Ev 0x00000071005baf0c,O,000036,_ZN5uking2ai17TargetAngerSelectD0Ev @@ -35230,18 +35230,18 @@ Address,Quality,Size,Name 0x00000071005bb2c4,U,000116,_ZNK5uking2ai17TargetAngerSelect8isFailedEv 0x00000071005bb338,U,000116,_ZNK5uking2ai17TargetAngerSelect10isFinishedEv 0x00000071005bb3ac,U,000060,AI_AITargetAttackAttitudeTgtSelect::ctor -0x00000071005bb3e8,O,000004,_ZN5uking2ai33TargetAttackAttitudeTgtSelectBaseD1Ev -0x00000071005bb3ec,O,000036,_ZN5uking2ai33TargetAttackAttitudeTgtSelectBaseD0Ev -0x00000071005bb410,W,000032,_ZN5uking2ai33TargetAttackAttitudeTgtSelectBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071005bb430,U,000424,_ZN5uking2ai33TargetAttackAttitudeTgtSelectBase5calc_Ev -0x00000071005bb5d8,W,000140,_ZN5uking2ai33TargetAttackAttitudeTgtSelectBase6leave_Ev +0x00000071005bb3e8,O,000004,_ZN5uking2ai23TargetAttackAttitudeTgtD1Ev +0x00000071005bb3ec,O,000036,_ZN5uking2ai23TargetAttackAttitudeTgtD0Ev +0x00000071005bb410,W,000032,_ZN5uking2ai23TargetAttackAttitudeTgt6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071005bb430,U,000424,_ZN5uking2ai23TargetAttackAttitudeTgt5calc_Ev +0x00000071005bb5d8,W,000140,_ZN5uking2ai23TargetAttackAttitudeTgt6leave_Ev 0x00000071005bb664,U,000156, -0x00000071005bb700,O,000004,_ZN5uking2ai33TargetAttackAttitudeTgtSelectBase11loadParams_Ev -0x00000071005bb704,U,000172,uking::ai::TargetAttackAttitudeTgtSelectBase::m34 -0x00000071005bb7b0,U,000172,uking::ai::TargetAttackAttitudeTgtSelectBase::m35 +0x00000071005bb700,O,000004,_ZN5uking2ai23TargetAttackAttitudeTgt11loadParams_Ev +0x00000071005bb704,U,000172,uking::ai::TargetAttackAttitudeTgt::m34 +0x00000071005bb7b0,U,000172,uking::ai::TargetAttackAttitudeTgt::m35 0x00000071005bb85c,U,000312, -0x00000071005bb994,O,000288,_ZNK5uking2ai33TargetAttackAttitudeTgtSelectBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005bbab4,O,000092,_ZNK5uking2ai33TargetAttackAttitudeTgtSelectBase18getRuntimeTypeInfoEv +0x00000071005bb994,O,000288,_ZNK5uking2ai23TargetAttackAttitudeTgt27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071005bbab4,O,000092,_ZNK5uking2ai23TargetAttackAttitudeTgt18getRuntimeTypeInfoEv 0x00000071005bbb10,U,000052,AI_AI_TargetAttackAttitudeTgtSelect::ctor 0x00000071005bbb44,O,000004,_ZN5uking2ai29TargetAttackAttitudeTgtSelectD1Ev 0x00000071005bbb48,O,000036,_ZN5uking2ai29TargetAttackAttitudeTgtSelectD0Ev @@ -35252,7 +35252,7 @@ Address,Quality,Size,Name 0x00000071005bbdf0,O,000008,_ZNK5uking2ai29TargetAttackAttitudeTgtSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071005bbdf8,O,000092,_ZNK5uking2ai29TargetAttackAttitudeTgtSelect18getRuntimeTypeInfoEv 0x00000071005bbe54,O,000372,_ZN5uking2ai29TargetAttackAttitudeTgtSelect33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005bbfc8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai33TargetAttackAttitudeTgtSelectBaseEE9isDerivedEPKNS0_9InterfaceE +0x00000071005bbfc8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai23TargetAttackAttitudeTgtEE9isDerivedEPKNS0_9InterfaceE 0x00000071005bc054,O,000052,_ZN5uking2ai20TargetBaitTypeSelectC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071005bc088,O,000004,_ZN5uking2ai20TargetBaitTypeSelectD1Ev 0x00000071005bc08c,O,000036,_ZN5uking2ai20TargetBaitTypeSelectD0Ev @@ -35372,16 +35372,16 @@ Address,Quality,Size,Name 0x00000071005bef14,U,000036,_ZNK5uking2ai17TargetExistSelect10isFinishedEv 0x00000071005bef38,U,000036,_ZNK5uking2ai17TargetExistSelect12isChangeableEv 0x00000071005bef5c,U,000052,AI_AIAssassinMiddleMagicAfter::ctor -0x00000071005bef90,O,000004,_ZN5uking2ai22AssassinMagicTgtSelectD1Ev -0x00000071005bef94,O,000036,_ZN5uking2ai22AssassinMagicTgtSelectD0Ev -0x00000071005befb8,O,000004,_ZN5uking2ai22AssassinMagicTgtSelect5init_EPN4sead4HeapE -0x00000071005befbc,O,000004,_ZN5uking2ai22AssassinMagicTgtSelect6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071005befc0,U,000004,_ZN5uking2ai22AssassinMagicTgtSelect5calc_Ev -0x00000071005befc4,O,000004,_ZN5uking2ai22AssassinMagicTgtSelect6leave_Ev -0x00000071005befc8,O,000084,_ZN5uking2ai22AssassinMagicTgtSelect11loadParams_Ev -0x00000071005bf01c,U,000236,uking::ai::AssassinMagicTgtSelect::m34 -0x00000071005bf108,O,000008,_ZNK5uking2ai22AssassinMagicTgtSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005bf110,O,000092,_ZNK5uking2ai22AssassinMagicTgtSelect18getRuntimeTypeInfoEv +0x00000071005bef90,O,000004,_ZN5uking2ai22TargetHeightAreaSelectD1Ev +0x00000071005bef94,O,000036,_ZN5uking2ai22TargetHeightAreaSelectD0Ev +0x00000071005befb8,O,000004,_ZN5uking2ai22TargetHeightAreaSelect5init_EPN4sead4HeapE +0x00000071005befbc,O,000004,_ZN5uking2ai22TargetHeightAreaSelect6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071005befc0,U,000004,_ZN5uking2ai22TargetHeightAreaSelect5calc_Ev +0x00000071005befc4,O,000004,_ZN5uking2ai22TargetHeightAreaSelect6leave_Ev +0x00000071005befc8,O,000084,_ZN5uking2ai22TargetHeightAreaSelect11loadParams_Ev +0x00000071005bf01c,U,000236,uking::ai::TargetHeightAreaSelect::m34 +0x00000071005bf108,O,000008,_ZNK5uking2ai22TargetHeightAreaSelect27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071005bf110,O,000092,_ZNK5uking2ai22TargetHeightAreaSelect18getRuntimeTypeInfoEv 0x00000071005bf16c,O,000048,_ZN5uking2ai13TargetHomeDirC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071005bf19c,O,000004,_ZN5uking2ai13TargetHomeDirD1Ev 0x00000071005bf1a0,O,000036,_ZN5uking2ai13TargetHomeDirD0Ev @@ -35648,20 +35648,20 @@ Address,Quality,Size,Name 0x00000071005c4c94,O,000132,_ZNK5uking2ai30TargetPosDynParamRotFromCtrPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071005c4d18,O,000092,_ZNK5uking2ai30TargetPosDynParamRotFromCtrPos18getRuntimeTypeInfoEv 0x00000071005c4d74,U,000024,uking::ai::TargetPosDynParamRotFromCtrPos::m36 -0x00000071005c4d8c,O,000372,_ZN5uking2ai20TargetPosDynParamRot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005c4f00,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai20TargetPosDynParamRotEE9isDerivedEPKNS0_9InterfaceE -0x00000071005c4f8c,O,000056,_ZN5uking2ai20TargetPosDynParamRotC1ERKN4ksys3act2ai10ActionBase7InitArgE -0x00000071005c4fc4,O,000004,_ZN5uking2ai20TargetPosDynParamRotD1Ev -0x00000071005c4fc8,O,000036,_ZN5uking2ai20TargetPosDynParamRotD0Ev -0x00000071005c4fec,O,000004,_ZN5uking2ai20TargetPosDynParamRot5init_EPN4sead4HeapE -0x00000071005c4ff0,O,000004,_ZN5uking2ai20TargetPosDynParamRot6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071005c4ff4,U,000004,_ZN5uking2ai20TargetPosDynParamRot5calc_Ev -0x00000071005c4ff8,O,000004,_ZN5uking2ai20TargetPosDynParamRot6leave_Ev -0x00000071005c4ffc,O,000200,_ZN5uking2ai20TargetPosDynParamRot11loadParams_Ev -0x00000071005c50c4,U,000032,uking::ai::TargetPosDynParamRot::m36 -0x00000071005c50e4,U,000468,uking::ai::TargetPosDynParamRot::m35 -0x00000071005c52b8,O,000008,_ZNK5uking2ai20TargetPosDynParamRot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005c52c0,O,000092,_ZNK5uking2ai20TargetPosDynParamRot18getRuntimeTypeInfoEv +0x00000071005c4d8c,O,000372,_ZN5uking2ai29TargetPosDynParamRotFromMyPos33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071005c4f00,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai29TargetPosDynParamRotFromMyPosEE9isDerivedEPKNS0_9InterfaceE +0x00000071005c4f8c,O,000056,_ZN5uking2ai29TargetPosDynParamRotFromMyPosC1ERKN4ksys3act2ai10ActionBase7InitArgE +0x00000071005c4fc4,O,000004,_ZN5uking2ai29TargetPosDynParamRotFromMyPosD1Ev +0x00000071005c4fc8,O,000036,_ZN5uking2ai29TargetPosDynParamRotFromMyPosD0Ev +0x00000071005c4fec,O,000004,_ZN5uking2ai29TargetPosDynParamRotFromMyPos5init_EPN4sead4HeapE +0x00000071005c4ff0,O,000004,_ZN5uking2ai29TargetPosDynParamRotFromMyPos6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071005c4ff4,U,000004,_ZN5uking2ai29TargetPosDynParamRotFromMyPos5calc_Ev +0x00000071005c4ff8,O,000004,_ZN5uking2ai29TargetPosDynParamRotFromMyPos6leave_Ev +0x00000071005c4ffc,O,000200,_ZN5uking2ai29TargetPosDynParamRotFromMyPos11loadParams_Ev +0x00000071005c50c4,U,000032,uking::ai::TargetPosDynParamRotFromMyPos::m36 +0x00000071005c50e4,U,000468,uking::ai::TargetPosDynParamRotFromMyPos::m35 +0x00000071005c52b8,O,000008,_ZNK5uking2ai29TargetPosDynParamRotFromMyPos27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071005c52c0,O,000092,_ZNK5uking2ai29TargetPosDynParamRotFromMyPos18getRuntimeTypeInfoEv 0x00000071005c531c,U,000064,AI_AI_TargetPosLostCheck::ctor 0x00000071005c535c,O,000004,_ZN5uking2ai18TargetPosLostCheckD1Ev 0x00000071005c5360,O,000036,_ZN5uking2ai18TargetPosLostCheckD0Ev @@ -36322,15 +36322,15 @@ Address,Quality,Size,Name 0x00000071005e32d0,U,000036,_ZNK5uking2ai24VacuumedBombDamageSelect8isFailedEv 0x00000071005e32f4,U,000036,_ZNK5uking2ai24VacuumedBombDamageSelect10isFinishedEv 0x00000071005e3318,U,000048,AI_AIOctarockRoot::ctor -0x00000071005e3348,W,000080,_ZN5uking2ai16OctarockRootBaseD1Ev -0x00000071005e3398,W,000088,_ZN5uking2ai16OctarockRootBaseD0Ev -0x00000071005e33f0,O,000004,_ZN5uking2ai16OctarockRootBase5init_EPN4sead4HeapE -0x00000071005e33f4,O,000004,_ZN5uking2ai16OctarockRootBase6enter_EPN4ksys3act2ai15InlineParamPackE -0x00000071005e33f8,U,000004,_ZN5uking2ai16OctarockRootBase5calc_Ev -0x00000071005e33fc,O,000004,_ZN5uking2ai16OctarockRootBase6leave_Ev -0x00000071005e3400,O,000004,_ZN5uking2ai16OctarockRootBase11loadParams_Ev -0x00000071005e3404,O,000008,_ZNK5uking2ai16OctarockRootBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x00000071005e340c,O,000092,_ZNK5uking2ai16OctarockRootBase18getRuntimeTypeInfoEv +0x00000071005e3348,W,000080,_ZN5uking2ai15VacuumEnemyRootD1Ev +0x00000071005e3398,W,000088,_ZN5uking2ai15VacuumEnemyRootD0Ev +0x00000071005e33f0,O,000004,_ZN5uking2ai15VacuumEnemyRoot5init_EPN4sead4HeapE +0x00000071005e33f4,O,000004,_ZN5uking2ai15VacuumEnemyRoot6enter_EPN4ksys3act2ai15InlineParamPackE +0x00000071005e33f8,U,000004,_ZN5uking2ai15VacuumEnemyRoot5calc_Ev +0x00000071005e33fc,O,000004,_ZN5uking2ai15VacuumEnemyRoot6leave_Ev +0x00000071005e3400,O,000004,_ZN5uking2ai15VacuumEnemyRoot11loadParams_Ev +0x00000071005e3404,O,000008,_ZNK5uking2ai15VacuumEnemyRoot27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x00000071005e340c,O,000092,_ZNK5uking2ai15VacuumEnemyRoot18getRuntimeTypeInfoEv 0x00000071005e3468,O,000048,_ZN5uking2ai15VehicleSelectorC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071005e3498,O,000004,_ZN5uking2ai15VehicleSelectorD1Ev 0x00000071005e349c,O,000036,_ZN5uking2ai15VehicleSelectorD0Ev @@ -48008,23 +48008,23 @@ Address,Quality,Size,Name 0x0000007100773aac,U,000220,uking::action::CameraLockOn::m57 0x0000007100773b88,O,000132,_ZNK5uking6action12CameraLockOn27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100773c0c,O,000092,_ZNK5uking6action12CameraLockOn18getRuntimeTypeInfoEv -0x0000007100773c68,W,000020,_ZN5uking6action16CameraLockOnBaseD1Ev +0x0000007100773c68,W,000020,_ZN5uking6action15CameraTrackBaseD1Ev 0x0000007100773c7c,W,000052,_ZN5uking6action12CameraLockOnD0Ev -0x0000007100773cb0,U,000008,uking::action::CameraLockOnBase::m42 -0x0000007100773cb8,U,000004,uking::action::CameraLockOnBase::m43 -0x0000007100773cbc,U,000008,uking::action::CameraLockOnBase::m47 -0x0000007100773cc4,U,000008,uking::action::CameraLockOnBase::m48 -0x0000007100773ccc,U,000008,uking::action::CameraLockOnBase::m49 -0x0000007100773cd4,U,000008,uking::action::CameraLockOnBase::m50 -0x0000007100773cdc,U,000004,uking::action::CameraLockOnBase::m53 -0x0000007100773ce0,U,000004,uking::action::CameraLockOnBase::m54 -0x0000007100773ce4,U,000008,uking::action::CameraLockOnBase::m55 -0x0000007100773cec,U,000008,uking::action::CameraLockOnBase::m59 -0x0000007100773cf4,U,000008,uking::action::CameraLockOnBase::m60 +0x0000007100773cb0,U,000008,uking::action::CameraTrackBase::m42 +0x0000007100773cb8,U,000004,uking::action::CameraTrackBase::m43 +0x0000007100773cbc,U,000008,uking::action::CameraTrackBase::m47 +0x0000007100773cc4,U,000008,uking::action::CameraTrackBase::m48 +0x0000007100773ccc,U,000008,uking::action::CameraTrackBase::m49 +0x0000007100773cd4,U,000008,uking::action::CameraTrackBase::m50 +0x0000007100773cdc,U,000004,uking::action::CameraTrackBase::m53 +0x0000007100773ce0,U,000004,uking::action::CameraTrackBase::m54 +0x0000007100773ce4,U,000008,uking::action::CameraTrackBase::m55 +0x0000007100773cec,U,000008,uking::action::CameraTrackBase::m59 +0x0000007100773cf4,U,000008,uking::action::CameraTrackBase::m60 0x0000007100773cfc,U,000024, 0x0000007100773d14,U,000056, -0x0000007100773d4c,O,000372,_ZN5uking6action16CameraLockOnBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100773ec0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action16CameraLockOnBaseEE9isDerivedEPKNS0_9InterfaceE +0x0000007100773d4c,O,000372,_ZN5uking6action15CameraTrackBase33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100773ec0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15CameraTrackBaseEE9isDerivedEPKNS0_9InterfaceE 0x0000007100773f4c,U,000244,AI_Action_CameraLockOnAimingAt::ctor 0x0000007100774040,U,000076,uking::action::CameraLockOnAimingAt::m33 0x000000710077408c,U,001052,uking::action::CameraLockOnAimingAt::m34 @@ -48069,9 +48069,9 @@ Address,Quality,Size,Name 0x0000007100776670,U,000008,uking::action::CameraMagneCatch::m48 0x0000007100776678,U,000008,uking::action::CameraMagneCatch::m49 0x0000007100776680,U,000008,uking::action::CameraMagneCatch::m50 -0x0000007100776688,U,000004,uking::action::CameraLockOnBase::m56 -0x000000710077668c,U,000004,uking::action::CameraLockOnBase::m57 -0x0000007100776690,U,000008,uking::action::CameraLockOnBase::m58 +0x0000007100776688,U,000004,uking::action::CameraTrackBase::m56 +0x000000710077668c,U,000004,uking::action::CameraTrackBase::m57 +0x0000007100776690,U,000008,uking::action::CameraTrackBase::m58 0x0000007100776698,U,000024, 0x00000071007766b0,U,000056, 0x00000071007766e8,U,000048, @@ -48196,19 +48196,19 @@ Address,Quality,Size,Name 0x0000007100784f38,U,000056, 0x0000007100784f70,O,000372,_ZN5uking6action10CameraTail33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071007850e4,U,000296,AI_ActionCameraLock::ctor -0x000000710078520c,U,000020,uking::action::CameraLockOnBase::m32 -0x0000007100785220,U,000416,uking::action::CameraLockOnBase::m33 -0x00000071007853c0,U,003084,uking::action::CameraLockOnBase::m34 +0x000000710078520c,U,000020,uking::action::CameraTrackBase::m32 +0x0000007100785220,U,000416,uking::action::CameraTrackBase::m33 +0x00000071007853c0,U,003084,uking::action::CameraTrackBase::m34 0x0000007100785fcc,U,000272, 0x00000071007860dc,U,000312, -0x0000007100786214,U,000660,uking::action::CameraLockOnBase::m36 -0x00000071007864a8,U,000540,uking::action::CameraLockOnBase::m46 +0x0000007100786214,U,000660,uking::action::CameraTrackBase::m36 +0x00000071007864a8,U,000540,uking::action::CameraTrackBase::m46 0x00000071007866c4,U,000364, 0x0000007100786830,U,000324, 0x0000007100786974,U,000208, 0x0000007100786a44,U,000636, 0x0000007100786cc0,U,000016, -0x0000007100786cd0,U,000036,uking::action::CameraLockOnBase::m52 +0x0000007100786cd0,U,000036,uking::action::CameraTrackBase::m52 0x0000007100786cf4,U,000020, 0x0000007100786d08,U,000016, 0x0000007100786d18,U,000072, @@ -48218,12 +48218,12 @@ Address,Quality,Size,Name 0x0000007100786ea0,U,000076, 0x0000007100786eec,U,000076, 0x0000007100786f38,U,000740, -0x000000710078721c,O,000008,_ZNK5uking6action16CameraLockOnBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100787224,O,000092,_ZNK5uking6action16CameraLockOnBase18getRuntimeTypeInfoEv -0x0000007100787280,W,000052,_ZN5uking6action16CameraLockOnBaseD0Ev -0x00000071007872b4,U,000012,uking::action::CameraLockOnBase::m44 -0x00000071007872c0,U,000012,uking::action::CameraLockOnBase::m45 -0x00000071007872cc,U,000008,uking::action::CameraLockOnBase::m51 +0x000000710078721c,O,000008,_ZNK5uking6action15CameraTrackBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100787224,O,000092,_ZNK5uking6action15CameraTrackBase18getRuntimeTypeInfoEv +0x0000007100787280,W,000052,_ZN5uking6action15CameraTrackBaseD0Ev +0x00000071007872b4,U,000012,uking::action::CameraTrackBase::m44 +0x00000071007872c0,U,000012,uking::action::CameraTrackBase::m45 +0x00000071007872cc,U,000008,uking::action::CameraTrackBase::m51 0x00000071007872d4,U,000024, 0x00000071007872ec,U,000056, 0x0000007100787324,U,000112, @@ -50607,7 +50607,7 @@ Address,Quality,Size,Name 0x00000071007f8b00,O,000092,_ZNK5uking6action16PlayerKokkoGlide18getRuntimeTypeInfoEv 0x00000071007f8b5c,O,000052,_ZN5uking6action16PlayerKokkoGlideD0Ev 0x00000071007f8b90,U,000008,_ZNK5uking6action16PlayerKokkoGlide12isChangeableEv -0x00000071007f8b98,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action11PlayerGlideEE9isDerivedEPKNS0_9InterfaceE +0x00000071007f8b98,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action24PlayerParashawlGlideBaseEE9isDerivedEPKNS0_9InterfaceE 0x00000071007f8c24,O,000048,_ZN5uking6action19PlayerLadderDownEndC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071007f8c54,U,000008,_ZNK5uking6action19PlayerLadderDownEnd10isFinishedEv 0x00000071007f8c5c,W,000124,_ZN5uking6action19PlayerLadderDownEnd6enter_EPN4ksys3act2ai15InlineParamPackE @@ -50799,16 +50799,16 @@ Address,Quality,Size,Name 0x00000071008034a8,O,000052,_ZN5uking6action20PlayerParashawlGlideD0Ev 0x00000071008034dc,U,000008,_ZNK5uking6action20PlayerParashawlGlide12isChangeableEv 0x00000071008034e4,U,000064,AI_ActionPlayerGlide::ctor -0x0000007100803524,U,000008,_ZNK5uking6action11PlayerGlide10isFinishedEv -0x000000710080352c,W,000256,_ZN5uking6action11PlayerGlide6enter_EPN4ksys3act2ai15InlineParamPackE -0x000000710080362c,W,000800,_ZN5uking6action11PlayerGlide5calc_Ev +0x0000007100803524,U,000008,_ZNK5uking6action24PlayerParashawlGlideBase10isFinishedEv +0x000000710080352c,W,000256,_ZN5uking6action24PlayerParashawlGlideBase6enter_EPN4ksys3act2ai15InlineParamPackE +0x000000710080362c,W,000800,_ZN5uking6action24PlayerParashawlGlideBase5calc_Ev 0x000000710080394c,U,000580, -0x0000007100803b90,W,000076,_ZN5uking6action11PlayerGlide6leave_Ev -0x0000007100803bdc,O,000380,_ZN5uking6action11PlayerGlide11loadParams_Ev -0x0000007100803d58,O,000132,_ZNK5uking6action11PlayerGlide27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100803ddc,O,000092,_ZNK5uking6action11PlayerGlide18getRuntimeTypeInfoEv -0x0000007100803e38,O,000052,_ZN5uking6action11PlayerGlideD0Ev -0x0000007100803e6c,U,000008,_ZNK5uking6action11PlayerGlide12isChangeableEv +0x0000007100803b90,W,000076,_ZN5uking6action24PlayerParashawlGlideBase6leave_Ev +0x0000007100803bdc,O,000380,_ZN5uking6action24PlayerParashawlGlideBase11loadParams_Ev +0x0000007100803d58,O,000132,_ZNK5uking6action24PlayerParashawlGlideBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100803ddc,O,000092,_ZNK5uking6action24PlayerParashawlGlideBase18getRuntimeTypeInfoEv +0x0000007100803e38,O,000052,_ZN5uking6action24PlayerParashawlGlideBaseD0Ev +0x0000007100803e6c,U,000008,_ZNK5uking6action24PlayerParashawlGlideBase12isChangeableEv 0x0000007100803e74,U,000052,AI_Action_PlayerPickUp::ctor 0x0000007100803ea8,W,000112,_ZN5uking6action12PlayerPickUpD1Ev 0x0000007100803f18,W,000120,_ZN5uking6action12PlayerPickUpD0Ev @@ -79068,17 +79068,17 @@ Address,Quality,Size,Name 0x0000007100e5ffbc,O,000288,_ZNK5uking2ai11RideHorseAI27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x0000007100e600dc,O,000092,_ZNK5uking2ai11RideHorseAI18getRuntimeTypeInfoEv 0x0000007100e60138,U,000064,AI_AINPCOrEnemyHorseRide::ctor -0x0000007100e60178,W,000096,_ZN5uking2ai18NonPlayerHorseRideD1Ev -0x0000007100e601d8,W,000104,_ZN5uking2ai18NonPlayerHorseRideD0Ev -0x0000007100e60240,O,000008,_ZN5uking2ai18NonPlayerHorseRide5init_EPN4sead4HeapE -0x0000007100e60248,W,000576,_ZN5uking2ai18NonPlayerHorseRide6enter_EPN4ksys3act2ai15InlineParamPackE -0x0000007100e60488,U,000196,_ZN5uking2ai18NonPlayerHorseRide5calc_Ev -0x0000007100e6054c,W,000140,_ZN5uking2ai18NonPlayerHorseRide6leave_Ev -0x0000007100e605d8,O,000004,_ZN5uking2ai18NonPlayerHorseRide11loadParams_Ev -0x0000007100e605dc,U,000096,uking::ai::NonPlayerHorseRide::m34 -0x0000007100e6063c,U,000016,uking::ai::NonPlayerHorseRide::m36 -0x0000007100e6064c,O,000288,_ZNK5uking2ai18NonPlayerHorseRide27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE -0x0000007100e6076c,O,000092,_ZNK5uking2ai18NonPlayerHorseRide18getRuntimeTypeInfoEv +0x0000007100e60178,W,000096,_ZN5uking2ai18RideHorseNonPlayerD1Ev +0x0000007100e601d8,W,000104,_ZN5uking2ai18RideHorseNonPlayerD0Ev +0x0000007100e60240,O,000008,_ZN5uking2ai18RideHorseNonPlayer5init_EPN4sead4HeapE +0x0000007100e60248,W,000576,_ZN5uking2ai18RideHorseNonPlayer6enter_EPN4ksys3act2ai15InlineParamPackE +0x0000007100e60488,U,000196,_ZN5uking2ai18RideHorseNonPlayer5calc_Ev +0x0000007100e6054c,W,000140,_ZN5uking2ai18RideHorseNonPlayer6leave_Ev +0x0000007100e605d8,O,000004,_ZN5uking2ai18RideHorseNonPlayer11loadParams_Ev +0x0000007100e605dc,U,000096,uking::ai::RideHorseNonPlayer::m34 +0x0000007100e6063c,U,000016,uking::ai::RideHorseNonPlayer::m36 +0x0000007100e6064c,O,000288,_ZNK5uking2ai18RideHorseNonPlayer27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE +0x0000007100e6076c,O,000092,_ZNK5uking2ai18RideHorseNonPlayer18getRuntimeTypeInfoEv 0x0000007100e607c8,U,000072,AI_AI_WildHorseDefWanderAI::ctor 0x0000007100e60810,O,000004,_ZN5uking2ai20WildHorseDefWanderAID1Ev 0x0000007100e60814,O,000036,_ZN5uking2ai20WildHorseDefWanderAID0Ev diff --git a/src/Game/Actor/AI/CMakeLists.txt b/src/Game/Actor/AI/CMakeLists.txt index 084c03a6..a3a25e45 100644 --- a/src/Game/Actor/AI/CMakeLists.txt +++ b/src/Game/Actor/AI/CMakeLists.txt @@ -17,8 +17,8 @@ target_sources(uking PRIVATE aiAddPlayerLargeAttackJustGuard.h aiAddSwarmMove.cpp aiAddSwarmMove.h - aiAddViewTargetPosBase.cpp - aiAddViewTargetPosBase.h + aiAddViewTarget.cpp + aiAddViewTarget.h aiAddViewTargetPos.cpp aiAddViewTargetPos.h aiAirOctaBoardBurn.cpp @@ -43,8 +43,8 @@ target_sources(uking PRIVATE aiAmbushableWeaponShoot.h aiAnchorRangeSelectTwoAction.cpp aiAnchorRangeSelectTwoAction.h - aiAncientNecklaceBallBase.cpp - aiAncientNecklaceBallBase.h + aiPlayASSwitch.cpp + aiPlayASSwitch.h aiAncientNecklaceBall.cpp aiAncientNecklaceBall.h aiAnimalAttackOtherTarget.cpp @@ -67,8 +67,8 @@ target_sources(uking PRIVATE aiAnimalRangeKeepMove.h aiAnimalRangeKeepMoveWithLOS.cpp aiAnimalRangeKeepMoveWithLOS.h - aiAnimalRoamBase.cpp - aiAnimalRoamBase.h + aiAnimalRndMove.cpp + aiAnimalRndMove.h aiAnimalRoamCheckWater.cpp aiAnimalRoamCheckWater.h aiAnimalRoam.cpp @@ -81,8 +81,8 @@ target_sources(uking PRIVATE aiAppearFromTargetFrontAfterChase.h aiAppearFromTargetFrontGround.cpp aiAppearFromTargetFrontGround.h - aiAppearNearTarget.cpp - aiAppearNearTarget.h + aiAppearFromTarget.cpp + aiAppearFromTarget.h aiAppearNearTargetOutOfScrnGnd.cpp aiAppearNearTargetOutOfScrnGnd.h aiArmorSearchKorokRoot.cpp @@ -127,12 +127,12 @@ target_sources(uking PRIVATE aiAssassinBossRoot.h aiAssassinCallSelect.cpp aiAssassinCallSelect.h - aiAssassinFieldShooterBattleBase.cpp - aiAssassinFieldShooterBattleBase.h + aiAssassinShooterBattle.cpp + aiAssassinShooterBattle.h aiAssassinFieldShooterBattle.cpp aiAssassinFieldShooterBattle.h - aiAssassinMagicTgtSelect.cpp - aiAssassinMagicTgtSelect.h + aiTargetHeightAreaSelect.cpp + aiTargetHeightAreaSelect.h aiAssassinMiddleAzitoDlcRoot.cpp aiAssassinMiddleAzitoDlcRoot.h aiAssassinMiddleAzitoNoMemberDemo.cpp @@ -147,8 +147,8 @@ target_sources(uking PRIVATE aiAssassinMiddleMagicAfter.h aiAssassinMiddleRoot.cpp aiAssassinMiddleRoot.h - aiAssassinNormal.cpp - aiAssassinNormal.h + aiGuardHomePosNormal.cpp + aiGuardHomePosNormal.h aiAssassinRoot.cpp aiAssassinRoot.h aiAssassinShooterJuniorAzitoRoot.cpp @@ -177,8 +177,8 @@ target_sources(uking PRIVATE aiBasicStatusRoot.h aiBattleBgmRequestFinishTag.cpp aiBattleBgmRequestFinishTag.h - aiBeamExplodeBase.cpp - aiBeamExplodeBase.h + aiSimpleBeamExplode.cpp + aiSimpleBeamExplode.h aiBeamExplode.cpp aiBeamExplodeEitherHit.cpp aiBeamExplodeEitherHit.h @@ -263,8 +263,8 @@ target_sources(uking PRIVATE aiChemicalWeaponRoot.h aiChildDeviceReflectArrow.cpp aiChildDeviceReflectArrow.h - aiChildFavoriteSelectorBase.cpp - aiChildFavoriteSelectorBase.h + aiChildSelector.cpp + aiChildSelector.h aiChildFavoriteSelector.cpp aiChildFavoriteSelector.h aiChildHaveSelect.cpp @@ -403,8 +403,8 @@ target_sources(uking PRIVATE aiDragonItemRoot.h aiDragonReturn.cpp aiDragonReturn.h - aiDragonRootBase.cpp - aiDragonRootBase.h + aiControlRailRoot.cpp + aiControlRailRoot.h aiDragonRoot.cpp aiDragonRoot.h aiDragonTurn.cpp @@ -479,8 +479,8 @@ target_sources(uking PRIVATE aiEnemyChemicalPowerSelect.h aiEnemyChemicalSelect.cpp aiEnemyChemicalSelect.h - aiEnemyChemTargetActionBase.cpp - aiEnemyChemTargetActionBase.h + aiEnemyTargetAction.cpp + aiEnemyTargetAction.h aiEnemyChemTargetAction.cpp aiEnemyChemTargetAction.h aiEnemyConfuse.cpp @@ -685,8 +685,8 @@ target_sources(uking PRIVATE aiFlyingEnemyFindPlayer.h aiFlyingEnemyFrontKeepMove.cpp aiFlyingEnemyFrontKeepMove.h - aiFlyingEnemyKeepMove.cpp - aiFlyingEnemyKeepMove.h + aiFlyingEnemyDistanceKeepMove.cpp + aiFlyingEnemyDistanceKeepMove.h aiFlyingEnemySideKeepMove.cpp aiFlyingEnemySideKeepMove.h aiFlyInsectRoam.cpp @@ -869,8 +869,8 @@ target_sources(uking PRIVATE aiGolemWeakPointRoot.h aiGolfBallRoot.cpp aiGolfBallRoot.h - aiGoronCannonBase.cpp - aiGoronCannonBase.h + aiBigCannon.cpp + aiBigCannon.h aiGoronCannon.cpp aiGoronCannon.h aiGoronHeroDescendentRoot.cpp @@ -893,8 +893,8 @@ target_sources(uking PRIVATE aiGuardianAI.h aiGuardianBattleBeamAttack.cpp aiGuardianBattleBeamAttack.h - aiGuardianBeamAttackBase.cpp - aiGuardianBeamAttackBase.h + aiGuardianCommonBeamAttack.cpp + aiGuardianCommonBeamAttack.h aiGuardianBeamAttack.cpp aiGuardianBeamAttack.h aiGuardianBeam.cpp @@ -965,8 +965,8 @@ target_sources(uking PRIVATE aiGuardianTargetLost.h aiGuardianWait.cpp aiGuardianWait.h - aiGuardNearTarget.cpp - aiGuardNearTarget.h + aiInvincibleNearTargetBase.cpp + aiInvincibleNearTargetBase.h aiGyroActivateTerminal.cpp aiGyroActivateTerminal.h aiHangedLamp.cpp @@ -989,8 +989,8 @@ target_sources(uking PRIVATE aiHiddenOctarockSearchTarget.h aiHomePosDistanceSelector.cpp aiHomePosDistanceSelector.h - aiHorseCheckLineOfSightSelectorBase.cpp - aiHorseCheckLineOfSightSelectorBase.h + aiCheckLineOfSightSelector.cpp + aiCheckLineOfSightSelector.h aiHorseCheckLineOfSightSelector.cpp aiHorseCheckLineOfSightSelector.h aiHorse.cpp @@ -1149,8 +1149,8 @@ target_sources(uking PRIVATE aiLandingChemicalBall.h aiLargeCannonAttackRoot.cpp aiLargeCannonAttackRoot.h - aiLargeEnemyFindPlayer.cpp - aiLargeEnemyFindPlayer.h + aiGiantEnemyFindPlayer.cpp + aiGiantEnemyFindPlayer.h aiLastAttackerSelect.cpp aiLastAttackerSelect.h aiLastAttackerSpecialActionSelect.cpp @@ -1297,8 +1297,8 @@ target_sources(uking PRIVATE aiMetalObjectBuried.h aiMetalObjectFixed.cpp aiMetalObjectFixed.h - aiMimicCliffStopEnemyNormalBase.cpp - aiMimicCliffStopEnemyNormalBase.h + aiCliffStopEnemyNormal.cpp + aiCliffStopEnemyNormal.h aiMimicCliffStopEnemyNormal.cpp aiMimicCliffStopEnemyNormal.h aiMimicEnemyFindPlayer.cpp @@ -1309,8 +1309,8 @@ target_sources(uking PRIVATE aiMimicFlagSelect.h aiMimicryResetCheck.cpp aiMimicryResetCheck.h - aiMiniBeamAttack.cpp - aiMiniBeamAttack.h + aiGuideBeamAttackEnemyBattle.cpp + aiGuideBeamAttackEnemyBattle.h aiMiniGolemLifted.cpp aiMiniGolemLifted.h aiMiniGolemReaction.cpp @@ -1329,8 +1329,8 @@ target_sources(uking PRIVATE aiMoriblinSpearNearBattle.h aiMoriblinUnarmedBattle.cpp aiMoriblinUnarmedBattle.h - aiMotorcycleRootBase.cpp - aiMotorcycleRootBase.h + aiHorseRiddenStatusSelector.cpp + aiHorseRiddenStatusSelector.h aiMotorcycleRoot.cpp aiMotorcycleRoot.h aiMoveAndFreeFallGondola.cpp @@ -1429,8 +1429,8 @@ target_sources(uking PRIVATE aiNpcTebaTrainingRoot.h aiNPCTimeline.cpp aiNPCTimeline.h - aiNPCTravelBase.cpp - aiNPCTravelBase.h + aiNPCScheduleMove.cpp + aiNPCScheduleMove.h aiNPCTravel.cpp aiNPCTravelerRoot.cpp aiNPCTravelerRoot.h @@ -1443,16 +1443,16 @@ target_sources(uking PRIVATE aiNushiWarp.h aiOctarockBattle.cpp aiOctarockBattle.h - aiOctarockEscape.cpp - aiOctarockEscape.h + aiOctarockHideEscapeBase.cpp + aiOctarockHideEscapeBase.h aiOctarockHideEscape.cpp aiOctarockHideEscape.h aiOctarockOptionRoot.cpp aiOctarockOptionRoot.h aiOctarockReaction.cpp aiOctarockReaction.h - aiOctarockRootBase.cpp - aiOctarockRootBase.h + aiVacuumEnemyRoot.cpp + aiVacuumEnemyRoot.h aiOctarockRoot.cpp aiOctarockRoot.h aiOctarockServiceHideWait.cpp @@ -1465,8 +1465,8 @@ target_sources(uking PRIVATE aiOnCliffSurfaceSelect.h aiOnCliffViewWait.cpp aiOnCliffViewWait.h - aiOneMemoryMagicBattleBase.cpp - aiOneMemoryMagicBattleBase.h + aiMagicBattle.cpp + aiMagicBattle.h aiOneMemoryMagicBattle.cpp aiOneMemoryMagicBattle.h aiOnEnterEventModeSelect.cpp @@ -1615,8 +1615,8 @@ target_sources(uking PRIVATE aiPriestBossMetaAIRoot.h aiPriestBossMeta.cpp aiPriestBossMeta.h - aiPriestBossMode.cpp - aiPriestBossMode.h + aiPriestBoss.cpp + aiPriestBoss.h aiPriestBossNormalMoveSelector.cpp aiPriestBossNormalMoveSelector.h aiPriestBossNormalQuickRecover.cpp @@ -1657,8 +1657,8 @@ target_sources(uking PRIVATE aiPriestIronBallAttack.h aiPullOutTree.cpp aiPullOutTree.h - aiRailMove.cpp - aiRailMove.h + aiBezierRailMove.cpp + aiBezierRailMove.h aiRailMoveObject.cpp aiRailMoveObject.h aiRailMoveObjectOneWay.cpp @@ -1693,8 +1693,8 @@ target_sources(uking PRIVATE aiRangeObstacleCheck.h aiRangeSelectAction.cpp aiRangeSelectAction.h - aiRangeSelect.cpp - aiRangeSelect.h + aiNewRangeSelect.cpp + aiNewRangeSelect.h aiRangeSelectThreeAction.cpp aiRangeSelectThreeAction.h aiRangeSelectTwoAction.cpp @@ -1713,14 +1713,14 @@ target_sources(uking PRIVATE aiReflectableIgnitedThrown.h aiReflectableThrown.cpp aiReflectableThrown.h - aiRegistedActorNumTwoSelectBase.cpp - aiRegistedActorNumTwoSelectBase.h + aiRegistedActor.cpp + aiRegistedActor.h aiRegistedActorNumTwoSelect.cpp aiRegistedActorNumTwoSelect.h aiRemainElectricCannonBeamAttack.cpp aiRemainElectricCannonBeamAttack.h - aiRemainElectricCannonRootBase.cpp - aiRemainElectricCannonRootBase.h + aiLargeCannonRoot.cpp + aiLargeCannonRoot.h aiRemainElectricCannonRoot.cpp aiRemainElectricCannonRoot.h aiRemainsElectricBGCamera.cpp @@ -1801,8 +1801,8 @@ target_sources(uking PRIVATE aiSandwormLost.h aiSandwormNavSearchWait.cpp aiSandwormNavSearchWait.h - aiSandwormNormalBase.cpp - aiSandwormNormalBase.h + aiAwnSeal.cpp + aiAwnSeal.h aiSandwormNormal.cpp aiSandwormNormal.h aiSandwormNoticeSound.cpp @@ -1867,8 +1867,8 @@ target_sources(uking PRIVATE aiSeqTrgPartsNotice.h aiSeqTwoAction.cpp aiSeqTwoAction.h - aiSeqTwoLineReachableTargetActionBase.cpp - aiSeqTwoLineReachableTargetActionBase.h + aiSeqTwoLineReachableTarget.cpp + aiSeqTwoLineReachableTarget.h aiSeqTwoLineReachableTargetAction.cpp aiSeqTwoLineReachableTargetAction.h aiSeqTwoWeakPointOnFirstDo.cpp @@ -1911,8 +1911,8 @@ target_sources(uking PRIVATE aiSimpleLineBeam.h aiSimpleShootingEnemyFindPlayer.cpp aiSimpleShootingEnemyFindPlayer.h - aiSimpleWildlifeRoot.cpp - aiSimpleWildlifeRoot.h + aiCapturedActorRoot.cpp + aiCapturedActorRoot.h aiSiteBossApproachRoot.cpp aiSiteBossApproachRoot.h aiSiteBossArrowRainAttack.cpp @@ -1927,8 +1927,8 @@ target_sources(uking PRIVATE aiSiteBossBowChildDeviceRoot.h aiSiteBossBowRoot.cpp aiSiteBossBowRoot.h - aiSiteBossChemicalProjectile.cpp - aiSiteBossChemicalProjectile.h + aiGanonFlameBall.cpp + aiGanonFlameBall.h aiSiteBossFlameBall.cpp aiSiteBossFlameBall.h aiSiteBossGaleArrowRoot.cpp @@ -1949,8 +1949,8 @@ target_sources(uking PRIVATE aiSiteBossPierceBulletAttack.h aiSiteBossReaction.cpp aiSiteBossReaction.h - aiSiteBossRecognizeRootBase.cpp - aiSiteBossRecognizeRootBase.h + aiLastBossRecognizeRoot.cpp + aiLastBossRecognizeRoot.h aiSiteBossRecognizeRoot.cpp aiSiteBossRecognizeRoot.h aiSiteBossReflectArrowRoot.cpp @@ -1999,8 +1999,8 @@ target_sources(uking PRIVATE aiSoundTriggerTag.h aiSpearWeaponSelect.cpp aiSpearWeaponSelect.h - aiSpecialEnemySleep.cpp - aiSpecialEnemySleep.h + aiSleepNormal.cpp + aiSleepNormal.h aiSpotBgmTrigger.cpp aiSpotBgmTrigger.h aiStalEnemyBlownOff.cpp @@ -2125,8 +2125,8 @@ target_sources(uking PRIVATE aiTargetActorGrabAdapter.h aiTargetAngerSelect.cpp aiTargetAngerSelect.h - aiTargetAttackAttitudeTgtSelectBase.cpp - aiTargetAttackAttitudeTgtSelectBase.h + aiTargetAttackAttitudeTgt.cpp + aiTargetAttackAttitudeTgt.h aiTargetAttackAttitudeTgtSelect.cpp aiTargetAttackAttitudeTgtSelect.h aiTargetBaitTypeSelect.cpp @@ -2185,24 +2185,24 @@ target_sources(uking PRIVATE aiTargetPickedItem.h aiTargetPlayerPos.cpp aiTargetPlayerPos.h - aiTargetPosAI.cpp - aiTargetPosAI.h + aiTargetActorPos.cpp + aiTargetActorPos.h aiTargetPosAnchorOffsetSelf.cpp aiTargetPosAnchorOffsetSelf.h aiTargetPosAnchorOffsetTarget.cpp aiTargetPosAnchorOffsetTarget.h aiTargetPosDirLRSelect.cpp aiTargetPosDirLRSelect.h - aiTargetPosDynParamRot.cpp + aiTargetPosDynParamRotFromMyPos.cpp aiTargetPosDynParamRotFromCtrPos.cpp aiTargetPosDynParamRotFromCtrPos.h - aiTargetPosDynParamRot.h + aiTargetPosDynParamRotFromMyPos.h aiTargetPosLostCheck.cpp aiTargetPosLostCheck.h - aiTargetPosOffset.cpp + aiOffsetTargetPos.cpp aiTargetPosOffsetFromMyPos.cpp aiTargetPosOffsetFromMyPos.h - aiTargetPosOffset.h + aiOffsetTargetPos.h aiTargetPosOnNavFaceSelect.cpp aiTargetPosOnNavFaceSelect.h aiTargetPosRotFromMyPos.cpp @@ -2227,8 +2227,8 @@ target_sources(uking PRIVATE aiTerminalEnduranceWarpRoot.h aiTimeControlTagRoot.cpp aiTimeControlTagRoot.h - aiTimedGuardNearTarget.cpp - aiTimedGuardNearTarget.h + aiInvincibleNearTarget.cpp + aiInvincibleNearTarget.h aiTimelineAI.cpp aiTimelineAI.h aiTimeredViewWait.cpp @@ -2265,10 +2265,10 @@ target_sources(uking PRIVATE aiTwnObjDlcFlightTrainingTarget.h aiUnarmedEnemyNoiseTarget.cpp aiUnarmedEnemyNoiseTarget.h - aiUnarmedEnemySearch.cpp - aiUnarmedEnemySearch.h - aiUnarmedEnemySearchWeapon.cpp - aiUnarmedEnemySearchWeapon.h + aiNavMove.cpp + aiNavMove.h + aiEnemySearch.cpp + aiEnemySearch.h aiUnarmedWeaponEquipableEnemyAct.cpp aiUnarmedWeaponEquipableEnemyAct.h aiUnderWaterDepthSelect.cpp @@ -2355,8 +2355,8 @@ target_sources(uking PRIVATE aiWeatherReactionCheck.h aiWetSelect.cpp aiWetSelect.h - aiWholeDungeonRotateTag.cpp - aiWholeDungeonRotateTag.h + aiDungeonRotateTagApp.cpp + aiDungeonRotateTagApp.h aiWillBallAttackLevelSelect.cpp aiWillBallAttackLevelSelect.h aiWillBallFollowAttack.cpp diff --git a/src/Game/Actor/AI/aiAddViewTarget.cpp b/src/Game/Actor/AI/aiAddViewTarget.cpp new file mode 100644 index 00000000..4c7d6e9e --- /dev/null +++ b/src/Game/Actor/AI/aiAddViewTarget.cpp @@ -0,0 +1,23 @@ +#include "Game/Actor/AI/aiAddViewTarget.h" + +namespace uking::ai { + +AddViewTarget::AddViewTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +AddViewTarget::~AddViewTarget() = default; + +bool AddViewTarget::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void AddViewTarget::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void AddViewTarget::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void AddViewTarget::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiNPCTravelBase.h b/src/Game/Actor/AI/aiAddViewTarget.h similarity index 62% rename from src/Game/Actor/AI/aiNPCTravelBase.h rename to src/Game/Actor/AI/aiAddViewTarget.h index 3c123cfb..cb18bb55 100644 --- a/src/Game/Actor/AI/aiNPCTravelBase.h +++ b/src/Game/Actor/AI/aiAddViewTarget.h @@ -4,11 +4,11 @@ namespace uking::ai { -class NPCTravelBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(NPCTravelBase, ksys::act::ai::Ai) +class AddViewTarget : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(AddViewTarget, ksys::act::ai::Ai) public: - explicit NPCTravelBase(const InitArg& arg); - ~NPCTravelBase() override; + explicit AddViewTarget(const InitArg& arg); + ~AddViewTarget() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiAddViewTargetPos.cpp b/src/Game/Actor/AI/aiAddViewTargetPos.cpp index 32e71bc9..d69c2e89 100644 --- a/src/Game/Actor/AI/aiAddViewTargetPos.cpp +++ b/src/Game/Actor/AI/aiAddViewTargetPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -AddViewTargetPos::AddViewTargetPos(const InitArg& arg) : AddViewTargetPosBase(arg) {} +AddViewTargetPos::AddViewTargetPos(const InitArg& arg) : AddViewTarget(arg) {} AddViewTargetPos::~AddViewTargetPos() = default; bool AddViewTargetPos::init_(sead::Heap* heap) { - return AddViewTargetPosBase::init_(heap); + return AddViewTarget::init_(heap); } void AddViewTargetPos::enter_(ksys::act::ai::InlineParamPack* params) { - AddViewTargetPosBase::enter_(params); + AddViewTarget::enter_(params); } void AddViewTargetPos::leave_() { - AddViewTargetPosBase::leave_(); + AddViewTarget::leave_(); } void AddViewTargetPos::loadParams_() { - AddViewTargetPosBase::loadParams_(); + AddViewTarget::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAddViewTargetPos.h b/src/Game/Actor/AI/aiAddViewTargetPos.h index 8dcc6947..50d8b5f9 100644 --- a/src/Game/Actor/AI/aiAddViewTargetPos.h +++ b/src/Game/Actor/AI/aiAddViewTargetPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAddViewTargetPosBase.h" +#include "Game/Actor/AI/aiAddViewTarget.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AddViewTargetPos : public AddViewTargetPosBase { - SEAD_RTTI_OVERRIDE(AddViewTargetPos, AddViewTargetPosBase) +class AddViewTargetPos : public AddViewTarget { + SEAD_RTTI_OVERRIDE(AddViewTargetPos, AddViewTarget) public: explicit AddViewTargetPos(const InitArg& arg); ~AddViewTargetPos() override; diff --git a/src/Game/Actor/AI/aiAddViewTargetPosBase.cpp b/src/Game/Actor/AI/aiAddViewTargetPosBase.cpp deleted file mode 100644 index 5e1dd9cb..00000000 --- a/src/Game/Actor/AI/aiAddViewTargetPosBase.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/AI/aiAddViewTargetPosBase.h" - -namespace uking::ai { - -AddViewTargetPosBase::AddViewTargetPosBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -AddViewTargetPosBase::~AddViewTargetPosBase() = default; - -bool AddViewTargetPosBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void AddViewTargetPosBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void AddViewTargetPosBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void AddViewTargetPosBase::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAncientNecklaceBall.cpp b/src/Game/Actor/AI/aiAncientNecklaceBall.cpp index 99bb7dc6..74682e65 100644 --- a/src/Game/Actor/AI/aiAncientNecklaceBall.cpp +++ b/src/Game/Actor/AI/aiAncientNecklaceBall.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -AncientNecklaceBall::AncientNecklaceBall(const InitArg& arg) : AncientNecklaceBallBase(arg) {} +AncientNecklaceBall::AncientNecklaceBall(const InitArg& arg) : PlayASSwitch(arg) {} AncientNecklaceBall::~AncientNecklaceBall() = default; bool AncientNecklaceBall::init_(sead::Heap* heap) { - return AncientNecklaceBallBase::init_(heap); + return PlayASSwitch::init_(heap); } void AncientNecklaceBall::enter_(ksys::act::ai::InlineParamPack* params) { - AncientNecklaceBallBase::enter_(params); + PlayASSwitch::enter_(params); } void AncientNecklaceBall::leave_() { - AncientNecklaceBallBase::leave_(); + PlayASSwitch::leave_(); } void AncientNecklaceBall::loadParams_() { - AncientNecklaceBallBase::loadParams_(); + PlayASSwitch::loadParams_(); getStaticParam(&mLandNoiseLevel_s, "LandNoiseLevel"); getMapUnitParam(&mGrabNodeIndex_m, "GrabNodeIndex"); getMapUnitParam(&mGiantNecklaceActiveSaveFlag_m, "GiantNecklaceActiveSaveFlag"); diff --git a/src/Game/Actor/AI/aiAncientNecklaceBall.h b/src/Game/Actor/AI/aiAncientNecklaceBall.h index a33ae832..6e58c327 100644 --- a/src/Game/Actor/AI/aiAncientNecklaceBall.h +++ b/src/Game/Actor/AI/aiAncientNecklaceBall.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAncientNecklaceBallBase.h" +#include "Game/Actor/AI/aiPlayASSwitch.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AncientNecklaceBall : public AncientNecklaceBallBase { - SEAD_RTTI_OVERRIDE(AncientNecklaceBall, AncientNecklaceBallBase) +class AncientNecklaceBall : public PlayASSwitch { + SEAD_RTTI_OVERRIDE(AncientNecklaceBall, PlayASSwitch) public: explicit AncientNecklaceBall(const InitArg& arg); ~AncientNecklaceBall() override; diff --git a/src/Game/Actor/AI/aiAncientNecklaceBallBase.cpp b/src/Game/Actor/AI/aiAncientNecklaceBallBase.cpp deleted file mode 100644 index fdd9aaf7..00000000 --- a/src/Game/Actor/AI/aiAncientNecklaceBallBase.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/AI/aiAncientNecklaceBallBase.h" - -namespace uking::ai { - -AncientNecklaceBallBase::AncientNecklaceBallBase(const InitArg& arg) : SimpleLiftable(arg) {} - -AncientNecklaceBallBase::~AncientNecklaceBallBase() = default; - -bool AncientNecklaceBallBase::init_(sead::Heap* heap) { - return SimpleLiftable::init_(heap); -} - -void AncientNecklaceBallBase::enter_(ksys::act::ai::InlineParamPack* params) { - SimpleLiftable::enter_(params); -} - -void AncientNecklaceBallBase::leave_() { - SimpleLiftable::leave_(); -} - -void AncientNecklaceBallBase::loadParams_() { - getStaticParam(&mIsIgnoreSameOnAS_s, "IsIgnoreSameOnAS"); - getStaticParam(&mIsIgnoreSameOffAS_s, "IsIgnoreSameOffAS"); - getStaticParam(&mOnAS_s, "OnAS"); - getStaticParam(&mOffAS_s, "OffAS"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAnimalEscapeAI.cpp b/src/Game/Actor/AI/aiAnimalEscapeAI.cpp index 549709fb..9a8ec606 100644 --- a/src/Game/Actor/AI/aiAnimalEscapeAI.cpp +++ b/src/Game/Actor/AI/aiAnimalEscapeAI.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -AnimalEscapeAI::AnimalEscapeAI(const InitArg& arg) : AnimalRoamBase(arg) {} +AnimalEscapeAI::AnimalEscapeAI(const InitArg& arg) : AnimalRndMove(arg) {} AnimalEscapeAI::~AnimalEscapeAI() = default; bool AnimalEscapeAI::init_(sead::Heap* heap) { - return AnimalRoamBase::init_(heap); + return AnimalRndMove::init_(heap); } void AnimalEscapeAI::enter_(ksys::act::ai::InlineParamPack* params) { - AnimalRoamBase::enter_(params); + AnimalRndMove::enter_(params); } void AnimalEscapeAI::leave_() { - AnimalRoamBase::leave_(); + AnimalRndMove::leave_(); } void AnimalEscapeAI::loadParams_() { - AnimalRoamBase::loadParams_(); + AnimalRndMove::loadParams_(); getStaticParam(&mNumTimesAllowStuck_s, "NumTimesAllowStuck"); getStaticParam(&mContinueDistance_s, "ContinueDistance"); getStaticParam(&mShouldEscapeDistance_s, "ShouldEscapeDistance"); diff --git a/src/Game/Actor/AI/aiAnimalEscapeAI.h b/src/Game/Actor/AI/aiAnimalEscapeAI.h index f7068c91..41d222c9 100644 --- a/src/Game/Actor/AI/aiAnimalEscapeAI.h +++ b/src/Game/Actor/AI/aiAnimalEscapeAI.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAnimalRoamBase.h" +#include "Game/Actor/AI/aiAnimalRndMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AnimalEscapeAI : public AnimalRoamBase { - SEAD_RTTI_OVERRIDE(AnimalEscapeAI, AnimalRoamBase) +class AnimalEscapeAI : public AnimalRndMove { + SEAD_RTTI_OVERRIDE(AnimalEscapeAI, AnimalRndMove) public: explicit AnimalEscapeAI(const InitArg& arg); ~AnimalEscapeAI() override; diff --git a/src/Game/Actor/AI/aiAnimalRoamBase.cpp b/src/Game/Actor/AI/aiAnimalRndMove.cpp similarity index 75% rename from src/Game/Actor/AI/aiAnimalRoamBase.cpp rename to src/Game/Actor/AI/aiAnimalRndMove.cpp index 16f9e132..97613a0b 100644 --- a/src/Game/Actor/AI/aiAnimalRoamBase.cpp +++ b/src/Game/Actor/AI/aiAnimalRndMove.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiAnimalRoamBase.h" +#include "Game/Actor/AI/aiAnimalRndMove.h" namespace uking::ai { -AnimalRoamBase::AnimalRoamBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +AnimalRndMove::AnimalRndMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -AnimalRoamBase::~AnimalRoamBase() = default; +AnimalRndMove::~AnimalRndMove() = default; -bool AnimalRoamBase::init_(sead::Heap* heap) { +bool AnimalRndMove::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void AnimalRoamBase::enter_(ksys::act::ai::InlineParamPack* params) { +void AnimalRndMove::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void AnimalRoamBase::leave_() { +void AnimalRndMove::leave_() { ksys::act::ai::Ai::leave_(); } -void AnimalRoamBase::loadParams_() { +void AnimalRndMove::loadParams_() { getStaticParam(&mSearchNextPathRadius_s, "SearchNextPathRadius"); getStaticParam(&mRadiusLimit_s, "RadiusLimit"); getStaticParam(&mForwardDirDistCoefficient_s, "ForwardDirDistCoefficient"); diff --git a/src/Game/Actor/AI/aiAnimalRoamBase.h b/src/Game/Actor/AI/aiAnimalRndMove.h similarity index 87% rename from src/Game/Actor/AI/aiAnimalRoamBase.h rename to src/Game/Actor/AI/aiAnimalRndMove.h index e01c6d6f..a0f8097d 100644 --- a/src/Game/Actor/AI/aiAnimalRoamBase.h +++ b/src/Game/Actor/AI/aiAnimalRndMove.h @@ -4,11 +4,11 @@ namespace uking::ai { -class AnimalRoamBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(AnimalRoamBase, ksys::act::ai::Ai) +class AnimalRndMove : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(AnimalRndMove, ksys::act::ai::Ai) public: - explicit AnimalRoamBase(const InitArg& arg); - ~AnimalRoamBase() override; + explicit AnimalRndMove(const InitArg& arg); + ~AnimalRndMove() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiAnimalRoam.cpp b/src/Game/Actor/AI/aiAnimalRoam.cpp index e518a211..35013085 100644 --- a/src/Game/Actor/AI/aiAnimalRoam.cpp +++ b/src/Game/Actor/AI/aiAnimalRoam.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -AnimalRoam::AnimalRoam(const InitArg& arg) : AnimalRoamBase(arg) {} +AnimalRoam::AnimalRoam(const InitArg& arg) : AnimalRndMove(arg) {} AnimalRoam::~AnimalRoam() = default; bool AnimalRoam::init_(sead::Heap* heap) { - return AnimalRoamBase::init_(heap); + return AnimalRndMove::init_(heap); } void AnimalRoam::enter_(ksys::act::ai::InlineParamPack* params) { - AnimalRoamBase::enter_(params); + AnimalRndMove::enter_(params); } void AnimalRoam::leave_() { - AnimalRoamBase::leave_(); + AnimalRndMove::leave_(); } void AnimalRoam::loadParams_() { - AnimalRoamBase::loadParams_(); + AnimalRndMove::loadParams_(); getStaticParam(&mFinishChangeCount_s, "FinishChangeCount"); getStaticParam(&mLimitRadius_s, "LimitRadius"); getStaticParam(&mChangeWaitRate_s, "ChangeWaitRate"); diff --git a/src/Game/Actor/AI/aiAnimalRoam.h b/src/Game/Actor/AI/aiAnimalRoam.h index 9b35ef3b..363b8286 100644 --- a/src/Game/Actor/AI/aiAnimalRoam.h +++ b/src/Game/Actor/AI/aiAnimalRoam.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAnimalRoamBase.h" +#include "Game/Actor/AI/aiAnimalRndMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AnimalRoam : public AnimalRoamBase { - SEAD_RTTI_OVERRIDE(AnimalRoam, AnimalRoamBase) +class AnimalRoam : public AnimalRndMove { + SEAD_RTTI_OVERRIDE(AnimalRoam, AnimalRndMove) public: explicit AnimalRoam(const InitArg& arg); ~AnimalRoam() override; diff --git a/src/Game/Actor/AI/aiAppearNearTarget.cpp b/src/Game/Actor/AI/aiAppearFromTarget.cpp similarity index 54% rename from src/Game/Actor/AI/aiAppearNearTarget.cpp rename to src/Game/Actor/AI/aiAppearFromTarget.cpp index e7fd1e3e..80484b6d 100644 --- a/src/Game/Actor/AI/aiAppearNearTarget.cpp +++ b/src/Game/Actor/AI/aiAppearFromTarget.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiAppearNearTarget.h" +#include "Game/Actor/AI/aiAppearFromTarget.h" namespace uking::ai { -AppearNearTarget::AppearNearTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +AppearFromTarget::AppearFromTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -AppearNearTarget::~AppearNearTarget() = default; +AppearFromTarget::~AppearFromTarget() = default; -bool AppearNearTarget::init_(sead::Heap* heap) { +bool AppearFromTarget::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void AppearNearTarget::enter_(ksys::act::ai::InlineParamPack* params) { +void AppearFromTarget::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void AppearNearTarget::leave_() { +void AppearFromTarget::leave_() { ksys::act::ai::Ai::leave_(); } -void AppearNearTarget::loadParams_() { +void AppearFromTarget::loadParams_() { getStaticParam(&mDist_s, "Dist"); getStaticParam(&mTeraDist_s, "TeraDist"); getMapUnitParam(&mNearCreateAppearID_m, "NearCreateAppearID"); diff --git a/src/Game/Actor/AI/aiAppearNearTarget.h b/src/Game/Actor/AI/aiAppearFromTarget.h similarity index 74% rename from src/Game/Actor/AI/aiAppearNearTarget.h rename to src/Game/Actor/AI/aiAppearFromTarget.h index b846acb4..f9ec35ba 100644 --- a/src/Game/Actor/AI/aiAppearNearTarget.h +++ b/src/Game/Actor/AI/aiAppearFromTarget.h @@ -4,11 +4,11 @@ namespace uking::ai { -class AppearNearTarget : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(AppearNearTarget, ksys::act::ai::Ai) +class AppearFromTarget : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(AppearFromTarget, ksys::act::ai::Ai) public: - explicit AppearNearTarget(const InitArg& arg); - ~AppearNearTarget() override; + explicit AppearFromTarget(const InitArg& arg); + ~AppearFromTarget() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.cpp b/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.cpp index 690cc904..4e11f5cc 100644 --- a/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.cpp +++ b/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.cpp @@ -3,20 +3,20 @@ namespace uking::ai { AppearFromTargetFrontAfterChase::AppearFromTargetFrontAfterChase(const InitArg& arg) - : AppearNearTarget(arg) {} + : AppearFromTarget(arg) {} AppearFromTargetFrontAfterChase::~AppearFromTargetFrontAfterChase() = default; void AppearFromTargetFrontAfterChase::enter_(ksys::act::ai::InlineParamPack* params) { - AppearNearTarget::enter_(params); + AppearFromTarget::enter_(params); } void AppearFromTargetFrontAfterChase::leave_() { - AppearNearTarget::leave_(); + AppearFromTarget::leave_(); } void AppearFromTargetFrontAfterChase::loadParams_() { - AppearNearTarget::loadParams_(); + AppearFromTarget::loadParams_(); getStaticParam(&mAppearDist_s, "AppearDist"); } diff --git a/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h b/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h index 4fe43b12..9ee44ff7 100644 --- a/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h +++ b/src/Game/Actor/AI/aiAppearFromTargetFrontAfterChase.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAppearNearTarget.h" +#include "Game/Actor/AI/aiAppearFromTarget.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AppearFromTargetFrontAfterChase : public AppearNearTarget { - SEAD_RTTI_OVERRIDE(AppearFromTargetFrontAfterChase, AppearNearTarget) +class AppearFromTargetFrontAfterChase : public AppearFromTarget { + SEAD_RTTI_OVERRIDE(AppearFromTargetFrontAfterChase, AppearFromTarget) public: explicit AppearFromTargetFrontAfterChase(const InitArg& arg); ~AppearFromTargetFrontAfterChase() override; diff --git a/src/Game/Actor/AI/aiAppearFromTargetFrontGround.cpp b/src/Game/Actor/AI/aiAppearFromTargetFrontGround.cpp index e8e77583..ee5d5d25 100644 --- a/src/Game/Actor/AI/aiAppearFromTargetFrontGround.cpp +++ b/src/Game/Actor/AI/aiAppearFromTargetFrontGround.cpp @@ -3,24 +3,24 @@ namespace uking::ai { AppearFromTargetFrontGround::AppearFromTargetFrontGround(const InitArg& arg) - : AppearNearTarget(arg) {} + : AppearFromTarget(arg) {} AppearFromTargetFrontGround::~AppearFromTargetFrontGround() = default; bool AppearFromTargetFrontGround::init_(sead::Heap* heap) { - return AppearNearTarget::init_(heap); + return AppearFromTarget::init_(heap); } void AppearFromTargetFrontGround::enter_(ksys::act::ai::InlineParamPack* params) { - AppearNearTarget::enter_(params); + AppearFromTarget::enter_(params); } void AppearFromTargetFrontGround::leave_() { - AppearNearTarget::leave_(); + AppearFromTarget::leave_(); } void AppearFromTargetFrontGround::loadParams_() { - AppearNearTarget::loadParams_(); + AppearFromTarget::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAppearFromTargetFrontGround.h b/src/Game/Actor/AI/aiAppearFromTargetFrontGround.h index 7124087c..5fbae97d 100644 --- a/src/Game/Actor/AI/aiAppearFromTargetFrontGround.h +++ b/src/Game/Actor/AI/aiAppearFromTargetFrontGround.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAppearNearTarget.h" +#include "Game/Actor/AI/aiAppearFromTarget.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AppearFromTargetFrontGround : public AppearNearTarget { - SEAD_RTTI_OVERRIDE(AppearFromTargetFrontGround, AppearNearTarget) +class AppearFromTargetFrontGround : public AppearFromTarget { + SEAD_RTTI_OVERRIDE(AppearFromTargetFrontGround, AppearFromTarget) public: explicit AppearFromTargetFrontGround(const InitArg& arg); ~AppearFromTargetFrontGround() override; diff --git a/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.cpp b/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.cpp index 493d7642..23eda7f5 100644 --- a/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.cpp +++ b/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.cpp @@ -3,24 +3,24 @@ namespace uking::ai { AppearNearTargetOutOfScrnGnd::AppearNearTargetOutOfScrnGnd(const InitArg& arg) - : AppearNearTarget(arg) {} + : AppearFromTarget(arg) {} AppearNearTargetOutOfScrnGnd::~AppearNearTargetOutOfScrnGnd() = default; bool AppearNearTargetOutOfScrnGnd::init_(sead::Heap* heap) { - return AppearNearTarget::init_(heap); + return AppearFromTarget::init_(heap); } void AppearNearTargetOutOfScrnGnd::enter_(ksys::act::ai::InlineParamPack* params) { - AppearNearTarget::enter_(params); + AppearFromTarget::enter_(params); } void AppearNearTargetOutOfScrnGnd::leave_() { - AppearNearTarget::leave_(); + AppearFromTarget::leave_(); } void AppearNearTargetOutOfScrnGnd::loadParams_() { - AppearNearTarget::loadParams_(); + AppearFromTarget::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h b/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h index 43432a61..7156fbae 100644 --- a/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h +++ b/src/Game/Actor/AI/aiAppearNearTargetOutOfScrnGnd.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAppearNearTarget.h" +#include "Game/Actor/AI/aiAppearFromTarget.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AppearNearTargetOutOfScrnGnd : public AppearNearTarget { - SEAD_RTTI_OVERRIDE(AppearNearTargetOutOfScrnGnd, AppearNearTarget) +class AppearNearTargetOutOfScrnGnd : public AppearFromTarget { + SEAD_RTTI_OVERRIDE(AppearNearTargetOutOfScrnGnd, AppearFromTarget) public: explicit AppearNearTargetOutOfScrnGnd(const InitArg& arg); ~AppearNearTargetOutOfScrnGnd() override; diff --git a/src/Game/Actor/AI/aiAssassinFieldShooterBattle.cpp b/src/Game/Actor/AI/aiAssassinFieldShooterBattle.cpp index 85b53e1f..96ab0c72 100644 --- a/src/Game/Actor/AI/aiAssassinFieldShooterBattle.cpp +++ b/src/Game/Actor/AI/aiAssassinFieldShooterBattle.cpp @@ -3,24 +3,24 @@ namespace uking::ai { AssassinFieldShooterBattle::AssassinFieldShooterBattle(const InitArg& arg) - : AssassinFieldShooterBattleBase(arg) {} + : AssassinShooterBattle(arg) {} AssassinFieldShooterBattle::~AssassinFieldShooterBattle() = default; bool AssassinFieldShooterBattle::init_(sead::Heap* heap) { - return AssassinFieldShooterBattleBase::init_(heap); + return AssassinShooterBattle::init_(heap); } void AssassinFieldShooterBattle::enter_(ksys::act::ai::InlineParamPack* params) { - AssassinFieldShooterBattleBase::enter_(params); + AssassinShooterBattle::enter_(params); } void AssassinFieldShooterBattle::leave_() { - AssassinFieldShooterBattleBase::leave_(); + AssassinShooterBattle::leave_(); } void AssassinFieldShooterBattle::loadParams_() { - AssassinFieldShooterBattleBase::loadParams_(); + AssassinShooterBattle::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAssassinFieldShooterBattle.h b/src/Game/Actor/AI/aiAssassinFieldShooterBattle.h index 552f6657..7bfde6e6 100644 --- a/src/Game/Actor/AI/aiAssassinFieldShooterBattle.h +++ b/src/Game/Actor/AI/aiAssassinFieldShooterBattle.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAssassinFieldShooterBattleBase.h" +#include "Game/Actor/AI/aiAssassinShooterBattle.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AssassinFieldShooterBattle : public AssassinFieldShooterBattleBase { - SEAD_RTTI_OVERRIDE(AssassinFieldShooterBattle, AssassinFieldShooterBattleBase) +class AssassinFieldShooterBattle : public AssassinShooterBattle { + SEAD_RTTI_OVERRIDE(AssassinFieldShooterBattle, AssassinShooterBattle) public: explicit AssassinFieldShooterBattle(const InitArg& arg); ~AssassinFieldShooterBattle() override; diff --git a/src/Game/Actor/AI/aiAssassinMagicTgtSelect.cpp b/src/Game/Actor/AI/aiAssassinMagicTgtSelect.cpp deleted file mode 100644 index c9d83e6f..00000000 --- a/src/Game/Actor/AI/aiAssassinMagicTgtSelect.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiAssassinMagicTgtSelect.h" - -namespace uking::ai { - -AssassinMagicTgtSelect::AssassinMagicTgtSelect(const InitArg& arg) : TargetInAreaSelect(arg) {} - -AssassinMagicTgtSelect::~AssassinMagicTgtSelect() = default; - -bool AssassinMagicTgtSelect::init_(sead::Heap* heap) { - return TargetInAreaSelect::init_(heap); -} - -void AssassinMagicTgtSelect::enter_(ksys::act::ai::InlineParamPack* params) { - TargetInAreaSelect::enter_(params); -} - -void AssassinMagicTgtSelect::leave_() { - TargetInAreaSelect::leave_(); -} - -void AssassinMagicTgtSelect::loadParams_() { - TargetInAreaSelect::loadParams_(); - getStaticParam(&mHeight_s, "Height"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.cpp b/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.cpp index dc876daa..768443b6 100644 --- a/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.cpp +++ b/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -AssassinMiddleAzitoRoot::AssassinMiddleAzitoRoot(const InitArg& arg) : AssassinNormal(arg) {} +AssassinMiddleAzitoRoot::AssassinMiddleAzitoRoot(const InitArg& arg) : GuardHomePosNormal(arg) {} AssassinMiddleAzitoRoot::~AssassinMiddleAzitoRoot() = default; bool AssassinMiddleAzitoRoot::init_(sead::Heap* heap) { - return AssassinNormal::init_(heap); + return GuardHomePosNormal::init_(heap); } void AssassinMiddleAzitoRoot::enter_(ksys::act::ai::InlineParamPack* params) { - AssassinNormal::enter_(params); + GuardHomePosNormal::enter_(params); } void AssassinMiddleAzitoRoot::leave_() { - AssassinNormal::leave_(); + GuardHomePosNormal::leave_(); } void AssassinMiddleAzitoRoot::loadParams_() { - AssassinNormal::loadParams_(); + GuardHomePosNormal::loadParams_(); getStaticParam(&mEntryPoint_s, "EntryPoint"); getStaticParam(&mDemoName_s, "DemoName"); getStaticParam(&mLikeItem_s, "LikeItem"); diff --git a/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.h b/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.h index f59356c6..16006162 100644 --- a/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.h +++ b/src/Game/Actor/AI/aiAssassinMiddleAzitoRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAssassinNormal.h" +#include "Game/Actor/AI/aiGuardHomePosNormal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AssassinMiddleAzitoRoot : public AssassinNormal { - SEAD_RTTI_OVERRIDE(AssassinMiddleAzitoRoot, AssassinNormal) +class AssassinMiddleAzitoRoot : public GuardHomePosNormal { + SEAD_RTTI_OVERRIDE(AssassinMiddleAzitoRoot, GuardHomePosNormal) public: explicit AssassinMiddleAzitoRoot(const InitArg& arg); ~AssassinMiddleAzitoRoot() override; diff --git a/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.cpp b/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.cpp index e2222625..2bb4b9c2 100644 --- a/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.cpp +++ b/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.cpp @@ -3,24 +3,24 @@ namespace uking::ai { AssassinMiddleMagicAfter::AssassinMiddleMagicAfter(const InitArg& arg) - : AssassinMagicTgtSelect(arg) {} + : TargetHeightAreaSelect(arg) {} AssassinMiddleMagicAfter::~AssassinMiddleMagicAfter() = default; bool AssassinMiddleMagicAfter::init_(sead::Heap* heap) { - return AssassinMagicTgtSelect::init_(heap); + return TargetHeightAreaSelect::init_(heap); } void AssassinMiddleMagicAfter::enter_(ksys::act::ai::InlineParamPack* params) { - AssassinMagicTgtSelect::enter_(params); + TargetHeightAreaSelect::enter_(params); } void AssassinMiddleMagicAfter::leave_() { - AssassinMagicTgtSelect::leave_(); + TargetHeightAreaSelect::leave_(); } void AssassinMiddleMagicAfter::loadParams_() { - AssassinMagicTgtSelect::loadParams_(); + TargetHeightAreaSelect::loadParams_(); getAITreeVariable(&mIsInterseptAttack_a, "IsInterseptAttack"); } diff --git a/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.h b/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.h index 130a36a1..50b50659 100644 --- a/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.h +++ b/src/Game/Actor/AI/aiAssassinMiddleMagicAfter.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiAssassinMagicTgtSelect.h" +#include "Game/Actor/AI/aiTargetHeightAreaSelect.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class AssassinMiddleMagicAfter : public AssassinMagicTgtSelect { - SEAD_RTTI_OVERRIDE(AssassinMiddleMagicAfter, AssassinMagicTgtSelect) +class AssassinMiddleMagicAfter : public TargetHeightAreaSelect { + SEAD_RTTI_OVERRIDE(AssassinMiddleMagicAfter, TargetHeightAreaSelect) public: explicit AssassinMiddleMagicAfter(const InitArg& arg); ~AssassinMiddleMagicAfter() override; diff --git a/src/Game/Actor/AI/aiAssassinNormal.cpp b/src/Game/Actor/AI/aiAssassinNormal.cpp deleted file mode 100644 index 8f06ae30..00000000 --- a/src/Game/Actor/AI/aiAssassinNormal.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiAssassinNormal.h" - -namespace uking::ai { - -AssassinNormal::AssassinNormal(const InitArg& arg) : LandHumEnemyNormal(arg) {} - -AssassinNormal::~AssassinNormal() = default; - -bool AssassinNormal::init_(sead::Heap* heap) { - return LandHumEnemyNormal::init_(heap); -} - -void AssassinNormal::enter_(ksys::act::ai::InlineParamPack* params) { - LandHumEnemyNormal::enter_(params); -} - -void AssassinNormal::leave_() { - LandHumEnemyNormal::leave_(); -} - -void AssassinNormal::loadParams_() { - LandHumEnemyNormal::loadParams_(); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAssassinFieldShooterBattleBase.cpp b/src/Game/Actor/AI/aiAssassinShooterBattle.cpp similarity index 52% rename from src/Game/Actor/AI/aiAssassinFieldShooterBattleBase.cpp rename to src/Game/Actor/AI/aiAssassinShooterBattle.cpp index 0b0bfe7f..6dabffc6 100644 --- a/src/Game/Actor/AI/aiAssassinFieldShooterBattleBase.cpp +++ b/src/Game/Actor/AI/aiAssassinShooterBattle.cpp @@ -1,25 +1,24 @@ -#include "Game/Actor/AI/aiAssassinFieldShooterBattleBase.h" +#include "Game/Actor/AI/aiAssassinShooterBattle.h" namespace uking::ai { -AssassinFieldShooterBattleBase::AssassinFieldShooterBattleBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} +AssassinShooterBattle::AssassinShooterBattle(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -AssassinFieldShooterBattleBase::~AssassinFieldShooterBattleBase() = default; +AssassinShooterBattle::~AssassinShooterBattle() = default; -bool AssassinFieldShooterBattleBase::init_(sead::Heap* heap) { +bool AssassinShooterBattle::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void AssassinFieldShooterBattleBase::enter_(ksys::act::ai::InlineParamPack* params) { +void AssassinShooterBattle::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void AssassinFieldShooterBattleBase::leave_() { +void AssassinShooterBattle::leave_() { ksys::act::ai::Ai::leave_(); } -void AssassinFieldShooterBattleBase::loadParams_() { +void AssassinShooterBattle::loadParams_() { getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mTiredTime_s, "TiredTime"); getStaticParam(&mWarpDistNear_s, "WarpDistNear"); diff --git a/src/Game/Actor/AI/aiAssassinFieldShooterBattleBase.h b/src/Game/Actor/AI/aiAssassinShooterBattle.h similarity index 75% rename from src/Game/Actor/AI/aiAssassinFieldShooterBattleBase.h rename to src/Game/Actor/AI/aiAssassinShooterBattle.h index fc0aa506..d007c2d3 100644 --- a/src/Game/Actor/AI/aiAssassinFieldShooterBattleBase.h +++ b/src/Game/Actor/AI/aiAssassinShooterBattle.h @@ -4,11 +4,11 @@ namespace uking::ai { -class AssassinFieldShooterBattleBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(AssassinFieldShooterBattleBase, ksys::act::ai::Ai) +class AssassinShooterBattle : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(AssassinShooterBattle, ksys::act::ai::Ai) public: - explicit AssassinFieldShooterBattleBase(const InitArg& arg); - ~AssassinFieldShooterBattleBase() override; + explicit AssassinShooterBattle(const InitArg& arg); + ~AssassinShooterBattle() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiSandwormNormalBase.cpp b/src/Game/Actor/AI/aiAwnSeal.cpp similarity index 51% rename from src/Game/Actor/AI/aiSandwormNormalBase.cpp rename to src/Game/Actor/AI/aiAwnSeal.cpp index 6d92d2f9..57494106 100644 --- a/src/Game/Actor/AI/aiSandwormNormalBase.cpp +++ b/src/Game/Actor/AI/aiAwnSeal.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiSandwormNormalBase.h" +#include "Game/Actor/AI/aiAwnSeal.h" namespace uking::ai { -SandwormNormalBase::SandwormNormalBase(const InitArg& arg) : EnemyNormal(arg) {} +AwnSeal::AwnSeal(const InitArg& arg) : EnemyNormal(arg) {} -SandwormNormalBase::~SandwormNormalBase() = default; +AwnSeal::~AwnSeal() = default; -bool SandwormNormalBase::init_(sead::Heap* heap) { +bool AwnSeal::init_(sead::Heap* heap) { return EnemyNormal::init_(heap); } -void SandwormNormalBase::enter_(ksys::act::ai::InlineParamPack* params) { +void AwnSeal::enter_(ksys::act::ai::InlineParamPack* params) { EnemyNormal::enter_(params); } -void SandwormNormalBase::leave_() { +void AwnSeal::leave_() { EnemyNormal::leave_(); } -void SandwormNormalBase::loadParams_() { +void AwnSeal::loadParams_() { EnemyNormal::loadParams_(); getStaticParam(&mSealedSight_s, "SealedSight"); getStaticParam(&mSealedHearing_s, "SealedHearing"); diff --git a/src/Game/Actor/AI/aiSandwormNormalBase.h b/src/Game/Actor/AI/aiAwnSeal.h similarity index 76% rename from src/Game/Actor/AI/aiSandwormNormalBase.h rename to src/Game/Actor/AI/aiAwnSeal.h index 2d042f0c..a1a1443c 100644 --- a/src/Game/Actor/AI/aiSandwormNormalBase.h +++ b/src/Game/Actor/AI/aiAwnSeal.h @@ -5,11 +5,11 @@ namespace uking::ai { -class SandwormNormalBase : public EnemyNormal { - SEAD_RTTI_OVERRIDE(SandwormNormalBase, EnemyNormal) +class AwnSeal : public EnemyNormal { + SEAD_RTTI_OVERRIDE(AwnSeal, EnemyNormal) public: - explicit SandwormNormalBase(const InitArg& arg); - ~SandwormNormalBase() override; + explicit AwnSeal(const InitArg& arg); + ~AwnSeal() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiBeamExplode.cpp b/src/Game/Actor/AI/aiBeamExplode.cpp index f441df5a..c19a97bf 100644 --- a/src/Game/Actor/AI/aiBeamExplode.cpp +++ b/src/Game/Actor/AI/aiBeamExplode.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -BeamExplode::BeamExplode(const InitArg& arg) : BeamExplodeBase(arg) {} +BeamExplode::BeamExplode(const InitArg& arg) : SimpleBeamExplode(arg) {} BeamExplode::~BeamExplode() = default; bool BeamExplode::init_(sead::Heap* heap) { - return BeamExplodeBase::init_(heap); + return SimpleBeamExplode::init_(heap); } void BeamExplode::enter_(ksys::act::ai::InlineParamPack* params) { - BeamExplodeBase::enter_(params); + SimpleBeamExplode::enter_(params); } void BeamExplode::leave_() { - BeamExplodeBase::leave_(); + SimpleBeamExplode::leave_(); } void BeamExplode::loadParams_() { - BeamExplodeBase::loadParams_(); + SimpleBeamExplode::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiBeamExplode.h b/src/Game/Actor/AI/aiBeamExplode.h index 6b7d3ac2..633aadf1 100644 --- a/src/Game/Actor/AI/aiBeamExplode.h +++ b/src/Game/Actor/AI/aiBeamExplode.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiBeamExplodeBase.h" +#include "Game/Actor/AI/aiSimpleBeamExplode.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class BeamExplode : public BeamExplodeBase { - SEAD_RTTI_OVERRIDE(BeamExplode, BeamExplodeBase) +class BeamExplode : public SimpleBeamExplode { + SEAD_RTTI_OVERRIDE(BeamExplode, SimpleBeamExplode) public: explicit BeamExplode(const InitArg& arg); ~BeamExplode() override; diff --git a/src/Game/Actor/AI/aiBeamExplodeBase.cpp b/src/Game/Actor/AI/aiBeamExplodeBase.cpp deleted file mode 100644 index ad73dace..00000000 --- a/src/Game/Actor/AI/aiBeamExplodeBase.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiBeamExplodeBase.h" - -namespace uking::ai { - -BeamExplodeBase::BeamExplodeBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -BeamExplodeBase::~BeamExplodeBase() = default; - -bool BeamExplodeBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void BeamExplodeBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void BeamExplodeBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void BeamExplodeBase::loadParams_() { - getStaticParam(&mMaxDistance_s, "MaxDistance"); - getStaticParam(&mIsDelete_s, "IsDelete"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiBezierRailMove.cpp b/src/Game/Actor/AI/aiBezierRailMove.cpp new file mode 100644 index 00000000..9819c1b1 --- /dev/null +++ b/src/Game/Actor/AI/aiBezierRailMove.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiBezierRailMove.h" + +namespace uking::ai { + +BezierRailMove::BezierRailMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +BezierRailMove::~BezierRailMove() = default; + +bool BezierRailMove::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void BezierRailMove::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void BezierRailMove::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void BezierRailMove::loadParams_() { + getStaticParam(&mIsIgnoreNoWaitStopPoint_s, "IsIgnoreNoWaitStopPoint"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRailMove.h b/src/Game/Actor/AI/aiBezierRailMove.h similarity index 67% rename from src/Game/Actor/AI/aiRailMove.h rename to src/Game/Actor/AI/aiBezierRailMove.h index a6bc4978..665d2a2b 100644 --- a/src/Game/Actor/AI/aiRailMove.h +++ b/src/Game/Actor/AI/aiBezierRailMove.h @@ -4,11 +4,11 @@ namespace uking::ai { -class RailMove : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(RailMove, ksys::act::ai::Ai) +class BezierRailMove : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(BezierRailMove, ksys::act::ai::Ai) public: - explicit RailMove(const InitArg& arg); - ~RailMove() override; + explicit BezierRailMove(const InitArg& arg); + ~BezierRailMove() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiGoronCannonBase.cpp b/src/Game/Actor/AI/aiBigCannon.cpp similarity index 69% rename from src/Game/Actor/AI/aiGoronCannonBase.cpp rename to src/Game/Actor/AI/aiBigCannon.cpp index ac161d57..49ac3648 100644 --- a/src/Game/Actor/AI/aiGoronCannonBase.cpp +++ b/src/Game/Actor/AI/aiBigCannon.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiGoronCannonBase.h" +#include "Game/Actor/AI/aiBigCannon.h" namespace uking::ai { -GoronCannonBase::GoronCannonBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +BigCannon::BigCannon(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -GoronCannonBase::~GoronCannonBase() = default; +BigCannon::~BigCannon() = default; -bool GoronCannonBase::init_(sead::Heap* heap) { +bool BigCannon::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void GoronCannonBase::enter_(ksys::act::ai::InlineParamPack* params) { +void BigCannon::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void GoronCannonBase::leave_() { +void BigCannon::leave_() { ksys::act::ai::Ai::leave_(); } -void GoronCannonBase::loadParams_() { +void BigCannon::loadParams_() { getStaticParam(&mRotRadAccel_s, "RotRadAccel"); getStaticParam(&mRotBrake_s, "RotBrake"); getStaticParam(&mShotCannonBallScale_s, "ShotCannonBallScale"); diff --git a/src/Game/Actor/AI/aiGoronCannonBase.h b/src/Game/Actor/AI/aiBigCannon.h similarity index 86% rename from src/Game/Actor/AI/aiGoronCannonBase.h rename to src/Game/Actor/AI/aiBigCannon.h index e2acc424..7ce000e6 100644 --- a/src/Game/Actor/AI/aiGoronCannonBase.h +++ b/src/Game/Actor/AI/aiBigCannon.h @@ -4,11 +4,11 @@ namespace uking::ai { -class GoronCannonBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(GoronCannonBase, ksys::act::ai::Ai) +class BigCannon : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(BigCannon, ksys::act::ai::Ai) public: - explicit GoronCannonBase(const InitArg& arg); - ~GoronCannonBase() override; + explicit BigCannon(const InitArg& arg); + ~BigCannon() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiSimpleWildlifeRoot.cpp b/src/Game/Actor/AI/aiCapturedActorRoot.cpp similarity index 68% rename from src/Game/Actor/AI/aiSimpleWildlifeRoot.cpp rename to src/Game/Actor/AI/aiCapturedActorRoot.cpp index bbfa9ffe..16d7798e 100644 --- a/src/Game/Actor/AI/aiSimpleWildlifeRoot.cpp +++ b/src/Game/Actor/AI/aiCapturedActorRoot.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiSimpleWildlifeRoot.h" +#include "Game/Actor/AI/aiCapturedActorRoot.h" namespace uking::ai { -SimpleWildlifeRoot::SimpleWildlifeRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +CapturedActorRoot::CapturedActorRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -SimpleWildlifeRoot::~SimpleWildlifeRoot() = default; +CapturedActorRoot::~CapturedActorRoot() = default; -bool SimpleWildlifeRoot::init_(sead::Heap* heap) { +bool CapturedActorRoot::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void SimpleWildlifeRoot::enter_(ksys::act::ai::InlineParamPack* params) { +void CapturedActorRoot::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void SimpleWildlifeRoot::leave_() { +void CapturedActorRoot::leave_() { ksys::act::ai::Ai::leave_(); } -void SimpleWildlifeRoot::loadParams_() { +void CapturedActorRoot::loadParams_() { getStaticParam(&mInvalidTgtTimerVal_s, "InvalidTgtTimerVal"); getStaticParam(&mInvalidEscapeTimerVal_s, "InvalidEscapeTimerVal"); getStaticParam(&mIsDeleteWhenDead_s, "IsDeleteWhenDead"); diff --git a/src/Game/Actor/AI/aiSimpleWildlifeRoot.h b/src/Game/Actor/AI/aiCapturedActorRoot.h similarity index 83% rename from src/Game/Actor/AI/aiSimpleWildlifeRoot.h rename to src/Game/Actor/AI/aiCapturedActorRoot.h index 7a74ae64..1758b92c 100644 --- a/src/Game/Actor/AI/aiSimpleWildlifeRoot.h +++ b/src/Game/Actor/AI/aiCapturedActorRoot.h @@ -4,11 +4,11 @@ namespace uking::ai { -class SimpleWildlifeRoot : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SimpleWildlifeRoot, ksys::act::ai::Ai) +class CapturedActorRoot : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(CapturedActorRoot, ksys::act::ai::Ai) public: - explicit SimpleWildlifeRoot(const InitArg& arg); - ~SimpleWildlifeRoot() override; + explicit CapturedActorRoot(const InitArg& arg); + ~CapturedActorRoot() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiCheckLineOfSightSelector.cpp b/src/Game/Actor/AI/aiCheckLineOfSightSelector.cpp new file mode 100644 index 00000000..ce4939a2 --- /dev/null +++ b/src/Game/Actor/AI/aiCheckLineOfSightSelector.cpp @@ -0,0 +1,28 @@ +#include "Game/Actor/AI/aiCheckLineOfSightSelector.h" + +namespace uking::ai { + +CheckLineOfSightSelector::CheckLineOfSightSelector(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +CheckLineOfSightSelector::~CheckLineOfSightSelector() = default; + +bool CheckLineOfSightSelector::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void CheckLineOfSightSelector::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void CheckLineOfSightSelector::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void CheckLineOfSightSelector::loadParams_() { + getStaticParam(&mDirectionNum_s, "DirectionNum"); + getStaticParam(&mDirectionAngle_s, "DirectionAngle"); + getStaticParam(&mDistance_s, "Distance"); + getStaticParam(&mRadiusScale_s, "RadiusScale"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.h b/src/Game/Actor/AI/aiCheckLineOfSightSelector.h similarity index 68% rename from src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.h rename to src/Game/Actor/AI/aiCheckLineOfSightSelector.h index ccde851b..cf238890 100644 --- a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.h +++ b/src/Game/Actor/AI/aiCheckLineOfSightSelector.h @@ -4,11 +4,11 @@ namespace uking::ai { -class HorseCheckLineOfSightSelectorBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(HorseCheckLineOfSightSelectorBase, ksys::act::ai::Ai) +class CheckLineOfSightSelector : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(CheckLineOfSightSelector, ksys::act::ai::Ai) public: - explicit HorseCheckLineOfSightSelectorBase(const InitArg& arg); - ~HorseCheckLineOfSightSelectorBase() override; + explicit CheckLineOfSightSelector(const InitArg& arg); + ~CheckLineOfSightSelector() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiChildFavoriteSelector.cpp b/src/Game/Actor/AI/aiChildFavoriteSelector.cpp index 672a5b1b..1d1005d8 100644 --- a/src/Game/Actor/AI/aiChildFavoriteSelector.cpp +++ b/src/Game/Actor/AI/aiChildFavoriteSelector.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -ChildFavoriteSelector::ChildFavoriteSelector(const InitArg& arg) : ChildFavoriteSelectorBase(arg) {} +ChildFavoriteSelector::ChildFavoriteSelector(const InitArg& arg) : ChildSelector(arg) {} ChildFavoriteSelector::~ChildFavoriteSelector() = default; bool ChildFavoriteSelector::init_(sead::Heap* heap) { - return ChildFavoriteSelectorBase::init_(heap); + return ChildSelector::init_(heap); } void ChildFavoriteSelector::enter_(ksys::act::ai::InlineParamPack* params) { - ChildFavoriteSelectorBase::enter_(params); + ChildSelector::enter_(params); } void ChildFavoriteSelector::leave_() { - ChildFavoriteSelectorBase::leave_(); + ChildSelector::leave_(); } void ChildFavoriteSelector::loadParams_() { - ChildFavoriteSelectorBase::loadParams_(); + ChildSelector::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiChildFavoriteSelector.h b/src/Game/Actor/AI/aiChildFavoriteSelector.h index e7ffddf9..e4b8c850 100644 --- a/src/Game/Actor/AI/aiChildFavoriteSelector.h +++ b/src/Game/Actor/AI/aiChildFavoriteSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiChildFavoriteSelectorBase.h" +#include "Game/Actor/AI/aiChildSelector.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class ChildFavoriteSelector : public ChildFavoriteSelectorBase { - SEAD_RTTI_OVERRIDE(ChildFavoriteSelector, ChildFavoriteSelectorBase) +class ChildFavoriteSelector : public ChildSelector { + SEAD_RTTI_OVERRIDE(ChildFavoriteSelector, ChildSelector) public: explicit ChildFavoriteSelector(const InitArg& arg); ~ChildFavoriteSelector() override; diff --git a/src/Game/Actor/AI/aiChildFavoriteSelectorBase.cpp b/src/Game/Actor/AI/aiChildFavoriteSelectorBase.cpp deleted file mode 100644 index 31184047..00000000 --- a/src/Game/Actor/AI/aiChildFavoriteSelectorBase.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiChildFavoriteSelectorBase.h" - -namespace uking::ai { - -ChildFavoriteSelectorBase::ChildFavoriteSelectorBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -ChildFavoriteSelectorBase::~ChildFavoriteSelectorBase() = default; - -bool ChildFavoriteSelectorBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void ChildFavoriteSelectorBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void ChildFavoriteSelectorBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void ChildFavoriteSelectorBase::loadParams_() { - getStaticParam(&mIsNoChildForceEnd_s, "IsNoChildForceEnd"); - getStaticParam(&mIsCheckEveryFrame_s, "IsCheckEveryFrame"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiChildSelector.cpp b/src/Game/Actor/AI/aiChildSelector.cpp new file mode 100644 index 00000000..8de5cef5 --- /dev/null +++ b/src/Game/Actor/AI/aiChildSelector.cpp @@ -0,0 +1,26 @@ +#include "Game/Actor/AI/aiChildSelector.h" + +namespace uking::ai { + +ChildSelector::ChildSelector(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +ChildSelector::~ChildSelector() = default; + +bool ChildSelector::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void ChildSelector::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void ChildSelector::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void ChildSelector::loadParams_() { + getStaticParam(&mIsNoChildForceEnd_s, "IsNoChildForceEnd"); + getStaticParam(&mIsCheckEveryFrame_s, "IsCheckEveryFrame"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiChildFavoriteSelectorBase.h b/src/Game/Actor/AI/aiChildSelector.h similarity index 66% rename from src/Game/Actor/AI/aiChildFavoriteSelectorBase.h rename to src/Game/Actor/AI/aiChildSelector.h index 3f18da0c..a0aa203a 100644 --- a/src/Game/Actor/AI/aiChildFavoriteSelectorBase.h +++ b/src/Game/Actor/AI/aiChildSelector.h @@ -4,11 +4,11 @@ namespace uking::ai { -class ChildFavoriteSelectorBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(ChildFavoriteSelectorBase, ksys::act::ai::Ai) +class ChildSelector : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(ChildSelector, ksys::act::ai::Ai) public: - explicit ChildFavoriteSelectorBase(const InitArg& arg); - ~ChildFavoriteSelectorBase() override; + explicit ChildSelector(const InitArg& arg); + ~ChildSelector() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.cpp b/src/Game/Actor/AI/aiCliffStopEnemyNormal.cpp similarity index 54% rename from src/Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.cpp rename to src/Game/Actor/AI/aiCliffStopEnemyNormal.cpp index a080d792..47ff6d76 100644 --- a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.cpp +++ b/src/Game/Actor/AI/aiCliffStopEnemyNormal.cpp @@ -1,25 +1,24 @@ -#include "Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.h" +#include "Game/Actor/AI/aiCliffStopEnemyNormal.h" namespace uking::ai { -MimicCliffStopEnemyNormalBase::MimicCliffStopEnemyNormalBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} +CliffStopEnemyNormal::CliffStopEnemyNormal(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -MimicCliffStopEnemyNormalBase::~MimicCliffStopEnemyNormalBase() = default; +CliffStopEnemyNormal::~CliffStopEnemyNormal() = default; -bool MimicCliffStopEnemyNormalBase::init_(sead::Heap* heap) { +bool CliffStopEnemyNormal::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void MimicCliffStopEnemyNormalBase::enter_(ksys::act::ai::InlineParamPack* params) { +void CliffStopEnemyNormal::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void MimicCliffStopEnemyNormalBase::leave_() { +void CliffStopEnemyNormal::leave_() { ksys::act::ai::Ai::leave_(); } -void MimicCliffStopEnemyNormalBase::loadParams_() { +void CliffStopEnemyNormal::loadParams_() { getStaticParam(&mNoticeSoundTime_s, "NoticeSoundTime"); getStaticParam(&mOffsetHand_s, "OffsetHand"); getStaticParam(&mOffsetTail_s, "OffsetTail"); diff --git a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.h b/src/Game/Actor/AI/aiCliffStopEnemyNormal.h similarity index 76% rename from src/Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.h rename to src/Game/Actor/AI/aiCliffStopEnemyNormal.h index dcd9d516..c4ff51f1 100644 --- a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.h +++ b/src/Game/Actor/AI/aiCliffStopEnemyNormal.h @@ -4,11 +4,11 @@ namespace uking::ai { -class MimicCliffStopEnemyNormalBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(MimicCliffStopEnemyNormalBase, ksys::act::ai::Ai) +class CliffStopEnemyNormal : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(CliffStopEnemyNormal, ksys::act::ai::Ai) public: - explicit MimicCliffStopEnemyNormalBase(const InitArg& arg); - ~MimicCliffStopEnemyNormalBase() override; + explicit CliffStopEnemyNormal(const InitArg& arg); + ~CliffStopEnemyNormal() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiControlRailRoot.cpp b/src/Game/Actor/AI/aiControlRailRoot.cpp new file mode 100644 index 00000000..43376617 --- /dev/null +++ b/src/Game/Actor/AI/aiControlRailRoot.cpp @@ -0,0 +1,23 @@ +#include "Game/Actor/AI/aiControlRailRoot.h" + +namespace uking::ai { + +ControlRailRoot::ControlRailRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +ControlRailRoot::~ControlRailRoot() = default; + +bool ControlRailRoot::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void ControlRailRoot::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void ControlRailRoot::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void ControlRailRoot::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiDragonRootBase.h b/src/Game/Actor/AI/aiControlRailRoot.h similarity index 61% rename from src/Game/Actor/AI/aiDragonRootBase.h rename to src/Game/Actor/AI/aiControlRailRoot.h index 5070e38e..0bf834b6 100644 --- a/src/Game/Actor/AI/aiDragonRootBase.h +++ b/src/Game/Actor/AI/aiControlRailRoot.h @@ -4,11 +4,11 @@ namespace uking::ai { -class DragonRootBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(DragonRootBase, ksys::act::ai::Ai) +class ControlRailRoot : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(ControlRailRoot, ksys::act::ai::Ai) public: - explicit DragonRootBase(const InitArg& arg); - ~DragonRootBase() override; + explicit ControlRailRoot(const InitArg& arg); + ~ControlRailRoot() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiDragonRoot.cpp b/src/Game/Actor/AI/aiDragonRoot.cpp index 8925c94b..fbe010db 100644 --- a/src/Game/Actor/AI/aiDragonRoot.cpp +++ b/src/Game/Actor/AI/aiDragonRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -DragonRoot::DragonRoot(const InitArg& arg) : DragonRootBase(arg) {} +DragonRoot::DragonRoot(const InitArg& arg) : ControlRailRoot(arg) {} DragonRoot::~DragonRoot() = default; bool DragonRoot::init_(sead::Heap* heap) { - return DragonRootBase::init_(heap); + return ControlRailRoot::init_(heap); } void DragonRoot::enter_(ksys::act::ai::InlineParamPack* params) { - DragonRootBase::enter_(params); + ControlRailRoot::enter_(params); } void DragonRoot::leave_() { - DragonRootBase::leave_(); + ControlRailRoot::leave_(); } void DragonRoot::loadParams_() { - DragonRootBase::loadParams_(); + ControlRailRoot::loadParams_(); getStaticParam(&mChemicalBulletRate_s, "ChemicalBulletRate"); getStaticParam(&mChemicalBulletNum_s, "ChemicalBulletNum"); getStaticParam(&mUpdraftInterval_s, "UpdraftInterval"); diff --git a/src/Game/Actor/AI/aiDragonRoot.h b/src/Game/Actor/AI/aiDragonRoot.h index 7d137484..38523e54 100644 --- a/src/Game/Actor/AI/aiDragonRoot.h +++ b/src/Game/Actor/AI/aiDragonRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiDragonRootBase.h" +#include "Game/Actor/AI/aiControlRailRoot.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class DragonRoot : public DragonRootBase { - SEAD_RTTI_OVERRIDE(DragonRoot, DragonRootBase) +class DragonRoot : public ControlRailRoot { + SEAD_RTTI_OVERRIDE(DragonRoot, ControlRailRoot) public: explicit DragonRoot(const InitArg& arg); ~DragonRoot() override; diff --git a/src/Game/Actor/AI/aiDragonRootBase.cpp b/src/Game/Actor/AI/aiDragonRootBase.cpp deleted file mode 100644 index 3aa082c3..00000000 --- a/src/Game/Actor/AI/aiDragonRootBase.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/AI/aiDragonRootBase.h" - -namespace uking::ai { - -DragonRootBase::DragonRootBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -DragonRootBase::~DragonRootBase() = default; - -bool DragonRootBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void DragonRootBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void DragonRootBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void DragonRootBase::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.cpp b/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.cpp index 3abdafd3..a724c1fd 100644 --- a/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.cpp +++ b/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -DungeonRotateTag4FireApp::DungeonRotateTag4FireApp(const InitArg& arg) - : WholeDungeonRotateTag(arg) {} +DungeonRotateTag4FireApp::DungeonRotateTag4FireApp(const InitArg& arg) : DungeonRotateTagApp(arg) {} DungeonRotateTag4FireApp::~DungeonRotateTag4FireApp() = default; bool DungeonRotateTag4FireApp::init_(sead::Heap* heap) { - return WholeDungeonRotateTag::init_(heap); + return DungeonRotateTagApp::init_(heap); } void DungeonRotateTag4FireApp::enter_(ksys::act::ai::InlineParamPack* params) { - WholeDungeonRotateTag::enter_(params); + DungeonRotateTagApp::enter_(params); } void DungeonRotateTag4FireApp::leave_() { - WholeDungeonRotateTag::leave_(); + DungeonRotateTagApp::leave_(); } void DungeonRotateTag4FireApp::loadParams_() { - WholeDungeonRotateTag::loadParams_(); + DungeonRotateTagApp::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.h b/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.h index 029f5878..292c65ab 100644 --- a/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.h +++ b/src/Game/Actor/AI/aiDungeonRotateTag4FireApp.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiWholeDungeonRotateTag.h" +#include "Game/Actor/AI/aiDungeonRotateTagApp.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class DungeonRotateTag4FireApp : public WholeDungeonRotateTag { - SEAD_RTTI_OVERRIDE(DungeonRotateTag4FireApp, WholeDungeonRotateTag) +class DungeonRotateTag4FireApp : public DungeonRotateTagApp { + SEAD_RTTI_OVERRIDE(DungeonRotateTag4FireApp, DungeonRotateTagApp) public: explicit DungeonRotateTag4FireApp(const InitArg& arg); ~DungeonRotateTag4FireApp() override; diff --git a/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.cpp b/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.cpp index 35bf1045..7617ae25 100644 --- a/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.cpp +++ b/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -DungeonRotateTag4WindApp::DungeonRotateTag4WindApp(const InitArg& arg) - : WholeDungeonRotateTag(arg) {} +DungeonRotateTag4WindApp::DungeonRotateTag4WindApp(const InitArg& arg) : DungeonRotateTagApp(arg) {} DungeonRotateTag4WindApp::~DungeonRotateTag4WindApp() = default; bool DungeonRotateTag4WindApp::init_(sead::Heap* heap) { - return WholeDungeonRotateTag::init_(heap); + return DungeonRotateTagApp::init_(heap); } void DungeonRotateTag4WindApp::enter_(ksys::act::ai::InlineParamPack* params) { - WholeDungeonRotateTag::enter_(params); + DungeonRotateTagApp::enter_(params); } void DungeonRotateTag4WindApp::leave_() { - WholeDungeonRotateTag::leave_(); + DungeonRotateTagApp::leave_(); } void DungeonRotateTag4WindApp::loadParams_() { - WholeDungeonRotateTag::loadParams_(); + DungeonRotateTagApp::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.h b/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.h index 36c71887..8dc40a25 100644 --- a/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.h +++ b/src/Game/Actor/AI/aiDungeonRotateTag4WindApp.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiWholeDungeonRotateTag.h" +#include "Game/Actor/AI/aiDungeonRotateTagApp.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class DungeonRotateTag4WindApp : public WholeDungeonRotateTag { - SEAD_RTTI_OVERRIDE(DungeonRotateTag4WindApp, WholeDungeonRotateTag) +class DungeonRotateTag4WindApp : public DungeonRotateTagApp { + SEAD_RTTI_OVERRIDE(DungeonRotateTag4WindApp, DungeonRotateTagApp) public: explicit DungeonRotateTag4WindApp(const InitArg& arg); ~DungeonRotateTag4WindApp() override; diff --git a/src/Game/Actor/AI/aiDungeonRotateTagApp.cpp b/src/Game/Actor/AI/aiDungeonRotateTagApp.cpp new file mode 100644 index 00000000..57396715 --- /dev/null +++ b/src/Game/Actor/AI/aiDungeonRotateTagApp.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiDungeonRotateTagApp.h" + +namespace uking::ai { + +DungeonRotateTagApp::DungeonRotateTagApp(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +DungeonRotateTagApp::~DungeonRotateTagApp() = default; + +bool DungeonRotateTagApp::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void DungeonRotateTagApp::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void DungeonRotateTagApp::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void DungeonRotateTagApp::loadParams_() { + getMapUnitParam(&mTiltAngle_m, "TiltAngle"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiWholeDungeonRotateTag.h b/src/Game/Actor/AI/aiDungeonRotateTagApp.h similarity index 63% rename from src/Game/Actor/AI/aiWholeDungeonRotateTag.h rename to src/Game/Actor/AI/aiDungeonRotateTagApp.h index e50850b3..feed15e8 100644 --- a/src/Game/Actor/AI/aiWholeDungeonRotateTag.h +++ b/src/Game/Actor/AI/aiDungeonRotateTagApp.h @@ -4,11 +4,11 @@ namespace uking::ai { -class WholeDungeonRotateTag : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(WholeDungeonRotateTag, ksys::act::ai::Ai) +class DungeonRotateTagApp : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(DungeonRotateTagApp, ksys::act::ai::Ai) public: - explicit WholeDungeonRotateTag(const InitArg& arg); - ~WholeDungeonRotateTag() override; + explicit DungeonRotateTagApp(const InitArg& arg); + ~DungeonRotateTagApp() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.cpp b/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.cpp index 8859817e..6b0b5466 100644 --- a/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.cpp +++ b/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.cpp @@ -2,21 +2,20 @@ namespace uking::ai { -EnemyChaseTargetAndAction::EnemyChaseTargetAndAction(const InitArg& arg) - : UnarmedEnemySearch(arg) {} +EnemyChaseTargetAndAction::EnemyChaseTargetAndAction(const InitArg& arg) : NavMove(arg) {} EnemyChaseTargetAndAction::~EnemyChaseTargetAndAction() = default; void EnemyChaseTargetAndAction::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearch::enter_(params); + NavMove::enter_(params); } void EnemyChaseTargetAndAction::leave_() { - UnarmedEnemySearch::leave_(); + NavMove::leave_(); } void EnemyChaseTargetAndAction::loadParams_() { - UnarmedEnemySearch::loadParams_(); + NavMove::loadParams_(); getStaticParam(&mRepathTime_s, "RepathTime"); getStaticParam(&mLostDist_s, "LostDist"); getStaticParam(&mLostSpeed_s, "LostSpeed"); diff --git a/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.h b/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.h index f38a4e96..8508987c 100644 --- a/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.h +++ b/src/Game/Actor/AI/aiEnemyChaseTargetAndAction.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearch.h" +#include "Game/Actor/AI/aiNavMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class EnemyChaseTargetAndAction : public UnarmedEnemySearch { - SEAD_RTTI_OVERRIDE(EnemyChaseTargetAndAction, UnarmedEnemySearch) +class EnemyChaseTargetAndAction : public NavMove { + SEAD_RTTI_OVERRIDE(EnemyChaseTargetAndAction, NavMove) public: explicit EnemyChaseTargetAndAction(const InitArg& arg); ~EnemyChaseTargetAndAction() override; diff --git a/src/Game/Actor/AI/aiEnemyChemTargetAction.cpp b/src/Game/Actor/AI/aiEnemyChemTargetAction.cpp index ed4fd1e5..e706e954 100644 --- a/src/Game/Actor/AI/aiEnemyChemTargetAction.cpp +++ b/src/Game/Actor/AI/aiEnemyChemTargetAction.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -EnemyChemTargetAction::EnemyChemTargetAction(const InitArg& arg) : EnemyChemTargetActionBase(arg) {} +EnemyChemTargetAction::EnemyChemTargetAction(const InitArg& arg) : EnemyTargetAction(arg) {} EnemyChemTargetAction::~EnemyChemTargetAction() = default; bool EnemyChemTargetAction::init_(sead::Heap* heap) { - return EnemyChemTargetActionBase::init_(heap); + return EnemyTargetAction::init_(heap); } void EnemyChemTargetAction::enter_(ksys::act::ai::InlineParamPack* params) { - EnemyChemTargetActionBase::enter_(params); + EnemyTargetAction::enter_(params); } void EnemyChemTargetAction::leave_() { - EnemyChemTargetActionBase::leave_(); + EnemyTargetAction::leave_(); } void EnemyChemTargetAction::loadParams_() { - EnemyChemTargetActionBase::loadParams_(); + EnemyTargetAction::loadParams_(); getDynamicParam(&mTargetActor_d, "TargetActor"); } diff --git a/src/Game/Actor/AI/aiEnemyChemTargetAction.h b/src/Game/Actor/AI/aiEnemyChemTargetAction.h index 1606fb35..b8f9ffaa 100644 --- a/src/Game/Actor/AI/aiEnemyChemTargetAction.h +++ b/src/Game/Actor/AI/aiEnemyChemTargetAction.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiEnemyChemTargetActionBase.h" +#include "Game/Actor/AI/aiEnemyTargetAction.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class EnemyChemTargetAction : public EnemyChemTargetActionBase { - SEAD_RTTI_OVERRIDE(EnemyChemTargetAction, EnemyChemTargetActionBase) +class EnemyChemTargetAction : public EnemyTargetAction { + SEAD_RTTI_OVERRIDE(EnemyChemTargetAction, EnemyTargetAction) public: explicit EnemyChemTargetAction(const InitArg& arg); ~EnemyChemTargetAction() override; diff --git a/src/Game/Actor/AI/aiEnemyChemTargetActionBase.cpp b/src/Game/Actor/AI/aiEnemyChemTargetActionBase.cpp deleted file mode 100644 index 7d77788f..00000000 --- a/src/Game/Actor/AI/aiEnemyChemTargetActionBase.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiEnemyChemTargetActionBase.h" - -namespace uking::ai { - -EnemyChemTargetActionBase::EnemyChemTargetActionBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -bool EnemyChemTargetActionBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void EnemyChemTargetActionBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void EnemyChemTargetActionBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void EnemyChemTargetActionBase::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mActionDist_s, "ActionDist"); - getStaticParam(&mActionDir_s, "ActionDir"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiEnemyHorseRide.cpp b/src/Game/Actor/AI/aiEnemyHorseRide.cpp index 9653bb8e..4c8128ca 100644 --- a/src/Game/Actor/AI/aiEnemyHorseRide.cpp +++ b/src/Game/Actor/AI/aiEnemyHorseRide.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -EnemyHorseRide::EnemyHorseRide(const InitArg& arg) : NonPlayerHorseRide(arg) {} +EnemyHorseRide::EnemyHorseRide(const InitArg& arg) : RideHorseNonPlayer(arg) {} EnemyHorseRide::~EnemyHorseRide() = default; bool EnemyHorseRide::init_(sead::Heap* heap) { - return NonPlayerHorseRide::init_(heap); + return RideHorseNonPlayer::init_(heap); } void EnemyHorseRide::enter_(ksys::act::ai::InlineParamPack* params) { - NonPlayerHorseRide::enter_(params); + RideHorseNonPlayer::enter_(params); } void EnemyHorseRide::leave_() { - NonPlayerHorseRide::leave_(); + RideHorseNonPlayer::leave_(); } void EnemyHorseRide::loadParams_() { - NonPlayerHorseRide::loadParams_(); + RideHorseNonPlayer::loadParams_(); getStaticParam(&mUpperBodyASSlot_s, "UpperBodyASSlot"); getStaticParam(&mLowerBodyASSlot_s, "LowerBodyASSlot"); } diff --git a/src/Game/Actor/AI/aiEnemyHorseRide.h b/src/Game/Actor/AI/aiEnemyHorseRide.h index 00999487..52011a2d 100644 --- a/src/Game/Actor/AI/aiEnemyHorseRide.h +++ b/src/Game/Actor/AI/aiEnemyHorseRide.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Horse/AI/aiNonPlayerHorseRide.h" +#include "Game/Actor/Horse/AI/aiRideHorseNonPlayer.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class EnemyHorseRide : public NonPlayerHorseRide { - SEAD_RTTI_OVERRIDE(EnemyHorseRide, NonPlayerHorseRide) +class EnemyHorseRide : public RideHorseNonPlayer { + SEAD_RTTI_OVERRIDE(EnemyHorseRide, RideHorseNonPlayer) public: explicit EnemyHorseRide(const InitArg& arg); ~EnemyHorseRide() override; diff --git a/src/Game/Actor/AI/aiEnemySearch.cpp b/src/Game/Actor/AI/aiEnemySearch.cpp new file mode 100644 index 00000000..121d7d32 --- /dev/null +++ b/src/Game/Actor/AI/aiEnemySearch.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/AI/aiEnemySearch.h" + +namespace uking::ai { + +EnemySearch::EnemySearch(const InitArg& arg) : NavMove(arg) {} + +EnemySearch::~EnemySearch() = default; + +void EnemySearch::enter_(ksys::act::ai::InlineParamPack* params) { + NavMove::enter_(params); +} + +void EnemySearch::leave_() { + NavMove::leave_(); +} + +void EnemySearch::loadParams_() { + NavMove::loadParams_(); + getStaticParam(&mEquipItemSearchIdx_s, "EquipItemSearchIdx"); + getStaticParam(&mRepathTime_s, "RepathTime"); + getStaticParam(&mSearchDist_s, "SearchDist"); + getStaticParam(&mSearchAng_s, "SearchAng"); + getStaticParam(&mIsUseSight_s, "IsUseSight"); + getStaticParam(&mLineReachableWeaponDist_s, "LineReachableWeaponDist"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.h b/src/Game/Actor/AI/aiEnemySearch.h similarity index 71% rename from src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.h rename to src/Game/Actor/AI/aiEnemySearch.h index 491d5a55..6989ad8c 100644 --- a/src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.h +++ b/src/Game/Actor/AI/aiEnemySearch.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearch.h" +#include "Game/Actor/AI/aiNavMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class UnarmedEnemySearchWeapon : public UnarmedEnemySearch { - SEAD_RTTI_OVERRIDE(UnarmedEnemySearchWeapon, UnarmedEnemySearch) +class EnemySearch : public NavMove { + SEAD_RTTI_OVERRIDE(EnemySearch, NavMove) public: - explicit UnarmedEnemySearchWeapon(const InitArg& arg); - ~UnarmedEnemySearchWeapon() override; + explicit EnemySearch(const InitArg& arg); + ~EnemySearch() override; void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override; diff --git a/src/Game/Actor/AI/aiEnemyTargetAction.cpp b/src/Game/Actor/AI/aiEnemyTargetAction.cpp new file mode 100644 index 00000000..20e409a2 --- /dev/null +++ b/src/Game/Actor/AI/aiEnemyTargetAction.cpp @@ -0,0 +1,26 @@ +#include "Game/Actor/AI/aiEnemyTargetAction.h" + +namespace uking::ai { + +EnemyTargetAction::EnemyTargetAction(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +bool EnemyTargetAction::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void EnemyTargetAction::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void EnemyTargetAction::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void EnemyTargetAction::loadParams_() { + getStaticParam(&mWeaponIdx_s, "WeaponIdx"); + getStaticParam(&mActionDist_s, "ActionDist"); + getStaticParam(&mActionDir_s, "ActionDir"); + getDynamicParam(&mTargetPos_d, "TargetPos"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiEnemyChemTargetActionBase.h b/src/Game/Actor/AI/aiEnemyTargetAction.h similarity index 75% rename from src/Game/Actor/AI/aiEnemyChemTargetActionBase.h rename to src/Game/Actor/AI/aiEnemyTargetAction.h index f68aaa2f..d0ab642f 100644 --- a/src/Game/Actor/AI/aiEnemyChemTargetActionBase.h +++ b/src/Game/Actor/AI/aiEnemyTargetAction.h @@ -4,10 +4,10 @@ namespace uking::ai { -class EnemyChemTargetActionBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(EnemyChemTargetActionBase, ksys::act::ai::Ai) +class EnemyTargetAction : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(EnemyTargetAction, ksys::act::ai::Ai) public: - explicit EnemyChemTargetActionBase(const InitArg& arg); + explicit EnemyTargetAction(const InitArg& arg); bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.cpp b/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.cpp index ce335489..3bf73a17 100644 --- a/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.cpp +++ b/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.cpp @@ -2,21 +2,20 @@ namespace uking::ai { -EquipShieldEnemySearchWeapon::EquipShieldEnemySearchWeapon(const InitArg& arg) - : UnarmedEnemySearchWeapon(arg) {} +EquipShieldEnemySearchWeapon::EquipShieldEnemySearchWeapon(const InitArg& arg) : EnemySearch(arg) {} EquipShieldEnemySearchWeapon::~EquipShieldEnemySearchWeapon() = default; void EquipShieldEnemySearchWeapon::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearchWeapon::enter_(params); + EnemySearch::enter_(params); } void EquipShieldEnemySearchWeapon::leave_() { - UnarmedEnemySearchWeapon::leave_(); + EnemySearch::leave_(); } void EquipShieldEnemySearchWeapon::loadParams_() { - UnarmedEnemySearchWeapon::loadParams_(); + EnemySearch::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.h b/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.h index ddc2b1e6..d797af92 100644 --- a/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.h +++ b/src/Game/Actor/AI/aiEquipShieldEnemySearchWeapon.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearchWeapon.h" +#include "Game/Actor/AI/aiEnemySearch.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class EquipShieldEnemySearchWeapon : public UnarmedEnemySearchWeapon { - SEAD_RTTI_OVERRIDE(EquipShieldEnemySearchWeapon, UnarmedEnemySearchWeapon) +class EquipShieldEnemySearchWeapon : public EnemySearch { + SEAD_RTTI_OVERRIDE(EquipShieldEnemySearchWeapon, EnemySearch) public: explicit EquipShieldEnemySearchWeapon(const InitArg& arg); ~EquipShieldEnemySearchWeapon() override; diff --git a/src/Game/Actor/AI/aiFishRoot.cpp b/src/Game/Actor/AI/aiFishRoot.cpp index 37557321..3abf46f4 100644 --- a/src/Game/Actor/AI/aiFishRoot.cpp +++ b/src/Game/Actor/AI/aiFishRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -FishRoot::FishRoot(const InitArg& arg) : SimpleWildlifeRoot(arg) {} +FishRoot::FishRoot(const InitArg& arg) : CapturedActorRoot(arg) {} FishRoot::~FishRoot() = default; bool FishRoot::init_(sead::Heap* heap) { - return SimpleWildlifeRoot::init_(heap); + return CapturedActorRoot::init_(heap); } void FishRoot::enter_(ksys::act::ai::InlineParamPack* params) { - SimpleWildlifeRoot::enter_(params); + CapturedActorRoot::enter_(params); } void FishRoot::leave_() { - SimpleWildlifeRoot::leave_(); + CapturedActorRoot::leave_(); } void FishRoot::loadParams_() { - SimpleWildlifeRoot::loadParams_(); + CapturedActorRoot::loadParams_(); getStaticParam(&mInWaterDepth_s, "InWaterDepth"); getStaticParam(&mOnGroundDepth_s, "OnGroundDepth"); getStaticParam(&mNextJumpTimeBase_s, "NextJumpTimeBase"); diff --git a/src/Game/Actor/AI/aiFishRoot.h b/src/Game/Actor/AI/aiFishRoot.h index 784c6ff1..0fc473fc 100644 --- a/src/Game/Actor/AI/aiFishRoot.h +++ b/src/Game/Actor/AI/aiFishRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSimpleWildlifeRoot.h" +#include "Game/Actor/AI/aiCapturedActorRoot.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class FishRoot : public SimpleWildlifeRoot { - SEAD_RTTI_OVERRIDE(FishRoot, SimpleWildlifeRoot) +class FishRoot : public CapturedActorRoot { + SEAD_RTTI_OVERRIDE(FishRoot, CapturedActorRoot) public: explicit FishRoot(const InitArg& arg); ~FishRoot() override; diff --git a/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.cpp b/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.cpp index a2bb44a1..a87902bc 100644 --- a/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.cpp +++ b/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.cpp @@ -2,24 +2,25 @@ namespace uking::ai { -FlyingEnemyBackKeepMove::FlyingEnemyBackKeepMove(const InitArg& arg) : FlyingEnemyKeepMove(arg) {} +FlyingEnemyBackKeepMove::FlyingEnemyBackKeepMove(const InitArg& arg) + : FlyingEnemyDistanceKeepMove(arg) {} FlyingEnemyBackKeepMove::~FlyingEnemyBackKeepMove() = default; bool FlyingEnemyBackKeepMove::init_(sead::Heap* heap) { - return FlyingEnemyKeepMove::init_(heap); + return FlyingEnemyDistanceKeepMove::init_(heap); } void FlyingEnemyBackKeepMove::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingEnemyKeepMove::enter_(params); + FlyingEnemyDistanceKeepMove::enter_(params); } void FlyingEnemyBackKeepMove::leave_() { - FlyingEnemyKeepMove::leave_(); + FlyingEnemyDistanceKeepMove::leave_(); } void FlyingEnemyBackKeepMove::loadParams_() { - FlyingEnemyKeepMove::loadParams_(); + FlyingEnemyDistanceKeepMove::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.h b/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.h index b9c5fd0c..b1d8aa91 100644 --- a/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.h +++ b/src/Game/Actor/AI/aiFlyingEnemyBackKeepMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h" +#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class FlyingEnemyBackKeepMove : public FlyingEnemyKeepMove { - SEAD_RTTI_OVERRIDE(FlyingEnemyBackKeepMove, FlyingEnemyKeepMove) +class FlyingEnemyBackKeepMove : public FlyingEnemyDistanceKeepMove { + SEAD_RTTI_OVERRIDE(FlyingEnemyBackKeepMove, FlyingEnemyDistanceKeepMove) public: explicit FlyingEnemyBackKeepMove(const InitArg& arg); ~FlyingEnemyBackKeepMove() override; diff --git a/src/Game/Actor/AI/aiFlyingEnemyKeepMove.cpp b/src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.cpp similarity index 56% rename from src/Game/Actor/AI/aiFlyingEnemyKeepMove.cpp rename to src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.cpp index 59262b20..c63884e2 100644 --- a/src/Game/Actor/AI/aiFlyingEnemyKeepMove.cpp +++ b/src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.cpp @@ -1,24 +1,25 @@ -#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h" +#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h" namespace uking::ai { -FlyingEnemyKeepMove::FlyingEnemyKeepMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +FlyingEnemyDistanceKeepMove::FlyingEnemyDistanceKeepMove(const InitArg& arg) + : ksys::act::ai::Ai(arg) {} -FlyingEnemyKeepMove::~FlyingEnemyKeepMove() = default; +FlyingEnemyDistanceKeepMove::~FlyingEnemyDistanceKeepMove() = default; -bool FlyingEnemyKeepMove::init_(sead::Heap* heap) { +bool FlyingEnemyDistanceKeepMove::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void FlyingEnemyKeepMove::enter_(ksys::act::ai::InlineParamPack* params) { +void FlyingEnemyDistanceKeepMove::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void FlyingEnemyKeepMove::leave_() { +void FlyingEnemyDistanceKeepMove::leave_() { ksys::act::ai::Ai::leave_(); } -void FlyingEnemyKeepMove::loadParams_() { +void FlyingEnemyDistanceKeepMove::loadParams_() { getStaticParam(&mLostDistance_s, "LostDistance"); getStaticParam(&mAngleRange_s, "AngleRange"); getStaticParam(&mSpaceDistance_s, "SpaceDistance"); diff --git a/src/Game/Actor/AI/aiFlyingEnemyKeepMove.h b/src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h similarity index 79% rename from src/Game/Actor/AI/aiFlyingEnemyKeepMove.h rename to src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h index c59e1b8f..8c1b39b5 100644 --- a/src/Game/Actor/AI/aiFlyingEnemyKeepMove.h +++ b/src/Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h @@ -4,11 +4,11 @@ namespace uking::ai { -class FlyingEnemyKeepMove : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(FlyingEnemyKeepMove, ksys::act::ai::Ai) +class FlyingEnemyDistanceKeepMove : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(FlyingEnemyDistanceKeepMove, ksys::act::ai::Ai) public: - explicit FlyingEnemyKeepMove(const InitArg& arg); - ~FlyingEnemyKeepMove() override; + explicit FlyingEnemyDistanceKeepMove(const InitArg& arg); + ~FlyingEnemyDistanceKeepMove() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.cpp b/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.cpp index b74b5e0a..8e8e5f7f 100644 --- a/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.cpp +++ b/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.cpp @@ -2,24 +2,25 @@ namespace uking::ai { -FlyingEnemyFrontKeepMove::FlyingEnemyFrontKeepMove(const InitArg& arg) : FlyingEnemyKeepMove(arg) {} +FlyingEnemyFrontKeepMove::FlyingEnemyFrontKeepMove(const InitArg& arg) + : FlyingEnemyDistanceKeepMove(arg) {} FlyingEnemyFrontKeepMove::~FlyingEnemyFrontKeepMove() = default; bool FlyingEnemyFrontKeepMove::init_(sead::Heap* heap) { - return FlyingEnemyKeepMove::init_(heap); + return FlyingEnemyDistanceKeepMove::init_(heap); } void FlyingEnemyFrontKeepMove::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingEnemyKeepMove::enter_(params); + FlyingEnemyDistanceKeepMove::enter_(params); } void FlyingEnemyFrontKeepMove::leave_() { - FlyingEnemyKeepMove::leave_(); + FlyingEnemyDistanceKeepMove::leave_(); } void FlyingEnemyFrontKeepMove::loadParams_() { - FlyingEnemyKeepMove::loadParams_(); + FlyingEnemyDistanceKeepMove::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.h b/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.h index 76a8015f..7c103f86 100644 --- a/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.h +++ b/src/Game/Actor/AI/aiFlyingEnemyFrontKeepMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h" +#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class FlyingEnemyFrontKeepMove : public FlyingEnemyKeepMove { - SEAD_RTTI_OVERRIDE(FlyingEnemyFrontKeepMove, FlyingEnemyKeepMove) +class FlyingEnemyFrontKeepMove : public FlyingEnemyDistanceKeepMove { + SEAD_RTTI_OVERRIDE(FlyingEnemyFrontKeepMove, FlyingEnemyDistanceKeepMove) public: explicit FlyingEnemyFrontKeepMove(const InitArg& arg); ~FlyingEnemyFrontKeepMove() override; diff --git a/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.cpp b/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.cpp index 6818d340..c235ea69 100644 --- a/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.cpp +++ b/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.cpp @@ -2,24 +2,25 @@ namespace uking::ai { -FlyingEnemySideKeepMove::FlyingEnemySideKeepMove(const InitArg& arg) : FlyingEnemyKeepMove(arg) {} +FlyingEnemySideKeepMove::FlyingEnemySideKeepMove(const InitArg& arg) + : FlyingEnemyDistanceKeepMove(arg) {} FlyingEnemySideKeepMove::~FlyingEnemySideKeepMove() = default; bool FlyingEnemySideKeepMove::init_(sead::Heap* heap) { - return FlyingEnemyKeepMove::init_(heap); + return FlyingEnemyDistanceKeepMove::init_(heap); } void FlyingEnemySideKeepMove::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingEnemyKeepMove::enter_(params); + FlyingEnemyDistanceKeepMove::enter_(params); } void FlyingEnemySideKeepMove::leave_() { - FlyingEnemyKeepMove::leave_(); + FlyingEnemyDistanceKeepMove::leave_(); } void FlyingEnemySideKeepMove::loadParams_() { - FlyingEnemyKeepMove::loadParams_(); + FlyingEnemyDistanceKeepMove::loadParams_(); getStaticParam(&mSideDirType_s, "SideDirType"); } diff --git a/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.h b/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.h index 92861e0f..14f6d474 100644 --- a/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.h +++ b/src/Game/Actor/AI/aiFlyingEnemySideKeepMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiFlyingEnemyKeepMove.h" +#include "Game/Actor/AI/aiFlyingEnemyDistanceKeepMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class FlyingEnemySideKeepMove : public FlyingEnemyKeepMove { - SEAD_RTTI_OVERRIDE(FlyingEnemySideKeepMove, FlyingEnemyKeepMove) +class FlyingEnemySideKeepMove : public FlyingEnemyDistanceKeepMove { + SEAD_RTTI_OVERRIDE(FlyingEnemySideKeepMove, FlyingEnemyDistanceKeepMove) public: explicit FlyingEnemySideKeepMove(const InitArg& arg); ~FlyingEnemySideKeepMove() override; diff --git a/src/Game/Actor/AI/aiForestGiantFindPlayer.cpp b/src/Game/Actor/AI/aiForestGiantFindPlayer.cpp index ec1d249b..e41ca04a 100644 --- a/src/Game/Actor/AI/aiForestGiantFindPlayer.cpp +++ b/src/Game/Actor/AI/aiForestGiantFindPlayer.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -ForestGiantFindPlayer::ForestGiantFindPlayer(const InitArg& arg) : LargeEnemyFindPlayer(arg) {} +ForestGiantFindPlayer::ForestGiantFindPlayer(const InitArg& arg) : GiantEnemyFindPlayer(arg) {} ForestGiantFindPlayer::~ForestGiantFindPlayer() = default; bool ForestGiantFindPlayer::init_(sead::Heap* heap) { - return LargeEnemyFindPlayer::init_(heap); + return GiantEnemyFindPlayer::init_(heap); } void ForestGiantFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - LargeEnemyFindPlayer::enter_(params); + GiantEnemyFindPlayer::enter_(params); } void ForestGiantFindPlayer::leave_() { - LargeEnemyFindPlayer::leave_(); + GiantEnemyFindPlayer::leave_(); } void ForestGiantFindPlayer::loadParams_() { - LargeEnemyFindPlayer::loadParams_(); + GiantEnemyFindPlayer::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiForestGiantFindPlayer.h b/src/Game/Actor/AI/aiForestGiantFindPlayer.h index 991189f9..2b8b65c1 100644 --- a/src/Game/Actor/AI/aiForestGiantFindPlayer.h +++ b/src/Game/Actor/AI/aiForestGiantFindPlayer.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiLargeEnemyFindPlayer.h" +#include "Game/Actor/AI/aiGiantEnemyFindPlayer.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class ForestGiantFindPlayer : public LargeEnemyFindPlayer { - SEAD_RTTI_OVERRIDE(ForestGiantFindPlayer, LargeEnemyFindPlayer) +class ForestGiantFindPlayer : public GiantEnemyFindPlayer { + SEAD_RTTI_OVERRIDE(ForestGiantFindPlayer, GiantEnemyFindPlayer) public: explicit ForestGiantFindPlayer(const InitArg& arg); ~ForestGiantFindPlayer() override; diff --git a/src/Game/Actor/AI/aiSiteBossChemicalProjectile.cpp b/src/Game/Actor/AI/aiGanonFlameBall.cpp similarity index 67% rename from src/Game/Actor/AI/aiSiteBossChemicalProjectile.cpp rename to src/Game/Actor/AI/aiGanonFlameBall.cpp index 2f32a22c..8caa8e45 100644 --- a/src/Game/Actor/AI/aiSiteBossChemicalProjectile.cpp +++ b/src/Game/Actor/AI/aiGanonFlameBall.cpp @@ -1,25 +1,24 @@ -#include "Game/Actor/AI/aiSiteBossChemicalProjectile.h" +#include "Game/Actor/AI/aiGanonFlameBall.h" namespace uking::ai { -SiteBossChemicalProjectile::SiteBossChemicalProjectile(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} +GanonFlameBall::GanonFlameBall(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -SiteBossChemicalProjectile::~SiteBossChemicalProjectile() = default; +GanonFlameBall::~GanonFlameBall() = default; -bool SiteBossChemicalProjectile::init_(sead::Heap* heap) { +bool GanonFlameBall::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void SiteBossChemicalProjectile::enter_(ksys::act::ai::InlineParamPack* params) { +void GanonFlameBall::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void SiteBossChemicalProjectile::leave_() { +void GanonFlameBall::leave_() { ksys::act::ai::Ai::leave_(); } -void SiteBossChemicalProjectile::loadParams_() { +void GanonFlameBall::loadParams_() { getStaticParam(&mExplosionTime_s, "ExplosionTime"); getStaticParam(&mChaseAngleLimit_s, "ChaseAngleLimit"); getStaticParam(&mReflectSpeedRate_s, "ReflectSpeedRate"); diff --git a/src/Game/Actor/AI/aiSiteBossChemicalProjectile.h b/src/Game/Actor/AI/aiGanonFlameBall.h similarity index 84% rename from src/Game/Actor/AI/aiSiteBossChemicalProjectile.h rename to src/Game/Actor/AI/aiGanonFlameBall.h index 1b2de341..707bcfea 100644 --- a/src/Game/Actor/AI/aiSiteBossChemicalProjectile.h +++ b/src/Game/Actor/AI/aiGanonFlameBall.h @@ -4,11 +4,11 @@ namespace uking::ai { -class SiteBossChemicalProjectile : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SiteBossChemicalProjectile, ksys::act::ai::Ai) +class GanonFlameBall : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(GanonFlameBall, ksys::act::ai::Ai) public: - explicit SiteBossChemicalProjectile(const InitArg& arg); - ~SiteBossChemicalProjectile() override; + explicit GanonFlameBall(const InitArg& arg); + ~GanonFlameBall() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiGiantEnemyFindPlayer.cpp b/src/Game/Actor/AI/aiGiantEnemyFindPlayer.cpp new file mode 100644 index 00000000..5666e91f --- /dev/null +++ b/src/Game/Actor/AI/aiGiantEnemyFindPlayer.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiGiantEnemyFindPlayer.h" + +namespace uking::ai { + +GiantEnemyFindPlayer::GiantEnemyFindPlayer(const InitArg& arg) : EnemyBaseFindPlayer(arg) {} + +GiantEnemyFindPlayer::~GiantEnemyFindPlayer() = default; + +bool GiantEnemyFindPlayer::init_(sead::Heap* heap) { + return EnemyBaseFindPlayer::init_(heap); +} + +void GiantEnemyFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) { + EnemyBaseFindPlayer::enter_(params); +} + +void GiantEnemyFindPlayer::leave_() { + EnemyBaseFindPlayer::leave_(); +} + +void GiantEnemyFindPlayer::loadParams_() { + EnemyBaseFindPlayer::loadParams_(); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiLargeEnemyFindPlayer.h b/src/Game/Actor/AI/aiGiantEnemyFindPlayer.h similarity index 62% rename from src/Game/Actor/AI/aiLargeEnemyFindPlayer.h rename to src/Game/Actor/AI/aiGiantEnemyFindPlayer.h index cabeb5e1..6270094d 100644 --- a/src/Game/Actor/AI/aiLargeEnemyFindPlayer.h +++ b/src/Game/Actor/AI/aiGiantEnemyFindPlayer.h @@ -5,11 +5,11 @@ namespace uking::ai { -class LargeEnemyFindPlayer : public EnemyBaseFindPlayer { - SEAD_RTTI_OVERRIDE(LargeEnemyFindPlayer, EnemyBaseFindPlayer) +class GiantEnemyFindPlayer : public EnemyBaseFindPlayer { + SEAD_RTTI_OVERRIDE(GiantEnemyFindPlayer, EnemyBaseFindPlayer) public: - explicit LargeEnemyFindPlayer(const InitArg& arg); - ~LargeEnemyFindPlayer() override; + explicit GiantEnemyFindPlayer(const InitArg& arg); + ~GiantEnemyFindPlayer() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiGiantSleepNormal.cpp b/src/Game/Actor/AI/aiGiantSleepNormal.cpp index 26c795bc..b34e5f85 100644 --- a/src/Game/Actor/AI/aiGiantSleepNormal.cpp +++ b/src/Game/Actor/AI/aiGiantSleepNormal.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -GiantSleepNormal::GiantSleepNormal(const InitArg& arg) : SpecialEnemySleep(arg) {} +GiantSleepNormal::GiantSleepNormal(const InitArg& arg) : SleepNormal(arg) {} GiantSleepNormal::~GiantSleepNormal() = default; bool GiantSleepNormal::init_(sead::Heap* heap) { - return SpecialEnemySleep::init_(heap); + return SleepNormal::init_(heap); } void GiantSleepNormal::enter_(ksys::act::ai::InlineParamPack* params) { - SpecialEnemySleep::enter_(params); + SleepNormal::enter_(params); } void GiantSleepNormal::leave_() { - SpecialEnemySleep::leave_(); + SleepNormal::leave_(); } void GiantSleepNormal::loadParams_() { - SpecialEnemySleep::loadParams_(); + SleepNormal::loadParams_(); getStaticParam(&mForceAwakeDist_s, "ForceAwakeDist"); getStaticParam(&mAwakeRbName_s, "AwakeRbName"); } diff --git a/src/Game/Actor/AI/aiGiantSleepNormal.h b/src/Game/Actor/AI/aiGiantSleepNormal.h index 0ee665fd..4aed13ce 100644 --- a/src/Game/Actor/AI/aiGiantSleepNormal.h +++ b/src/Game/Actor/AI/aiGiantSleepNormal.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSpecialEnemySleep.h" +#include "Game/Actor/AI/aiSleepNormal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GiantSleepNormal : public SpecialEnemySleep { - SEAD_RTTI_OVERRIDE(GiantSleepNormal, SpecialEnemySleep) +class GiantSleepNormal : public SleepNormal { + SEAD_RTTI_OVERRIDE(GiantSleepNormal, SleepNormal) public: explicit GiantSleepNormal(const InitArg& arg); ~GiantSleepNormal() override; diff --git a/src/Game/Actor/AI/aiGolemFindPlayer.cpp b/src/Game/Actor/AI/aiGolemFindPlayer.cpp index a8269ba4..1cc92df1 100644 --- a/src/Game/Actor/AI/aiGolemFindPlayer.cpp +++ b/src/Game/Actor/AI/aiGolemFindPlayer.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -GolemFindPlayer::GolemFindPlayer(const InitArg& arg) : LargeEnemyFindPlayer(arg) {} +GolemFindPlayer::GolemFindPlayer(const InitArg& arg) : GiantEnemyFindPlayer(arg) {} GolemFindPlayer::~GolemFindPlayer() = default; bool GolemFindPlayer::init_(sead::Heap* heap) { - return LargeEnemyFindPlayer::init_(heap); + return GiantEnemyFindPlayer::init_(heap); } void GolemFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - LargeEnemyFindPlayer::enter_(params); + GiantEnemyFindPlayer::enter_(params); } void GolemFindPlayer::leave_() { - LargeEnemyFindPlayer::leave_(); + GiantEnemyFindPlayer::leave_(); } void GolemFindPlayer::loadParams_() { - LargeEnemyFindPlayer::loadParams_(); + GiantEnemyFindPlayer::loadParams_(); getStaticParam(&mSearchExplosiveDist_s, "SearchExplosiveDist"); } diff --git a/src/Game/Actor/AI/aiGolemFindPlayer.h b/src/Game/Actor/AI/aiGolemFindPlayer.h index 5ff161d8..a944d906 100644 --- a/src/Game/Actor/AI/aiGolemFindPlayer.h +++ b/src/Game/Actor/AI/aiGolemFindPlayer.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiLargeEnemyFindPlayer.h" +#include "Game/Actor/AI/aiGiantEnemyFindPlayer.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GolemFindPlayer : public LargeEnemyFindPlayer { - SEAD_RTTI_OVERRIDE(GolemFindPlayer, LargeEnemyFindPlayer) +class GolemFindPlayer : public GiantEnemyFindPlayer { + SEAD_RTTI_OVERRIDE(GolemFindPlayer, GiantEnemyFindPlayer) public: explicit GolemFindPlayer(const InitArg& arg); ~GolemFindPlayer() override; diff --git a/src/Game/Actor/AI/aiGolemSleepNormal.cpp b/src/Game/Actor/AI/aiGolemSleepNormal.cpp index 08cc54dc..8bb74c58 100644 --- a/src/Game/Actor/AI/aiGolemSleepNormal.cpp +++ b/src/Game/Actor/AI/aiGolemSleepNormal.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -GolemSleepNormal::GolemSleepNormal(const InitArg& arg) : SpecialEnemySleep(arg) {} +GolemSleepNormal::GolemSleepNormal(const InitArg& arg) : SleepNormal(arg) {} GolemSleepNormal::~GolemSleepNormal() = default; bool GolemSleepNormal::init_(sead::Heap* heap) { - return SpecialEnemySleep::init_(heap); + return SleepNormal::init_(heap); } void GolemSleepNormal::enter_(ksys::act::ai::InlineParamPack* params) { - SpecialEnemySleep::enter_(params); + SleepNormal::enter_(params); } void GolemSleepNormal::leave_() { - SpecialEnemySleep::leave_(); + SleepNormal::leave_(); } void GolemSleepNormal::loadParams_() { - SpecialEnemySleep::loadParams_(); + SleepNormal::loadParams_(); getAITreeVariable(&mGolemChemicalController_a, "GolemChemicalController"); } diff --git a/src/Game/Actor/AI/aiGolemSleepNormal.h b/src/Game/Actor/AI/aiGolemSleepNormal.h index ac47be9a..99e560f8 100644 --- a/src/Game/Actor/AI/aiGolemSleepNormal.h +++ b/src/Game/Actor/AI/aiGolemSleepNormal.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSpecialEnemySleep.h" +#include "Game/Actor/AI/aiSleepNormal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GolemSleepNormal : public SpecialEnemySleep { - SEAD_RTTI_OVERRIDE(GolemSleepNormal, SpecialEnemySleep) +class GolemSleepNormal : public SleepNormal { + SEAD_RTTI_OVERRIDE(GolemSleepNormal, SleepNormal) public: explicit GolemSleepNormal(const InitArg& arg); ~GolemSleepNormal() override; diff --git a/src/Game/Actor/AI/aiGoronCannon.cpp b/src/Game/Actor/AI/aiGoronCannon.cpp index f32db08a..473fc572 100644 --- a/src/Game/Actor/AI/aiGoronCannon.cpp +++ b/src/Game/Actor/AI/aiGoronCannon.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -GoronCannon::GoronCannon(const InitArg& arg) : GoronCannonBase(arg) {} +GoronCannon::GoronCannon(const InitArg& arg) : BigCannon(arg) {} GoronCannon::~GoronCannon() = default; bool GoronCannon::init_(sead::Heap* heap) { - return GoronCannonBase::init_(heap); + return BigCannon::init_(heap); } void GoronCannon::enter_(ksys::act::ai::InlineParamPack* params) { - GoronCannonBase::enter_(params); + BigCannon::enter_(params); } void GoronCannon::leave_() { - GoronCannonBase::leave_(); + BigCannon::leave_(); } void GoronCannon::loadParams_() { - GoronCannonBase::loadParams_(); + BigCannon::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiGoronCannon.h b/src/Game/Actor/AI/aiGoronCannon.h index b1e7a5c0..adef3cde 100644 --- a/src/Game/Actor/AI/aiGoronCannon.h +++ b/src/Game/Actor/AI/aiGoronCannon.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiGoronCannonBase.h" +#include "Game/Actor/AI/aiBigCannon.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GoronCannon : public GoronCannonBase { - SEAD_RTTI_OVERRIDE(GoronCannon, GoronCannonBase) +class GoronCannon : public BigCannon { + SEAD_RTTI_OVERRIDE(GoronCannon, BigCannon) public: explicit GoronCannon(const InitArg& arg); ~GoronCannon() override; diff --git a/src/Game/Actor/AI/aiGuardHomePosNormal.cpp b/src/Game/Actor/AI/aiGuardHomePosNormal.cpp new file mode 100644 index 00000000..881c638f --- /dev/null +++ b/src/Game/Actor/AI/aiGuardHomePosNormal.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiGuardHomePosNormal.h" + +namespace uking::ai { + +GuardHomePosNormal::GuardHomePosNormal(const InitArg& arg) : LandHumEnemyNormal(arg) {} + +GuardHomePosNormal::~GuardHomePosNormal() = default; + +bool GuardHomePosNormal::init_(sead::Heap* heap) { + return LandHumEnemyNormal::init_(heap); +} + +void GuardHomePosNormal::enter_(ksys::act::ai::InlineParamPack* params) { + LandHumEnemyNormal::enter_(params); +} + +void GuardHomePosNormal::leave_() { + LandHumEnemyNormal::leave_(); +} + +void GuardHomePosNormal::loadParams_() { + LandHumEnemyNormal::loadParams_(); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAssassinNormal.h b/src/Game/Actor/AI/aiGuardHomePosNormal.h similarity index 62% rename from src/Game/Actor/AI/aiAssassinNormal.h rename to src/Game/Actor/AI/aiGuardHomePosNormal.h index f69de299..a5b7e04c 100644 --- a/src/Game/Actor/AI/aiAssassinNormal.h +++ b/src/Game/Actor/AI/aiGuardHomePosNormal.h @@ -5,11 +5,11 @@ namespace uking::ai { -class AssassinNormal : public LandHumEnemyNormal { - SEAD_RTTI_OVERRIDE(AssassinNormal, LandHumEnemyNormal) +class GuardHomePosNormal : public LandHumEnemyNormal { + SEAD_RTTI_OVERRIDE(GuardHomePosNormal, LandHumEnemyNormal) public: - explicit AssassinNormal(const InitArg& arg); - ~AssassinNormal() override; + explicit GuardHomePosNormal(const InitArg& arg); + ~GuardHomePosNormal() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiGuardNearTarget.cpp b/src/Game/Actor/AI/aiGuardNearTarget.cpp deleted file mode 100644 index 05966833..00000000 --- a/src/Game/Actor/AI/aiGuardNearTarget.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/AI/aiGuardNearTarget.h" - -namespace uking::ai { - -GuardNearTarget::GuardNearTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -GuardNearTarget::~GuardNearTarget() = default; - -bool GuardNearTarget::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void GuardNearTarget::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void GuardNearTarget::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void GuardNearTarget::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mBaseDist_s, "BaseDist"); - getStaticParam(&mGuardStartDist_s, "GuardStartDist"); - getStaticParam(&mGuardEndDist_s, "GuardEndDist"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiGuardianBeamAttack.cpp b/src/Game/Actor/AI/aiGuardianBeamAttack.cpp index 5d8adfad..37a80cef 100644 --- a/src/Game/Actor/AI/aiGuardianBeamAttack.cpp +++ b/src/Game/Actor/AI/aiGuardianBeamAttack.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -GuardianBeamAttack::GuardianBeamAttack(const InitArg& arg) : GuardianBeamAttackBase(arg) {} +GuardianBeamAttack::GuardianBeamAttack(const InitArg& arg) : GuardianCommonBeamAttack(arg) {} GuardianBeamAttack::~GuardianBeamAttack() = default; bool GuardianBeamAttack::init_(sead::Heap* heap) { - return GuardianBeamAttackBase::init_(heap); + return GuardianCommonBeamAttack::init_(heap); } void GuardianBeamAttack::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianBeamAttackBase::enter_(params); + GuardianCommonBeamAttack::enter_(params); } void GuardianBeamAttack::leave_() { - GuardianBeamAttackBase::leave_(); + GuardianCommonBeamAttack::leave_(); } void GuardianBeamAttack::loadParams_() { - GuardianBeamAttackBase::loadParams_(); + GuardianCommonBeamAttack::loadParams_(); getStaticParam(&mLightRadius_s, "LightRadius"); getStaticParam(&mLightLength_s, "LightLength"); getStaticParam(&mLightLengthOffset_s, "LightLengthOffset"); diff --git a/src/Game/Actor/AI/aiGuardianBeamAttack.h b/src/Game/Actor/AI/aiGuardianBeamAttack.h index 57780ea7..8a36e67b 100644 --- a/src/Game/Actor/AI/aiGuardianBeamAttack.h +++ b/src/Game/Actor/AI/aiGuardianBeamAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiGuardianBeamAttackBase.h" +#include "Game/Actor/AI/aiGuardianCommonBeamAttack.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GuardianBeamAttack : public GuardianBeamAttackBase { - SEAD_RTTI_OVERRIDE(GuardianBeamAttack, GuardianBeamAttackBase) +class GuardianBeamAttack : public GuardianCommonBeamAttack { + SEAD_RTTI_OVERRIDE(GuardianBeamAttack, GuardianCommonBeamAttack) public: explicit GuardianBeamAttack(const InitArg& arg); ~GuardianBeamAttack() override; diff --git a/src/Game/Actor/AI/aiGuardianBeamAttackBase.cpp b/src/Game/Actor/AI/aiGuardianBeamAttackBase.cpp deleted file mode 100644 index 30520086..00000000 --- a/src/Game/Actor/AI/aiGuardianBeamAttackBase.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/AI/aiGuardianBeamAttackBase.h" - -namespace uking::ai { - -GuardianBeamAttackBase::GuardianBeamAttackBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -GuardianBeamAttackBase::~GuardianBeamAttackBase() = default; - -bool GuardianBeamAttackBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void GuardianBeamAttackBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void GuardianBeamAttackBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void GuardianBeamAttackBase::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiGuardianCommonBeamAttack.cpp b/src/Game/Actor/AI/aiGuardianCommonBeamAttack.cpp new file mode 100644 index 00000000..8c7251a5 --- /dev/null +++ b/src/Game/Actor/AI/aiGuardianCommonBeamAttack.cpp @@ -0,0 +1,23 @@ +#include "Game/Actor/AI/aiGuardianCommonBeamAttack.h" + +namespace uking::ai { + +GuardianCommonBeamAttack::GuardianCommonBeamAttack(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +GuardianCommonBeamAttack::~GuardianCommonBeamAttack() = default; + +bool GuardianCommonBeamAttack::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void GuardianCommonBeamAttack::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void GuardianCommonBeamAttack::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void GuardianCommonBeamAttack::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAddViewTargetPosBase.h b/src/Game/Actor/AI/aiGuardianCommonBeamAttack.h similarity index 56% rename from src/Game/Actor/AI/aiAddViewTargetPosBase.h rename to src/Game/Actor/AI/aiGuardianCommonBeamAttack.h index c4f31b4d..d1e7a24c 100644 --- a/src/Game/Actor/AI/aiAddViewTargetPosBase.h +++ b/src/Game/Actor/AI/aiGuardianCommonBeamAttack.h @@ -4,11 +4,11 @@ namespace uking::ai { -class AddViewTargetPosBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(AddViewTargetPosBase, ksys::act::ai::Ai) +class GuardianCommonBeamAttack : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(GuardianCommonBeamAttack, ksys::act::ai::Ai) public: - explicit AddViewTargetPosBase(const InitArg& arg); - ~AddViewTargetPosBase() override; + explicit GuardianCommonBeamAttack(const InitArg& arg); + ~GuardianCommonBeamAttack() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiGuardianMiniBeam.cpp b/src/Game/Actor/AI/aiGuardianMiniBeam.cpp index 45dd56e0..2fe53143 100644 --- a/src/Game/Actor/AI/aiGuardianMiniBeam.cpp +++ b/src/Game/Actor/AI/aiGuardianMiniBeam.cpp @@ -2,20 +2,20 @@ namespace uking::ai { -GuardianMiniBeam::GuardianMiniBeam(const InitArg& arg) : BeamExplodeBase(arg) {} +GuardianMiniBeam::GuardianMiniBeam(const InitArg& arg) : SimpleBeamExplode(arg) {} GuardianMiniBeam::~GuardianMiniBeam() = default; void GuardianMiniBeam::enter_(ksys::act::ai::InlineParamPack* params) { - BeamExplodeBase::enter_(params); + SimpleBeamExplode::enter_(params); } void GuardianMiniBeam::leave_() { - BeamExplodeBase::leave_(); + SimpleBeamExplode::leave_(); } void GuardianMiniBeam::loadParams_() { - BeamExplodeBase::loadParams_(); + SimpleBeamExplode::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiGuardianMiniBeam.h b/src/Game/Actor/AI/aiGuardianMiniBeam.h index 894eb68b..09b86548 100644 --- a/src/Game/Actor/AI/aiGuardianMiniBeam.h +++ b/src/Game/Actor/AI/aiGuardianMiniBeam.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiBeamExplodeBase.h" +#include "Game/Actor/AI/aiSimpleBeamExplode.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GuardianMiniBeam : public BeamExplodeBase { - SEAD_RTTI_OVERRIDE(GuardianMiniBeam, BeamExplodeBase) +class GuardianMiniBeam : public SimpleBeamExplode { + SEAD_RTTI_OVERRIDE(GuardianMiniBeam, SimpleBeamExplode) public: explicit GuardianMiniBeam(const InitArg& arg); ~GuardianMiniBeam() override; diff --git a/src/Game/Actor/AI/aiGuardianMiniBeamAttack.cpp b/src/Game/Actor/AI/aiGuardianMiniBeamAttack.cpp index 6dbe161b..f62df68e 100644 --- a/src/Game/Actor/AI/aiGuardianMiniBeamAttack.cpp +++ b/src/Game/Actor/AI/aiGuardianMiniBeamAttack.cpp @@ -2,20 +2,21 @@ namespace uking::ai { -GuardianMiniBeamAttack::GuardianMiniBeamAttack(const InitArg& arg) : MiniBeamAttack(arg) {} +GuardianMiniBeamAttack::GuardianMiniBeamAttack(const InitArg& arg) + : GuideBeamAttackEnemyBattle(arg) {} GuardianMiniBeamAttack::~GuardianMiniBeamAttack() = default; void GuardianMiniBeamAttack::enter_(ksys::act::ai::InlineParamPack* params) { - MiniBeamAttack::enter_(params); + GuideBeamAttackEnemyBattle::enter_(params); } void GuardianMiniBeamAttack::leave_() { - MiniBeamAttack::leave_(); + GuideBeamAttackEnemyBattle::leave_(); } void GuardianMiniBeamAttack::loadParams_() { - MiniBeamAttack::loadParams_(); + GuideBeamAttackEnemyBattle::loadParams_(); getStaticParam(&mHeadNodeName_s, "HeadNodeName"); getStaticParam(&mAttackInterval_s, "AttackInterval"); getStaticParam(&mEndShaderASFrame_s, "EndShaderASFrame"); diff --git a/src/Game/Actor/AI/aiGuardianMiniBeamAttack.h b/src/Game/Actor/AI/aiGuardianMiniBeamAttack.h index 456b4347..e8c25cc6 100644 --- a/src/Game/Actor/AI/aiGuardianMiniBeamAttack.h +++ b/src/Game/Actor/AI/aiGuardianMiniBeamAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiMiniBeamAttack.h" +#include "Game/Actor/AI/aiGuideBeamAttackEnemyBattle.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class GuardianMiniBeamAttack : public MiniBeamAttack { - SEAD_RTTI_OVERRIDE(GuardianMiniBeamAttack, MiniBeamAttack) +class GuardianMiniBeamAttack : public GuideBeamAttackEnemyBattle { + SEAD_RTTI_OVERRIDE(GuardianMiniBeamAttack, GuideBeamAttackEnemyBattle) public: explicit GuardianMiniBeamAttack(const InitArg& arg); ~GuardianMiniBeamAttack() override; diff --git a/src/Game/Actor/AI/aiMiniBeamAttack.cpp b/src/Game/Actor/AI/aiGuideBeamAttackEnemyBattle.cpp similarity index 59% rename from src/Game/Actor/AI/aiMiniBeamAttack.cpp rename to src/Game/Actor/AI/aiGuideBeamAttackEnemyBattle.cpp index 77c59e89..ed41673a 100644 --- a/src/Game/Actor/AI/aiMiniBeamAttack.cpp +++ b/src/Game/Actor/AI/aiGuideBeamAttackEnemyBattle.cpp @@ -1,24 +1,25 @@ -#include "Game/Actor/AI/aiMiniBeamAttack.h" +#include "Game/Actor/AI/aiGuideBeamAttackEnemyBattle.h" namespace uking::ai { -MiniBeamAttack::MiniBeamAttack(const InitArg& arg) : BreathAttackEnemyBattle(arg) {} +GuideBeamAttackEnemyBattle::GuideBeamAttackEnemyBattle(const InitArg& arg) + : BreathAttackEnemyBattle(arg) {} -MiniBeamAttack::~MiniBeamAttack() = default; +GuideBeamAttackEnemyBattle::~GuideBeamAttackEnemyBattle() = default; -bool MiniBeamAttack::init_(sead::Heap* heap) { +bool GuideBeamAttackEnemyBattle::init_(sead::Heap* heap) { return BreathAttackEnemyBattle::init_(heap); } -void MiniBeamAttack::enter_(ksys::act::ai::InlineParamPack* params) { +void GuideBeamAttackEnemyBattle::enter_(ksys::act::ai::InlineParamPack* params) { BreathAttackEnemyBattle::enter_(params); } -void MiniBeamAttack::leave_() { +void GuideBeamAttackEnemyBattle::leave_() { BreathAttackEnemyBattle::leave_(); } -void MiniBeamAttack::loadParams_() { +void GuideBeamAttackEnemyBattle::loadParams_() { BreathAttackEnemyBattle::loadParams_(); getStaticParam(&mFluctuationRange_s, "FluctuationRange"); getStaticParam(&mFluctuationSpan_s, "FluctuationSpan"); diff --git a/src/Game/Actor/AI/aiMiniBeamAttack.h b/src/Game/Actor/AI/aiGuideBeamAttackEnemyBattle.h similarity index 79% rename from src/Game/Actor/AI/aiMiniBeamAttack.h rename to src/Game/Actor/AI/aiGuideBeamAttackEnemyBattle.h index 91f44462..a4cb38bb 100644 --- a/src/Game/Actor/AI/aiMiniBeamAttack.h +++ b/src/Game/Actor/AI/aiGuideBeamAttackEnemyBattle.h @@ -5,11 +5,11 @@ namespace uking::ai { -class MiniBeamAttack : public BreathAttackEnemyBattle { - SEAD_RTTI_OVERRIDE(MiniBeamAttack, BreathAttackEnemyBattle) +class GuideBeamAttackEnemyBattle : public BreathAttackEnemyBattle { + SEAD_RTTI_OVERRIDE(GuideBeamAttackEnemyBattle, BreathAttackEnemyBattle) public: - explicit MiniBeamAttack(const InitArg& arg); - ~MiniBeamAttack() override; + explicit GuideBeamAttackEnemyBattle(const InitArg& arg); + ~GuideBeamAttackEnemyBattle() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.cpp b/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.cpp index cf01e4d9..4cb13640 100644 --- a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.cpp +++ b/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.cpp @@ -3,24 +3,24 @@ namespace uking::ai { HorseCheckLineOfSightSelector::HorseCheckLineOfSightSelector(const InitArg& arg) - : HorseCheckLineOfSightSelectorBase(arg) {} + : CheckLineOfSightSelector(arg) {} HorseCheckLineOfSightSelector::~HorseCheckLineOfSightSelector() = default; bool HorseCheckLineOfSightSelector::init_(sead::Heap* heap) { - return HorseCheckLineOfSightSelectorBase::init_(heap); + return CheckLineOfSightSelector::init_(heap); } void HorseCheckLineOfSightSelector::enter_(ksys::act::ai::InlineParamPack* params) { - HorseCheckLineOfSightSelectorBase::enter_(params); + CheckLineOfSightSelector::enter_(params); } void HorseCheckLineOfSightSelector::leave_() { - HorseCheckLineOfSightSelectorBase::leave_(); + CheckLineOfSightSelector::leave_(); } void HorseCheckLineOfSightSelector::loadParams_() { - HorseCheckLineOfSightSelectorBase::loadParams_(); + CheckLineOfSightSelector::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.h b/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.h index 3095e98d..cac5214a 100644 --- a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.h +++ b/src/Game/Actor/AI/aiHorseCheckLineOfSightSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.h" +#include "Game/Actor/AI/aiCheckLineOfSightSelector.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class HorseCheckLineOfSightSelector : public HorseCheckLineOfSightSelectorBase { - SEAD_RTTI_OVERRIDE(HorseCheckLineOfSightSelector, HorseCheckLineOfSightSelectorBase) +class HorseCheckLineOfSightSelector : public CheckLineOfSightSelector { + SEAD_RTTI_OVERRIDE(HorseCheckLineOfSightSelector, CheckLineOfSightSelector) public: explicit HorseCheckLineOfSightSelector(const InitArg& arg); ~HorseCheckLineOfSightSelector() override; diff --git a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.cpp b/src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.cpp deleted file mode 100644 index dae45171..00000000 --- a/src/Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/AI/aiHorseCheckLineOfSightSelectorBase.h" - -namespace uking::ai { - -HorseCheckLineOfSightSelectorBase::HorseCheckLineOfSightSelectorBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} - -HorseCheckLineOfSightSelectorBase::~HorseCheckLineOfSightSelectorBase() = default; - -bool HorseCheckLineOfSightSelectorBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void HorseCheckLineOfSightSelectorBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void HorseCheckLineOfSightSelectorBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void HorseCheckLineOfSightSelectorBase::loadParams_() { - getStaticParam(&mDirectionNum_s, "DirectionNum"); - getStaticParam(&mDirectionAngle_s, "DirectionAngle"); - getStaticParam(&mDistance_s, "Distance"); - getStaticParam(&mRadiusScale_s, "RadiusScale"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiHorseRiddenStatusSelector.cpp b/src/Game/Actor/AI/aiHorseRiddenStatusSelector.cpp new file mode 100644 index 00000000..9e478188 --- /dev/null +++ b/src/Game/Actor/AI/aiHorseRiddenStatusSelector.cpp @@ -0,0 +1,23 @@ +#include "Game/Actor/AI/aiHorseRiddenStatusSelector.h" + +namespace uking::ai { + +HorseRiddenStatusSelector::HorseRiddenStatusSelector(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +HorseRiddenStatusSelector::~HorseRiddenStatusSelector() = default; + +bool HorseRiddenStatusSelector::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void HorseRiddenStatusSelector::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void HorseRiddenStatusSelector::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void HorseRiddenStatusSelector::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiGuardianBeamAttackBase.h b/src/Game/Actor/AI/aiHorseRiddenStatusSelector.h similarity index 56% rename from src/Game/Actor/AI/aiGuardianBeamAttackBase.h rename to src/Game/Actor/AI/aiHorseRiddenStatusSelector.h index 7ee6ce45..1ca04d1f 100644 --- a/src/Game/Actor/AI/aiGuardianBeamAttackBase.h +++ b/src/Game/Actor/AI/aiHorseRiddenStatusSelector.h @@ -4,11 +4,11 @@ namespace uking::ai { -class GuardianBeamAttackBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(GuardianBeamAttackBase, ksys::act::ai::Ai) +class HorseRiddenStatusSelector : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(HorseRiddenStatusSelector, ksys::act::ai::Ai) public: - explicit GuardianBeamAttackBase(const InitArg& arg); - ~GuardianBeamAttackBase() override; + explicit HorseRiddenStatusSelector(const InitArg& arg); + ~HorseRiddenStatusSelector() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiInsectRoot.cpp b/src/Game/Actor/AI/aiInsectRoot.cpp index 73ec8ec9..e27f9dbc 100644 --- a/src/Game/Actor/AI/aiInsectRoot.cpp +++ b/src/Game/Actor/AI/aiInsectRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -InsectRoot::InsectRoot(const InitArg& arg) : SimpleWildlifeRoot(arg) {} +InsectRoot::InsectRoot(const InitArg& arg) : CapturedActorRoot(arg) {} InsectRoot::~InsectRoot() = default; bool InsectRoot::init_(sead::Heap* heap) { - return SimpleWildlifeRoot::init_(heap); + return CapturedActorRoot::init_(heap); } void InsectRoot::enter_(ksys::act::ai::InlineParamPack* params) { - SimpleWildlifeRoot::enter_(params); + CapturedActorRoot::enter_(params); } void InsectRoot::leave_() { - SimpleWildlifeRoot::leave_(); + CapturedActorRoot::leave_(); } void InsectRoot::loadParams_() { - SimpleWildlifeRoot::loadParams_(); + CapturedActorRoot::loadParams_(); getStaticParam(&mIsEscapeInWater_s, "IsEscapeInWater"); } diff --git a/src/Game/Actor/AI/aiInsectRoot.h b/src/Game/Actor/AI/aiInsectRoot.h index 31ef15e0..44b37dbb 100644 --- a/src/Game/Actor/AI/aiInsectRoot.h +++ b/src/Game/Actor/AI/aiInsectRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSimpleWildlifeRoot.h" +#include "Game/Actor/AI/aiCapturedActorRoot.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class InsectRoot : public SimpleWildlifeRoot { - SEAD_RTTI_OVERRIDE(InsectRoot, SimpleWildlifeRoot) +class InsectRoot : public CapturedActorRoot { + SEAD_RTTI_OVERRIDE(InsectRoot, CapturedActorRoot) public: explicit InsectRoot(const InitArg& arg); ~InsectRoot() override; diff --git a/src/Game/Actor/AI/aiInvincibleNearTarget.cpp b/src/Game/Actor/AI/aiInvincibleNearTarget.cpp new file mode 100644 index 00000000..8392c66c --- /dev/null +++ b/src/Game/Actor/AI/aiInvincibleNearTarget.cpp @@ -0,0 +1,28 @@ +#include "Game/Actor/AI/aiInvincibleNearTarget.h" + +namespace uking::ai { + +InvincibleNearTarget::InvincibleNearTarget(const InitArg& arg) : InvincibleNearTargetBase(arg) {} + +InvincibleNearTarget::~InvincibleNearTarget() = default; + +bool InvincibleNearTarget::init_(sead::Heap* heap) { + return InvincibleNearTargetBase::init_(heap); +} + +void InvincibleNearTarget::enter_(ksys::act::ai::InlineParamPack* params) { + InvincibleNearTargetBase::enter_(params); +} + +void InvincibleNearTarget::leave_() { + InvincibleNearTargetBase::leave_(); +} + +void InvincibleNearTarget::loadParams_() { + InvincibleNearTargetBase::loadParams_(); + getStaticParam(&mGuardEndTime_s, "GuardEndTime"); + getStaticParam(&mGuardStartAngle_s, "GuardStartAngle"); + getStaticParam(&mGuardEndAngle_s, "GuardEndAngle"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTimedGuardNearTarget.h b/src/Game/Actor/AI/aiInvincibleNearTarget.h similarity index 64% rename from src/Game/Actor/AI/aiTimedGuardNearTarget.h rename to src/Game/Actor/AI/aiInvincibleNearTarget.h index 330984e1..9db89401 100644 --- a/src/Game/Actor/AI/aiTimedGuardNearTarget.h +++ b/src/Game/Actor/AI/aiInvincibleNearTarget.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/AI/aiGuardNearTarget.h" +#include "Game/Actor/AI/aiInvincibleNearTargetBase.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TimedGuardNearTarget : public GuardNearTarget { - SEAD_RTTI_OVERRIDE(TimedGuardNearTarget, GuardNearTarget) +class InvincibleNearTarget : public InvincibleNearTargetBase { + SEAD_RTTI_OVERRIDE(InvincibleNearTarget, InvincibleNearTargetBase) public: - explicit TimedGuardNearTarget(const InitArg& arg); - ~TimedGuardNearTarget() override; + explicit InvincibleNearTarget(const InitArg& arg); + ~InvincibleNearTarget() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiInvincibleNearTargetBase.cpp b/src/Game/Actor/AI/aiInvincibleNearTargetBase.cpp new file mode 100644 index 00000000..dbb92dc7 --- /dev/null +++ b/src/Game/Actor/AI/aiInvincibleNearTargetBase.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/AI/aiInvincibleNearTargetBase.h" + +namespace uking::ai { + +InvincibleNearTargetBase::InvincibleNearTargetBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +InvincibleNearTargetBase::~InvincibleNearTargetBase() = default; + +bool InvincibleNearTargetBase::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void InvincibleNearTargetBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void InvincibleNearTargetBase::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void InvincibleNearTargetBase::loadParams_() { + getStaticParam(&mWeaponIdx_s, "WeaponIdx"); + getStaticParam(&mBaseDist_s, "BaseDist"); + getStaticParam(&mGuardStartDist_s, "GuardStartDist"); + getStaticParam(&mGuardEndDist_s, "GuardEndDist"); + getDynamicParam(&mTargetPos_d, "TargetPos"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiGuardNearTarget.h b/src/Game/Actor/AI/aiInvincibleNearTargetBase.h similarity index 74% rename from src/Game/Actor/AI/aiGuardNearTarget.h rename to src/Game/Actor/AI/aiInvincibleNearTargetBase.h index b42cb987..13dd411a 100644 --- a/src/Game/Actor/AI/aiGuardNearTarget.h +++ b/src/Game/Actor/AI/aiInvincibleNearTargetBase.h @@ -4,11 +4,11 @@ namespace uking::ai { -class GuardNearTarget : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(GuardNearTarget, ksys::act::ai::Ai) +class InvincibleNearTargetBase : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(InvincibleNearTargetBase, ksys::act::ai::Ai) public: - explicit GuardNearTarget(const InitArg& arg); - ~GuardNearTarget() override; + explicit InvincibleNearTargetBase(const InitArg& arg); + ~InvincibleNearTargetBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiLandHumEnemyFindBait.cpp b/src/Game/Actor/AI/aiLandHumEnemyFindBait.cpp index e711f92c..840bfbd1 100644 --- a/src/Game/Actor/AI/aiLandHumEnemyFindBait.cpp +++ b/src/Game/Actor/AI/aiLandHumEnemyFindBait.cpp @@ -2,20 +2,20 @@ namespace uking::ai { -LandHumEnemyFindBait::LandHumEnemyFindBait(const InitArg& arg) : UnarmedEnemySearch(arg) {} +LandHumEnemyFindBait::LandHumEnemyFindBait(const InitArg& arg) : NavMove(arg) {} LandHumEnemyFindBait::~LandHumEnemyFindBait() = default; void LandHumEnemyFindBait::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearch::enter_(params); + NavMove::enter_(params); } void LandHumEnemyFindBait::leave_() { - UnarmedEnemySearch::leave_(); + NavMove::leave_(); } void LandHumEnemyFindBait::loadParams_() { - UnarmedEnemySearch::loadParams_(); + NavMove::loadParams_(); getStaticParam(&mRepathTime_s, "RepathTime"); getDynamicParam(&mTargetBait_d, "TargetBait"); getDynamicParam(&mIsNotice_d, "IsNotice"); diff --git a/src/Game/Actor/AI/aiLandHumEnemyFindBait.h b/src/Game/Actor/AI/aiLandHumEnemyFindBait.h index 8ba3f798..1e53d6c5 100644 --- a/src/Game/Actor/AI/aiLandHumEnemyFindBait.h +++ b/src/Game/Actor/AI/aiLandHumEnemyFindBait.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearch.h" +#include "Game/Actor/AI/aiNavMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class LandHumEnemyFindBait : public UnarmedEnemySearch { - SEAD_RTTI_OVERRIDE(LandHumEnemyFindBait, UnarmedEnemySearch) +class LandHumEnemyFindBait : public NavMove { + SEAD_RTTI_OVERRIDE(LandHumEnemyFindBait, NavMove) public: explicit LandHumEnemyFindBait(const InitArg& arg); ~LandHumEnemyFindBait() override; diff --git a/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.cpp b/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.cpp index 472d72bb..5c1e057d 100644 --- a/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.cpp +++ b/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.cpp @@ -2,21 +2,20 @@ namespace uking::ai { -LandHumEnemyUnarmedBattle::LandHumEnemyUnarmedBattle(const InitArg& arg) - : UnarmedEnemySearch(arg) {} +LandHumEnemyUnarmedBattle::LandHumEnemyUnarmedBattle(const InitArg& arg) : NavMove(arg) {} LandHumEnemyUnarmedBattle::~LandHumEnemyUnarmedBattle() = default; void LandHumEnemyUnarmedBattle::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearch::enter_(params); + NavMove::enter_(params); } void LandHumEnemyUnarmedBattle::leave_() { - UnarmedEnemySearch::leave_(); + NavMove::leave_(); } void LandHumEnemyUnarmedBattle::loadParams_() { - UnarmedEnemySearch::loadParams_(); + NavMove::loadParams_(); getStaticParam(&mLostTimer_s, "LostTimer"); getStaticParam(&mEquipItemSearchIdx_s, "EquipItemSearchIdx"); getStaticParam(&mSearchWeaponDist_s, "SearchWeaponDist"); diff --git a/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.h b/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.h index 3fa758ad..0ffc8303 100644 --- a/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.h +++ b/src/Game/Actor/AI/aiLandHumEnemyUnarmedBattle.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearch.h" +#include "Game/Actor/AI/aiNavMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class LandHumEnemyUnarmedBattle : public UnarmedEnemySearch { - SEAD_RTTI_OVERRIDE(LandHumEnemyUnarmedBattle, UnarmedEnemySearch) +class LandHumEnemyUnarmedBattle : public NavMove { + SEAD_RTTI_OVERRIDE(LandHumEnemyUnarmedBattle, NavMove) public: explicit LandHumEnemyUnarmedBattle(const InitArg& arg); ~LandHumEnemyUnarmedBattle() override; diff --git a/src/Game/Actor/AI/aiLargeCannonRoot.cpp b/src/Game/Actor/AI/aiLargeCannonRoot.cpp new file mode 100644 index 00000000..ab144334 --- /dev/null +++ b/src/Game/Actor/AI/aiLargeCannonRoot.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiLargeCannonRoot.h" + +namespace uking::ai { + +LargeCannonRoot::LargeCannonRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +bool LargeCannonRoot::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void LargeCannonRoot::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void LargeCannonRoot::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void LargeCannonRoot::loadParams_() { + getStaticParam(&mSearchMaxDist_s, "SearchMaxDist"); + getStaticParam(&mSearchMinDist_s, "SearchMinDist"); + getStaticParam(&mSearchDistMargin_s, "SearchDistMargin"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRemainElectricCannonRootBase.h b/src/Game/Actor/AI/aiLargeCannonRoot.h similarity index 72% rename from src/Game/Actor/AI/aiRemainElectricCannonRootBase.h rename to src/Game/Actor/AI/aiLargeCannonRoot.h index ce37f48a..4d444e63 100644 --- a/src/Game/Actor/AI/aiRemainElectricCannonRootBase.h +++ b/src/Game/Actor/AI/aiLargeCannonRoot.h @@ -4,10 +4,10 @@ namespace uking::ai { -class RemainElectricCannonRootBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(RemainElectricCannonRootBase, ksys::act::ai::Ai) +class LargeCannonRoot : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(LargeCannonRoot, ksys::act::ai::Ai) public: - explicit RemainElectricCannonRootBase(const InitArg& arg); + explicit LargeCannonRoot(const InitArg& arg); bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiLargeEnemyFindPlayer.cpp b/src/Game/Actor/AI/aiLargeEnemyFindPlayer.cpp deleted file mode 100644 index da82a56b..00000000 --- a/src/Game/Actor/AI/aiLargeEnemyFindPlayer.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiLargeEnemyFindPlayer.h" - -namespace uking::ai { - -LargeEnemyFindPlayer::LargeEnemyFindPlayer(const InitArg& arg) : EnemyBaseFindPlayer(arg) {} - -LargeEnemyFindPlayer::~LargeEnemyFindPlayer() = default; - -bool LargeEnemyFindPlayer::init_(sead::Heap* heap) { - return EnemyBaseFindPlayer::init_(heap); -} - -void LargeEnemyFindPlayer::enter_(ksys::act::ai::InlineParamPack* params) { - EnemyBaseFindPlayer::enter_(params); -} - -void LargeEnemyFindPlayer::leave_() { - EnemyBaseFindPlayer::leave_(); -} - -void LargeEnemyFindPlayer::loadParams_() { - EnemyBaseFindPlayer::loadParams_(); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSiteBossRecognizeRootBase.cpp b/src/Game/Actor/AI/aiLastBossRecognizeRoot.cpp similarity index 51% rename from src/Game/Actor/AI/aiSiteBossRecognizeRootBase.cpp rename to src/Game/Actor/AI/aiLastBossRecognizeRoot.cpp index be4b78db..2ce293d9 100644 --- a/src/Game/Actor/AI/aiSiteBossRecognizeRootBase.cpp +++ b/src/Game/Actor/AI/aiLastBossRecognizeRoot.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiSiteBossRecognizeRootBase.h" +#include "Game/Actor/AI/aiLastBossRecognizeRoot.h" namespace uking::ai { -SiteBossRecognizeRootBase::SiteBossRecognizeRootBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} +LastBossRecognizeRoot::LastBossRecognizeRoot(const InitArg& arg) : ksys::act::ai::Ai(arg) {} -SiteBossRecognizeRootBase::~SiteBossRecognizeRootBase() = default; +LastBossRecognizeRoot::~LastBossRecognizeRoot() = default; -bool SiteBossRecognizeRootBase::init_(sead::Heap* heap) { +bool LastBossRecognizeRoot::init_(sead::Heap* heap) { return ksys::act::ai::Ai::init_(heap); } -void SiteBossRecognizeRootBase::enter_(ksys::act::ai::InlineParamPack* params) { +void LastBossRecognizeRoot::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Ai::enter_(params); } -void SiteBossRecognizeRootBase::leave_() { +void LastBossRecognizeRoot::leave_() { ksys::act::ai::Ai::leave_(); } -void SiteBossRecognizeRootBase::loadParams_() { +void LastBossRecognizeRoot::loadParams_() { getStaticParam(&mAttackNum_s, "AttackNum"); getStaticParam(&mAttackRandNum_s, "AttackRandNum"); getStaticParam(&mWarpStartDist_s, "WarpStartDist"); diff --git a/src/Game/Actor/AI/aiSiteBossRecognizeRootBase.h b/src/Game/Actor/AI/aiLastBossRecognizeRoot.h similarity index 73% rename from src/Game/Actor/AI/aiSiteBossRecognizeRootBase.h rename to src/Game/Actor/AI/aiLastBossRecognizeRoot.h index e8885ba9..bc8e37aa 100644 --- a/src/Game/Actor/AI/aiSiteBossRecognizeRootBase.h +++ b/src/Game/Actor/AI/aiLastBossRecognizeRoot.h @@ -4,11 +4,11 @@ namespace uking::ai { -class SiteBossRecognizeRootBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SiteBossRecognizeRootBase, ksys::act::ai::Ai) +class LastBossRecognizeRoot : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(LastBossRecognizeRoot, ksys::act::ai::Ai) public: - explicit SiteBossRecognizeRootBase(const InitArg& arg); - ~SiteBossRecognizeRootBase() override; + explicit LastBossRecognizeRoot(const InitArg& arg); + ~LastBossRecognizeRoot() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiOneMemoryMagicBattleBase.cpp b/src/Game/Actor/AI/aiMagicBattle.cpp similarity index 53% rename from src/Game/Actor/AI/aiOneMemoryMagicBattleBase.cpp rename to src/Game/Actor/AI/aiMagicBattle.cpp index 458bf3c1..7eb7bd47 100644 --- a/src/Game/Actor/AI/aiOneMemoryMagicBattleBase.cpp +++ b/src/Game/Actor/AI/aiMagicBattle.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/AI/aiOneMemoryMagicBattleBase.h" +#include "Game/Actor/AI/aiMagicBattle.h" namespace uking::ai { -OneMemoryMagicBattleBase::OneMemoryMagicBattleBase(const InitArg& arg) : EnemyBattle(arg) {} +MagicBattle::MagicBattle(const InitArg& arg) : EnemyBattle(arg) {} -OneMemoryMagicBattleBase::~OneMemoryMagicBattleBase() = default; +MagicBattle::~MagicBattle() = default; -bool OneMemoryMagicBattleBase::init_(sead::Heap* heap) { +bool MagicBattle::init_(sead::Heap* heap) { return EnemyBattle::init_(heap); } -void OneMemoryMagicBattleBase::enter_(ksys::act::ai::InlineParamPack* params) { +void MagicBattle::enter_(ksys::act::ai::InlineParamPack* params) { EnemyBattle::enter_(params); } -void OneMemoryMagicBattleBase::leave_() { +void MagicBattle::leave_() { EnemyBattle::leave_(); } -void OneMemoryMagicBattleBase::loadParams_() { +void MagicBattle::loadParams_() { EnemyBattle::loadParams_(); getStaticParam(&mEnlargeTime_s, "EnlargeTime"); getStaticParam(&mAttackRatio_s, "AttackRatio"); diff --git a/src/Game/Actor/AI/aiOneMemoryMagicBattleBase.h b/src/Game/Actor/AI/aiMagicBattle.h similarity index 77% rename from src/Game/Actor/AI/aiOneMemoryMagicBattleBase.h rename to src/Game/Actor/AI/aiMagicBattle.h index e6123eb3..895070e9 100644 --- a/src/Game/Actor/AI/aiOneMemoryMagicBattleBase.h +++ b/src/Game/Actor/AI/aiMagicBattle.h @@ -5,11 +5,11 @@ namespace uking::ai { -class OneMemoryMagicBattleBase : public EnemyBattle { - SEAD_RTTI_OVERRIDE(OneMemoryMagicBattleBase, EnemyBattle) +class MagicBattle : public EnemyBattle { + SEAD_RTTI_OVERRIDE(MagicBattle, EnemyBattle) public: - explicit OneMemoryMagicBattleBase(const InitArg& arg); - ~OneMemoryMagicBattleBase() override; + explicit MagicBattle(const InitArg& arg); + ~MagicBattle() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.cpp b/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.cpp index 297ff1e0..79eb35fe 100644 --- a/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.cpp +++ b/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.cpp @@ -3,24 +3,24 @@ namespace uking::ai { MagneGrabbedPartsRangeSelector::MagneGrabbedPartsRangeSelector(const InitArg& arg) - : RangeSelect(arg) {} + : NewRangeSelect(arg) {} MagneGrabbedPartsRangeSelector::~MagneGrabbedPartsRangeSelector() = default; bool MagneGrabbedPartsRangeSelector::init_(sead::Heap* heap) { - return RangeSelect::init_(heap); + return NewRangeSelect::init_(heap); } void MagneGrabbedPartsRangeSelector::enter_(ksys::act::ai::InlineParamPack* params) { - RangeSelect::enter_(params); + NewRangeSelect::enter_(params); } void MagneGrabbedPartsRangeSelector::leave_() { - RangeSelect::leave_(); + NewRangeSelect::leave_(); } void MagneGrabbedPartsRangeSelector::loadParams_() { - RangeSelect::loadParams_(); + NewRangeSelect::loadParams_(); getStaticParam(&mPartsName_s, "PartsName"); } diff --git a/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.h b/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.h index 806e08da..f641e115 100644 --- a/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.h +++ b/src/Game/Actor/AI/aiMagneGrabbedPartsRangeSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRangeSelect.h" +#include "Game/Actor/AI/aiNewRangeSelect.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class MagneGrabbedPartsRangeSelector : public RangeSelect { - SEAD_RTTI_OVERRIDE(MagneGrabbedPartsRangeSelector, RangeSelect) +class MagneGrabbedPartsRangeSelector : public NewRangeSelect { + SEAD_RTTI_OVERRIDE(MagneGrabbedPartsRangeSelector, NewRangeSelect) public: explicit MagneGrabbedPartsRangeSelector(const InitArg& arg); ~MagneGrabbedPartsRangeSelector() override; diff --git a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.cpp b/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.cpp index 934719ec..4ba79025 100644 --- a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.cpp +++ b/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.cpp @@ -3,24 +3,24 @@ namespace uking::ai { MimicCliffStopEnemyNormal::MimicCliffStopEnemyNormal(const InitArg& arg) - : MimicCliffStopEnemyNormalBase(arg) {} + : CliffStopEnemyNormal(arg) {} MimicCliffStopEnemyNormal::~MimicCliffStopEnemyNormal() = default; bool MimicCliffStopEnemyNormal::init_(sead::Heap* heap) { - return MimicCliffStopEnemyNormalBase::init_(heap); + return CliffStopEnemyNormal::init_(heap); } void MimicCliffStopEnemyNormal::enter_(ksys::act::ai::InlineParamPack* params) { - MimicCliffStopEnemyNormalBase::enter_(params); + CliffStopEnemyNormal::enter_(params); } void MimicCliffStopEnemyNormal::leave_() { - MimicCliffStopEnemyNormalBase::leave_(); + CliffStopEnemyNormal::leave_(); } void MimicCliffStopEnemyNormal::loadParams_() { - MimicCliffStopEnemyNormalBase::loadParams_(); + CliffStopEnemyNormal::loadParams_(); getStaticParam(&mJumpDistXZ_s, "JumpDistXZ"); } diff --git a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.h b/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.h index 96fbedb2..4b7073fe 100644 --- a/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.h +++ b/src/Game/Actor/AI/aiMimicCliffStopEnemyNormal.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiMimicCliffStopEnemyNormalBase.h" +#include "Game/Actor/AI/aiCliffStopEnemyNormal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class MimicCliffStopEnemyNormal : public MimicCliffStopEnemyNormalBase { - SEAD_RTTI_OVERRIDE(MimicCliffStopEnemyNormal, MimicCliffStopEnemyNormalBase) +class MimicCliffStopEnemyNormal : public CliffStopEnemyNormal { + SEAD_RTTI_OVERRIDE(MimicCliffStopEnemyNormal, CliffStopEnemyNormal) public: explicit MimicCliffStopEnemyNormal(const InitArg& arg); ~MimicCliffStopEnemyNormal() override; diff --git a/src/Game/Actor/AI/aiMiniGolemSleep.cpp b/src/Game/Actor/AI/aiMiniGolemSleep.cpp index f3840f4d..078af650 100644 --- a/src/Game/Actor/AI/aiMiniGolemSleep.cpp +++ b/src/Game/Actor/AI/aiMiniGolemSleep.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -MiniGolemSleep::MiniGolemSleep(const InitArg& arg) : SpecialEnemySleep(arg) {} +MiniGolemSleep::MiniGolemSleep(const InitArg& arg) : SleepNormal(arg) {} MiniGolemSleep::~MiniGolemSleep() = default; bool MiniGolemSleep::init_(sead::Heap* heap) { - return SpecialEnemySleep::init_(heap); + return SleepNormal::init_(heap); } void MiniGolemSleep::enter_(ksys::act::ai::InlineParamPack* params) { - SpecialEnemySleep::enter_(params); + SleepNormal::enter_(params); } void MiniGolemSleep::leave_() { - SpecialEnemySleep::leave_(); + SleepNormal::leave_(); } void MiniGolemSleep::loadParams_() { - SpecialEnemySleep::loadParams_(); + SleepNormal::loadParams_(); getAITreeVariable(&mGolemChemicalController_a, "GolemChemicalController"); } diff --git a/src/Game/Actor/AI/aiMiniGolemSleep.h b/src/Game/Actor/AI/aiMiniGolemSleep.h index e903475a..81e4825f 100644 --- a/src/Game/Actor/AI/aiMiniGolemSleep.h +++ b/src/Game/Actor/AI/aiMiniGolemSleep.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSpecialEnemySleep.h" +#include "Game/Actor/AI/aiSleepNormal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class MiniGolemSleep : public SpecialEnemySleep { - SEAD_RTTI_OVERRIDE(MiniGolemSleep, SpecialEnemySleep) +class MiniGolemSleep : public SleepNormal { + SEAD_RTTI_OVERRIDE(MiniGolemSleep, SleepNormal) public: explicit MiniGolemSleep(const InitArg& arg); ~MiniGolemSleep() override; diff --git a/src/Game/Actor/AI/aiMotorcycleRoot.cpp b/src/Game/Actor/AI/aiMotorcycleRoot.cpp index 9c6dc981..4ced0630 100644 --- a/src/Game/Actor/AI/aiMotorcycleRoot.cpp +++ b/src/Game/Actor/AI/aiMotorcycleRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -MotorcycleRoot::MotorcycleRoot(const InitArg& arg) : MotorcycleRootBase(arg) {} +MotorcycleRoot::MotorcycleRoot(const InitArg& arg) : HorseRiddenStatusSelector(arg) {} MotorcycleRoot::~MotorcycleRoot() = default; bool MotorcycleRoot::init_(sead::Heap* heap) { - return MotorcycleRootBase::init_(heap); + return HorseRiddenStatusSelector::init_(heap); } void MotorcycleRoot::enter_(ksys::act::ai::InlineParamPack* params) { - MotorcycleRootBase::enter_(params); + HorseRiddenStatusSelector::enter_(params); } void MotorcycleRoot::leave_() { - MotorcycleRootBase::leave_(); + HorseRiddenStatusSelector::leave_(); } void MotorcycleRoot::loadParams_() { - MotorcycleRootBase::loadParams_(); + HorseRiddenStatusSelector::loadParams_(); getStaticParam(&mInWaterRateForDisappear_s, "InWaterRateForDisappear"); getStaticParam(&mDistanceToPlayerForDisappear_s, "DistanceToPlayerForDisappear"); getStaticParam(&mNoiseEnergyEmpty_s, "NoiseEnergyEmpty"); diff --git a/src/Game/Actor/AI/aiMotorcycleRoot.h b/src/Game/Actor/AI/aiMotorcycleRoot.h index 41fb67d2..1cf302ee 100644 --- a/src/Game/Actor/AI/aiMotorcycleRoot.h +++ b/src/Game/Actor/AI/aiMotorcycleRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiMotorcycleRootBase.h" +#include "Game/Actor/AI/aiHorseRiddenStatusSelector.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class MotorcycleRoot : public MotorcycleRootBase { - SEAD_RTTI_OVERRIDE(MotorcycleRoot, MotorcycleRootBase) +class MotorcycleRoot : public HorseRiddenStatusSelector { + SEAD_RTTI_OVERRIDE(MotorcycleRoot, HorseRiddenStatusSelector) public: explicit MotorcycleRoot(const InitArg& arg); ~MotorcycleRoot() override; diff --git a/src/Game/Actor/AI/aiMotorcycleRootBase.cpp b/src/Game/Actor/AI/aiMotorcycleRootBase.cpp deleted file mode 100644 index 2362242d..00000000 --- a/src/Game/Actor/AI/aiMotorcycleRootBase.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/AI/aiMotorcycleRootBase.h" - -namespace uking::ai { - -MotorcycleRootBase::MotorcycleRootBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -MotorcycleRootBase::~MotorcycleRootBase() = default; - -bool MotorcycleRootBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void MotorcycleRootBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void MotorcycleRootBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void MotorcycleRootBase::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiMoveAndFreeFallGondola.cpp b/src/Game/Actor/AI/aiMoveAndFreeFallGondola.cpp index 3576809d..2a5cd6f3 100644 --- a/src/Game/Actor/AI/aiMoveAndFreeFallGondola.cpp +++ b/src/Game/Actor/AI/aiMoveAndFreeFallGondola.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -MoveAndFreeFallGondola::MoveAndFreeFallGondola(const InitArg& arg) : RailMove(arg) {} +MoveAndFreeFallGondola::MoveAndFreeFallGondola(const InitArg& arg) : BezierRailMove(arg) {} MoveAndFreeFallGondola::~MoveAndFreeFallGondola() = default; bool MoveAndFreeFallGondola::init_(sead::Heap* heap) { - return RailMove::init_(heap); + return BezierRailMove::init_(heap); } void MoveAndFreeFallGondola::enter_(ksys::act::ai::InlineParamPack* params) { - RailMove::enter_(params); + BezierRailMove::enter_(params); } void MoveAndFreeFallGondola::leave_() { - RailMove::leave_(); + BezierRailMove::leave_(); } void MoveAndFreeFallGondola::loadParams_() { - RailMove::loadParams_(); + BezierRailMove::loadParams_(); getMapUnitParam(&mRailMoveSpeed_m, "RailMoveSpeed"); getMapUnitParam(&mGondolaRailOffsetTime_m, "GondolaRailOffsetTime"); } diff --git a/src/Game/Actor/AI/aiMoveAndFreeFallGondola.h b/src/Game/Actor/AI/aiMoveAndFreeFallGondola.h index 205f55ce..487c4eda 100644 --- a/src/Game/Actor/AI/aiMoveAndFreeFallGondola.h +++ b/src/Game/Actor/AI/aiMoveAndFreeFallGondola.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRailMove.h" +#include "Game/Actor/AI/aiBezierRailMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class MoveAndFreeFallGondola : public RailMove { - SEAD_RTTI_OVERRIDE(MoveAndFreeFallGondola, RailMove) +class MoveAndFreeFallGondola : public BezierRailMove { + SEAD_RTTI_OVERRIDE(MoveAndFreeFallGondola, BezierRailMove) public: explicit MoveAndFreeFallGondola(const InitArg& arg); ~MoveAndFreeFallGondola() override; diff --git a/src/Game/Actor/AI/aiNPCHorseRide.cpp b/src/Game/Actor/AI/aiNPCHorseRide.cpp index a2cbc91f..aff49444 100644 --- a/src/Game/Actor/AI/aiNPCHorseRide.cpp +++ b/src/Game/Actor/AI/aiNPCHorseRide.cpp @@ -2,20 +2,20 @@ namespace uking::ai { -NPCHorseRide::NPCHorseRide(const InitArg& arg) : NonPlayerHorseRide(arg) {} +NPCHorseRide::NPCHorseRide(const InitArg& arg) : RideHorseNonPlayer(arg) {} NPCHorseRide::~NPCHorseRide() = default; bool NPCHorseRide::init_(sead::Heap* heap) { - return NonPlayerHorseRide::init_(heap); + return RideHorseNonPlayer::init_(heap); } void NPCHorseRide::enter_(ksys::act::ai::InlineParamPack* params) { - NonPlayerHorseRide::enter_(params); + RideHorseNonPlayer::enter_(params); } void NPCHorseRide::leave_() { - NonPlayerHorseRide::leave_(); + RideHorseNonPlayer::leave_(); } void NPCHorseRide::loadParams_() { diff --git a/src/Game/Actor/AI/aiNPCHorseRide.h b/src/Game/Actor/AI/aiNPCHorseRide.h index eb5b7159..1a402f23 100644 --- a/src/Game/Actor/AI/aiNPCHorseRide.h +++ b/src/Game/Actor/AI/aiNPCHorseRide.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Horse/AI/aiNonPlayerHorseRide.h" +#include "Game/Actor/Horse/AI/aiRideHorseNonPlayer.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class NPCHorseRide : public NonPlayerHorseRide { - SEAD_RTTI_OVERRIDE(NPCHorseRide, NonPlayerHorseRide) +class NPCHorseRide : public RideHorseNonPlayer { + SEAD_RTTI_OVERRIDE(NPCHorseRide, RideHorseNonPlayer) public: explicit NPCHorseRide(const InitArg& arg); ~NPCHorseRide() override; diff --git a/src/Game/Actor/AI/aiNPCScheduleMove.cpp b/src/Game/Actor/AI/aiNPCScheduleMove.cpp new file mode 100644 index 00000000..b85ee479 --- /dev/null +++ b/src/Game/Actor/AI/aiNPCScheduleMove.cpp @@ -0,0 +1,23 @@ +#include "Game/Actor/AI/aiNPCScheduleMove.h" + +namespace uking::ai { + +NPCScheduleMove::NPCScheduleMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +NPCScheduleMove::~NPCScheduleMove() = default; + +bool NPCScheduleMove::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void NPCScheduleMove::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void NPCScheduleMove::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void NPCScheduleMove::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.h b/src/Game/Actor/AI/aiNPCScheduleMove.h similarity index 59% rename from src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.h rename to src/Game/Actor/AI/aiNPCScheduleMove.h index aad74d2f..b3608a5c 100644 --- a/src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.h +++ b/src/Game/Actor/AI/aiNPCScheduleMove.h @@ -4,11 +4,11 @@ namespace uking::ai { -class NonPlayerHorseRide : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(NonPlayerHorseRide, ksys::act::ai::Ai) +class NPCScheduleMove : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(NPCScheduleMove, ksys::act::ai::Ai) public: - explicit NonPlayerHorseRide(const InitArg& arg); - ~NonPlayerHorseRide() override; + explicit NPCScheduleMove(const InitArg& arg); + ~NPCScheduleMove() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiNPCTravel.cpp b/src/Game/Actor/AI/aiNPCTravel.cpp index cdff563f..edb42137 100644 --- a/src/Game/Actor/AI/aiNPCTravel.cpp +++ b/src/Game/Actor/AI/aiNPCTravel.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -NPCTravel::NPCTravel(const InitArg& arg) : NPCTravelBase(arg) {} +NPCTravel::NPCTravel(const InitArg& arg) : NPCScheduleMove(arg) {} NPCTravel::~NPCTravel() = default; bool NPCTravel::init_(sead::Heap* heap) { - return NPCTravelBase::init_(heap); + return NPCScheduleMove::init_(heap); } void NPCTravel::enter_(ksys::act::ai::InlineParamPack* params) { - NPCTravelBase::enter_(params); + NPCScheduleMove::enter_(params); } void NPCTravel::leave_() { - NPCTravelBase::leave_(); + NPCScheduleMove::leave_(); } void NPCTravel::loadParams_() { - NPCTravelBase::loadParams_(); + NPCScheduleMove::loadParams_(); getStaticParam(&mWaitHorseReturnDist_s, "WaitHorseReturnDist"); getStaticParam(&mGiveUpWaitHorseTime_s, "GiveUpWaitHorseTime"); } diff --git a/src/Game/Actor/AI/aiNPCTravel.h b/src/Game/Actor/AI/aiNPCTravel.h index 1fab865c..9570bd5c 100644 --- a/src/Game/Actor/AI/aiNPCTravel.h +++ b/src/Game/Actor/AI/aiNPCTravel.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiNPCTravelBase.h" +#include "Game/Actor/AI/aiNPCScheduleMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class NPCTravel : public NPCTravelBase { - SEAD_RTTI_OVERRIDE(NPCTravel, NPCTravelBase) +class NPCTravel : public NPCScheduleMove { + SEAD_RTTI_OVERRIDE(NPCTravel, NPCScheduleMove) public: explicit NPCTravel(const InitArg& arg); ~NPCTravel() override; diff --git a/src/Game/Actor/AI/aiNPCTravelBase.cpp b/src/Game/Actor/AI/aiNPCTravelBase.cpp deleted file mode 100644 index f7acd50e..00000000 --- a/src/Game/Actor/AI/aiNPCTravelBase.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/AI/aiNPCTravelBase.h" - -namespace uking::ai { - -NPCTravelBase::NPCTravelBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -NPCTravelBase::~NPCTravelBase() = default; - -bool NPCTravelBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void NPCTravelBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void NPCTravelBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void NPCTravelBase::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiNPCWander.cpp b/src/Game/Actor/AI/aiNPCWander.cpp index 76aaecb5..f2ed60a8 100644 --- a/src/Game/Actor/AI/aiNPCWander.cpp +++ b/src/Game/Actor/AI/aiNPCWander.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -NPCWander::NPCWander(const InitArg& arg) : NPCTravelBase(arg) {} +NPCWander::NPCWander(const InitArg& arg) : NPCScheduleMove(arg) {} NPCWander::~NPCWander() = default; bool NPCWander::init_(sead::Heap* heap) { - return NPCTravelBase::init_(heap); + return NPCScheduleMove::init_(heap); } void NPCWander::enter_(ksys::act::ai::InlineParamPack* params) { - NPCTravelBase::enter_(params); + NPCScheduleMove::enter_(params); } void NPCWander::leave_() { - NPCTravelBase::leave_(); + NPCScheduleMove::leave_(); } void NPCWander::loadParams_() { - NPCTravelBase::loadParams_(); + NPCScheduleMove::loadParams_(); getStaticParam(&mRainWaitTime_s, "RainWaitTime"); getStaticParam(&mGoalDistance_s, "GoalDistance"); getStaticParam(&mRailUpdateDistRate_s, "RailUpdateDistRate"); diff --git a/src/Game/Actor/AI/aiNPCWander.h b/src/Game/Actor/AI/aiNPCWander.h index a268677f..609c4710 100644 --- a/src/Game/Actor/AI/aiNPCWander.h +++ b/src/Game/Actor/AI/aiNPCWander.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiNPCTravelBase.h" +#include "Game/Actor/AI/aiNPCScheduleMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class NPCWander : public NPCTravelBase { - SEAD_RTTI_OVERRIDE(NPCWander, NPCTravelBase) +class NPCWander : public NPCScheduleMove { + SEAD_RTTI_OVERRIDE(NPCWander, NPCScheduleMove) public: explicit NPCWander(const InitArg& arg); ~NPCWander() override; diff --git a/src/Game/Actor/AI/aiNavMove.cpp b/src/Game/Actor/AI/aiNavMove.cpp new file mode 100644 index 00000000..5b986232 --- /dev/null +++ b/src/Game/Actor/AI/aiNavMove.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/AI/aiNavMove.h" + +namespace uking::ai { + +NavMove::NavMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +NavMove::~NavMove() = default; + +bool NavMove::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void NavMove::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void NavMove::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void NavMove::loadParams_() { + getStaticParam(&mWeaponIdx_s, "WeaponIdx"); + getStaticParam(&mReachTargetArea_s, "ReachTargetArea"); + getStaticParam(&mTurnStartAng_s, "TurnStartAng"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiUnarmedEnemySearch.h b/src/Game/Actor/AI/aiNavMove.h similarity index 71% rename from src/Game/Actor/AI/aiUnarmedEnemySearch.h rename to src/Game/Actor/AI/aiNavMove.h index e849552a..8fa805cc 100644 --- a/src/Game/Actor/AI/aiUnarmedEnemySearch.h +++ b/src/Game/Actor/AI/aiNavMove.h @@ -4,11 +4,11 @@ namespace uking::ai { -class UnarmedEnemySearch : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(UnarmedEnemySearch, ksys::act::ai::Ai) +class NavMove : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(NavMove, ksys::act::ai::Ai) public: - explicit UnarmedEnemySearch(const InitArg& arg); - ~UnarmedEnemySearch() override; + explicit NavMove(const InitArg& arg); + ~NavMove() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiNewRangeSelect.cpp b/src/Game/Actor/AI/aiNewRangeSelect.cpp new file mode 100644 index 00000000..c3debbd7 --- /dev/null +++ b/src/Game/Actor/AI/aiNewRangeSelect.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/AI/aiNewRangeSelect.h" + +namespace uking::ai { + +NewRangeSelect::NewRangeSelect(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +NewRangeSelect::~NewRangeSelect() = default; + +bool NewRangeSelect::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void NewRangeSelect::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void NewRangeSelect::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void NewRangeSelect::loadParams_() { + getStaticParam(&mWeaponIdx_s, "WeaponIdx"); + getStaticParam(&mFarDist_s, "FarDist"); + getStaticParam(&mIsSelectEveryFrame_s, "IsSelectEveryFrame"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRangeSelect.h b/src/Game/Actor/AI/aiNewRangeSelect.h similarity index 73% rename from src/Game/Actor/AI/aiRangeSelect.h rename to src/Game/Actor/AI/aiNewRangeSelect.h index c041013e..b9cd9275 100644 --- a/src/Game/Actor/AI/aiRangeSelect.h +++ b/src/Game/Actor/AI/aiNewRangeSelect.h @@ -4,11 +4,11 @@ namespace uking::ai { -class RangeSelect : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(RangeSelect, ksys::act::ai::Ai) +class NewRangeSelect : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(NewRangeSelect, ksys::act::ai::Ai) public: - explicit RangeSelect(const InitArg& arg); - ~RangeSelect() override; + explicit NewRangeSelect(const InitArg& arg); + ~NewRangeSelect() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiNoticePartsRangeSelector.cpp b/src/Game/Actor/AI/aiNoticePartsRangeSelector.cpp index ef6d2616..7cd44849 100644 --- a/src/Game/Actor/AI/aiNoticePartsRangeSelector.cpp +++ b/src/Game/Actor/AI/aiNoticePartsRangeSelector.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -NoticePartsRangeSelector::NoticePartsRangeSelector(const InitArg& arg) : RangeSelect(arg) {} +NoticePartsRangeSelector::NoticePartsRangeSelector(const InitArg& arg) : NewRangeSelect(arg) {} NoticePartsRangeSelector::~NoticePartsRangeSelector() = default; bool NoticePartsRangeSelector::init_(sead::Heap* heap) { - return RangeSelect::init_(heap); + return NewRangeSelect::init_(heap); } void NoticePartsRangeSelector::enter_(ksys::act::ai::InlineParamPack* params) { - RangeSelect::enter_(params); + NewRangeSelect::enter_(params); } void NoticePartsRangeSelector::leave_() { - RangeSelect::leave_(); + NewRangeSelect::leave_(); } void NoticePartsRangeSelector::loadParams_() { - RangeSelect::loadParams_(); + NewRangeSelect::loadParams_(); getStaticParam(&mPartsName_s, "PartsName"); } diff --git a/src/Game/Actor/AI/aiNoticePartsRangeSelector.h b/src/Game/Actor/AI/aiNoticePartsRangeSelector.h index 4865d801..c5393cb0 100644 --- a/src/Game/Actor/AI/aiNoticePartsRangeSelector.h +++ b/src/Game/Actor/AI/aiNoticePartsRangeSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRangeSelect.h" +#include "Game/Actor/AI/aiNewRangeSelect.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class NoticePartsRangeSelector : public RangeSelect { - SEAD_RTTI_OVERRIDE(NoticePartsRangeSelector, RangeSelect) +class NoticePartsRangeSelector : public NewRangeSelect { + SEAD_RTTI_OVERRIDE(NoticePartsRangeSelector, NewRangeSelect) public: explicit NoticePartsRangeSelector(const InitArg& arg); ~NoticePartsRangeSelector() override; diff --git a/src/Game/Actor/AI/aiOctarockEscape.cpp b/src/Game/Actor/AI/aiOctarockEscape.cpp deleted file mode 100644 index 3eceb5df..00000000 --- a/src/Game/Actor/AI/aiOctarockEscape.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiOctarockEscape.h" - -namespace uking::ai { - -OctarockEscape::OctarockEscape(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -OctarockEscape::~OctarockEscape() = default; - -bool OctarockEscape::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void OctarockEscape::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void OctarockEscape::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void OctarockEscape::loadParams_() { - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiOctarockHideEscape.cpp b/src/Game/Actor/AI/aiOctarockHideEscape.cpp index e74a566b..99d7a35a 100644 --- a/src/Game/Actor/AI/aiOctarockHideEscape.cpp +++ b/src/Game/Actor/AI/aiOctarockHideEscape.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -OctarockHideEscape::OctarockHideEscape(const InitArg& arg) : OctarockEscape(arg) {} +OctarockHideEscape::OctarockHideEscape(const InitArg& arg) : OctarockHideEscapeBase(arg) {} OctarockHideEscape::~OctarockHideEscape() = default; bool OctarockHideEscape::init_(sead::Heap* heap) { - return OctarockEscape::init_(heap); + return OctarockHideEscapeBase::init_(heap); } void OctarockHideEscape::enter_(ksys::act::ai::InlineParamPack* params) { - OctarockEscape::enter_(params); + OctarockHideEscapeBase::enter_(params); } void OctarockHideEscape::leave_() { - OctarockEscape::leave_(); + OctarockHideEscapeBase::leave_(); } void OctarockHideEscape::loadParams_() { - OctarockEscape::loadParams_(); + OctarockHideEscapeBase::loadParams_(); getStaticParam(&mEscapeDist_s, "EscapeDist"); } diff --git a/src/Game/Actor/AI/aiOctarockHideEscape.h b/src/Game/Actor/AI/aiOctarockHideEscape.h index b5ad4f79..ff29bbbc 100644 --- a/src/Game/Actor/AI/aiOctarockHideEscape.h +++ b/src/Game/Actor/AI/aiOctarockHideEscape.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiOctarockEscape.h" +#include "Game/Actor/AI/aiOctarockHideEscapeBase.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class OctarockHideEscape : public OctarockEscape { - SEAD_RTTI_OVERRIDE(OctarockHideEscape, OctarockEscape) +class OctarockHideEscape : public OctarockHideEscapeBase { + SEAD_RTTI_OVERRIDE(OctarockHideEscape, OctarockHideEscapeBase) public: explicit OctarockHideEscape(const InitArg& arg); ~OctarockHideEscape() override; diff --git a/src/Game/Actor/AI/aiOctarockHideEscapeBase.cpp b/src/Game/Actor/AI/aiOctarockHideEscapeBase.cpp new file mode 100644 index 00000000..9bd99410 --- /dev/null +++ b/src/Game/Actor/AI/aiOctarockHideEscapeBase.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiOctarockHideEscapeBase.h" + +namespace uking::ai { + +OctarockHideEscapeBase::OctarockHideEscapeBase(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +OctarockHideEscapeBase::~OctarockHideEscapeBase() = default; + +bool OctarockHideEscapeBase::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void OctarockHideEscapeBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void OctarockHideEscapeBase::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void OctarockHideEscapeBase::loadParams_() { + getDynamicParam(&mTargetPos_d, "TargetPos"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiOctarockEscape.h b/src/Game/Actor/AI/aiOctarockHideEscapeBase.h similarity index 62% rename from src/Game/Actor/AI/aiOctarockEscape.h rename to src/Game/Actor/AI/aiOctarockHideEscapeBase.h index 97d076a7..11c0cb60 100644 --- a/src/Game/Actor/AI/aiOctarockEscape.h +++ b/src/Game/Actor/AI/aiOctarockHideEscapeBase.h @@ -4,11 +4,11 @@ namespace uking::ai { -class OctarockEscape : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(OctarockEscape, ksys::act::ai::Ai) +class OctarockHideEscapeBase : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(OctarockHideEscapeBase, ksys::act::ai::Ai) public: - explicit OctarockEscape(const InitArg& arg); - ~OctarockEscape() override; + explicit OctarockHideEscapeBase(const InitArg& arg); + ~OctarockHideEscapeBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiOctarockRoot.cpp b/src/Game/Actor/AI/aiOctarockRoot.cpp index e4ebd26a..7cc08cf1 100644 --- a/src/Game/Actor/AI/aiOctarockRoot.cpp +++ b/src/Game/Actor/AI/aiOctarockRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -OctarockRoot::OctarockRoot(const InitArg& arg) : OctarockRootBase(arg) {} +OctarockRoot::OctarockRoot(const InitArg& arg) : VacuumEnemyRoot(arg) {} OctarockRoot::~OctarockRoot() = default; bool OctarockRoot::init_(sead::Heap* heap) { - return OctarockRootBase::init_(heap); + return VacuumEnemyRoot::init_(heap); } void OctarockRoot::enter_(ksys::act::ai::InlineParamPack* params) { - OctarockRootBase::enter_(params); + VacuumEnemyRoot::enter_(params); } void OctarockRoot::leave_() { - OctarockRootBase::leave_(); + VacuumEnemyRoot::leave_(); } void OctarockRoot::loadParams_() { - OctarockRootBase::loadParams_(); + VacuumEnemyRoot::loadParams_(); getStaticParam(&mIsWigBreakable_s, "IsWigBreakable"); getStaticParam(&mItemName_s, "ItemName"); getStaticParam(&mConnectRigidBodyName_s, "ConnectRigidBodyName"); diff --git a/src/Game/Actor/AI/aiOctarockRoot.h b/src/Game/Actor/AI/aiOctarockRoot.h index e484f7d7..24c1dc37 100644 --- a/src/Game/Actor/AI/aiOctarockRoot.h +++ b/src/Game/Actor/AI/aiOctarockRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiOctarockRootBase.h" +#include "Game/Actor/AI/aiVacuumEnemyRoot.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class OctarockRoot : public OctarockRootBase { - SEAD_RTTI_OVERRIDE(OctarockRoot, OctarockRootBase) +class OctarockRoot : public VacuumEnemyRoot { + SEAD_RTTI_OVERRIDE(OctarockRoot, VacuumEnemyRoot) public: explicit OctarockRoot(const InitArg& arg); ~OctarockRoot() override; diff --git a/src/Game/Actor/AI/aiOctarockRootBase.cpp b/src/Game/Actor/AI/aiOctarockRootBase.cpp deleted file mode 100644 index 26138d5b..00000000 --- a/src/Game/Actor/AI/aiOctarockRootBase.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiOctarockRootBase.h" - -namespace uking::ai { - -OctarockRootBase::OctarockRootBase(const InitArg& arg) : EnemyRoot(arg) {} - -OctarockRootBase::~OctarockRootBase() = default; - -bool OctarockRootBase::init_(sead::Heap* heap) { - return EnemyRoot::init_(heap); -} - -void OctarockRootBase::enter_(ksys::act::ai::InlineParamPack* params) { - EnemyRoot::enter_(params); -} - -void OctarockRootBase::leave_() { - EnemyRoot::leave_(); -} - -void OctarockRootBase::loadParams_() { - EnemyRoot::loadParams_(); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiOffsetTargetPos.cpp b/src/Game/Actor/AI/aiOffsetTargetPos.cpp new file mode 100644 index 00000000..d4228def --- /dev/null +++ b/src/Game/Actor/AI/aiOffsetTargetPos.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/AI/aiOffsetTargetPos.h" + +namespace uking::ai { + +OffsetTargetPos::OffsetTargetPos(const InitArg& arg) : TargetActorPos(arg) {} + +OffsetTargetPos::~OffsetTargetPos() = default; + +bool OffsetTargetPos::init_(sead::Heap* heap) { + return TargetActorPos::init_(heap); +} + +void OffsetTargetPos::enter_(ksys::act::ai::InlineParamPack* params) { + TargetActorPos::enter_(params); +} + +void OffsetTargetPos::leave_() { + TargetActorPos::leave_(); +} + +void OffsetTargetPos::loadParams_() { + TargetActorPos::loadParams_(); + getStaticParam(&mDir_s, "Dir"); + getStaticParam(&mOffset_s, "Offset"); + getStaticParam(&mMinDist_s, "MinDist"); + getStaticParam(&mSideDist_s, "SideDist"); + getStaticParam(&mIsRandSide_s, "IsRandSide"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPosOffset.h b/src/Game/Actor/AI/aiOffsetTargetPos.h similarity index 73% rename from src/Game/Actor/AI/aiTargetPosOffset.h rename to src/Game/Actor/AI/aiOffsetTargetPos.h index 9c86c8ab..8e7f65dd 100644 --- a/src/Game/Actor/AI/aiTargetPosOffset.h +++ b/src/Game/Actor/AI/aiOffsetTargetPos.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosOffset : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPosOffset, TargetPosAI) +class OffsetTargetPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(OffsetTargetPos, TargetActorPos) public: - explicit TargetPosOffset(const InitArg& arg); - ~TargetPosOffset() override; + explicit OffsetTargetPos(const InitArg& arg); + ~OffsetTargetPos() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiOneMemoryMagicBattle.cpp b/src/Game/Actor/AI/aiOneMemoryMagicBattle.cpp index 20e0e24c..8c456f93 100644 --- a/src/Game/Actor/AI/aiOneMemoryMagicBattle.cpp +++ b/src/Game/Actor/AI/aiOneMemoryMagicBattle.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -OneMemoryMagicBattle::OneMemoryMagicBattle(const InitArg& arg) : OneMemoryMagicBattleBase(arg) {} +OneMemoryMagicBattle::OneMemoryMagicBattle(const InitArg& arg) : MagicBattle(arg) {} OneMemoryMagicBattle::~OneMemoryMagicBattle() = default; bool OneMemoryMagicBattle::init_(sead::Heap* heap) { - return OneMemoryMagicBattleBase::init_(heap); + return MagicBattle::init_(heap); } void OneMemoryMagicBattle::enter_(ksys::act::ai::InlineParamPack* params) { - OneMemoryMagicBattleBase::enter_(params); + MagicBattle::enter_(params); } void OneMemoryMagicBattle::leave_() { - OneMemoryMagicBattleBase::leave_(); + MagicBattle::leave_(); } void OneMemoryMagicBattle::loadParams_() { - OneMemoryMagicBattleBase::loadParams_(); + MagicBattle::loadParams_(); getStaticParam(&mMemoryPartsName_s, "MemoryPartsName"); } diff --git a/src/Game/Actor/AI/aiOneMemoryMagicBattle.h b/src/Game/Actor/AI/aiOneMemoryMagicBattle.h index 8b506b5b..e26d3f9b 100644 --- a/src/Game/Actor/AI/aiOneMemoryMagicBattle.h +++ b/src/Game/Actor/AI/aiOneMemoryMagicBattle.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiOneMemoryMagicBattleBase.h" +#include "Game/Actor/AI/aiMagicBattle.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class OneMemoryMagicBattle : public OneMemoryMagicBattleBase { - SEAD_RTTI_OVERRIDE(OneMemoryMagicBattle, OneMemoryMagicBattleBase) +class OneMemoryMagicBattle : public MagicBattle { + SEAD_RTTI_OVERRIDE(OneMemoryMagicBattle, MagicBattle) public: explicit OneMemoryMagicBattle(const InitArg& arg); ~OneMemoryMagicBattle() override; diff --git a/src/Game/Actor/AI/aiPlayASSwitch.cpp b/src/Game/Actor/AI/aiPlayASSwitch.cpp new file mode 100644 index 00000000..ee29eca3 --- /dev/null +++ b/src/Game/Actor/AI/aiPlayASSwitch.cpp @@ -0,0 +1,28 @@ +#include "Game/Actor/AI/aiPlayASSwitch.h" + +namespace uking::ai { + +PlayASSwitch::PlayASSwitch(const InitArg& arg) : SimpleLiftable(arg) {} + +PlayASSwitch::~PlayASSwitch() = default; + +bool PlayASSwitch::init_(sead::Heap* heap) { + return SimpleLiftable::init_(heap); +} + +void PlayASSwitch::enter_(ksys::act::ai::InlineParamPack* params) { + SimpleLiftable::enter_(params); +} + +void PlayASSwitch::leave_() { + SimpleLiftable::leave_(); +} + +void PlayASSwitch::loadParams_() { + getStaticParam(&mIsIgnoreSameOnAS_s, "IsIgnoreSameOnAS"); + getStaticParam(&mIsIgnoreSameOffAS_s, "IsIgnoreSameOffAS"); + getStaticParam(&mOnAS_s, "OnAS"); + getStaticParam(&mOffAS_s, "OffAS"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAncientNecklaceBallBase.h b/src/Game/Actor/AI/aiPlayASSwitch.h similarity index 74% rename from src/Game/Actor/AI/aiAncientNecklaceBallBase.h rename to src/Game/Actor/AI/aiPlayASSwitch.h index f56f2f0a..1565d43e 100644 --- a/src/Game/Actor/AI/aiAncientNecklaceBallBase.h +++ b/src/Game/Actor/AI/aiPlayASSwitch.h @@ -5,11 +5,11 @@ namespace uking::ai { -class AncientNecklaceBallBase : public SimpleLiftable { - SEAD_RTTI_OVERRIDE(AncientNecklaceBallBase, SimpleLiftable) +class PlayASSwitch : public SimpleLiftable { + SEAD_RTTI_OVERRIDE(PlayASSwitch, SimpleLiftable) public: - explicit AncientNecklaceBallBase(const InitArg& arg); - ~AncientNecklaceBallBase() override; + explicit PlayASSwitch(const InitArg& arg); + ~PlayASSwitch() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiPriestBoss.cpp b/src/Game/Actor/AI/aiPriestBoss.cpp new file mode 100644 index 00000000..a72be500 --- /dev/null +++ b/src/Game/Actor/AI/aiPriestBoss.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiPriestBoss.h" + +namespace uking::ai { + +PriestBoss::PriestBoss(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +PriestBoss::~PriestBoss() = default; + +bool PriestBoss::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void PriestBoss::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void PriestBoss::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void PriestBoss::loadParams_() { + getAITreeVariable(&mPriestBossMetaAIUnit_a, "PriestBossMetaAIUnit"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiPriestBossMode.h b/src/Game/Actor/AI/aiPriestBoss.h similarity index 66% rename from src/Game/Actor/AI/aiPriestBossMode.h rename to src/Game/Actor/AI/aiPriestBoss.h index ec4c89a8..422bce8f 100644 --- a/src/Game/Actor/AI/aiPriestBossMode.h +++ b/src/Game/Actor/AI/aiPriestBoss.h @@ -4,11 +4,11 @@ namespace uking::ai { -class PriestBossMode : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(PriestBossMode, ksys::act::ai::Ai) +class PriestBoss : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(PriestBoss, ksys::act::ai::Ai) public: - explicit PriestBossMode(const InitArg& arg); - ~PriestBossMode() override; + explicit PriestBoss(const InitArg& arg); + ~PriestBoss() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiPriestBossActorNormalMode.cpp b/src/Game/Actor/AI/aiPriestBossActorNormalMode.cpp index dbd304ae..82d04e9b 100644 --- a/src/Game/Actor/AI/aiPriestBossActorNormalMode.cpp +++ b/src/Game/Actor/AI/aiPriestBossActorNormalMode.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossActorNormalMode::PriestBossActorNormalMode(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossActorNormalMode::PriestBossActorNormalMode(const InitArg& arg) : PriestBoss(arg) {} PriestBossActorNormalMode::~PriestBossActorNormalMode() = default; bool PriestBossActorNormalMode::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossActorNormalMode::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossActorNormalMode::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossActorNormalMode::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mApproachWarpRate_s, "ApproachWarpRate"); getStaticParam(&mApproachStartDistance_s, "ApproachStartDistance"); getStaticParam(&mLeaveStartDistance_s, "LeaveStartDistance"); diff --git a/src/Game/Actor/AI/aiPriestBossActorNormalMode.h b/src/Game/Actor/AI/aiPriestBossActorNormalMode.h index f1989cc3..048a4b57 100644 --- a/src/Game/Actor/AI/aiPriestBossActorNormalMode.h +++ b/src/Game/Actor/AI/aiPriestBossActorNormalMode.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossActorNormalMode : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossActorNormalMode, PriestBossMode) +class PriestBossActorNormalMode : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossActorNormalMode, PriestBoss) public: explicit PriestBossActorNormalMode(const InitArg& arg); ~PriestBossActorNormalMode() override; diff --git a/src/Game/Actor/AI/aiPriestBossActorRoot.cpp b/src/Game/Actor/AI/aiPriestBossActorRoot.cpp index 2b65fb89..66117e21 100644 --- a/src/Game/Actor/AI/aiPriestBossActorRoot.cpp +++ b/src/Game/Actor/AI/aiPriestBossActorRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossActorRoot::PriestBossActorRoot(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossActorRoot::PriestBossActorRoot(const InitArg& arg) : PriestBoss(arg) {} PriestBossActorRoot::~PriestBossActorRoot() = default; bool PriestBossActorRoot::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossActorRoot::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossActorRoot::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossActorRoot::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiPriestBossActorRoot.h b/src/Game/Actor/AI/aiPriestBossActorRoot.h index cd23047e..ba1b82be 100644 --- a/src/Game/Actor/AI/aiPriestBossActorRoot.h +++ b/src/Game/Actor/AI/aiPriestBossActorRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossActorRoot : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossActorRoot, PriestBossMode) +class PriestBossActorRoot : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossActorRoot, PriestBoss) public: explicit PriestBossActorRoot(const InitArg& arg); ~PriestBossActorRoot() override; diff --git a/src/Game/Actor/AI/aiPriestBossBananaMode.cpp b/src/Game/Actor/AI/aiPriestBossBananaMode.cpp index b97e0c43..58ee3f3a 100644 --- a/src/Game/Actor/AI/aiPriestBossBananaMode.cpp +++ b/src/Game/Actor/AI/aiPriestBossBananaMode.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossBananaMode::PriestBossBananaMode(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossBananaMode::PriestBossBananaMode(const InitArg& arg) : PriestBoss(arg) {} PriestBossBananaMode::~PriestBossBananaMode() = default; bool PriestBossBananaMode::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossBananaMode::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossBananaMode::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossBananaMode::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mHealAmount_s, "HealAmount"); getStaticParam(&mTimeUpFrames_s, "TimeUpFrames"); getAITreeVariable(&mReturnFromBananaMode_a, "ReturnFromBananaMode"); diff --git a/src/Game/Actor/AI/aiPriestBossBananaMode.h b/src/Game/Actor/AI/aiPriestBossBananaMode.h index dc7e93ca..db074a78 100644 --- a/src/Game/Actor/AI/aiPriestBossBananaMode.h +++ b/src/Game/Actor/AI/aiPriestBossBananaMode.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossBananaMode : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossBananaMode, PriestBossMode) +class PriestBossBananaMode : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossBananaMode, PriestBoss) public: explicit PriestBossBananaMode(const InitArg& arg); ~PriestBossBananaMode() override; diff --git a/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.cpp b/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.cpp index c2f36b07..cf7c71fb 100644 --- a/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.cpp +++ b/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossCloneBulletRoot::PriestBossCloneBulletRoot(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossCloneBulletRoot::PriestBossCloneBulletRoot(const InitArg& arg) : PriestBoss(arg) {} PriestBossCloneBulletRoot::~PriestBossCloneBulletRoot() = default; bool PriestBossCloneBulletRoot::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossCloneBulletRoot::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossCloneBulletRoot::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossCloneBulletRoot::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getAITreeVariable(&mPriestBossMetaAIUnit_a, "PriestBossMetaAIUnit"); } diff --git a/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.h b/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.h index 46a884a6..14800221 100644 --- a/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.h +++ b/src/Game/Actor/AI/aiPriestBossCloneBulletRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossCloneBulletRoot : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossCloneBulletRoot, PriestBossMode) +class PriestBossCloneBulletRoot : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossCloneBulletRoot, PriestBoss) public: explicit PriestBossCloneBulletRoot(const InitArg& arg); ~PriestBossCloneBulletRoot() override; diff --git a/src/Game/Actor/AI/aiPriestBossGiantDownSeq.cpp b/src/Game/Actor/AI/aiPriestBossGiantDownSeq.cpp index cc8a1757..24011162 100644 --- a/src/Game/Actor/AI/aiPriestBossGiantDownSeq.cpp +++ b/src/Game/Actor/AI/aiPriestBossGiantDownSeq.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossGiantDownSeq::PriestBossGiantDownSeq(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossGiantDownSeq::PriestBossGiantDownSeq(const InitArg& arg) : PriestBoss(arg) {} PriestBossGiantDownSeq::~PriestBossGiantDownSeq() = default; bool PriestBossGiantDownSeq::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossGiantDownSeq::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossGiantDownSeq::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossGiantDownSeq::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mRecoverIfAlreadyDown_s, "RecoverIfAlreadyDown"); getStaticParam(&mIsUseRecover_s, "IsUseRecover"); getStaticParam(&mHitGroundASName_s, "HitGroundASName"); diff --git a/src/Game/Actor/AI/aiPriestBossGiantDownSeq.h b/src/Game/Actor/AI/aiPriestBossGiantDownSeq.h index 7f2cedb7..5131f03a 100644 --- a/src/Game/Actor/AI/aiPriestBossGiantDownSeq.h +++ b/src/Game/Actor/AI/aiPriestBossGiantDownSeq.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossGiantDownSeq : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossGiantDownSeq, PriestBossMode) +class PriestBossGiantDownSeq : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossGiantDownSeq, PriestBoss) public: explicit PriestBossGiantDownSeq(const InitArg& arg); ~PriestBossGiantDownSeq() override; diff --git a/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.cpp b/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.cpp index d87215ca..c70a62a2 100644 --- a/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.cpp +++ b/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -PriestBossGiantStageRotRoot::PriestBossGiantStageRotRoot(const InitArg& arg) - : PriestBossMode(arg) {} +PriestBossGiantStageRotRoot::PriestBossGiantStageRotRoot(const InitArg& arg) : PriestBoss(arg) {} PriestBossGiantStageRotRoot::~PriestBossGiantStageRotRoot() = default; bool PriestBossGiantStageRotRoot::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossGiantStageRotRoot::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossGiantStageRotRoot::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossGiantStageRotRoot::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mCentralAngle_s, "CentralAngle"); getStaticParam(&mPercentRadiusHeight_s, "PercentRadiusHeight"); getStaticParam(&mIronBallHeightOffset_s, "IronBallHeightOffset"); diff --git a/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.h b/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.h index 7288ce64..c94e0b8e 100644 --- a/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.h +++ b/src/Game/Actor/AI/aiPriestBossGiantStageRotRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossGiantStageRotRoot : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossGiantStageRotRoot, PriestBossMode) +class PriestBossGiantStageRotRoot : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossGiantStageRotRoot, PriestBoss) public: explicit PriestBossGiantStageRotRoot(const InitArg& arg); ~PriestBossGiantStageRotRoot() override; diff --git a/src/Game/Actor/AI/aiPriestBossGiantStageRotate.cpp b/src/Game/Actor/AI/aiPriestBossGiantStageRotate.cpp index ee8934d3..1c71f365 100644 --- a/src/Game/Actor/AI/aiPriestBossGiantStageRotate.cpp +++ b/src/Game/Actor/AI/aiPriestBossGiantStageRotate.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossGiantStageRotate::PriestBossGiantStageRotate(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossGiantStageRotate::PriestBossGiantStageRotate(const InitArg& arg) : PriestBoss(arg) {} PriestBossGiantStageRotate::~PriestBossGiantStageRotate() = default; bool PriestBossGiantStageRotate::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossGiantStageRotate::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossGiantStageRotate::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossGiantStageRotate::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mSendCommand_s, "SendCommand"); getStaticParam(&mSendOnThrowASEvent_s, "SendOnThrowASEvent"); getStaticParam(&mIsUseStartAction_s, "IsUseStartAction"); diff --git a/src/Game/Actor/AI/aiPriestBossGiantStageRotate.h b/src/Game/Actor/AI/aiPriestBossGiantStageRotate.h index 35b48ab1..6ea1e326 100644 --- a/src/Game/Actor/AI/aiPriestBossGiantStageRotate.h +++ b/src/Game/Actor/AI/aiPriestBossGiantStageRotate.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossGiantStageRotate : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossGiantStageRotate, PriestBossMode) +class PriestBossGiantStageRotate : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossGiantStageRotate, PriestBoss) public: explicit PriestBossGiantStageRotate(const InitArg& arg); ~PriestBossGiantStageRotate() override; diff --git a/src/Game/Actor/AI/aiPriestBossIronBallRoot.cpp b/src/Game/Actor/AI/aiPriestBossIronBallRoot.cpp index 7acd994a..2009b125 100644 --- a/src/Game/Actor/AI/aiPriestBossIronBallRoot.cpp +++ b/src/Game/Actor/AI/aiPriestBossIronBallRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossIronBallRoot::PriestBossIronBallRoot(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossIronBallRoot::PriestBossIronBallRoot(const InitArg& arg) : PriestBoss(arg) {} PriestBossIronBallRoot::~PriestBossIronBallRoot() = default; bool PriestBossIronBallRoot::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossIronBallRoot::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossIronBallRoot::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossIronBallRoot::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mAttackPower_s, "AttackPower"); getStaticParam(&mAttackPowerForPlayer_s, "AttackPowerForPlayer"); getStaticParam(&mAtMinDamage_s, "AtMinDamage"); diff --git a/src/Game/Actor/AI/aiPriestBossIronBallRoot.h b/src/Game/Actor/AI/aiPriestBossIronBallRoot.h index 234fa860..7c732885 100644 --- a/src/Game/Actor/AI/aiPriestBossIronBallRoot.h +++ b/src/Game/Actor/AI/aiPriestBossIronBallRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossIronBallRoot : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossIronBallRoot, PriestBossMode) +class PriestBossIronBallRoot : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossIronBallRoot, PriestBoss) public: explicit PriestBossIronBallRoot(const InitArg& arg); ~PriestBossIronBallRoot() override; diff --git a/src/Game/Actor/AI/aiPriestBossMode.cpp b/src/Game/Actor/AI/aiPriestBossMode.cpp deleted file mode 100644 index 2c5aaad7..00000000 --- a/src/Game/Actor/AI/aiPriestBossMode.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiPriestBossMode.h" - -namespace uking::ai { - -PriestBossMode::PriestBossMode(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -PriestBossMode::~PriestBossMode() = default; - -bool PriestBossMode::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void PriestBossMode::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void PriestBossMode::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void PriestBossMode::loadParams_() { - getAITreeVariable(&mPriestBossMetaAIUnit_a, "PriestBossMetaAIUnit"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.cpp b/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.cpp index 612921bb..ba5f689c 100644 --- a/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.cpp +++ b/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -PriestBossNormalMoveSelector::PriestBossNormalMoveSelector(const InitArg& arg) - : PriestBossMode(arg) {} +PriestBossNormalMoveSelector::PriestBossNormalMoveSelector(const InitArg& arg) : PriestBoss(arg) {} PriestBossNormalMoveSelector::~PriestBossNormalMoveSelector() = default; bool PriestBossNormalMoveSelector::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossNormalMoveSelector::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossNormalMoveSelector::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossNormalMoveSelector::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getDynamicParam(&mMoveTargetPos_d, "MoveTargetPos"); } diff --git a/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.h b/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.h index 9f692297..9d7defff 100644 --- a/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.h +++ b/src/Game/Actor/AI/aiPriestBossNormalMoveSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossNormalMoveSelector : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossNormalMoveSelector, PriestBossMode) +class PriestBossNormalMoveSelector : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossNormalMoveSelector, PriestBoss) public: explicit PriestBossNormalMoveSelector(const InitArg& arg); ~PriestBossNormalMoveSelector() override; diff --git a/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.cpp b/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.cpp index f4cc7d28..83ff2f0a 100644 --- a/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.cpp +++ b/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -PriestBossNormalQuickRecover::PriestBossNormalQuickRecover(const InitArg& arg) - : PriestBossMode(arg) {} +PriestBossNormalQuickRecover::PriestBossNormalQuickRecover(const InitArg& arg) : PriestBoss(arg) {} PriestBossNormalQuickRecover::~PriestBossNormalQuickRecover() = default; bool PriestBossNormalQuickRecover::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossNormalQuickRecover::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossNormalQuickRecover::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossNormalQuickRecover::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getDynamicParam(&mIsFromRagdoll_d, "IsFromRagdoll"); } diff --git a/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.h b/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.h index e6036791..c2f8a1a9 100644 --- a/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.h +++ b/src/Game/Actor/AI/aiPriestBossNormalQuickRecover.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossNormalQuickRecover : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossNormalQuickRecover, PriestBossMode) +class PriestBossNormalQuickRecover : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossNormalQuickRecover, PriestBoss) public: explicit PriestBossNormalQuickRecover(const InitArg& arg); ~PriestBossNormalQuickRecover() override; diff --git a/src/Game/Actor/AI/aiPriestBossPhaseSelector.cpp b/src/Game/Actor/AI/aiPriestBossPhaseSelector.cpp index 63a706c5..92fbc1df 100644 --- a/src/Game/Actor/AI/aiPriestBossPhaseSelector.cpp +++ b/src/Game/Actor/AI/aiPriestBossPhaseSelector.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossPhaseSelector::PriestBossPhaseSelector(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossPhaseSelector::PriestBossPhaseSelector(const InitArg& arg) : PriestBoss(arg) {} PriestBossPhaseSelector::~PriestBossPhaseSelector() = default; bool PriestBossPhaseSelector::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossPhaseSelector::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossPhaseSelector::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossPhaseSelector::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mIsSelectOnlyOnce_s, "IsSelectOnlyOnce"); } diff --git a/src/Game/Actor/AI/aiPriestBossPhaseSelector.h b/src/Game/Actor/AI/aiPriestBossPhaseSelector.h index 40184968..6acb48d9 100644 --- a/src/Game/Actor/AI/aiPriestBossPhaseSelector.h +++ b/src/Game/Actor/AI/aiPriestBossPhaseSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossPhaseSelector : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossPhaseSelector, PriestBossMode) +class PriestBossPhaseSelector : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossPhaseSelector, PriestBoss) public: explicit PriestBossPhaseSelector(const InitArg& arg); ~PriestBossPhaseSelector() override; diff --git a/src/Game/Actor/AI/aiPriestBossStageRotationSelector.cpp b/src/Game/Actor/AI/aiPriestBossStageRotationSelector.cpp index 06a9c373..8b8017c2 100644 --- a/src/Game/Actor/AI/aiPriestBossStageRotationSelector.cpp +++ b/src/Game/Actor/AI/aiPriestBossStageRotationSelector.cpp @@ -3,24 +3,24 @@ namespace uking::ai { PriestBossStageRotationSelector::PriestBossStageRotationSelector(const InitArg& arg) - : PriestBossMode(arg) {} + : PriestBoss(arg) {} PriestBossStageRotationSelector::~PriestBossStageRotationSelector() = default; bool PriestBossStageRotationSelector::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossStageRotationSelector::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossStageRotationSelector::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossStageRotationSelector::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiPriestBossStageRotationSelector.h b/src/Game/Actor/AI/aiPriestBossStageRotationSelector.h index 4243e172..39bb580d 100644 --- a/src/Game/Actor/AI/aiPriestBossStageRotationSelector.h +++ b/src/Game/Actor/AI/aiPriestBossStageRotationSelector.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossStageRotationSelector : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossStageRotationSelector, PriestBossMode) +class PriestBossStageRotationSelector : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossStageRotationSelector, PriestBoss) public: explicit PriestBossStageRotationSelector(const InitArg& arg); ~PriestBossStageRotationSelector() override; diff --git a/src/Game/Actor/AI/aiPriestBossSynchroMode.cpp b/src/Game/Actor/AI/aiPriestBossSynchroMode.cpp index 461cbf1d..401e35ac 100644 --- a/src/Game/Actor/AI/aiPriestBossSynchroMode.cpp +++ b/src/Game/Actor/AI/aiPriestBossSynchroMode.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossSynchroMode::PriestBossSynchroMode(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossSynchroMode::PriestBossSynchroMode(const InitArg& arg) : PriestBoss(arg) {} PriestBossSynchroMode::~PriestBossSynchroMode() = default; bool PriestBossSynchroMode::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossSynchroMode::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossSynchroMode::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossSynchroMode::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getAITreeVariable(&mEquipWeaponBufIndex_a, "EquipWeaponBufIndex"); getAITreeVariable(&mReturnFromBananaMode_a, "ReturnFromBananaMode"); } diff --git a/src/Game/Actor/AI/aiPriestBossSynchroMode.h b/src/Game/Actor/AI/aiPriestBossSynchroMode.h index d02ac301..2df11f05 100644 --- a/src/Game/Actor/AI/aiPriestBossSynchroMode.h +++ b/src/Game/Actor/AI/aiPriestBossSynchroMode.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossSynchroMode : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossSynchroMode, PriestBossMode) +class PriestBossSynchroMode : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossSynchroMode, PriestBoss) public: explicit PriestBossSynchroMode(const InitArg& arg); ~PriestBossSynchroMode() override; diff --git a/src/Game/Actor/AI/aiPriestBossWarpToSafePos.cpp b/src/Game/Actor/AI/aiPriestBossWarpToSafePos.cpp index 8a9f6554..222babe3 100644 --- a/src/Game/Actor/AI/aiPriestBossWarpToSafePos.cpp +++ b/src/Game/Actor/AI/aiPriestBossWarpToSafePos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -PriestBossWarpToSafePos::PriestBossWarpToSafePos(const InitArg& arg) : PriestBossMode(arg) {} +PriestBossWarpToSafePos::PriestBossWarpToSafePos(const InitArg& arg) : PriestBoss(arg) {} PriestBossWarpToSafePos::~PriestBossWarpToSafePos() = default; bool PriestBossWarpToSafePos::init_(sead::Heap* heap) { - return PriestBossMode::init_(heap); + return PriestBoss::init_(heap); } void PriestBossWarpToSafePos::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossMode::enter_(params); + PriestBoss::enter_(params); } void PriestBossWarpToSafePos::leave_() { - PriestBossMode::leave_(); + PriestBoss::leave_(); } void PriestBossWarpToSafePos::loadParams_() { - PriestBossMode::loadParams_(); + PriestBoss::loadParams_(); getStaticParam(&mOffsetY_s, "OffsetY"); getStaticParam(&mOffsetZ_s, "OffsetZ"); getAITreeVariable(&mIsActive_a, "IsActive"); diff --git a/src/Game/Actor/AI/aiPriestBossWarpToSafePos.h b/src/Game/Actor/AI/aiPriestBossWarpToSafePos.h index 61033b32..87d8ea88 100644 --- a/src/Game/Actor/AI/aiPriestBossWarpToSafePos.h +++ b/src/Game/Actor/AI/aiPriestBossWarpToSafePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiPriestBossMode.h" +#include "Game/Actor/AI/aiPriestBoss.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class PriestBossWarpToSafePos : public PriestBossMode { - SEAD_RTTI_OVERRIDE(PriestBossWarpToSafePos, PriestBossMode) +class PriestBossWarpToSafePos : public PriestBoss { + SEAD_RTTI_OVERRIDE(PriestBossWarpToSafePos, PriestBoss) public: explicit PriestBossWarpToSafePos(const InitArg& arg); ~PriestBossWarpToSafePos() override; diff --git a/src/Game/Actor/AI/aiRailMove.cpp b/src/Game/Actor/AI/aiRailMove.cpp deleted file mode 100644 index fb342171..00000000 --- a/src/Game/Actor/AI/aiRailMove.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiRailMove.h" - -namespace uking::ai { - -RailMove::RailMove(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -RailMove::~RailMove() = default; - -bool RailMove::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void RailMove::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void RailMove::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void RailMove::loadParams_() { - getStaticParam(&mIsIgnoreNoWaitStopPoint_s, "IsIgnoreNoWaitStopPoint"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRailMoveWithClose.cpp b/src/Game/Actor/AI/aiRailMoveWithClose.cpp index 822a86ea..36b9cdd6 100644 --- a/src/Game/Actor/AI/aiRailMoveWithClose.cpp +++ b/src/Game/Actor/AI/aiRailMoveWithClose.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -RailMoveWithClose::RailMoveWithClose(const InitArg& arg) : RailMove(arg) {} +RailMoveWithClose::RailMoveWithClose(const InitArg& arg) : BezierRailMove(arg) {} RailMoveWithClose::~RailMoveWithClose() = default; bool RailMoveWithClose::init_(sead::Heap* heap) { - return RailMove::init_(heap); + return BezierRailMove::init_(heap); } void RailMoveWithClose::enter_(ksys::act::ai::InlineParamPack* params) { - RailMove::enter_(params); + BezierRailMove::enter_(params); } void RailMoveWithClose::leave_() { - RailMove::leave_(); + BezierRailMove::leave_(); } void RailMoveWithClose::loadParams_() { - RailMove::loadParams_(); + BezierRailMove::loadParams_(); getStaticParam(&mOnRailDistance_s, "OnRailDistance"); getStaticParam(&mFarDistance_s, "FarDistance"); getStaticParam(&mSpeed_s, "Speed"); diff --git a/src/Game/Actor/AI/aiRailMoveWithClose.h b/src/Game/Actor/AI/aiRailMoveWithClose.h index 1ed30445..a87493c3 100644 --- a/src/Game/Actor/AI/aiRailMoveWithClose.h +++ b/src/Game/Actor/AI/aiRailMoveWithClose.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRailMove.h" +#include "Game/Actor/AI/aiBezierRailMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class RailMoveWithClose : public RailMove { - SEAD_RTTI_OVERRIDE(RailMoveWithClose, RailMove) +class RailMoveWithClose : public BezierRailMove { + SEAD_RTTI_OVERRIDE(RailMoveWithClose, BezierRailMove) public: explicit RailMoveWithClose(const InitArg& arg); ~RailMoveWithClose() override; diff --git a/src/Game/Actor/AI/aiRangeSelect.cpp b/src/Game/Actor/AI/aiRangeSelect.cpp deleted file mode 100644 index 1e7d3ad6..00000000 --- a/src/Game/Actor/AI/aiRangeSelect.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/AI/aiRangeSelect.h" - -namespace uking::ai { - -RangeSelect::RangeSelect(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -RangeSelect::~RangeSelect() = default; - -bool RangeSelect::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void RangeSelect::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void RangeSelect::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void RangeSelect::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mFarDist_s, "FarDist"); - getStaticParam(&mIsSelectEveryFrame_s, "IsSelectEveryFrame"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRegistedActor.cpp b/src/Game/Actor/AI/aiRegistedActor.cpp new file mode 100644 index 00000000..3d79d925 --- /dev/null +++ b/src/Game/Actor/AI/aiRegistedActor.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiRegistedActor.h" + +namespace uking::ai { + +RegistedActor::RegistedActor(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +RegistedActor::~RegistedActor() = default; + +bool RegistedActor::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void RegistedActor::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void RegistedActor::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void RegistedActor::loadParams_() { + getAITreeVariable(&mRegistedActorUnit_a, "RegistedActorUnit"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.h b/src/Game/Actor/AI/aiRegistedActor.h similarity index 60% rename from src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.h rename to src/Game/Actor/AI/aiRegistedActor.h index 2ddaf121..c5566d66 100644 --- a/src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.h +++ b/src/Game/Actor/AI/aiRegistedActor.h @@ -4,11 +4,11 @@ namespace uking::ai { -class RegistedActorNumTwoSelectBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(RegistedActorNumTwoSelectBase, ksys::act::ai::Ai) +class RegistedActor : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(RegistedActor, ksys::act::ai::Ai) public: - explicit RegistedActorNumTwoSelectBase(const InitArg& arg); - ~RegistedActorNumTwoSelectBase() override; + explicit RegistedActor(const InitArg& arg); + ~RegistedActor() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.cpp b/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.cpp index 2f3f857a..57594858 100644 --- a/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.cpp +++ b/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -RegistedActorNumTwoSelect::RegistedActorNumTwoSelect(const InitArg& arg) - : RegistedActorNumTwoSelectBase(arg) {} +RegistedActorNumTwoSelect::RegistedActorNumTwoSelect(const InitArg& arg) : RegistedActor(arg) {} RegistedActorNumTwoSelect::~RegistedActorNumTwoSelect() = default; bool RegistedActorNumTwoSelect::init_(sead::Heap* heap) { - return RegistedActorNumTwoSelectBase::init_(heap); + return RegistedActor::init_(heap); } void RegistedActorNumTwoSelect::enter_(ksys::act::ai::InlineParamPack* params) { - RegistedActorNumTwoSelectBase::enter_(params); + RegistedActor::enter_(params); } void RegistedActorNumTwoSelect::leave_() { - RegistedActorNumTwoSelectBase::leave_(); + RegistedActor::leave_(); } void RegistedActorNumTwoSelect::loadParams_() { - RegistedActorNumTwoSelectBase::loadParams_(); + RegistedActor::loadParams_(); getStaticParam(&mNum_s, "Num"); } diff --git a/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.h b/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.h index 0fb95b09..85c06380 100644 --- a/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.h +++ b/src/Game/Actor/AI/aiRegistedActorNumTwoSelect.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRegistedActorNumTwoSelectBase.h" +#include "Game/Actor/AI/aiRegistedActor.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class RegistedActorNumTwoSelect : public RegistedActorNumTwoSelectBase { - SEAD_RTTI_OVERRIDE(RegistedActorNumTwoSelect, RegistedActorNumTwoSelectBase) +class RegistedActorNumTwoSelect : public RegistedActor { + SEAD_RTTI_OVERRIDE(RegistedActorNumTwoSelect, RegistedActor) public: explicit RegistedActorNumTwoSelect(const InitArg& arg); ~RegistedActorNumTwoSelect() override; diff --git a/src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.cpp b/src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.cpp deleted file mode 100644 index d3fb0b2b..00000000 --- a/src/Game/Actor/AI/aiRegistedActorNumTwoSelectBase.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiRegistedActorNumTwoSelectBase.h" - -namespace uking::ai { - -RegistedActorNumTwoSelectBase::RegistedActorNumTwoSelectBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} - -RegistedActorNumTwoSelectBase::~RegistedActorNumTwoSelectBase() = default; - -bool RegistedActorNumTwoSelectBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void RegistedActorNumTwoSelectBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void RegistedActorNumTwoSelectBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void RegistedActorNumTwoSelectBase::loadParams_() { - getAITreeVariable(&mRegistedActorUnit_a, "RegistedActorUnit"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRemainElectricCannonRoot.cpp b/src/Game/Actor/AI/aiRemainElectricCannonRoot.cpp index 13b3d1a9..597a2bbd 100644 --- a/src/Game/Actor/AI/aiRemainElectricCannonRoot.cpp +++ b/src/Game/Actor/AI/aiRemainElectricCannonRoot.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -RemainElectricCannonRoot::RemainElectricCannonRoot(const InitArg& arg) - : RemainElectricCannonRootBase(arg) {} +RemainElectricCannonRoot::RemainElectricCannonRoot(const InitArg& arg) : LargeCannonRoot(arg) {} RemainElectricCannonRoot::~RemainElectricCannonRoot() = default; bool RemainElectricCannonRoot::init_(sead::Heap* heap) { - return RemainElectricCannonRootBase::init_(heap); + return LargeCannonRoot::init_(heap); } void RemainElectricCannonRoot::enter_(ksys::act::ai::InlineParamPack* params) { - RemainElectricCannonRootBase::enter_(params); + LargeCannonRoot::enter_(params); } void RemainElectricCannonRoot::leave_() { - RemainElectricCannonRootBase::leave_(); + LargeCannonRoot::leave_(); } void RemainElectricCannonRoot::loadParams_() { - RemainElectricCannonRootBase::loadParams_(); + LargeCannonRoot::loadParams_(); getStaticParam(&mSearchMaxDistLoiter_s, "SearchMaxDistLoiter"); } diff --git a/src/Game/Actor/AI/aiRemainElectricCannonRoot.h b/src/Game/Actor/AI/aiRemainElectricCannonRoot.h index 4e6747fd..f2608ec8 100644 --- a/src/Game/Actor/AI/aiRemainElectricCannonRoot.h +++ b/src/Game/Actor/AI/aiRemainElectricCannonRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRemainElectricCannonRootBase.h" +#include "Game/Actor/AI/aiLargeCannonRoot.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class RemainElectricCannonRoot : public RemainElectricCannonRootBase { - SEAD_RTTI_OVERRIDE(RemainElectricCannonRoot, RemainElectricCannonRootBase) +class RemainElectricCannonRoot : public LargeCannonRoot { + SEAD_RTTI_OVERRIDE(RemainElectricCannonRoot, LargeCannonRoot) public: explicit RemainElectricCannonRoot(const InitArg& arg); ~RemainElectricCannonRoot() override; diff --git a/src/Game/Actor/AI/aiRemainElectricCannonRootBase.cpp b/src/Game/Actor/AI/aiRemainElectricCannonRootBase.cpp deleted file mode 100644 index c73d27c0..00000000 --- a/src/Game/Actor/AI/aiRemainElectricCannonRootBase.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "Game/Actor/AI/aiRemainElectricCannonRootBase.h" - -namespace uking::ai { - -RemainElectricCannonRootBase::RemainElectricCannonRootBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} - -bool RemainElectricCannonRootBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void RemainElectricCannonRootBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void RemainElectricCannonRootBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void RemainElectricCannonRootBase::loadParams_() { - getStaticParam(&mSearchMaxDist_s, "SearchMaxDist"); - getStaticParam(&mSearchMinDist_s, "SearchMinDist"); - getStaticParam(&mSearchDistMargin_s, "SearchDistMargin"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiRemainsFireDroneNormal.cpp b/src/Game/Actor/AI/aiRemainsFireDroneNormal.cpp index 6027c295..d81082da 100644 --- a/src/Game/Actor/AI/aiRemainsFireDroneNormal.cpp +++ b/src/Game/Actor/AI/aiRemainsFireDroneNormal.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -RemainsFireDroneNormal::RemainsFireDroneNormal(const InitArg& arg) : RailMove(arg) {} +RemainsFireDroneNormal::RemainsFireDroneNormal(const InitArg& arg) : BezierRailMove(arg) {} RemainsFireDroneNormal::~RemainsFireDroneNormal() = default; bool RemainsFireDroneNormal::init_(sead::Heap* heap) { - return RailMove::init_(heap); + return BezierRailMove::init_(heap); } void RemainsFireDroneNormal::enter_(ksys::act::ai::InlineParamPack* params) { - RailMove::enter_(params); + BezierRailMove::enter_(params); } void RemainsFireDroneNormal::leave_() { - RailMove::leave_(); + BezierRailMove::leave_(); } void RemainsFireDroneNormal::loadParams_() { - RailMove::loadParams_(); + BezierRailMove::loadParams_(); getStaticParam(&mLightLengthOffset_s, "LightLengthOffset"); getStaticParam(&mAdjustRadius_s, "AdjustRadius"); getMapUnitParam(&mSearchLightType_m, "SearchLightType"); diff --git a/src/Game/Actor/AI/aiRemainsFireDroneNormal.h b/src/Game/Actor/AI/aiRemainsFireDroneNormal.h index 5c27967a..99a8d166 100644 --- a/src/Game/Actor/AI/aiRemainsFireDroneNormal.h +++ b/src/Game/Actor/AI/aiRemainsFireDroneNormal.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRailMove.h" +#include "Game/Actor/AI/aiBezierRailMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class RemainsFireDroneNormal : public RailMove { - SEAD_RTTI_OVERRIDE(RemainsFireDroneNormal, RailMove) +class RemainsFireDroneNormal : public BezierRailMove { + SEAD_RTTI_OVERRIDE(RemainsFireDroneNormal, BezierRailMove) public: explicit RemainsFireDroneNormal(const InitArg& arg); ~RemainsFireDroneNormal() override; diff --git a/src/Game/Actor/AI/aiRemainsWindBatteryAttack.cpp b/src/Game/Actor/AI/aiRemainsWindBatteryAttack.cpp index ac35ea3f..778bd3e4 100644 --- a/src/Game/Actor/AI/aiRemainsWindBatteryAttack.cpp +++ b/src/Game/Actor/AI/aiRemainsWindBatteryAttack.cpp @@ -3,24 +3,24 @@ namespace uking::ai { RemainsWindBatteryAttack::RemainsWindBatteryAttack(const InitArg& arg) - : GuardianBeamAttackBase(arg) {} + : GuardianCommonBeamAttack(arg) {} RemainsWindBatteryAttack::~RemainsWindBatteryAttack() = default; bool RemainsWindBatteryAttack::init_(sead::Heap* heap) { - return GuardianBeamAttackBase::init_(heap); + return GuardianCommonBeamAttack::init_(heap); } void RemainsWindBatteryAttack::enter_(ksys::act::ai::InlineParamPack* params) { - GuardianBeamAttackBase::enter_(params); + GuardianCommonBeamAttack::enter_(params); } void RemainsWindBatteryAttack::leave_() { - GuardianBeamAttackBase::leave_(); + GuardianCommonBeamAttack::leave_(); } void RemainsWindBatteryAttack::loadParams_() { - GuardianBeamAttackBase::loadParams_(); + GuardianCommonBeamAttack::loadParams_(); getDynamicParam(&mTargetPos_d, "TargetPos"); } diff --git a/src/Game/Actor/AI/aiRemainsWindBatteryAttack.h b/src/Game/Actor/AI/aiRemainsWindBatteryAttack.h index 6cd3851d..3ab5baeb 100644 --- a/src/Game/Actor/AI/aiRemainsWindBatteryAttack.h +++ b/src/Game/Actor/AI/aiRemainsWindBatteryAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiGuardianBeamAttackBase.h" +#include "Game/Actor/AI/aiGuardianCommonBeamAttack.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class RemainsWindBatteryAttack : public GuardianBeamAttackBase { - SEAD_RTTI_OVERRIDE(RemainsWindBatteryAttack, GuardianBeamAttackBase) +class RemainsWindBatteryAttack : public GuardianCommonBeamAttack { + SEAD_RTTI_OVERRIDE(RemainsWindBatteryAttack, GuardianCommonBeamAttack) public: explicit RemainsWindBatteryAttack(const InitArg& arg); ~RemainsWindBatteryAttack() override; diff --git a/src/Game/Actor/AI/aiSandwormNormal.cpp b/src/Game/Actor/AI/aiSandwormNormal.cpp index bd056288..a7732779 100644 --- a/src/Game/Actor/AI/aiSandwormNormal.cpp +++ b/src/Game/Actor/AI/aiSandwormNormal.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -SandwormNormal::SandwormNormal(const InitArg& arg) : SandwormNormalBase(arg) {} +SandwormNormal::SandwormNormal(const InitArg& arg) : AwnSeal(arg) {} SandwormNormal::~SandwormNormal() = default; bool SandwormNormal::init_(sead::Heap* heap) { - return SandwormNormalBase::init_(heap); + return AwnSeal::init_(heap); } void SandwormNormal::enter_(ksys::act::ai::InlineParamPack* params) { - SandwormNormalBase::enter_(params); + AwnSeal::enter_(params); } void SandwormNormal::leave_() { - SandwormNormalBase::leave_(); + AwnSeal::leave_(); } void SandwormNormal::loadParams_() { - SandwormNormalBase::loadParams_(); + AwnSeal::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSandwormNormal.h b/src/Game/Actor/AI/aiSandwormNormal.h index 53dbde48..35b0b3b3 100644 --- a/src/Game/Actor/AI/aiSandwormNormal.h +++ b/src/Game/Actor/AI/aiSandwormNormal.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSandwormNormalBase.h" +#include "Game/Actor/AI/aiAwnSeal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class SandwormNormal : public SandwormNormalBase { - SEAD_RTTI_OVERRIDE(SandwormNormal, SandwormNormalBase) +class SandwormNormal : public AwnSeal { + SEAD_RTTI_OVERRIDE(SandwormNormal, AwnSeal) public: explicit SandwormNormal(const InitArg& arg); ~SandwormNormal() override; diff --git a/src/Game/Actor/AI/aiSeqTwoLineReachableTarget.cpp b/src/Game/Actor/AI/aiSeqTwoLineReachableTarget.cpp new file mode 100644 index 00000000..c2fae82c --- /dev/null +++ b/src/Game/Actor/AI/aiSeqTwoLineReachableTarget.cpp @@ -0,0 +1,26 @@ +#include "Game/Actor/AI/aiSeqTwoLineReachableTarget.h" + +namespace uking::ai { + +SeqTwoLineReachableTarget::SeqTwoLineReachableTarget(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +SeqTwoLineReachableTarget::~SeqTwoLineReachableTarget() = default; + +bool SeqTwoLineReachableTarget::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void SeqTwoLineReachableTarget::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void SeqTwoLineReachableTarget::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void SeqTwoLineReachableTarget::loadParams_() { + getStaticParam(&mReachableCheckType1_s, "ReachableCheckType1"); + getStaticParam(&mReachableCheckType2_s, "ReachableCheckType2"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.h b/src/Game/Actor/AI/aiSeqTwoLineReachableTarget.h similarity index 62% rename from src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.h rename to src/Game/Actor/AI/aiSeqTwoLineReachableTarget.h index eedbf552..60438e9f 100644 --- a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.h +++ b/src/Game/Actor/AI/aiSeqTwoLineReachableTarget.h @@ -4,11 +4,11 @@ namespace uking::ai { -class SeqTwoLineReachableTargetActionBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SeqTwoLineReachableTargetActionBase, ksys::act::ai::Ai) +class SeqTwoLineReachableTarget : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(SeqTwoLineReachableTarget, ksys::act::ai::Ai) public: - explicit SeqTwoLineReachableTargetActionBase(const InitArg& arg); - ~SeqTwoLineReachableTargetActionBase() override; + explicit SeqTwoLineReachableTarget(const InitArg& arg); + ~SeqTwoLineReachableTarget() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.cpp b/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.cpp index 987239c5..9ed4cde8 100644 --- a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.cpp +++ b/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.cpp @@ -3,24 +3,24 @@ namespace uking::ai { SeqTwoLineReachableTargetAction::SeqTwoLineReachableTargetAction(const InitArg& arg) - : SeqTwoLineReachableTargetActionBase(arg) {} + : SeqTwoLineReachableTarget(arg) {} SeqTwoLineReachableTargetAction::~SeqTwoLineReachableTargetAction() = default; bool SeqTwoLineReachableTargetAction::init_(sead::Heap* heap) { - return SeqTwoLineReachableTargetActionBase::init_(heap); + return SeqTwoLineReachableTarget::init_(heap); } void SeqTwoLineReachableTargetAction::enter_(ksys::act::ai::InlineParamPack* params) { - SeqTwoLineReachableTargetActionBase::enter_(params); + SeqTwoLineReachableTarget::enter_(params); } void SeqTwoLineReachableTargetAction::leave_() { - SeqTwoLineReachableTargetActionBase::leave_(); + SeqTwoLineReachableTarget::leave_(); } void SeqTwoLineReachableTargetAction::loadParams_() { - SeqTwoLineReachableTargetActionBase::loadParams_(); + SeqTwoLineReachableTarget::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.h b/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.h index 77daa52d..f6d8c974 100644 --- a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.h +++ b/src/Game/Actor/AI/aiSeqTwoLineReachableTargetAction.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.h" +#include "Game/Actor/AI/aiSeqTwoLineReachableTarget.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class SeqTwoLineReachableTargetAction : public SeqTwoLineReachableTargetActionBase { - SEAD_RTTI_OVERRIDE(SeqTwoLineReachableTargetAction, SeqTwoLineReachableTargetActionBase) +class SeqTwoLineReachableTargetAction : public SeqTwoLineReachableTarget { + SEAD_RTTI_OVERRIDE(SeqTwoLineReachableTargetAction, SeqTwoLineReachableTarget) public: explicit SeqTwoLineReachableTargetAction(const InitArg& arg); ~SeqTwoLineReachableTargetAction() override; diff --git a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.cpp b/src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.cpp deleted file mode 100644 index f0992943..00000000 --- a/src/Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/AI/aiSeqTwoLineReachableTargetActionBase.h" - -namespace uking::ai { - -SeqTwoLineReachableTargetActionBase::SeqTwoLineReachableTargetActionBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} - -SeqTwoLineReachableTargetActionBase::~SeqTwoLineReachableTargetActionBase() = default; - -bool SeqTwoLineReachableTargetActionBase::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void SeqTwoLineReachableTargetActionBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void SeqTwoLineReachableTargetActionBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void SeqTwoLineReachableTargetActionBase::loadParams_() { - getStaticParam(&mReachableCheckType1_s, "ReachableCheckType1"); - getStaticParam(&mReachableCheckType2_s, "ReachableCheckType2"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSimpleBeamExplode.cpp b/src/Game/Actor/AI/aiSimpleBeamExplode.cpp new file mode 100644 index 00000000..f3fc3043 --- /dev/null +++ b/src/Game/Actor/AI/aiSimpleBeamExplode.cpp @@ -0,0 +1,26 @@ +#include "Game/Actor/AI/aiSimpleBeamExplode.h" + +namespace uking::ai { + +SimpleBeamExplode::SimpleBeamExplode(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +SimpleBeamExplode::~SimpleBeamExplode() = default; + +bool SimpleBeamExplode::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void SimpleBeamExplode::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void SimpleBeamExplode::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void SimpleBeamExplode::loadParams_() { + getStaticParam(&mMaxDistance_s, "MaxDistance"); + getStaticParam(&mIsDelete_s, "IsDelete"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiBeamExplodeBase.h b/src/Game/Actor/AI/aiSimpleBeamExplode.h similarity index 68% rename from src/Game/Actor/AI/aiBeamExplodeBase.h rename to src/Game/Actor/AI/aiSimpleBeamExplode.h index 21f94dcc..1f4e6773 100644 --- a/src/Game/Actor/AI/aiBeamExplodeBase.h +++ b/src/Game/Actor/AI/aiSimpleBeamExplode.h @@ -4,11 +4,11 @@ namespace uking::ai { -class BeamExplodeBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(BeamExplodeBase, ksys::act::ai::Ai) +class SimpleBeamExplode : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(SimpleBeamExplode, ksys::act::ai::Ai) public: - explicit BeamExplodeBase(const InitArg& arg); - ~BeamExplodeBase() override; + explicit SimpleBeamExplode(const InitArg& arg); + ~SimpleBeamExplode() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiSiteBossFlameBall.cpp b/src/Game/Actor/AI/aiSiteBossFlameBall.cpp index 95e40b9d..c8426287 100644 --- a/src/Game/Actor/AI/aiSiteBossFlameBall.cpp +++ b/src/Game/Actor/AI/aiSiteBossFlameBall.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -SiteBossFlameBall::SiteBossFlameBall(const InitArg& arg) : SiteBossChemicalProjectile(arg) {} +SiteBossFlameBall::SiteBossFlameBall(const InitArg& arg) : GanonFlameBall(arg) {} SiteBossFlameBall::~SiteBossFlameBall() = default; bool SiteBossFlameBall::init_(sead::Heap* heap) { - return SiteBossChemicalProjectile::init_(heap); + return GanonFlameBall::init_(heap); } void SiteBossFlameBall::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossChemicalProjectile::enter_(params); + GanonFlameBall::enter_(params); } void SiteBossFlameBall::leave_() { - SiteBossChemicalProjectile::leave_(); + GanonFlameBall::leave_(); } void SiteBossFlameBall::loadParams_() { - SiteBossChemicalProjectile::loadParams_(); + GanonFlameBall::loadParams_(); getStaticParam(&mChemicalIndex_s, "ChemicalIndex"); getStaticParam(&mAtAttr_s, "AtAttr"); getStaticParam(&mMoveSpeed_s, "MoveSpeed"); diff --git a/src/Game/Actor/AI/aiSiteBossFlameBall.h b/src/Game/Actor/AI/aiSiteBossFlameBall.h index 5eba04ee..f6be27b1 100644 --- a/src/Game/Actor/AI/aiSiteBossFlameBall.h +++ b/src/Game/Actor/AI/aiSiteBossFlameBall.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSiteBossChemicalProjectile.h" +#include "Game/Actor/AI/aiGanonFlameBall.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class SiteBossFlameBall : public SiteBossChemicalProjectile { - SEAD_RTTI_OVERRIDE(SiteBossFlameBall, SiteBossChemicalProjectile) +class SiteBossFlameBall : public GanonFlameBall { + SEAD_RTTI_OVERRIDE(SiteBossFlameBall, GanonFlameBall) public: explicit SiteBossFlameBall(const InitArg& arg); ~SiteBossFlameBall() override; diff --git a/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.cpp b/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.cpp index 87b30bad..ff102c82 100644 --- a/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.cpp +++ b/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.cpp @@ -2,25 +2,24 @@ namespace uking::ai { -SiteBossIceSplinterRoot::SiteBossIceSplinterRoot(const InitArg& arg) - : SiteBossChemicalProjectile(arg) {} +SiteBossIceSplinterRoot::SiteBossIceSplinterRoot(const InitArg& arg) : GanonFlameBall(arg) {} SiteBossIceSplinterRoot::~SiteBossIceSplinterRoot() = default; bool SiteBossIceSplinterRoot::init_(sead::Heap* heap) { - return SiteBossChemicalProjectile::init_(heap); + return GanonFlameBall::init_(heap); } void SiteBossIceSplinterRoot::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossChemicalProjectile::enter_(params); + GanonFlameBall::enter_(params); } void SiteBossIceSplinterRoot::leave_() { - SiteBossChemicalProjectile::leave_(); + GanonFlameBall::leave_(); } void SiteBossIceSplinterRoot::loadParams_() { - SiteBossChemicalProjectile::loadParams_(); + GanonFlameBall::loadParams_(); getStaticParam(&mReflectAtkPower_s, "ReflectAtkPower"); getStaticParam(&mChaseAngleMin_s, "ChaseAngleMin"); getStaticParam(&mRotateSpeed_s, "RotateSpeed"); diff --git a/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.h b/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.h index c99c1244..dbc54aff 100644 --- a/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.h +++ b/src/Game/Actor/AI/aiSiteBossIceSplinterRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSiteBossChemicalProjectile.h" +#include "Game/Actor/AI/aiGanonFlameBall.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class SiteBossIceSplinterRoot : public SiteBossChemicalProjectile { - SEAD_RTTI_OVERRIDE(SiteBossIceSplinterRoot, SiteBossChemicalProjectile) +class SiteBossIceSplinterRoot : public GanonFlameBall { + SEAD_RTTI_OVERRIDE(SiteBossIceSplinterRoot, GanonFlameBall) public: explicit SiteBossIceSplinterRoot(const InitArg& arg); ~SiteBossIceSplinterRoot() override; diff --git a/src/Game/Actor/AI/aiSiteBossRecognizeRoot.cpp b/src/Game/Actor/AI/aiSiteBossRecognizeRoot.cpp index ad6c881e..e892f3bd 100644 --- a/src/Game/Actor/AI/aiSiteBossRecognizeRoot.cpp +++ b/src/Game/Actor/AI/aiSiteBossRecognizeRoot.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -SiteBossRecognizeRoot::SiteBossRecognizeRoot(const InitArg& arg) : SiteBossRecognizeRootBase(arg) {} +SiteBossRecognizeRoot::SiteBossRecognizeRoot(const InitArg& arg) : LastBossRecognizeRoot(arg) {} SiteBossRecognizeRoot::~SiteBossRecognizeRoot() = default; bool SiteBossRecognizeRoot::init_(sead::Heap* heap) { - return SiteBossRecognizeRootBase::init_(heap); + return LastBossRecognizeRoot::init_(heap); } void SiteBossRecognizeRoot::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossRecognizeRootBase::enter_(params); + LastBossRecognizeRoot::enter_(params); } void SiteBossRecognizeRoot::leave_() { - SiteBossRecognizeRootBase::leave_(); + LastBossRecognizeRoot::leave_(); } void SiteBossRecognizeRoot::loadParams_() { - SiteBossRecognizeRootBase::loadParams_(); + LastBossRecognizeRoot::loadParams_(); getStaticParam(&mIgnoreWaprDistMax_s, "IgnoreWaprDistMax"); getStaticParam(&mIsCheckChildDevice_s, "IsCheckChildDevice"); getStaticParam(&mIgnoreWarpDistRetFromDamage_s, "IgnoreWarpDistRetFromDamage"); diff --git a/src/Game/Actor/AI/aiSiteBossRecognizeRoot.h b/src/Game/Actor/AI/aiSiteBossRecognizeRoot.h index 57d16263..78b4469e 100644 --- a/src/Game/Actor/AI/aiSiteBossRecognizeRoot.h +++ b/src/Game/Actor/AI/aiSiteBossRecognizeRoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSiteBossRecognizeRootBase.h" +#include "Game/Actor/AI/aiLastBossRecognizeRoot.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class SiteBossRecognizeRoot : public SiteBossRecognizeRootBase { - SEAD_RTTI_OVERRIDE(SiteBossRecognizeRoot, SiteBossRecognizeRootBase) +class SiteBossRecognizeRoot : public LastBossRecognizeRoot { + SEAD_RTTI_OVERRIDE(SiteBossRecognizeRoot, LastBossRecognizeRoot) public: explicit SiteBossRecognizeRoot(const InitArg& arg); ~SiteBossRecognizeRoot() override; diff --git a/src/Game/Actor/AI/aiSleepNormal.cpp b/src/Game/Actor/AI/aiSleepNormal.cpp new file mode 100644 index 00000000..24e69fe6 --- /dev/null +++ b/src/Game/Actor/AI/aiSleepNormal.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/AI/aiSleepNormal.h" + +namespace uking::ai { + +SleepNormal::SleepNormal(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +SleepNormal::~SleepNormal() = default; + +bool SleepNormal::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void SleepNormal::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void SleepNormal::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void SleepNormal::loadParams_() { + getStaticParam(&mAwakeDelayTime_s, "AwakeDelayTime"); + getStaticParam(&mIsAwakenByHearing_s, "IsAwakenByHearing"); + getStaticParam(&mIsWaitAfterAwaken_s, "IsWaitAfterAwaken"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiSpecialEnemySleep.h b/src/Game/Actor/AI/aiSleepNormal.h similarity index 72% rename from src/Game/Actor/AI/aiSpecialEnemySleep.h rename to src/Game/Actor/AI/aiSleepNormal.h index af7c7c55..9ee395ab 100644 --- a/src/Game/Actor/AI/aiSpecialEnemySleep.h +++ b/src/Game/Actor/AI/aiSleepNormal.h @@ -4,11 +4,11 @@ namespace uking::ai { -class SpecialEnemySleep : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(SpecialEnemySleep, ksys::act::ai::Ai) +class SleepNormal : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(SleepNormal, ksys::act::ai::Ai) public: - explicit SpecialEnemySleep(const InitArg& arg); - ~SpecialEnemySleep() override; + explicit SleepNormal(const InitArg& arg); + ~SleepNormal() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiSpecialEnemySleep.cpp b/src/Game/Actor/AI/aiSpecialEnemySleep.cpp deleted file mode 100644 index 1ccff37e..00000000 --- a/src/Game/Actor/AI/aiSpecialEnemySleep.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/AI/aiSpecialEnemySleep.h" - -namespace uking::ai { - -SpecialEnemySleep::SpecialEnemySleep(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -SpecialEnemySleep::~SpecialEnemySleep() = default; - -bool SpecialEnemySleep::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void SpecialEnemySleep::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void SpecialEnemySleep::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void SpecialEnemySleep::loadParams_() { - getStaticParam(&mAwakeDelayTime_s, "AwakeDelayTime"); - getStaticParam(&mIsAwakenByHearing_s, "IsAwakenByHearing"); - getStaticParam(&mIsWaitAfterAwaken_s, "IsWaitAfterAwaken"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiStalEnemySleep.cpp b/src/Game/Actor/AI/aiStalEnemySleep.cpp index 52b8e814..c4729f91 100644 --- a/src/Game/Actor/AI/aiStalEnemySleep.cpp +++ b/src/Game/Actor/AI/aiStalEnemySleep.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -StalEnemySleep::StalEnemySleep(const InitArg& arg) : SpecialEnemySleep(arg) {} +StalEnemySleep::StalEnemySleep(const InitArg& arg) : SleepNormal(arg) {} StalEnemySleep::~StalEnemySleep() = default; bool StalEnemySleep::init_(sead::Heap* heap) { - return SpecialEnemySleep::init_(heap); + return SleepNormal::init_(heap); } void StalEnemySleep::enter_(ksys::act::ai::InlineParamPack* params) { - SpecialEnemySleep::enter_(params); + SleepNormal::enter_(params); } void StalEnemySleep::leave_() { - SpecialEnemySleep::leave_(); + SleepNormal::leave_(); } void StalEnemySleep::loadParams_() { - SpecialEnemySleep::loadParams_(); + SleepNormal::loadParams_(); getStaticParam(&mUseAwarenessWakeUp_s, "UseAwarenessWakeUp"); getStaticParam(&mUseNoticeActiveWakeUp_s, "UseNoticeActiveWakeUp"); } diff --git a/src/Game/Actor/AI/aiStalEnemySleep.h b/src/Game/Actor/AI/aiStalEnemySleep.h index 7d60a916..ef827e6b 100644 --- a/src/Game/Actor/AI/aiStalEnemySleep.h +++ b/src/Game/Actor/AI/aiStalEnemySleep.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiSpecialEnemySleep.h" +#include "Game/Actor/AI/aiSleepNormal.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class StalEnemySleep : public SpecialEnemySleep { - SEAD_RTTI_OVERRIDE(StalEnemySleep, SpecialEnemySleep) +class StalEnemySleep : public SleepNormal { + SEAD_RTTI_OVERRIDE(StalEnemySleep, SleepNormal) public: explicit StalEnemySleep(const InitArg& arg); ~StalEnemySleep() override; diff --git a/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.cpp b/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.cpp index a865067b..a57fbb76 100644 --- a/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.cpp +++ b/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.cpp @@ -3,24 +3,24 @@ namespace uking::ai { StoneOctarockGuardNearTarget::StoneOctarockGuardNearTarget(const InitArg& arg) - : TimedGuardNearTarget(arg) {} + : InvincibleNearTarget(arg) {} StoneOctarockGuardNearTarget::~StoneOctarockGuardNearTarget() = default; bool StoneOctarockGuardNearTarget::init_(sead::Heap* heap) { - return TimedGuardNearTarget::init_(heap); + return InvincibleNearTarget::init_(heap); } void StoneOctarockGuardNearTarget::enter_(ksys::act::ai::InlineParamPack* params) { - TimedGuardNearTarget::enter_(params); + InvincibleNearTarget::enter_(params); } void StoneOctarockGuardNearTarget::leave_() { - TimedGuardNearTarget::leave_(); + InvincibleNearTarget::leave_(); } void StoneOctarockGuardNearTarget::loadParams_() { - TimedGuardNearTarget::loadParams_(); + InvincibleNearTarget::loadParams_(); getStaticParam(&mNoticeTerrorLevel_s, "NoticeTerrorLevel"); } diff --git a/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.h b/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.h index 29649b47..f1c7a869 100644 --- a/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.h +++ b/src/Game/Actor/AI/aiStoneOctarockGuardNearTarget.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTimedGuardNearTarget.h" +#include "Game/Actor/AI/aiInvincibleNearTarget.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class StoneOctarockGuardNearTarget : public TimedGuardNearTarget { - SEAD_RTTI_OVERRIDE(StoneOctarockGuardNearTarget, TimedGuardNearTarget) +class StoneOctarockGuardNearTarget : public InvincibleNearTarget { + SEAD_RTTI_OVERRIDE(StoneOctarockGuardNearTarget, InvincibleNearTarget) public: explicit StoneOctarockGuardNearTarget(const InitArg& arg); ~StoneOctarockGuardNearTarget() override; diff --git a/src/Game/Actor/AI/aiTargetAbsolutePos.cpp b/src/Game/Actor/AI/aiTargetAbsolutePos.cpp index 282d8c30..b91fe940 100644 --- a/src/Game/Actor/AI/aiTargetAbsolutePos.cpp +++ b/src/Game/Actor/AI/aiTargetAbsolutePos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetAbsolutePos::TargetAbsolutePos(const InitArg& arg) : TargetPosAI(arg) {} +TargetAbsolutePos::TargetAbsolutePos(const InitArg& arg) : TargetActorPos(arg) {} TargetAbsolutePos::~TargetAbsolutePos() = default; bool TargetAbsolutePos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetAbsolutePos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetAbsolutePos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetAbsolutePos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mTargetPos_s, "TargetPos"); } diff --git a/src/Game/Actor/AI/aiTargetAbsolutePos.h b/src/Game/Actor/AI/aiTargetAbsolutePos.h index 69e11603..595f35d7 100644 --- a/src/Game/Actor/AI/aiTargetAbsolutePos.h +++ b/src/Game/Actor/AI/aiTargetAbsolutePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetAbsolutePos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetAbsolutePos, TargetPosAI) +class TargetAbsolutePos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetAbsolutePos, TargetActorPos) public: explicit TargetAbsolutePos(const InitArg& arg); ~TargetAbsolutePos() override; diff --git a/src/Game/Actor/AI/aiTargetActorPos.cpp b/src/Game/Actor/AI/aiTargetActorPos.cpp new file mode 100644 index 00000000..41fe6b39 --- /dev/null +++ b/src/Game/Actor/AI/aiTargetActorPos.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiTargetActorPos.h" + +namespace uking::ai { + +TargetActorPos::TargetActorPos(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +TargetActorPos::~TargetActorPos() = default; + +bool TargetActorPos::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void TargetActorPos::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void TargetActorPos::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void TargetActorPos::loadParams_() { + getStaticParam(&mOnEnterOnly_s, "OnEnterOnly"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPosAI.h b/src/Game/Actor/AI/aiTargetActorPos.h similarity index 66% rename from src/Game/Actor/AI/aiTargetPosAI.h rename to src/Game/Actor/AI/aiTargetActorPos.h index 9d7045b9..6a636ee9 100644 --- a/src/Game/Actor/AI/aiTargetPosAI.h +++ b/src/Game/Actor/AI/aiTargetActorPos.h @@ -4,11 +4,11 @@ namespace uking::ai { -class TargetPosAI : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(TargetPosAI, ksys::act::ai::Ai) +class TargetActorPos : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(TargetActorPos, ksys::act::ai::Ai) public: - explicit TargetPosAI(const InitArg& arg); - ~TargetPosAI() override; + explicit TargetActorPos(const InitArg& arg); + ~TargetActorPos() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiTargetAttackAttitudeTgt.cpp b/src/Game/Actor/AI/aiTargetAttackAttitudeTgt.cpp new file mode 100644 index 00000000..f5cd2bb3 --- /dev/null +++ b/src/Game/Actor/AI/aiTargetAttackAttitudeTgt.cpp @@ -0,0 +1,19 @@ +#include "Game/Actor/AI/aiTargetAttackAttitudeTgt.h" + +namespace uking::ai { + +TargetAttackAttitudeTgt::TargetAttackAttitudeTgt(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +TargetAttackAttitudeTgt::~TargetAttackAttitudeTgt() = default; + +void TargetAttackAttitudeTgt::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void TargetAttackAttitudeTgt::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void TargetAttackAttitudeTgt::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetAttackAttitudeTgt.h b/src/Game/Actor/AI/aiTargetAttackAttitudeTgt.h new file mode 100644 index 00000000..dc7afb34 --- /dev/null +++ b/src/Game/Actor/AI/aiTargetAttackAttitudeTgt.h @@ -0,0 +1,20 @@ +#pragma once + +#include "KingSystem/ActorSystem/actAiAi.h" + +namespace uking::ai { + +class TargetAttackAttitudeTgt : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(TargetAttackAttitudeTgt, ksys::act::ai::Ai) +public: + explicit TargetAttackAttitudeTgt(const InitArg& arg); + ~TargetAttackAttitudeTgt() override; + + void enter_(ksys::act::ai::InlineParamPack* params) override; + void leave_() override; + void loadParams_() override; + +protected: +}; + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.cpp b/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.cpp index f48ab244..36a3c832 100644 --- a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.cpp +++ b/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.cpp @@ -3,12 +3,12 @@ namespace uking::ai { TargetAttackAttitudeTgtSelect::TargetAttackAttitudeTgtSelect(const InitArg& arg) - : TargetAttackAttitudeTgtSelectBase(arg) {} + : TargetAttackAttitudeTgt(arg) {} TargetAttackAttitudeTgtSelect::~TargetAttackAttitudeTgtSelect() = default; void TargetAttackAttitudeTgtSelect::loadParams_() { - TargetAttackAttitudeTgtSelectBase::loadParams_(); + TargetAttackAttitudeTgt::loadParams_(); getDynamicParam(&mTargetPos_d, "TargetPos"); } diff --git a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.h b/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.h index 7c956bcd..b231c0ca 100644 --- a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.h +++ b/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelect.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.h" +#include "Game/Actor/AI/aiTargetAttackAttitudeTgt.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetAttackAttitudeTgtSelect : public TargetAttackAttitudeTgtSelectBase { - SEAD_RTTI_OVERRIDE(TargetAttackAttitudeTgtSelect, TargetAttackAttitudeTgtSelectBase) +class TargetAttackAttitudeTgtSelect : public TargetAttackAttitudeTgt { + SEAD_RTTI_OVERRIDE(TargetAttackAttitudeTgtSelect, TargetAttackAttitudeTgt) public: explicit TargetAttackAttitudeTgtSelect(const InitArg& arg); ~TargetAttackAttitudeTgtSelect() override; diff --git a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.cpp b/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.cpp deleted file mode 100644 index 562bb04e..00000000 --- a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.cpp +++ /dev/null @@ -1,20 +0,0 @@ -#include "Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.h" - -namespace uking::ai { - -TargetAttackAttitudeTgtSelectBase::TargetAttackAttitudeTgtSelectBase(const InitArg& arg) - : ksys::act::ai::Ai(arg) {} - -TargetAttackAttitudeTgtSelectBase::~TargetAttackAttitudeTgtSelectBase() = default; - -void TargetAttackAttitudeTgtSelectBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void TargetAttackAttitudeTgtSelectBase::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void TargetAttackAttitudeTgtSelectBase::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.h b/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.h deleted file mode 100644 index 4881cbeb..00000000 --- a/src/Game/Actor/AI/aiTargetAttackAttitudeTgtSelectBase.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "KingSystem/ActorSystem/actAiAi.h" - -namespace uking::ai { - -class TargetAttackAttitudeTgtSelectBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(TargetAttackAttitudeTgtSelectBase, ksys::act::ai::Ai) -public: - explicit TargetAttackAttitudeTgtSelectBase(const InitArg& arg); - ~TargetAttackAttitudeTgtSelectBase() override; - - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: -}; - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetDynamicActorPos.cpp b/src/Game/Actor/AI/aiTargetDynamicActorPos.cpp index e7e31748..5ff03d7d 100644 --- a/src/Game/Actor/AI/aiTargetDynamicActorPos.cpp +++ b/src/Game/Actor/AI/aiTargetDynamicActorPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetDynamicActorPos::TargetDynamicActorPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetDynamicActorPos::TargetDynamicActorPos(const InitArg& arg) : TargetActorPos(arg) {} TargetDynamicActorPos::~TargetDynamicActorPos() = default; bool TargetDynamicActorPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetDynamicActorPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetDynamicActorPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetDynamicActorPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getDynamicParam(&mTargetActor_d, "TargetActor"); } diff --git a/src/Game/Actor/AI/aiTargetDynamicActorPos.h b/src/Game/Actor/AI/aiTargetDynamicActorPos.h index f7c8e13b..88828106 100644 --- a/src/Game/Actor/AI/aiTargetDynamicActorPos.h +++ b/src/Game/Actor/AI/aiTargetDynamicActorPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetDynamicActorPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetDynamicActorPos, TargetPosAI) +class TargetDynamicActorPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetDynamicActorPos, TargetActorPos) public: explicit TargetDynamicActorPos(const InitArg& arg); ~TargetDynamicActorPos() override; diff --git a/src/Game/Actor/AI/aiTargetHeightAreaSelect.cpp b/src/Game/Actor/AI/aiTargetHeightAreaSelect.cpp new file mode 100644 index 00000000..f211b5c3 --- /dev/null +++ b/src/Game/Actor/AI/aiTargetHeightAreaSelect.cpp @@ -0,0 +1,26 @@ +#include "Game/Actor/AI/aiTargetHeightAreaSelect.h" + +namespace uking::ai { + +TargetHeightAreaSelect::TargetHeightAreaSelect(const InitArg& arg) : TargetInAreaSelect(arg) {} + +TargetHeightAreaSelect::~TargetHeightAreaSelect() = default; + +bool TargetHeightAreaSelect::init_(sead::Heap* heap) { + return TargetInAreaSelect::init_(heap); +} + +void TargetHeightAreaSelect::enter_(ksys::act::ai::InlineParamPack* params) { + TargetInAreaSelect::enter_(params); +} + +void TargetHeightAreaSelect::leave_() { + TargetInAreaSelect::leave_(); +} + +void TargetHeightAreaSelect::loadParams_() { + TargetInAreaSelect::loadParams_(); + getStaticParam(&mHeight_s, "Height"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiAssassinMagicTgtSelect.h b/src/Game/Actor/AI/aiTargetHeightAreaSelect.h similarity index 65% rename from src/Game/Actor/AI/aiAssassinMagicTgtSelect.h rename to src/Game/Actor/AI/aiTargetHeightAreaSelect.h index 50f53434..a8dc06af 100644 --- a/src/Game/Actor/AI/aiAssassinMagicTgtSelect.h +++ b/src/Game/Actor/AI/aiTargetHeightAreaSelect.h @@ -5,11 +5,11 @@ namespace uking::ai { -class AssassinMagicTgtSelect : public TargetInAreaSelect { - SEAD_RTTI_OVERRIDE(AssassinMagicTgtSelect, TargetInAreaSelect) +class TargetHeightAreaSelect : public TargetInAreaSelect { + SEAD_RTTI_OVERRIDE(TargetHeightAreaSelect, TargetInAreaSelect) public: - explicit AssassinMagicTgtSelect(const InitArg& arg); - ~AssassinMagicTgtSelect() override; + explicit TargetHeightAreaSelect(const InitArg& arg); + ~TargetHeightAreaSelect() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiTargetHomeDir.cpp b/src/Game/Actor/AI/aiTargetHomeDir.cpp index ab7052cb..44d89af0 100644 --- a/src/Game/Actor/AI/aiTargetHomeDir.cpp +++ b/src/Game/Actor/AI/aiTargetHomeDir.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetHomeDir::TargetHomeDir(const InitArg& arg) : TargetPosAI(arg) {} +TargetHomeDir::TargetHomeDir(const InitArg& arg) : TargetActorPos(arg) {} TargetHomeDir::~TargetHomeDir() = default; bool TargetHomeDir::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetHomeDir::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetHomeDir::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetHomeDir::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetHomeDir.h b/src/Game/Actor/AI/aiTargetHomeDir.h index 6cb38a49..65b6e64d 100644 --- a/src/Game/Actor/AI/aiTargetHomeDir.h +++ b/src/Game/Actor/AI/aiTargetHomeDir.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetHomeDir : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetHomeDir, TargetPosAI) +class TargetHomeDir : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetHomeDir, TargetActorPos) public: explicit TargetHomeDir(const InitArg& arg); ~TargetHomeDir() override; diff --git a/src/Game/Actor/AI/aiTargetHomePos.cpp b/src/Game/Actor/AI/aiTargetHomePos.cpp index df963302..da4c8fe5 100644 --- a/src/Game/Actor/AI/aiTargetHomePos.cpp +++ b/src/Game/Actor/AI/aiTargetHomePos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetHomePos::TargetHomePos(const InitArg& arg) : TargetPosAI(arg) {} +TargetHomePos::TargetHomePos(const InitArg& arg) : TargetActorPos(arg) {} TargetHomePos::~TargetHomePos() = default; bool TargetHomePos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetHomePos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetHomePos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetHomePos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetHomePos.h b/src/Game/Actor/AI/aiTargetHomePos.h index 5af4c9d0..e64d57af 100644 --- a/src/Game/Actor/AI/aiTargetHomePos.h +++ b/src/Game/Actor/AI/aiTargetHomePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetHomePos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetHomePos, TargetPosAI) +class TargetHomePos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetHomePos, TargetActorPos) public: explicit TargetHomePos(const InitArg& arg); ~TargetHomePos() override; diff --git a/src/Game/Actor/AI/aiTargetHomeRangeSelect.cpp b/src/Game/Actor/AI/aiTargetHomeRangeSelect.cpp index c169cae0..87e5a657 100644 --- a/src/Game/Actor/AI/aiTargetHomeRangeSelect.cpp +++ b/src/Game/Actor/AI/aiTargetHomeRangeSelect.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetHomeRangeSelect::TargetHomeRangeSelect(const InitArg& arg) : RangeSelect(arg) {} +TargetHomeRangeSelect::TargetHomeRangeSelect(const InitArg& arg) : NewRangeSelect(arg) {} TargetHomeRangeSelect::~TargetHomeRangeSelect() = default; bool TargetHomeRangeSelect::init_(sead::Heap* heap) { - return RangeSelect::init_(heap); + return NewRangeSelect::init_(heap); } void TargetHomeRangeSelect::enter_(ksys::act::ai::InlineParamPack* params) { - RangeSelect::enter_(params); + NewRangeSelect::enter_(params); } void TargetHomeRangeSelect::leave_() { - RangeSelect::leave_(); + NewRangeSelect::leave_(); } void TargetHomeRangeSelect::loadParams_() { - RangeSelect::loadParams_(); + NewRangeSelect::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetHomeRangeSelect.h b/src/Game/Actor/AI/aiTargetHomeRangeSelect.h index f25cb3a5..b5058c40 100644 --- a/src/Game/Actor/AI/aiTargetHomeRangeSelect.h +++ b/src/Game/Actor/AI/aiTargetHomeRangeSelect.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRangeSelect.h" +#include "Game/Actor/AI/aiNewRangeSelect.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetHomeRangeSelect : public RangeSelect { - SEAD_RTTI_OVERRIDE(TargetHomeRangeSelect, RangeSelect) +class TargetHomeRangeSelect : public NewRangeSelect { + SEAD_RTTI_OVERRIDE(TargetHomeRangeSelect, NewRangeSelect) public: explicit TargetHomeRangeSelect(const InitArg& arg); ~TargetHomeRangeSelect() override; diff --git a/src/Game/Actor/AI/aiTargetKnockBackBasePos.cpp b/src/Game/Actor/AI/aiTargetKnockBackBasePos.cpp index 2810af20..ef9ba818 100644 --- a/src/Game/Actor/AI/aiTargetKnockBackBasePos.cpp +++ b/src/Game/Actor/AI/aiTargetKnockBackBasePos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetKnockBackBasePos::TargetKnockBackBasePos(const InitArg& arg) : TargetPosAI(arg) {} +TargetKnockBackBasePos::TargetKnockBackBasePos(const InitArg& arg) : TargetActorPos(arg) {} TargetKnockBackBasePos::~TargetKnockBackBasePos() = default; bool TargetKnockBackBasePos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetKnockBackBasePos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetKnockBackBasePos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetKnockBackBasePos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetKnockBackBasePos.h b/src/Game/Actor/AI/aiTargetKnockBackBasePos.h index a4ce70b5..d75733b4 100644 --- a/src/Game/Actor/AI/aiTargetKnockBackBasePos.h +++ b/src/Game/Actor/AI/aiTargetKnockBackBasePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetKnockBackBasePos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetKnockBackBasePos, TargetPosAI) +class TargetKnockBackBasePos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetKnockBackBasePos, TargetActorPos) public: explicit TargetKnockBackBasePos(const InitArg& arg); ~TargetKnockBackBasePos() override; diff --git a/src/Game/Actor/AI/aiTargetLastAttackedPos.cpp b/src/Game/Actor/AI/aiTargetLastAttackedPos.cpp index 19d5b921..8168b635 100644 --- a/src/Game/Actor/AI/aiTargetLastAttackedPos.cpp +++ b/src/Game/Actor/AI/aiTargetLastAttackedPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetLastAttackedPos::TargetLastAttackedPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetLastAttackedPos::TargetLastAttackedPos(const InitArg& arg) : TargetActorPos(arg) {} TargetLastAttackedPos::~TargetLastAttackedPos() = default; bool TargetLastAttackedPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetLastAttackedPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetLastAttackedPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetLastAttackedPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetLastAttackedPos.h b/src/Game/Actor/AI/aiTargetLastAttackedPos.h index d74243ca..bf31a0fc 100644 --- a/src/Game/Actor/AI/aiTargetLastAttackedPos.h +++ b/src/Game/Actor/AI/aiTargetLastAttackedPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetLastAttackedPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetLastAttackedPos, TargetPosAI) +class TargetLastAttackedPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetLastAttackedPos, TargetActorPos) public: explicit TargetLastAttackedPos(const InitArg& arg); ~TargetLastAttackedPos() override; diff --git a/src/Game/Actor/AI/aiTargetLastAttackerPos.cpp b/src/Game/Actor/AI/aiTargetLastAttackerPos.cpp index 9ddc2769..f062c75c 100644 --- a/src/Game/Actor/AI/aiTargetLastAttackerPos.cpp +++ b/src/Game/Actor/AI/aiTargetLastAttackerPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetLastAttackerPos::TargetLastAttackerPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetLastAttackerPos::TargetLastAttackerPos(const InitArg& arg) : TargetActorPos(arg) {} TargetLastAttackerPos::~TargetLastAttackerPos() = default; bool TargetLastAttackerPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetLastAttackerPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetLastAttackerPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetLastAttackerPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetLastAttackerPos.h b/src/Game/Actor/AI/aiTargetLastAttackerPos.h index e0c7d078..9594a490 100644 --- a/src/Game/Actor/AI/aiTargetLastAttackerPos.h +++ b/src/Game/Actor/AI/aiTargetLastAttackerPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetLastAttackerPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetLastAttackerPos, TargetPosAI) +class TargetLastAttackerPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetLastAttackerPos, TargetActorPos) public: explicit TargetLastAttackerPos(const InitArg& arg); ~TargetLastAttackerPos() override; diff --git a/src/Game/Actor/AI/aiTargetLastDamagedPos.cpp b/src/Game/Actor/AI/aiTargetLastDamagedPos.cpp index ef068e5f..426c8f72 100644 --- a/src/Game/Actor/AI/aiTargetLastDamagedPos.cpp +++ b/src/Game/Actor/AI/aiTargetLastDamagedPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetLastDamagedPos::TargetLastDamagedPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetLastDamagedPos::TargetLastDamagedPos(const InitArg& arg) : TargetActorPos(arg) {} TargetLastDamagedPos::~TargetLastDamagedPos() = default; bool TargetLastDamagedPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetLastDamagedPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetLastDamagedPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetLastDamagedPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetLastDamagedPos.h b/src/Game/Actor/AI/aiTargetLastDamagedPos.h index 4f800798..9bc760ae 100644 --- a/src/Game/Actor/AI/aiTargetLastDamagedPos.h +++ b/src/Game/Actor/AI/aiTargetLastDamagedPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetLastDamagedPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetLastDamagedPos, TargetPosAI) +class TargetLastDamagedPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetLastDamagedPos, TargetActorPos) public: explicit TargetLastDamagedPos(const InitArg& arg); ~TargetLastDamagedPos() override; diff --git a/src/Game/Actor/AI/aiTargetPartsPos.cpp b/src/Game/Actor/AI/aiTargetPartsPos.cpp index e190d522..026d9f74 100644 --- a/src/Game/Actor/AI/aiTargetPartsPos.cpp +++ b/src/Game/Actor/AI/aiTargetPartsPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetPartsPos::TargetPartsPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetPartsPos::TargetPartsPos(const InitArg& arg) : TargetActorPos(arg) {} TargetPartsPos::~TargetPartsPos() = default; bool TargetPartsPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetPartsPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetPartsPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetPartsPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mPartsName_s, "PartsName"); } diff --git a/src/Game/Actor/AI/aiTargetPartsPos.h b/src/Game/Actor/AI/aiTargetPartsPos.h index dca9d608..f1a31554 100644 --- a/src/Game/Actor/AI/aiTargetPartsPos.h +++ b/src/Game/Actor/AI/aiTargetPartsPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPartsPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPartsPos, TargetPosAI) +class TargetPartsPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPartsPos, TargetActorPos) public: explicit TargetPartsPos(const InitArg& arg); ~TargetPartsPos() override; diff --git a/src/Game/Actor/AI/aiTargetPlayerPos.cpp b/src/Game/Actor/AI/aiTargetPlayerPos.cpp index e74b8675..18a488d0 100644 --- a/src/Game/Actor/AI/aiTargetPlayerPos.cpp +++ b/src/Game/Actor/AI/aiTargetPlayerPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetPlayerPos::TargetPlayerPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetPlayerPos::TargetPlayerPos(const InitArg& arg) : TargetActorPos(arg) {} TargetPlayerPos::~TargetPlayerPos() = default; bool TargetPlayerPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetPlayerPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetPlayerPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetPlayerPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPlayerPos.h b/src/Game/Actor/AI/aiTargetPlayerPos.h index e9e80386..ab641e26 100644 --- a/src/Game/Actor/AI/aiTargetPlayerPos.h +++ b/src/Game/Actor/AI/aiTargetPlayerPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPlayerPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPlayerPos, TargetPosAI) +class TargetPlayerPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPlayerPos, TargetActorPos) public: explicit TargetPlayerPos(const InitArg& arg); ~TargetPlayerPos() override; diff --git a/src/Game/Actor/AI/aiTargetPosAI.cpp b/src/Game/Actor/AI/aiTargetPosAI.cpp deleted file mode 100644 index 68542ef7..00000000 --- a/src/Game/Actor/AI/aiTargetPosAI.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiTargetPosAI.h" - -namespace uking::ai { - -TargetPosAI::TargetPosAI(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -TargetPosAI::~TargetPosAI() = default; - -bool TargetPosAI::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void TargetPosAI::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void TargetPosAI::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void TargetPosAI::loadParams_() { - getStaticParam(&mOnEnterOnly_s, "OnEnterOnly"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.cpp b/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.cpp index 4bc02f82..005f71fc 100644 --- a/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.cpp +++ b/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetPosAnchorOffsetSelf::TargetPosAnchorOffsetSelf(const InitArg& arg) : TargetPosAI(arg) {} +TargetPosAnchorOffsetSelf::TargetPosAnchorOffsetSelf(const InitArg& arg) : TargetActorPos(arg) {} TargetPosAnchorOffsetSelf::~TargetPosAnchorOffsetSelf() = default; bool TargetPosAnchorOffsetSelf::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetPosAnchorOffsetSelf::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetPosAnchorOffsetSelf::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetPosAnchorOffsetSelf::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mDist_s, "Dist"); getStaticParam(&mAnchorName_s, "AnchorName"); } diff --git a/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.h b/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.h index cbb7fd39..447481c9 100644 --- a/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.h +++ b/src/Game/Actor/AI/aiTargetPosAnchorOffsetSelf.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosAnchorOffsetSelf : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPosAnchorOffsetSelf, TargetPosAI) +class TargetPosAnchorOffsetSelf : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPosAnchorOffsetSelf, TargetActorPos) public: explicit TargetPosAnchorOffsetSelf(const InitArg& arg); ~TargetPosAnchorOffsetSelf() override; diff --git a/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.cpp b/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.cpp index 87b826b7..ef550e6b 100644 --- a/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.cpp +++ b/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.cpp @@ -2,24 +2,25 @@ namespace uking::ai { -TargetPosAnchorOffsetTarget::TargetPosAnchorOffsetTarget(const InitArg& arg) : TargetPosAI(arg) {} +TargetPosAnchorOffsetTarget::TargetPosAnchorOffsetTarget(const InitArg& arg) + : TargetActorPos(arg) {} TargetPosAnchorOffsetTarget::~TargetPosAnchorOffsetTarget() = default; bool TargetPosAnchorOffsetTarget::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetPosAnchorOffsetTarget::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetPosAnchorOffsetTarget::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetPosAnchorOffsetTarget::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mDist_s, "Dist"); getStaticParam(&mAnchorName_s, "AnchorName"); } diff --git a/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.h b/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.h index c5d9a6d2..a076cbfa 100644 --- a/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.h +++ b/src/Game/Actor/AI/aiTargetPosAnchorOffsetTarget.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosAnchorOffsetTarget : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPosAnchorOffsetTarget, TargetPosAI) +class TargetPosAnchorOffsetTarget : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPosAnchorOffsetTarget, TargetActorPos) public: explicit TargetPosAnchorOffsetTarget(const InitArg& arg); ~TargetPosAnchorOffsetTarget() override; diff --git a/src/Game/Actor/AI/aiTargetPosDynParamRot.cpp b/src/Game/Actor/AI/aiTargetPosDynParamRot.cpp deleted file mode 100644 index 2d49cfd8..00000000 --- a/src/Game/Actor/AI/aiTargetPosDynParamRot.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/AI/aiTargetPosDynParamRot.h" - -namespace uking::ai { - -TargetPosDynParamRot::TargetPosDynParamRot(const InitArg& arg) : TargetPosAI(arg) {} - -TargetPosDynParamRot::~TargetPosDynParamRot() = default; - -bool TargetPosDynParamRot::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); -} - -void TargetPosDynParamRot::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); -} - -void TargetPosDynParamRot::leave_() { - TargetPosAI::leave_(); -} - -void TargetPosDynParamRot::loadParams_() { - TargetPosAI::loadParams_(); - getStaticParam(&mMinDist_s, "MinDist"); - getDynamicParam(&mAngle_d, "Angle"); - getDynamicParam(&mTargetPos_d, "TargetPos"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.cpp b/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.cpp index b663ec5a..600c865a 100644 --- a/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.cpp +++ b/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.cpp @@ -3,24 +3,24 @@ namespace uking::ai { TargetPosDynParamRotFromCtrPos::TargetPosDynParamRotFromCtrPos(const InitArg& arg) - : TargetPosDynParamRot(arg) {} + : TargetPosDynParamRotFromMyPos(arg) {} TargetPosDynParamRotFromCtrPos::~TargetPosDynParamRotFromCtrPos() = default; bool TargetPosDynParamRotFromCtrPos::init_(sead::Heap* heap) { - return TargetPosDynParamRot::init_(heap); + return TargetPosDynParamRotFromMyPos::init_(heap); } void TargetPosDynParamRotFromCtrPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosDynParamRot::enter_(params); + TargetPosDynParamRotFromMyPos::enter_(params); } void TargetPosDynParamRotFromCtrPos::leave_() { - TargetPosDynParamRot::leave_(); + TargetPosDynParamRotFromMyPos::leave_(); } void TargetPosDynParamRotFromCtrPos::loadParams_() { - TargetPosDynParamRot::loadParams_(); + TargetPosDynParamRotFromMyPos::loadParams_(); getDynamicParam(&mCenterPos_d, "CenterPos"); } diff --git a/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.h b/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.h index ef19bb9a..8527cb8e 100644 --- a/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.h +++ b/src/Game/Actor/AI/aiTargetPosDynParamRotFromCtrPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosDynParamRot.h" +#include "Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosDynParamRotFromCtrPos : public TargetPosDynParamRot { - SEAD_RTTI_OVERRIDE(TargetPosDynParamRotFromCtrPos, TargetPosDynParamRot) +class TargetPosDynParamRotFromCtrPos : public TargetPosDynParamRotFromMyPos { + SEAD_RTTI_OVERRIDE(TargetPosDynParamRotFromCtrPos, TargetPosDynParamRotFromMyPos) public: explicit TargetPosDynParamRotFromCtrPos(const InitArg& arg); ~TargetPosDynParamRotFromCtrPos() override; diff --git a/src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.cpp b/src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.cpp new file mode 100644 index 00000000..f83a9863 --- /dev/null +++ b/src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.h" + +namespace uking::ai { + +TargetPosDynParamRotFromMyPos::TargetPosDynParamRotFromMyPos(const InitArg& arg) + : TargetActorPos(arg) {} + +TargetPosDynParamRotFromMyPos::~TargetPosDynParamRotFromMyPos() = default; + +bool TargetPosDynParamRotFromMyPos::init_(sead::Heap* heap) { + return TargetActorPos::init_(heap); +} + +void TargetPosDynParamRotFromMyPos::enter_(ksys::act::ai::InlineParamPack* params) { + TargetActorPos::enter_(params); +} + +void TargetPosDynParamRotFromMyPos::leave_() { + TargetActorPos::leave_(); +} + +void TargetPosDynParamRotFromMyPos::loadParams_() { + TargetActorPos::loadParams_(); + getStaticParam(&mMinDist_s, "MinDist"); + getDynamicParam(&mAngle_d, "Angle"); + getDynamicParam(&mTargetPos_d, "TargetPos"); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPosDynParamRot.h b/src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.h similarity index 63% rename from src/Game/Actor/AI/aiTargetPosDynParamRot.h rename to src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.h index 90b4b0e4..7278f4d2 100644 --- a/src/Game/Actor/AI/aiTargetPosDynParamRot.h +++ b/src/Game/Actor/AI/aiTargetPosDynParamRotFromMyPos.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosDynParamRot : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPosDynParamRot, TargetPosAI) +class TargetPosDynParamRotFromMyPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPosDynParamRotFromMyPos, TargetActorPos) public: - explicit TargetPosDynParamRot(const InitArg& arg); - ~TargetPosDynParamRot() override; + explicit TargetPosDynParamRotFromMyPos(const InitArg& arg); + ~TargetPosDynParamRotFromMyPos() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiTargetPosOffset.cpp b/src/Game/Actor/AI/aiTargetPosOffset.cpp deleted file mode 100644 index cfd68a28..00000000 --- a/src/Game/Actor/AI/aiTargetPosOffset.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/AI/aiTargetPosOffset.h" - -namespace uking::ai { - -TargetPosOffset::TargetPosOffset(const InitArg& arg) : TargetPosAI(arg) {} - -TargetPosOffset::~TargetPosOffset() = default; - -bool TargetPosOffset::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); -} - -void TargetPosOffset::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); -} - -void TargetPosOffset::leave_() { - TargetPosAI::leave_(); -} - -void TargetPosOffset::loadParams_() { - TargetPosAI::loadParams_(); - getStaticParam(&mDir_s, "Dir"); - getStaticParam(&mOffset_s, "Offset"); - getStaticParam(&mMinDist_s, "MinDist"); - getStaticParam(&mSideDist_s, "SideDist"); - getStaticParam(&mIsRandSide_s, "IsRandSide"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.cpp b/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.cpp index 9c8b3b55..8c263e77 100644 --- a/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.cpp +++ b/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetPosOffsetFromMyPos::TargetPosOffsetFromMyPos(const InitArg& arg) : TargetPosOffset(arg) {} +TargetPosOffsetFromMyPos::TargetPosOffsetFromMyPos(const InitArg& arg) : OffsetTargetPos(arg) {} TargetPosOffsetFromMyPos::~TargetPosOffsetFromMyPos() = default; bool TargetPosOffsetFromMyPos::init_(sead::Heap* heap) { - return TargetPosOffset::init_(heap); + return OffsetTargetPos::init_(heap); } void TargetPosOffsetFromMyPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosOffset::enter_(params); + OffsetTargetPos::enter_(params); } void TargetPosOffsetFromMyPos::leave_() { - TargetPosOffset::leave_(); + OffsetTargetPos::leave_(); } void TargetPosOffsetFromMyPos::loadParams_() { - TargetPosOffset::loadParams_(); + OffsetTargetPos::loadParams_(); getDynamicParam(&mTargetPos_d, "TargetPos"); } diff --git a/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.h b/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.h index 89280c3f..f2882bee 100644 --- a/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.h +++ b/src/Game/Actor/AI/aiTargetPosOffsetFromMyPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosOffset.h" +#include "Game/Actor/AI/aiOffsetTargetPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosOffsetFromMyPos : public TargetPosOffset { - SEAD_RTTI_OVERRIDE(TargetPosOffsetFromMyPos, TargetPosOffset) +class TargetPosOffsetFromMyPos : public OffsetTargetPos { + SEAD_RTTI_OVERRIDE(TargetPosOffsetFromMyPos, OffsetTargetPos) public: explicit TargetPosOffsetFromMyPos(const InitArg& arg); ~TargetPosOffsetFromMyPos() override; diff --git a/src/Game/Actor/AI/aiTargetPosRotFromMyPos.cpp b/src/Game/Actor/AI/aiTargetPosRotFromMyPos.cpp index 15bad3b6..38a00ce6 100644 --- a/src/Game/Actor/AI/aiTargetPosRotFromMyPos.cpp +++ b/src/Game/Actor/AI/aiTargetPosRotFromMyPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetPosRotFromMyPos::TargetPosRotFromMyPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetPosRotFromMyPos::TargetPosRotFromMyPos(const InitArg& arg) : TargetActorPos(arg) {} TargetPosRotFromMyPos::~TargetPosRotFromMyPos() = default; bool TargetPosRotFromMyPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetPosRotFromMyPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetPosRotFromMyPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetPosRotFromMyPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mIsRandSign_s, "IsRandSign"); getStaticParam(&mAngle_s, "Angle"); getDynamicParam(&mTargetPos_d, "TargetPos"); diff --git a/src/Game/Actor/AI/aiTargetPosRotFromMyPos.h b/src/Game/Actor/AI/aiTargetPosRotFromMyPos.h index 8bb8816c..11510c84 100644 --- a/src/Game/Actor/AI/aiTargetPosRotFromMyPos.h +++ b/src/Game/Actor/AI/aiTargetPosRotFromMyPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPosRotFromMyPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPosRotFromMyPos, TargetPosAI) +class TargetPosRotFromMyPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPosRotFromMyPos, TargetActorPos) public: explicit TargetPosRotFromMyPos(const InitArg& arg); ~TargetPosRotFromMyPos() override; diff --git a/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.cpp b/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.cpp index 6cfebac5..522a763e 100644 --- a/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.cpp +++ b/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.cpp @@ -2,24 +2,25 @@ namespace uking::ai { -TargetPredictRotSpdTargetPos::TargetPredictRotSpdTargetPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetPredictRotSpdTargetPos::TargetPredictRotSpdTargetPos(const InitArg& arg) + : TargetActorPos(arg) {} TargetPredictRotSpdTargetPos::~TargetPredictRotSpdTargetPos() = default; bool TargetPredictRotSpdTargetPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetPredictRotSpdTargetPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetPredictRotSpdTargetPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetPredictRotSpdTargetPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mAddSpeed_s, "AddSpeed"); } diff --git a/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.h b/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.h index feaa1da6..6c38b013 100644 --- a/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.h +++ b/src/Game/Actor/AI/aiTargetPredictRotSpdTargetPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetPredictRotSpdTargetPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetPredictRotSpdTargetPos, TargetPosAI) +class TargetPredictRotSpdTargetPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetPredictRotSpdTargetPos, TargetActorPos) public: explicit TargetPredictRotSpdTargetPos(const InitArg& arg); ~TargetPredictRotSpdTargetPos() override; diff --git a/src/Game/Actor/AI/aiTargetRangeSelect.cpp b/src/Game/Actor/AI/aiTargetRangeSelect.cpp index 45f88d74..493d6218 100644 --- a/src/Game/Actor/AI/aiTargetRangeSelect.cpp +++ b/src/Game/Actor/AI/aiTargetRangeSelect.cpp @@ -2,12 +2,12 @@ namespace uking::ai { -TargetRangeSelect::TargetRangeSelect(const InitArg& arg) : RangeSelect(arg) {} +TargetRangeSelect::TargetRangeSelect(const InitArg& arg) : NewRangeSelect(arg) {} TargetRangeSelect::~TargetRangeSelect() = default; void TargetRangeSelect::loadParams_() { - RangeSelect::loadParams_(); + NewRangeSelect::loadParams_(); getStaticParam(&mIsXZOnly_s, "IsXZOnly"); } diff --git a/src/Game/Actor/AI/aiTargetRangeSelect.h b/src/Game/Actor/AI/aiTargetRangeSelect.h index cd12656c..e1704736 100644 --- a/src/Game/Actor/AI/aiTargetRangeSelect.h +++ b/src/Game/Actor/AI/aiTargetRangeSelect.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiRangeSelect.h" +#include "Game/Actor/AI/aiNewRangeSelect.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetRangeSelect : public RangeSelect { - SEAD_RTTI_OVERRIDE(TargetRangeSelect, RangeSelect) +class TargetRangeSelect : public NewRangeSelect { + SEAD_RTTI_OVERRIDE(TargetRangeSelect, NewRangeSelect) public: explicit TargetRangeSelect(const InitArg& arg); ~TargetRangeSelect() override; diff --git a/src/Game/Actor/AI/aiTargetTargetPos.cpp b/src/Game/Actor/AI/aiTargetTargetPos.cpp index b78da1ea..746a62ee 100644 --- a/src/Game/Actor/AI/aiTargetTargetPos.cpp +++ b/src/Game/Actor/AI/aiTargetTargetPos.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -TargetTargetPos::TargetTargetPos(const InitArg& arg) : TargetPosAI(arg) {} +TargetTargetPos::TargetTargetPos(const InitArg& arg) : TargetActorPos(arg) {} TargetTargetPos::~TargetTargetPos() = default; bool TargetTargetPos::init_(sead::Heap* heap) { - return TargetPosAI::init_(heap); + return TargetActorPos::init_(heap); } void TargetTargetPos::enter_(ksys::act::ai::InlineParamPack* params) { - TargetPosAI::enter_(params); + TargetActorPos::enter_(params); } void TargetTargetPos::leave_() { - TargetPosAI::leave_(); + TargetActorPos::leave_(); } void TargetTargetPos::loadParams_() { - TargetPosAI::loadParams_(); + TargetActorPos::loadParams_(); getStaticParam(&mAddSpeed_s, "AddSpeed"); } diff --git a/src/Game/Actor/AI/aiTargetTargetPos.h b/src/Game/Actor/AI/aiTargetTargetPos.h index 45026773..c7213921 100644 --- a/src/Game/Actor/AI/aiTargetTargetPos.h +++ b/src/Game/Actor/AI/aiTargetTargetPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiTargetPosAI.h" +#include "Game/Actor/AI/aiTargetActorPos.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class TargetTargetPos : public TargetPosAI { - SEAD_RTTI_OVERRIDE(TargetTargetPos, TargetPosAI) +class TargetTargetPos : public TargetActorPos { + SEAD_RTTI_OVERRIDE(TargetTargetPos, TargetActorPos) public: explicit TargetTargetPos(const InitArg& arg); ~TargetTargetPos() override; diff --git a/src/Game/Actor/AI/aiTimedGuardNearTarget.cpp b/src/Game/Actor/AI/aiTimedGuardNearTarget.cpp deleted file mode 100644 index e4b93d61..00000000 --- a/src/Game/Actor/AI/aiTimedGuardNearTarget.cpp +++ /dev/null @@ -1,28 +0,0 @@ -#include "Game/Actor/AI/aiTimedGuardNearTarget.h" - -namespace uking::ai { - -TimedGuardNearTarget::TimedGuardNearTarget(const InitArg& arg) : GuardNearTarget(arg) {} - -TimedGuardNearTarget::~TimedGuardNearTarget() = default; - -bool TimedGuardNearTarget::init_(sead::Heap* heap) { - return GuardNearTarget::init_(heap); -} - -void TimedGuardNearTarget::enter_(ksys::act::ai::InlineParamPack* params) { - GuardNearTarget::enter_(params); -} - -void TimedGuardNearTarget::leave_() { - GuardNearTarget::leave_(); -} - -void TimedGuardNearTarget::loadParams_() { - GuardNearTarget::loadParams_(); - getStaticParam(&mGuardEndTime_s, "GuardEndTime"); - getStaticParam(&mGuardStartAngle_s, "GuardStartAngle"); - getStaticParam(&mGuardEndAngle_s, "GuardEndAngle"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.cpp b/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.cpp index 02a009d2..ba6ceea7 100644 --- a/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.cpp +++ b/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.cpp @@ -2,20 +2,20 @@ namespace uking::ai { -UnarmedEnemyNoiseTarget::UnarmedEnemyNoiseTarget(const InitArg& arg) : UnarmedEnemySearch(arg) {} +UnarmedEnemyNoiseTarget::UnarmedEnemyNoiseTarget(const InitArg& arg) : NavMove(arg) {} UnarmedEnemyNoiseTarget::~UnarmedEnemyNoiseTarget() = default; void UnarmedEnemyNoiseTarget::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearch::enter_(params); + NavMove::enter_(params); } void UnarmedEnemyNoiseTarget::leave_() { - UnarmedEnemySearch::leave_(); + NavMove::leave_(); } void UnarmedEnemyNoiseTarget::loadParams_() { - UnarmedEnemySearch::loadParams_(); + NavMove::loadParams_(); getStaticParam(&mLostTime_s, "LostTime"); getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mLostRange_s, "LostRange"); diff --git a/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.h b/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.h index 3c1d7bdb..09fed057 100644 --- a/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.h +++ b/src/Game/Actor/AI/aiUnarmedEnemyNoiseTarget.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearch.h" +#include "Game/Actor/AI/aiNavMove.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class UnarmedEnemyNoiseTarget : public UnarmedEnemySearch { - SEAD_RTTI_OVERRIDE(UnarmedEnemyNoiseTarget, UnarmedEnemySearch) +class UnarmedEnemyNoiseTarget : public NavMove { + SEAD_RTTI_OVERRIDE(UnarmedEnemyNoiseTarget, NavMove) public: explicit UnarmedEnemyNoiseTarget(const InitArg& arg); ~UnarmedEnemyNoiseTarget() override; diff --git a/src/Game/Actor/AI/aiUnarmedEnemySearch.cpp b/src/Game/Actor/AI/aiUnarmedEnemySearch.cpp deleted file mode 100644 index 1ed31c7d..00000000 --- a/src/Game/Actor/AI/aiUnarmedEnemySearch.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/AI/aiUnarmedEnemySearch.h" - -namespace uking::ai { - -UnarmedEnemySearch::UnarmedEnemySearch(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -UnarmedEnemySearch::~UnarmedEnemySearch() = default; - -bool UnarmedEnemySearch::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void UnarmedEnemySearch::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void UnarmedEnemySearch::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void UnarmedEnemySearch::loadParams_() { - getStaticParam(&mWeaponIdx_s, "WeaponIdx"); - getStaticParam(&mReachTargetArea_s, "ReachTargetArea"); - getStaticParam(&mTurnStartAng_s, "TurnStartAng"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.cpp b/src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.cpp deleted file mode 100644 index 514e9228..00000000 --- a/src/Game/Actor/AI/aiUnarmedEnemySearchWeapon.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/AI/aiUnarmedEnemySearchWeapon.h" - -namespace uking::ai { - -UnarmedEnemySearchWeapon::UnarmedEnemySearchWeapon(const InitArg& arg) : UnarmedEnemySearch(arg) {} - -UnarmedEnemySearchWeapon::~UnarmedEnemySearchWeapon() = default; - -void UnarmedEnemySearchWeapon::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearch::enter_(params); -} - -void UnarmedEnemySearchWeapon::leave_() { - UnarmedEnemySearch::leave_(); -} - -void UnarmedEnemySearchWeapon::loadParams_() { - UnarmedEnemySearch::loadParams_(); - getStaticParam(&mEquipItemSearchIdx_s, "EquipItemSearchIdx"); - getStaticParam(&mRepathTime_s, "RepathTime"); - getStaticParam(&mSearchDist_s, "SearchDist"); - getStaticParam(&mSearchAng_s, "SearchAng"); - getStaticParam(&mIsUseSight_s, "IsUseSight"); - getStaticParam(&mLineReachableWeaponDist_s, "LineReachableWeaponDist"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.cpp b/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.cpp index 7182fad8..c09787f1 100644 --- a/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.cpp +++ b/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.cpp @@ -3,24 +3,24 @@ namespace uking::ai { UnarmedWeaponEquipableEnemyAct::UnarmedWeaponEquipableEnemyAct(const InitArg& arg) - : UnarmedEnemySearchWeapon(arg) {} + : EnemySearch(arg) {} UnarmedWeaponEquipableEnemyAct::~UnarmedWeaponEquipableEnemyAct() = default; bool UnarmedWeaponEquipableEnemyAct::init_(sead::Heap* heap) { - return UnarmedEnemySearchWeapon::init_(heap); + return EnemySearch::init_(heap); } void UnarmedWeaponEquipableEnemyAct::enter_(ksys::act::ai::InlineParamPack* params) { - UnarmedEnemySearchWeapon::enter_(params); + EnemySearch::enter_(params); } void UnarmedWeaponEquipableEnemyAct::leave_() { - UnarmedEnemySearchWeapon::leave_(); + EnemySearch::leave_(); } void UnarmedWeaponEquipableEnemyAct::loadParams_() { - UnarmedEnemySearchWeapon::loadParams_(); + EnemySearch::loadParams_(); } } // namespace uking::ai diff --git a/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.h b/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.h index 4824bd6f..f1632250 100644 --- a/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.h +++ b/src/Game/Actor/AI/aiUnarmedWeaponEquipableEnemyAct.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiUnarmedEnemySearchWeapon.h" +#include "Game/Actor/AI/aiEnemySearch.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class UnarmedWeaponEquipableEnemyAct : public UnarmedEnemySearchWeapon { - SEAD_RTTI_OVERRIDE(UnarmedWeaponEquipableEnemyAct, UnarmedEnemySearchWeapon) +class UnarmedWeaponEquipableEnemyAct : public EnemySearch { + SEAD_RTTI_OVERRIDE(UnarmedWeaponEquipableEnemyAct, EnemySearch) public: explicit UnarmedWeaponEquipableEnemyAct(const InitArg& arg); ~UnarmedWeaponEquipableEnemyAct() override; diff --git a/src/Game/Actor/AI/aiVacuumEnemyRoot.cpp b/src/Game/Actor/AI/aiVacuumEnemyRoot.cpp new file mode 100644 index 00000000..55732528 --- /dev/null +++ b/src/Game/Actor/AI/aiVacuumEnemyRoot.cpp @@ -0,0 +1,25 @@ +#include "Game/Actor/AI/aiVacuumEnemyRoot.h" + +namespace uking::ai { + +VacuumEnemyRoot::VacuumEnemyRoot(const InitArg& arg) : EnemyRoot(arg) {} + +VacuumEnemyRoot::~VacuumEnemyRoot() = default; + +bool VacuumEnemyRoot::init_(sead::Heap* heap) { + return EnemyRoot::init_(heap); +} + +void VacuumEnemyRoot::enter_(ksys::act::ai::InlineParamPack* params) { + EnemyRoot::enter_(params); +} + +void VacuumEnemyRoot::leave_() { + EnemyRoot::leave_(); +} + +void VacuumEnemyRoot::loadParams_() { + EnemyRoot::loadParams_(); +} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiOctarockRootBase.h b/src/Game/Actor/AI/aiVacuumEnemyRoot.h similarity index 65% rename from src/Game/Actor/AI/aiOctarockRootBase.h rename to src/Game/Actor/AI/aiVacuumEnemyRoot.h index 04e1885d..0f5d21c2 100644 --- a/src/Game/Actor/AI/aiOctarockRootBase.h +++ b/src/Game/Actor/AI/aiVacuumEnemyRoot.h @@ -5,11 +5,11 @@ namespace uking::ai { -class OctarockRootBase : public EnemyRoot { - SEAD_RTTI_OVERRIDE(OctarockRootBase, EnemyRoot) +class VacuumEnemyRoot : public EnemyRoot { + SEAD_RTTI_OVERRIDE(VacuumEnemyRoot, EnemyRoot) public: - explicit OctarockRootBase(const InitArg& arg); - ~OctarockRootBase() override; + explicit VacuumEnemyRoot(const InitArg& arg); + ~VacuumEnemyRoot() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/AI/aiWholeDungeonRotateTag.cpp b/src/Game/Actor/AI/aiWholeDungeonRotateTag.cpp deleted file mode 100644 index eff1deae..00000000 --- a/src/Game/Actor/AI/aiWholeDungeonRotateTag.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "Game/Actor/AI/aiWholeDungeonRotateTag.h" - -namespace uking::ai { - -WholeDungeonRotateTag::WholeDungeonRotateTag(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -WholeDungeonRotateTag::~WholeDungeonRotateTag() = default; - -bool WholeDungeonRotateTag::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void WholeDungeonRotateTag::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void WholeDungeonRotateTag::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void WholeDungeonRotateTag::loadParams_() { - getMapUnitParam(&mTiltAngle_m, "TiltAngle"); -} - -} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiYunBoCannon.cpp b/src/Game/Actor/AI/aiYunBoCannon.cpp index 3241f459..ca6c4152 100644 --- a/src/Game/Actor/AI/aiYunBoCannon.cpp +++ b/src/Game/Actor/AI/aiYunBoCannon.cpp @@ -2,24 +2,24 @@ namespace uking::ai { -YunBoCannon::YunBoCannon(const InitArg& arg) : GoronCannonBase(arg) {} +YunBoCannon::YunBoCannon(const InitArg& arg) : BigCannon(arg) {} YunBoCannon::~YunBoCannon() = default; bool YunBoCannon::init_(sead::Heap* heap) { - return GoronCannonBase::init_(heap); + return BigCannon::init_(heap); } void YunBoCannon::enter_(ksys::act::ai::InlineParamPack* params) { - GoronCannonBase::enter_(params); + BigCannon::enter_(params); } void YunBoCannon::leave_() { - GoronCannonBase::leave_(); + BigCannon::leave_(); } void YunBoCannon::loadParams_() { - GoronCannonBase::loadParams_(); + BigCannon::loadParams_(); getStaticParam(&mReturnAnchorName_s, "ReturnAnchorName"); getMapUnitParam(&mCannonSpot_m, "CannonSpot"); getMapUnitParam(&mActorName_m, "ActorName"); diff --git a/src/Game/Actor/AI/aiYunBoCannon.h b/src/Game/Actor/AI/aiYunBoCannon.h index 8870cfc3..d322da52 100644 --- a/src/Game/Actor/AI/aiYunBoCannon.h +++ b/src/Game/Actor/AI/aiYunBoCannon.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/AI/aiGoronCannonBase.h" +#include "Game/Actor/AI/aiBigCannon.h" #include "KingSystem/ActorSystem/actAiAi.h" namespace uking::ai { -class YunBoCannon : public GoronCannonBase { - SEAD_RTTI_OVERRIDE(YunBoCannon, GoronCannonBase) +class YunBoCannon : public BigCannon { + SEAD_RTTI_OVERRIDE(YunBoCannon, BigCannon) public: explicit YunBoCannon(const InitArg& arg); ~YunBoCannon() override; diff --git a/src/Game/Actor/Action/CMakeLists.txt b/src/Game/Actor/Action/CMakeLists.txt index 9433f89c..94d90a21 100644 --- a/src/Game/Actor/Action/CMakeLists.txt +++ b/src/Game/Actor/Action/CMakeLists.txt @@ -23,8 +23,8 @@ target_sources(uking PRIVATE actionAddRigidBody.h actionAdvanceTime.cpp actionAdvanceTime.h - actionAirOctaFloatBase.cpp - actionAirOctaFloatBase.h + actionAirOctaMoveBase.cpp + actionAirOctaMoveBase.h actionAirOctaFloat.cpp actionAirOctaFloat.h actionAirOctaMgr.cpp @@ -193,8 +193,8 @@ target_sources(uking PRIVATE actionAssassinBossIronMagicChargeShot.h actionAtAndBodyOnWait.cpp actionAtAndBodyOnWait.h - actionAtkTackleMove.cpp - actionAtkTackleMove.h + actionTackleAttack.cpp + actionTackleAttack.h actionAtOnWait.cpp actionAtOnWait.h actionAtOnWaitNoHitRope.cpp @@ -209,6 +209,10 @@ target_sources(uking PRIVATE actionAttackPartBind.h actionAttackPowerExplode.cpp actionAttackPowerExplode.h + actionAvoidingCloseMoveActionWithAcc.cpp + actionAvoidingCloseMoveActionWithAcc.h + actionAvoidingCloseMoveBase.cpp + actionAvoidingCloseMoveBase.h actionAwarenessShareOnePartsASPlay.cpp actionAwarenessShareOnePartsASPlay.h actionBackFlip.cpp @@ -247,14 +251,10 @@ target_sources(uking PRIVATE actionBasicSignalBossAwakeSleep.h actionBasicSignalChangeDamping.cpp actionBasicSignalChangeDamping.h - actionBasicSignalEnemy.cpp + actionBasicSignalEnemyNotice.cpp actionBasicSignalEnemyForceNotice.cpp actionBasicSignalEnemyForceNotice.h - actionBasicSignalEnemy.h - actionBattleCloseAction.cpp - actionBattleCloseAction.h - actionBattleCloseActionWithAcc.cpp - actionBattleCloseActionWithAcc.h + actionBasicSignalEnemyNotice.h actionBattleCloseDangerAvoidRun.cpp actionBattleCloseDangerAvoidRun.h actionBattleCloseExplosivesAvoidRun.cpp @@ -279,8 +279,8 @@ target_sources(uking PRIVATE actionBattleCloseMoveAction.h actionBattleCloseMove.cpp actionBattleCloseMove.h - actionBattleCloseSlippedWalkBase.cpp - actionBattleCloseSlippedWalkBase.h + actionBattleCloseSlippedMoveBase.cpp + actionBattleCloseSlippedMoveBase.h actionBattleCloseSlippedWalk.cpp actionBattleCloseSlippedWalk.h actionBattleCloseWalk.cpp @@ -415,18 +415,18 @@ target_sources(uking PRIVATE actionChangeScheduleAnchor.h actionChangeWeaponEquipState.cpp actionChangeWeaponEquipState.h - actionChargeAndShoot.cpp - actionChargeAndShoot.h + actionArrowChargeAndShoot.cpp + actionArrowChargeAndShoot.h actionChargeChemicalWeaponPower.cpp actionChargeChemicalWeaponPower.h actionCheckExistenceOfParticipant.cpp actionCheckExistenceOfParticipant.h actionCheckHorseCustomizeEdit.cpp actionCheckHorseCustomizeEdit.h - actionChemicalAttackBall.cpp - actionChemicalAttackBall.h actionChemicalAttack.cpp actionChemicalAttack.h + actionEmitAttackBase.cpp + actionEmitAttackBase.h actionChemicalElectricWaterBall.cpp actionChemicalElectricWaterBall.h actionChemicalPhysBall.cpp @@ -1005,16 +1005,16 @@ target_sources(uking PRIVATE actionFlyingCharacterFreezeDie.cpp actionFlyingCharacterFreezeDie.h actionFlyingCharacterFreeze.h - actionFlyingCharacterReaction.cpp - actionFlyingCharacterReaction.h + actionFlyingCharacterFreeFallBase.cpp + actionFlyingCharacterFreeFallBase.h actionFlyMoveBase.cpp actionFlyMoveBase.h actionFlyMove.cpp actionFlyMove.h actionFollowAttack.cpp actionFollowAttack.h - actionFollowChallenge.cpp - actionFollowChallenge.h + actionAppearFollowChallenge.cpp + actionAppearFollowChallenge.h actionFollowDungeonRotateASPlay.cpp actionFollowDungeonRotateASPlay.h actionFollowDungeonRotate.cpp @@ -1129,8 +1129,8 @@ target_sources(uking PRIVATE actionForkASTrgEmitChmFieldPos.h actionForkASTrgEmitShockWaveAtEnter.cpp actionForkASTrgEmitShockWaveAtEnter.h - actionForkASTrgEmitShockWave.cpp - actionForkASTrgEmitShockWave.h + actionForkEmitShockWave.cpp + actionForkEmitShockWave.h actionForkASTrgEmitShockWavePos.cpp actionForkASTrgEmitShockWavePos.h actionForkASTrgForceDirAerialTurn.cpp @@ -1583,8 +1583,8 @@ target_sources(uking PRIVATE actionGolemDieFromRagdoll.h actionGolemRepairParts.cpp actionGolemRepairParts.h - actionGolemThrowPartsToTargetBase.cpp - actionGolemThrowPartsToTargetBase.h + actionGolemThrowPartsBase.cpp + actionGolemThrowPartsBase.h actionGolemThrowPartsToTarget.cpp actionGolemThrowPartsToTarget.h actionGoronHeroDescendentAppear.cpp @@ -1735,8 +1735,8 @@ target_sources(uking PRIVATE actionHorseRideLookWait.h actionHorseRideLoopAttack.cpp actionHorseRideLoopAttack.h - actionHorseRideMoveCommand.cpp - actionHorseRideMoveCommand.h + actionHorseRideSetGearCommand.cpp + actionHorseRideSetGearCommand.h actionHorseRideMoveToCommand.cpp actionHorseRideMoveToCommand.h actionHorseRideOneTimeASPlay.cpp @@ -2237,8 +2237,8 @@ target_sources(uking PRIVATE actionObjBoardWoodTriangle01.h actionObservationPointAction.cpp actionObservationPointAction.h - actionOctarockBalloonBase.cpp - actionOctarockBalloonBase.h + actionBalloonRopeBase.cpp + actionBalloonRopeBase.h actionOctarockBalloon.cpp actionOctarockBalloon.h actionOctarockBulletLExplode.cpp @@ -2399,8 +2399,8 @@ target_sources(uking PRIVATE actionPriestBossSideMove.h actionPriestBossSlowWarpMove.cpp actionPriestBossSlowWarpMove.h - actionPriestBossWarpOrVanish.cpp - actionPriestBossWarpOrVanish.h + actionPriestBossCloneFastWarp.cpp + actionPriestBossCloneFastWarp.h actionPuddle.cpp actionPuddle.h actionPulleyChainASControl.cpp @@ -2527,8 +2527,8 @@ target_sources(uking PRIVATE actionRotatedWait.cpp actionRotatedWait.h actionRotate.h - actionRotateTurnToTarget.cpp - actionRotateTurnToTarget.h + actionASPlayRotateTurnToTarget.cpp + actionASPlayRotateTurnToTarget.h actionRun.cpp actionRun.h actionSandwichDetectionAreaTag.cpp @@ -2621,8 +2621,8 @@ target_sources(uking PRIVATE actionSetExtraLifeOfPlayer.h actionSetFrameASPlay.cpp actionSetFrameASPlay.h - actionSetGetFlagBase.cpp - actionSetGetFlagBase.h + actionSetFlag.cpp + actionSetFlag.h actionSetGetFlagByActorName.cpp actionSetGetFlagByActorName.h actionSetGetFlag.cpp @@ -2713,16 +2713,16 @@ target_sources(uking PRIVATE actionSimpleGrabWithAS.h actionSimpleLineBeam.cpp actionSimpleLineBeam.h - actionSimpleMessageDialogCtrl.cpp - actionSimpleMessageDialogCtrl.h + actionForkBasicMessageDialogCtrl.cpp + actionForkBasicMessageDialogCtrl.h actionSimpleOpenMessageDialogAction.cpp actionSimpleOpenMessageDialogAction.h actionSimpleUniqueTalk.cpp actionSimpleUniqueTalk.h actionSiteBossAvoid.cpp actionSiteBossAvoid.h - actionSiteBossBlowOff.cpp - actionSiteBossBlowOff.h + actionLastBossBlowOff.cpp + actionLastBossBlowOff.h actionSiteBossBowBlowOff.cpp actionSiteBossBowBlowOff.h actionSiteBossBowChildDeviceBreak.cpp @@ -2743,8 +2743,8 @@ target_sources(uking PRIVATE actionSiteBossFlyWaitTurnToTarget.h actionSiteBossGetUpLinear.cpp actionSiteBossGetUpLinear.h - actionSiteBossLswordAtk.cpp - actionSiteBossLswordAtk.h + actionSiteBossLswordAttack.cpp + actionSiteBossLswordAttack.h actionSiteBossLswordAtkWithChemical.cpp actionSiteBossLswordAtkWithChemical.h actionSiteBossLswordFireBall.cpp @@ -3133,8 +3133,8 @@ target_sources(uking PRIVATE actionWaitMagneGear.h actionWaitMessageDialogEnd.cpp actionWaitMessageDialogEnd.h - actionWaitOnObjBase.cpp - actionWaitOnObjBase.h + actionStopOnObj.cpp + actionStopOnObj.h actionWaitOnObj.cpp actionWaitOnObj.h actionWaitTimer.cpp @@ -3213,8 +3213,8 @@ target_sources(uking PRIVATE actionWaterUpDownAnmDrivenMove.h actionWaterUpDownDrivenPreAttack.cpp actionWaterUpDownDrivenPreAttack.h - actionWaterUpDownMoveBase.cpp - actionWaterUpDownMoveBase.h + actionWaterDepthMoveBase.cpp + actionWaterDepthMoveBase.h actionWaterUpDownMove.cpp actionWaterUpDownMove.h actionWeaponDrawn.cpp diff --git a/src/Game/Actor/Action/actionASPlayRotateTurnToTarget.cpp b/src/Game/Actor/Action/actionASPlayRotateTurnToTarget.cpp new file mode 100644 index 00000000..1f898724 --- /dev/null +++ b/src/Game/Actor/Action/actionASPlayRotateTurnToTarget.cpp @@ -0,0 +1,34 @@ +#include "Game/Actor/Action/actionASPlayRotateTurnToTarget.h" + +namespace uking::action { + +ASPlayRotateTurnToTarget::ASPlayRotateTurnToTarget(const InitArg& arg) + : ksys::act::ai::Action(arg) {} + +ASPlayRotateTurnToTarget::~ASPlayRotateTurnToTarget() = default; + +bool ASPlayRotateTurnToTarget::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void ASPlayRotateTurnToTarget::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void ASPlayRotateTurnToTarget::leave_() { + ksys::act::ai::Action::leave_(); +} + +void ASPlayRotateTurnToTarget::loadParams_() { + getStaticParam(&mAngSpd_s, "AngSpd"); + getStaticParam(&mIsJumpType_s, "IsJumpType"); + getStaticParam(&mASName_s, "ASName"); + getDynamicParam(&mTargetPos_d, "TargetPos"); + getStaticParam(&mIsChangeable_s, "IsChangeable"); +} + +void ASPlayRotateTurnToTarget::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionRotateTurnToTarget.h b/src/Game/Actor/Action/actionASPlayRotateTurnToTarget.h similarity index 74% rename from src/Game/Actor/Action/actionRotateTurnToTarget.h rename to src/Game/Actor/Action/actionASPlayRotateTurnToTarget.h index 9711122b..2d353021 100644 --- a/src/Game/Actor/Action/actionRotateTurnToTarget.h +++ b/src/Game/Actor/Action/actionASPlayRotateTurnToTarget.h @@ -4,11 +4,11 @@ namespace uking::action { -class RotateTurnToTarget : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(RotateTurnToTarget, ksys::act::ai::Action) +class ASPlayRotateTurnToTarget : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(ASPlayRotateTurnToTarget, ksys::act::ai::Action) public: - explicit RotateTurnToTarget(const InitArg& arg); - ~RotateTurnToTarget() override; + explicit ASPlayRotateTurnToTarget(const InitArg& arg); + ~ASPlayRotateTurnToTarget() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionAirOctaFloat.cpp b/src/Game/Actor/Action/actionAirOctaFloat.cpp index e624963e..e45c5de9 100644 --- a/src/Game/Actor/Action/actionAirOctaFloat.cpp +++ b/src/Game/Actor/Action/actionAirOctaFloat.cpp @@ -2,28 +2,28 @@ namespace uking::action { -AirOctaFloat::AirOctaFloat(const InitArg& arg) : AirOctaFloatBase(arg) {} +AirOctaFloat::AirOctaFloat(const InitArg& arg) : AirOctaMoveBase(arg) {} AirOctaFloat::~AirOctaFloat() = default; bool AirOctaFloat::init_(sead::Heap* heap) { - return AirOctaFloatBase::init_(heap); + return AirOctaMoveBase::init_(heap); } void AirOctaFloat::enter_(ksys::act::ai::InlineParamPack* params) { - AirOctaFloatBase::enter_(params); + AirOctaMoveBase::enter_(params); } void AirOctaFloat::leave_() { - AirOctaFloatBase::leave_(); + AirOctaMoveBase::leave_(); } void AirOctaFloat::loadParams_() { - AirOctaFloatBase::loadParams_(); + AirOctaMoveBase::loadParams_(); } void AirOctaFloat::calc_() { - AirOctaFloatBase::calc_(); + AirOctaMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionAirOctaFloat.h b/src/Game/Actor/Action/actionAirOctaFloat.h index cbc540e6..97869272 100644 --- a/src/Game/Actor/Action/actionAirOctaFloat.h +++ b/src/Game/Actor/Action/actionAirOctaFloat.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionAirOctaFloatBase.h" +#include "Game/Actor/Action/actionAirOctaMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class AirOctaFloat : public AirOctaFloatBase { - SEAD_RTTI_OVERRIDE(AirOctaFloat, AirOctaFloatBase) +class AirOctaFloat : public AirOctaMoveBase { + SEAD_RTTI_OVERRIDE(AirOctaFloat, AirOctaMoveBase) public: explicit AirOctaFloat(const InitArg& arg); ~AirOctaFloat() override; diff --git a/src/Game/Actor/Action/actionAirOctaFloatBase.cpp b/src/Game/Actor/Action/actionAirOctaMoveBase.cpp similarity index 52% rename from src/Game/Actor/Action/actionAirOctaFloatBase.cpp rename to src/Game/Actor/Action/actionAirOctaMoveBase.cpp index 7ec4c6a5..142572a8 100644 --- a/src/Game/Actor/Action/actionAirOctaFloatBase.cpp +++ b/src/Game/Actor/Action/actionAirOctaMoveBase.cpp @@ -1,31 +1,31 @@ -#include "Game/Actor/Action/actionAirOctaFloatBase.h" +#include "Game/Actor/Action/actionAirOctaMoveBase.h" namespace uking::action { -AirOctaFloatBase::AirOctaFloatBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +AirOctaMoveBase::AirOctaMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -AirOctaFloatBase::~AirOctaFloatBase() = default; +AirOctaMoveBase::~AirOctaMoveBase() = default; -bool AirOctaFloatBase::init_(sead::Heap* heap) { +bool AirOctaMoveBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void AirOctaFloatBase::enter_(ksys::act::ai::InlineParamPack* params) { +void AirOctaMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void AirOctaFloatBase::leave_() { +void AirOctaMoveBase::leave_() { ksys::act::ai::Action::leave_(); } -void AirOctaFloatBase::loadParams_() { +void AirOctaMoveBase::loadParams_() { getStaticParam(&mAmplitude_s, "Amplitude"); getStaticParam(&mGoalDistance_s, "GoalDistance"); getStaticParam(&mGoalInSuccessEnd_s, "GoalInSuccessEnd"); getAITreeVariable(&mAirOctaDataMgr_a, "AirOctaDataMgr"); } -void AirOctaFloatBase::calc_() { +void AirOctaMoveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionAirOctaFloatBase.h b/src/Game/Actor/Action/actionAirOctaMoveBase.h similarity index 75% rename from src/Game/Actor/Action/actionAirOctaFloatBase.h rename to src/Game/Actor/Action/actionAirOctaMoveBase.h index 98410ec4..595ff8a1 100644 --- a/src/Game/Actor/Action/actionAirOctaFloatBase.h +++ b/src/Game/Actor/Action/actionAirOctaMoveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class AirOctaFloatBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(AirOctaFloatBase, ksys::act::ai::Action) +class AirOctaMoveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(AirOctaMoveBase, ksys::act::ai::Action) public: - explicit AirOctaFloatBase(const InitArg& arg); - ~AirOctaFloatBase() override; + explicit AirOctaMoveBase(const InitArg& arg); + ~AirOctaMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionAppearFollowChallenge.cpp b/src/Game/Actor/Action/actionAppearFollowChallenge.cpp new file mode 100644 index 00000000..1d1c4702 --- /dev/null +++ b/src/Game/Actor/Action/actionAppearFollowChallenge.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionAppearFollowChallenge.h" + +namespace uking::action { + +AppearFollowChallenge::AppearFollowChallenge(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +AppearFollowChallenge::~AppearFollowChallenge() = default; + +bool AppearFollowChallenge::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void AppearFollowChallenge::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void AppearFollowChallenge::leave_() { + ksys::act::ai::Action::leave_(); +} + +void AppearFollowChallenge::loadParams_() { + getMapUnitParam(&mGimmickTimeLimit_m, "GimmickTimeLimit"); + getMapUnitParam(&mIsBillboard_m, "IsBillboard"); +} + +void AppearFollowChallenge::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFollowChallenge.h b/src/Game/Actor/Action/actionAppearFollowChallenge.h similarity index 68% rename from src/Game/Actor/Action/actionFollowChallenge.h rename to src/Game/Actor/Action/actionAppearFollowChallenge.h index d85b5fda..fc08124e 100644 --- a/src/Game/Actor/Action/actionFollowChallenge.h +++ b/src/Game/Actor/Action/actionAppearFollowChallenge.h @@ -4,11 +4,11 @@ namespace uking::action { -class FollowChallenge : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(FollowChallenge, ksys::act::ai::Action) +class AppearFollowChallenge : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(AppearFollowChallenge, ksys::act::ai::Action) public: - explicit FollowChallenge(const InitArg& arg); - ~FollowChallenge() override; + explicit AppearFollowChallenge(const InitArg& arg); + ~AppearFollowChallenge() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionArrowChargeAndShoot.cpp b/src/Game/Actor/Action/actionArrowChargeAndShoot.cpp new file mode 100644 index 00000000..e14748fe --- /dev/null +++ b/src/Game/Actor/Action/actionArrowChargeAndShoot.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionArrowChargeAndShoot.h" + +namespace uking::action { + +ArrowChargeAndShoot::ArrowChargeAndShoot(const InitArg& arg) : ShootArrow(arg) {} + +ArrowChargeAndShoot::~ArrowChargeAndShoot() = default; + +bool ArrowChargeAndShoot::init_(sead::Heap* heap) { + return ShootArrow::init_(heap); +} + +void ArrowChargeAndShoot::enter_(ksys::act::ai::InlineParamPack* params) { + ShootArrow::enter_(params); +} + +void ArrowChargeAndShoot::leave_() { + ShootArrow::leave_(); +} + +void ArrowChargeAndShoot::loadParams_() { + ShootArrow::loadParams_(); +} + +void ArrowChargeAndShoot::calc_() { + ShootArrow::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChargeAndShoot.h b/src/Game/Actor/Action/actionArrowChargeAndShoot.h similarity index 66% rename from src/Game/Actor/Action/actionChargeAndShoot.h rename to src/Game/Actor/Action/actionArrowChargeAndShoot.h index a8a0ea5d..3110af59 100644 --- a/src/Game/Actor/Action/actionChargeAndShoot.h +++ b/src/Game/Actor/Action/actionArrowChargeAndShoot.h @@ -5,11 +5,11 @@ namespace uking::action { -class ChargeAndShoot : public ShootArrow { - SEAD_RTTI_OVERRIDE(ChargeAndShoot, ShootArrow) +class ArrowChargeAndShoot : public ShootArrow { + SEAD_RTTI_OVERRIDE(ArrowChargeAndShoot, ShootArrow) public: - explicit ChargeAndShoot(const InitArg& arg); - ~ChargeAndShoot() override; + explicit ArrowChargeAndShoot(const InitArg& arg); + ~ArrowChargeAndShoot() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionAtkTackleMove.cpp b/src/Game/Actor/Action/actionAtkTackleMove.cpp deleted file mode 100644 index 607518e0..00000000 --- a/src/Game/Actor/Action/actionAtkTackleMove.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionAtkTackleMove.h" - -namespace uking::action { - -AtkTackleMove::AtkTackleMove(const InitArg& arg) : TackleMove(arg) {} - -AtkTackleMove::~AtkTackleMove() = default; - -bool AtkTackleMove::init_(sead::Heap* heap) { - return TackleMove::init_(heap); -} - -void AtkTackleMove::enter_(ksys::act::ai::InlineParamPack* params) { - TackleMove::enter_(params); -} - -void AtkTackleMove::leave_() { - TackleMove::leave_(); -} - -void AtkTackleMove::loadParams_() { - TackleMove::loadParams_(); - getStaticParam(&mAtkSensorName_s, "AtkSensorName"); -} - -void AtkTackleMove::calc_() { - TackleMove::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.cpp b/src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.cpp new file mode 100644 index 00000000..3a048c49 --- /dev/null +++ b/src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.cpp @@ -0,0 +1,31 @@ +#include "Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.h" + +namespace uking::action { + +AvoidingCloseMoveActionWithAcc::AvoidingCloseMoveActionWithAcc(const InitArg& arg) + : AvoidingCloseMoveBase(arg) {} + +AvoidingCloseMoveActionWithAcc::~AvoidingCloseMoveActionWithAcc() = default; + +bool AvoidingCloseMoveActionWithAcc::init_(sead::Heap* heap) { + return AvoidingCloseMoveBase::init_(heap); +} + +void AvoidingCloseMoveActionWithAcc::enter_(ksys::act::ai::InlineParamPack* params) { + AvoidingCloseMoveBase::enter_(params); +} + +void AvoidingCloseMoveActionWithAcc::leave_() { + AvoidingCloseMoveBase::leave_(); +} + +void AvoidingCloseMoveActionWithAcc::loadParams_() { + AvoidingCloseMoveBase::loadParams_(); + getStaticParam(&mAccRatio_s, "AccRatio"); +} + +void AvoidingCloseMoveActionWithAcc::calc_() { + AvoidingCloseMoveBase::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseActionWithAcc.h b/src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.h similarity index 56% rename from src/Game/Actor/Action/actionBattleCloseActionWithAcc.h rename to src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.h index 8691fdd1..f91646ab 100644 --- a/src/Game/Actor/Action/actionBattleCloseActionWithAcc.h +++ b/src/Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionBattleCloseAction.h" +#include "Game/Actor/Action/actionAvoidingCloseMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BattleCloseActionWithAcc : public BattleCloseAction { - SEAD_RTTI_OVERRIDE(BattleCloseActionWithAcc, BattleCloseAction) +class AvoidingCloseMoveActionWithAcc : public AvoidingCloseMoveBase { + SEAD_RTTI_OVERRIDE(AvoidingCloseMoveActionWithAcc, AvoidingCloseMoveBase) public: - explicit BattleCloseActionWithAcc(const InitArg& arg); - ~BattleCloseActionWithAcc() override; + explicit AvoidingCloseMoveActionWithAcc(const InitArg& arg); + ~AvoidingCloseMoveActionWithAcc() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBattleCloseAction.cpp b/src/Game/Actor/Action/actionAvoidingCloseMoveBase.cpp similarity index 54% rename from src/Game/Actor/Action/actionBattleCloseAction.cpp rename to src/Game/Actor/Action/actionAvoidingCloseMoveBase.cpp index bcb8ed83..5609876d 100644 --- a/src/Game/Actor/Action/actionBattleCloseAction.cpp +++ b/src/Game/Actor/Action/actionAvoidingCloseMoveBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionBattleCloseAction.h" +#include "Game/Actor/Action/actionAvoidingCloseMoveBase.h" namespace uking::action { -BattleCloseAction::BattleCloseAction(const InitArg& arg) : ksys::act::ai::Action(arg) {} +AvoidingCloseMoveBase::AvoidingCloseMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -BattleCloseAction::~BattleCloseAction() = default; +AvoidingCloseMoveBase::~AvoidingCloseMoveBase() = default; -bool BattleCloseAction::init_(sead::Heap* heap) { +bool AvoidingCloseMoveBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void BattleCloseAction::enter_(ksys::act::ai::InlineParamPack* params) { +void AvoidingCloseMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void BattleCloseAction::leave_() { +void AvoidingCloseMoveBase::leave_() { ksys::act::ai::Action::leave_(); } -void BattleCloseAction::loadParams_() { +void AvoidingCloseMoveBase::loadParams_() { getStaticParam(&mWeaponIdx_s, "WeaponIdx"); getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mRotSpd_s, "RotSpd"); @@ -28,7 +28,7 @@ void BattleCloseAction::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void BattleCloseAction::calc_() { +void AvoidingCloseMoveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionBattleCloseAction.h b/src/Game/Actor/Action/actionAvoidingCloseMoveBase.h similarity index 78% rename from src/Game/Actor/Action/actionBattleCloseAction.h rename to src/Game/Actor/Action/actionAvoidingCloseMoveBase.h index 8f7b6a9c..c5d754da 100644 --- a/src/Game/Actor/Action/actionBattleCloseAction.h +++ b/src/Game/Actor/Action/actionAvoidingCloseMoveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class BattleCloseAction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(BattleCloseAction, ksys::act::ai::Action) +class AvoidingCloseMoveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(AvoidingCloseMoveBase, ksys::act::ai::Action) public: - explicit BattleCloseAction(const InitArg& arg); - ~BattleCloseAction() override; + explicit AvoidingCloseMoveBase(const InitArg& arg); + ~AvoidingCloseMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBackFlip.cpp b/src/Game/Actor/Action/actionBackFlip.cpp index 083739f9..2e16fa64 100644 --- a/src/Game/Actor/Action/actionBackFlip.cpp +++ b/src/Game/Actor/Action/actionBackFlip.cpp @@ -2,24 +2,24 @@ namespace uking::action { -BackFlip::BackFlip(const InitArg& arg) : RotateTurnToTarget(arg) {} +BackFlip::BackFlip(const InitArg& arg) : ASPlayRotateTurnToTarget(arg) {} BackFlip::~BackFlip() = default; bool BackFlip::init_(sead::Heap* heap) { - return RotateTurnToTarget::init_(heap); + return ASPlayRotateTurnToTarget::init_(heap); } void BackFlip::enter_(ksys::act::ai::InlineParamPack* params) { - RotateTurnToTarget::enter_(params); + ASPlayRotateTurnToTarget::enter_(params); } void BackFlip::leave_() { - RotateTurnToTarget::leave_(); + ASPlayRotateTurnToTarget::leave_(); } void BackFlip::loadParams_() { - RotateTurnToTarget::loadParams_(); + ASPlayRotateTurnToTarget::loadParams_(); getStaticParam(&mSpeed_s, "Speed"); getStaticParam(&mPosRestRatio_s, "PosRestRatio"); getStaticParam(&mJumpHeight_s, "JumpHeight"); @@ -28,7 +28,7 @@ void BackFlip::loadParams_() { } void BackFlip::calc_() { - RotateTurnToTarget::calc_(); + ASPlayRotateTurnToTarget::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBackFlip.h b/src/Game/Actor/Action/actionBackFlip.h index b5efb141..2b7d5ff0 100644 --- a/src/Game/Actor/Action/actionBackFlip.h +++ b/src/Game/Actor/Action/actionBackFlip.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRotateTurnToTarget.h" +#include "Game/Actor/Action/actionASPlayRotateTurnToTarget.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BackFlip : public RotateTurnToTarget { - SEAD_RTTI_OVERRIDE(BackFlip, RotateTurnToTarget) +class BackFlip : public ASPlayRotateTurnToTarget { + SEAD_RTTI_OVERRIDE(BackFlip, ASPlayRotateTurnToTarget) public: explicit BackFlip(const InitArg& arg); ~BackFlip() override; diff --git a/src/Game/Actor/Action/actionOctarockBalloonBase.cpp b/src/Game/Actor/Action/actionBalloonRopeBase.cpp similarity index 58% rename from src/Game/Actor/Action/actionOctarockBalloonBase.cpp rename to src/Game/Actor/Action/actionBalloonRopeBase.cpp index 74e68d41..d9f86717 100644 --- a/src/Game/Actor/Action/actionOctarockBalloonBase.cpp +++ b/src/Game/Actor/Action/actionBalloonRopeBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionOctarockBalloonBase.h" +#include "Game/Actor/Action/actionBalloonRopeBase.h" namespace uking::action { -OctarockBalloonBase::OctarockBalloonBase(const InitArg& arg) : BalloonBase(arg) {} +BalloonRopeBase::BalloonRopeBase(const InitArg& arg) : BalloonBase(arg) {} -OctarockBalloonBase::~OctarockBalloonBase() = default; +BalloonRopeBase::~BalloonRopeBase() = default; -bool OctarockBalloonBase::init_(sead::Heap* heap) { +bool BalloonRopeBase::init_(sead::Heap* heap) { return BalloonBase::init_(heap); } -void OctarockBalloonBase::enter_(ksys::act::ai::InlineParamPack* params) { +void BalloonRopeBase::enter_(ksys::act::ai::InlineParamPack* params) { BalloonBase::enter_(params); } -void OctarockBalloonBase::leave_() { +void BalloonRopeBase::leave_() { BalloonBase::leave_(); } -void OctarockBalloonBase::loadParams_() { +void BalloonRopeBase::loadParams_() { BalloonBase::loadParams_(); getStaticParam(&mConnectReleaseTimer_s, "ConnectReleaseTimer"); getStaticParam(&mClampWindForceScale_s, "ClampWindForceScale"); @@ -28,7 +28,7 @@ void OctarockBalloonBase::loadParams_() { getDynamicParam(&mRopeActorHandle_d, "RopeActorHandle"); } -void OctarockBalloonBase::calc_() { +void BalloonRopeBase::calc_() { BalloonBase::calc_(); } diff --git a/src/Game/Actor/Action/actionOctarockBalloonBase.h b/src/Game/Actor/Action/actionBalloonRopeBase.h similarity index 81% rename from src/Game/Actor/Action/actionOctarockBalloonBase.h rename to src/Game/Actor/Action/actionBalloonRopeBase.h index f56949f4..c408070d 100644 --- a/src/Game/Actor/Action/actionOctarockBalloonBase.h +++ b/src/Game/Actor/Action/actionBalloonRopeBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class OctarockBalloonBase : public BalloonBase { - SEAD_RTTI_OVERRIDE(OctarockBalloonBase, BalloonBase) +class BalloonRopeBase : public BalloonBase { + SEAD_RTTI_OVERRIDE(BalloonRopeBase, BalloonBase) public: - explicit OctarockBalloonBase(const InitArg& arg); - ~OctarockBalloonBase() override; + explicit BalloonRopeBase(const InitArg& arg); + ~BalloonRopeBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.cpp b/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.cpp index a96b9d66..32879569 100644 --- a/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.cpp +++ b/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.cpp @@ -2,28 +2,29 @@ namespace uking::action { -BasicSignalBossAwakeSleep::BasicSignalBossAwakeSleep(const InitArg& arg) : BasicSignalEnemy(arg) {} +BasicSignalBossAwakeSleep::BasicSignalBossAwakeSleep(const InitArg& arg) + : BasicSignalEnemyNotice(arg) {} BasicSignalBossAwakeSleep::~BasicSignalBossAwakeSleep() = default; bool BasicSignalBossAwakeSleep::init_(sead::Heap* heap) { - return BasicSignalEnemy::init_(heap); + return BasicSignalEnemyNotice::init_(heap); } void BasicSignalBossAwakeSleep::enter_(ksys::act::ai::InlineParamPack* params) { - BasicSignalEnemy::enter_(params); + BasicSignalEnemyNotice::enter_(params); } void BasicSignalBossAwakeSleep::leave_() { - BasicSignalEnemy::leave_(); + BasicSignalEnemyNotice::leave_(); } void BasicSignalBossAwakeSleep::loadParams_() { - BasicSignalEnemy::loadParams_(); + BasicSignalEnemyNotice::loadParams_(); } void BasicSignalBossAwakeSleep::calc_() { - BasicSignalEnemy::calc_(); + BasicSignalEnemyNotice::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.h b/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.h index e9c9d9d2..fee28289 100644 --- a/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.h +++ b/src/Game/Actor/Action/actionBasicSignalBossAwakeSleep.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBasicSignalEnemy.h" +#include "Game/Actor/Action/actionBasicSignalEnemyNotice.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BasicSignalBossAwakeSleep : public BasicSignalEnemy { - SEAD_RTTI_OVERRIDE(BasicSignalBossAwakeSleep, BasicSignalEnemy) +class BasicSignalBossAwakeSleep : public BasicSignalEnemyNotice { + SEAD_RTTI_OVERRIDE(BasicSignalBossAwakeSleep, BasicSignalEnemyNotice) public: explicit BasicSignalBossAwakeSleep(const InitArg& arg); ~BasicSignalBossAwakeSleep() override; diff --git a/src/Game/Actor/Action/actionBasicSignalEnemy.cpp b/src/Game/Actor/Action/actionBasicSignalEnemy.cpp deleted file mode 100644 index bd766c8e..00000000 --- a/src/Game/Actor/Action/actionBasicSignalEnemy.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "Game/Actor/Action/actionBasicSignalEnemy.h" - -namespace uking::action { - -BasicSignalEnemy::BasicSignalEnemy(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -BasicSignalEnemy::~BasicSignalEnemy() = default; - -bool BasicSignalEnemy::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void BasicSignalEnemy::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void BasicSignalEnemy::leave_() { - ksys::act::ai::Action::leave_(); -} - -void BasicSignalEnemy::loadParams_() {} - -void BasicSignalEnemy::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.cpp b/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.cpp index e1599b90..f8043291 100644 --- a/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.cpp +++ b/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.cpp @@ -3,29 +3,29 @@ namespace uking::action { BasicSignalEnemyForceNotice::BasicSignalEnemyForceNotice(const InitArg& arg) - : BasicSignalEnemy(arg) {} + : BasicSignalEnemyNotice(arg) {} BasicSignalEnemyForceNotice::~BasicSignalEnemyForceNotice() = default; bool BasicSignalEnemyForceNotice::init_(sead::Heap* heap) { - return BasicSignalEnemy::init_(heap); + return BasicSignalEnemyNotice::init_(heap); } void BasicSignalEnemyForceNotice::enter_(ksys::act::ai::InlineParamPack* params) { - BasicSignalEnemy::enter_(params); + BasicSignalEnemyNotice::enter_(params); } void BasicSignalEnemyForceNotice::leave_() { - BasicSignalEnemy::leave_(); + BasicSignalEnemyNotice::leave_(); } void BasicSignalEnemyForceNotice::loadParams_() { - BasicSignalEnemy::loadParams_(); + BasicSignalEnemyNotice::loadParams_(); getStaticParam(&mInterval_s, "Interval"); } void BasicSignalEnemyForceNotice::calc_() { - BasicSignalEnemy::calc_(); + BasicSignalEnemyNotice::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.h b/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.h index a14d7ae4..671fcdf2 100644 --- a/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.h +++ b/src/Game/Actor/Action/actionBasicSignalEnemyForceNotice.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBasicSignalEnemy.h" +#include "Game/Actor/Action/actionBasicSignalEnemyNotice.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BasicSignalEnemyForceNotice : public BasicSignalEnemy { - SEAD_RTTI_OVERRIDE(BasicSignalEnemyForceNotice, BasicSignalEnemy) +class BasicSignalEnemyForceNotice : public BasicSignalEnemyNotice { + SEAD_RTTI_OVERRIDE(BasicSignalEnemyForceNotice, BasicSignalEnemyNotice) public: explicit BasicSignalEnemyForceNotice(const InitArg& arg); ~BasicSignalEnemyForceNotice() override; diff --git a/src/Game/Actor/Action/actionBasicSignalEnemyNotice.cpp b/src/Game/Actor/Action/actionBasicSignalEnemyNotice.cpp new file mode 100644 index 00000000..186ad198 --- /dev/null +++ b/src/Game/Actor/Action/actionBasicSignalEnemyNotice.cpp @@ -0,0 +1,27 @@ +#include "Game/Actor/Action/actionBasicSignalEnemyNotice.h" + +namespace uking::action { + +BasicSignalEnemyNotice::BasicSignalEnemyNotice(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +BasicSignalEnemyNotice::~BasicSignalEnemyNotice() = default; + +bool BasicSignalEnemyNotice::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void BasicSignalEnemyNotice::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void BasicSignalEnemyNotice::leave_() { + ksys::act::ai::Action::leave_(); +} + +void BasicSignalEnemyNotice::loadParams_() {} + +void BasicSignalEnemyNotice::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBasicSignalEnemy.h b/src/Game/Actor/Action/actionBasicSignalEnemyNotice.h similarity index 59% rename from src/Game/Actor/Action/actionBasicSignalEnemy.h rename to src/Game/Actor/Action/actionBasicSignalEnemyNotice.h index 3942bddd..2626ef5d 100644 --- a/src/Game/Actor/Action/actionBasicSignalEnemy.h +++ b/src/Game/Actor/Action/actionBasicSignalEnemyNotice.h @@ -4,11 +4,11 @@ namespace uking::action { -class BasicSignalEnemy : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(BasicSignalEnemy, ksys::act::ai::Action) +class BasicSignalEnemyNotice : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(BasicSignalEnemyNotice, ksys::act::ai::Action) public: - explicit BasicSignalEnemy(const InitArg& arg); - ~BasicSignalEnemy() override; + explicit BasicSignalEnemyNotice(const InitArg& arg); + ~BasicSignalEnemyNotice() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBattleCloseActionWithAcc.cpp b/src/Game/Actor/Action/actionBattleCloseActionWithAcc.cpp deleted file mode 100644 index 7e8abe95..00000000 --- a/src/Game/Actor/Action/actionBattleCloseActionWithAcc.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionBattleCloseActionWithAcc.h" - -namespace uking::action { - -BattleCloseActionWithAcc::BattleCloseActionWithAcc(const InitArg& arg) : BattleCloseAction(arg) {} - -BattleCloseActionWithAcc::~BattleCloseActionWithAcc() = default; - -bool BattleCloseActionWithAcc::init_(sead::Heap* heap) { - return BattleCloseAction::init_(heap); -} - -void BattleCloseActionWithAcc::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseAction::enter_(params); -} - -void BattleCloseActionWithAcc::leave_() { - BattleCloseAction::leave_(); -} - -void BattleCloseActionWithAcc::loadParams_() { - BattleCloseAction::loadParams_(); - getStaticParam(&mAccRatio_s, "AccRatio"); -} - -void BattleCloseActionWithAcc::calc_() { - BattleCloseAction::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp b/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp index 0b16ddeb..f942ef9b 100644 --- a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp +++ b/src/Game/Actor/Action/actionBattleCloseMoveActionBase.cpp @@ -2,28 +2,29 @@ namespace uking::action { -BattleCloseMoveActionBase::BattleCloseMoveActionBase(const InitArg& arg) : BattleCloseAction(arg) {} +BattleCloseMoveActionBase::BattleCloseMoveActionBase(const InitArg& arg) + : AvoidingCloseMoveBase(arg) {} BattleCloseMoveActionBase::~BattleCloseMoveActionBase() = default; bool BattleCloseMoveActionBase::init_(sead::Heap* heap) { - return BattleCloseAction::init_(heap); + return AvoidingCloseMoveBase::init_(heap); } void BattleCloseMoveActionBase::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseAction::enter_(params); + AvoidingCloseMoveBase::enter_(params); } void BattleCloseMoveActionBase::leave_() { - BattleCloseAction::leave_(); + AvoidingCloseMoveBase::leave_(); } void BattleCloseMoveActionBase::loadParams_() { - BattleCloseAction::loadParams_(); + AvoidingCloseMoveBase::loadParams_(); } void BattleCloseMoveActionBase::calc_() { - BattleCloseAction::calc_(); + AvoidingCloseMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.h b/src/Game/Actor/Action/actionBattleCloseMoveActionBase.h index f5cf4322..c3543839 100644 --- a/src/Game/Actor/Action/actionBattleCloseMoveActionBase.h +++ b/src/Game/Actor/Action/actionBattleCloseMoveActionBase.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBattleCloseAction.h" +#include "Game/Actor/Action/actionAvoidingCloseMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BattleCloseMoveActionBase : public BattleCloseAction { - SEAD_RTTI_OVERRIDE(BattleCloseMoveActionBase, BattleCloseAction) +class BattleCloseMoveActionBase : public AvoidingCloseMoveBase { + SEAD_RTTI_OVERRIDE(BattleCloseMoveActionBase, AvoidingCloseMoveBase) public: explicit BattleCloseMoveActionBase(const InitArg& arg); ~BattleCloseMoveActionBase() override; diff --git a/src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.cpp b/src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.cpp new file mode 100644 index 00000000..c96b07d2 --- /dev/null +++ b/src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionBattleCloseSlippedMoveBase.h" + +namespace uking::action { + +BattleCloseSlippedMoveBase::BattleCloseSlippedMoveBase(const InitArg& arg) + : AvoidingCloseMoveActionWithAcc(arg) {} + +BattleCloseSlippedMoveBase::~BattleCloseSlippedMoveBase() = default; + +bool BattleCloseSlippedMoveBase::init_(sead::Heap* heap) { + return AvoidingCloseMoveActionWithAcc::init_(heap); +} + +void BattleCloseSlippedMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { + AvoidingCloseMoveActionWithAcc::enter_(params); +} + +void BattleCloseSlippedMoveBase::leave_() { + AvoidingCloseMoveActionWithAcc::leave_(); +} + +void BattleCloseSlippedMoveBase::loadParams_() { + AvoidingCloseMoveActionWithAcc::loadParams_(); +} + +void BattleCloseSlippedMoveBase::calc_() { + AvoidingCloseMoveActionWithAcc::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.h b/src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.h similarity index 50% rename from src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.h rename to src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.h index 9b8221ff..accb269b 100644 --- a/src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.h +++ b/src/Game/Actor/Action/actionBattleCloseSlippedMoveBase.h @@ -1,15 +1,15 @@ #pragma once -#include "Game/Actor/Action/actionBattleCloseActionWithAcc.h" +#include "Game/Actor/Action/actionAvoidingCloseMoveActionWithAcc.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BattleCloseSlippedWalkBase : public BattleCloseActionWithAcc { - SEAD_RTTI_OVERRIDE(BattleCloseSlippedWalkBase, BattleCloseActionWithAcc) +class BattleCloseSlippedMoveBase : public AvoidingCloseMoveActionWithAcc { + SEAD_RTTI_OVERRIDE(BattleCloseSlippedMoveBase, AvoidingCloseMoveActionWithAcc) public: - explicit BattleCloseSlippedWalkBase(const InitArg& arg); - ~BattleCloseSlippedWalkBase() override; + explicit BattleCloseSlippedMoveBase(const InitArg& arg); + ~BattleCloseSlippedMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionBattleCloseSlippedWalk.cpp b/src/Game/Actor/Action/actionBattleCloseSlippedWalk.cpp index e0048043..b54694ae 100644 --- a/src/Game/Actor/Action/actionBattleCloseSlippedWalk.cpp +++ b/src/Game/Actor/Action/actionBattleCloseSlippedWalk.cpp @@ -3,29 +3,29 @@ namespace uking::action { BattleCloseSlippedWalk::BattleCloseSlippedWalk(const InitArg& arg) - : BattleCloseSlippedWalkBase(arg) {} + : BattleCloseSlippedMoveBase(arg) {} BattleCloseSlippedWalk::~BattleCloseSlippedWalk() = default; bool BattleCloseSlippedWalk::init_(sead::Heap* heap) { - return BattleCloseSlippedWalkBase::init_(heap); + return BattleCloseSlippedMoveBase::init_(heap); } void BattleCloseSlippedWalk::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseSlippedWalkBase::enter_(params); + BattleCloseSlippedMoveBase::enter_(params); } void BattleCloseSlippedWalk::leave_() { - BattleCloseSlippedWalkBase::leave_(); + BattleCloseSlippedMoveBase::leave_(); } void BattleCloseSlippedWalk::loadParams_() { - BattleCloseSlippedWalkBase::loadParams_(); + BattleCloseSlippedMoveBase::loadParams_(); getStaticParam(&mASName_s, "ASName"); } void BattleCloseSlippedWalk::calc_() { - BattleCloseSlippedWalkBase::calc_(); + BattleCloseSlippedMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionBattleCloseSlippedWalk.h b/src/Game/Actor/Action/actionBattleCloseSlippedWalk.h index 1d8e6ee4..0b98eef4 100644 --- a/src/Game/Actor/Action/actionBattleCloseSlippedWalk.h +++ b/src/Game/Actor/Action/actionBattleCloseSlippedWalk.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionBattleCloseSlippedWalkBase.h" +#include "Game/Actor/Action/actionBattleCloseSlippedMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class BattleCloseSlippedWalk : public BattleCloseSlippedWalkBase { - SEAD_RTTI_OVERRIDE(BattleCloseSlippedWalk, BattleCloseSlippedWalkBase) +class BattleCloseSlippedWalk : public BattleCloseSlippedMoveBase { + SEAD_RTTI_OVERRIDE(BattleCloseSlippedWalk, BattleCloseSlippedMoveBase) public: explicit BattleCloseSlippedWalk(const InitArg& arg); ~BattleCloseSlippedWalk() override; diff --git a/src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.cpp b/src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.cpp deleted file mode 100644 index 3d670d87..00000000 --- a/src/Game/Actor/Action/actionBattleCloseSlippedWalkBase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionBattleCloseSlippedWalkBase.h" - -namespace uking::action { - -BattleCloseSlippedWalkBase::BattleCloseSlippedWalkBase(const InitArg& arg) - : BattleCloseActionWithAcc(arg) {} - -BattleCloseSlippedWalkBase::~BattleCloseSlippedWalkBase() = default; - -bool BattleCloseSlippedWalkBase::init_(sead::Heap* heap) { - return BattleCloseActionWithAcc::init_(heap); -} - -void BattleCloseSlippedWalkBase::enter_(ksys::act::ai::InlineParamPack* params) { - BattleCloseActionWithAcc::enter_(params); -} - -void BattleCloseSlippedWalkBase::leave_() { - BattleCloseActionWithAcc::leave_(); -} - -void BattleCloseSlippedWalkBase::loadParams_() { - BattleCloseActionWithAcc::loadParams_(); -} - -void BattleCloseSlippedWalkBase::calc_() { - BattleCloseActionWithAcc::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChallengeChainRing.cpp b/src/Game/Actor/Action/actionChallengeChainRing.cpp index 8d02d43c..f3096448 100644 --- a/src/Game/Actor/Action/actionChallengeChainRing.cpp +++ b/src/Game/Actor/Action/actionChallengeChainRing.cpp @@ -2,30 +2,30 @@ namespace uking::action { -ChallengeChainRing::ChallengeChainRing(const InitArg& arg) : FollowChallenge(arg) {} +ChallengeChainRing::ChallengeChainRing(const InitArg& arg) : AppearFollowChallenge(arg) {} ChallengeChainRing::~ChallengeChainRing() = default; bool ChallengeChainRing::init_(sead::Heap* heap) { - return FollowChallenge::init_(heap); + return AppearFollowChallenge::init_(heap); } void ChallengeChainRing::enter_(ksys::act::ai::InlineParamPack* params) { - FollowChallenge::enter_(params); + AppearFollowChallenge::enter_(params); } void ChallengeChainRing::leave_() { - FollowChallenge::leave_(); + AppearFollowChallenge::leave_(); } void ChallengeChainRing::loadParams_() { - FollowChallenge::loadParams_(); + AppearFollowChallenge::loadParams_(); getMapUnitParam(&mChainRingOrbitSpeed_m, "ChainRingOrbitSpeed"); getMapUnitParam(&mIsFirstNode_m, "IsFirstNode"); } void ChallengeChainRing::calc_() { - FollowChallenge::calc_(); + AppearFollowChallenge::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChallengeChainRing.h b/src/Game/Actor/Action/actionChallengeChainRing.h index b9ee2556..83fa467b 100644 --- a/src/Game/Actor/Action/actionChallengeChainRing.h +++ b/src/Game/Actor/Action/actionChallengeChainRing.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFollowChallenge.h" +#include "Game/Actor/Action/actionAppearFollowChallenge.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ChallengeChainRing : public FollowChallenge { - SEAD_RTTI_OVERRIDE(ChallengeChainRing, FollowChallenge) +class ChallengeChainRing : public AppearFollowChallenge { + SEAD_RTTI_OVERRIDE(ChallengeChainRing, AppearFollowChallenge) public: explicit ChallengeChainRing(const InitArg& arg); ~ChallengeChainRing() override; diff --git a/src/Game/Actor/Action/actionChargeAndShoot.cpp b/src/Game/Actor/Action/actionChargeAndShoot.cpp deleted file mode 100644 index 9e9dd2b9..00000000 --- a/src/Game/Actor/Action/actionChargeAndShoot.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionChargeAndShoot.h" - -namespace uking::action { - -ChargeAndShoot::ChargeAndShoot(const InitArg& arg) : ShootArrow(arg) {} - -ChargeAndShoot::~ChargeAndShoot() = default; - -bool ChargeAndShoot::init_(sead::Heap* heap) { - return ShootArrow::init_(heap); -} - -void ChargeAndShoot::enter_(ksys::act::ai::InlineParamPack* params) { - ShootArrow::enter_(params); -} - -void ChargeAndShoot::leave_() { - ShootArrow::leave_(); -} - -void ChargeAndShoot::loadParams_() { - ShootArrow::loadParams_(); -} - -void ChargeAndShoot::calc_() { - ShootArrow::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalAttack.cpp b/src/Game/Actor/Action/actionChemicalAttack.cpp index d013911a..0716ac2f 100644 --- a/src/Game/Actor/Action/actionChemicalAttack.cpp +++ b/src/Game/Actor/Action/actionChemicalAttack.cpp @@ -2,34 +2,30 @@ namespace uking::action { -ChemicalAttack::ChemicalAttack(const InitArg& arg) : ksys::act::ai::Action(arg) {} +ChemicalAttack::ChemicalAttack(const InitArg& arg) : EmitAttackBase(arg) {} ChemicalAttack::~ChemicalAttack() = default; bool ChemicalAttack::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); + return EmitAttackBase::init_(heap); } void ChemicalAttack::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); + EmitAttackBase::enter_(params); } void ChemicalAttack::leave_() { - ksys::act::ai::Action::leave_(); + EmitAttackBase::leave_(); } void ChemicalAttack::loadParams_() { - getStaticParam(&mAttackIntensity_s, "AttackIntensity"); - getStaticParam(&mAttackMinPower_s, "AttackMinPower"); - getMapUnitParam(&mAttackPower_m, "AttackPower"); - getMapUnitParam(&mAttackPowerForPlayer_m, "AttackPowerForPlayer"); - getMapUnitParam(&mScaleTime_m, "ScaleTime"); - getMapUnitParam(&mRange_m, "Range"); - getMapUnitParam(&mRigidBodyName_m, "RigidBodyName"); + EmitAttackBase::loadParams_(); + getStaticParam(&mIsUseMyRange_s, "IsUseMyRange"); + getStaticParam(&mAttackType_s, "AttackType"); } void ChemicalAttack::calc_() { - ksys::act::ai::Action::calc_(); + EmitAttackBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalAttack.h b/src/Game/Actor/Action/actionChemicalAttack.h index e3b4f55c..439a4568 100644 --- a/src/Game/Actor/Action/actionChemicalAttack.h +++ b/src/Game/Actor/Action/actionChemicalAttack.h @@ -1,11 +1,12 @@ #pragma once +#include "Game/Actor/Action/actionEmitAttackBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ChemicalAttack : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ChemicalAttack, ksys::act::ai::Action) +class ChemicalAttack : public EmitAttackBase { + SEAD_RTTI_OVERRIDE(ChemicalAttack, EmitAttackBase) public: explicit ChemicalAttack(const InitArg& arg); ~ChemicalAttack() override; @@ -18,20 +19,10 @@ public: protected: void calc_() override; - // static_param at offset 0x20 - const int* mAttackIntensity_s{}; - // static_param at offset 0x28 - const int* mAttackMinPower_s{}; - // map_unit_param at offset 0x30 - const int* mAttackPower_m{}; - // map_unit_param at offset 0x38 - const int* mAttackPowerForPlayer_m{}; - // map_unit_param at offset 0x40 - const float* mScaleTime_m{}; - // map_unit_param at offset 0x48 - const float* mRange_m{}; - // map_unit_param at offset 0x50 - sead::SafeString mRigidBodyName_m{}; + // static_param at offset 0x80 + const bool* mIsUseMyRange_s{}; + // static_param at offset 0x88 + const int* mAttackType_s{}; }; } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalAttackBall.cpp b/src/Game/Actor/Action/actionChemicalAttackBall.cpp deleted file mode 100644 index e4a810ed..00000000 --- a/src/Game/Actor/Action/actionChemicalAttackBall.cpp +++ /dev/null @@ -1,31 +0,0 @@ -#include "Game/Actor/Action/actionChemicalAttackBall.h" - -namespace uking::action { - -ChemicalAttackBall::ChemicalAttackBall(const InitArg& arg) : ChemicalAttack(arg) {} - -ChemicalAttackBall::~ChemicalAttackBall() = default; - -bool ChemicalAttackBall::init_(sead::Heap* heap) { - return ChemicalAttack::init_(heap); -} - -void ChemicalAttackBall::enter_(ksys::act::ai::InlineParamPack* params) { - ChemicalAttack::enter_(params); -} - -void ChemicalAttackBall::leave_() { - ChemicalAttack::leave_(); -} - -void ChemicalAttackBall::loadParams_() { - ChemicalAttack::loadParams_(); - getStaticParam(&mIsUseMyRange_s, "IsUseMyRange"); - getStaticParam(&mAttackType_s, "AttackType"); -} - -void ChemicalAttackBall::calc_() { - ChemicalAttack::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalAttackBall.h b/src/Game/Actor/Action/actionChemicalAttackBall.h deleted file mode 100644 index b3d11dff..00000000 --- a/src/Game/Actor/Action/actionChemicalAttackBall.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "Game/Actor/Action/actionChemicalAttack.h" -#include "KingSystem/ActorSystem/actAiAction.h" - -namespace uking::action { - -class ChemicalAttackBall : public ChemicalAttack { - SEAD_RTTI_OVERRIDE(ChemicalAttackBall, ChemicalAttack) -public: - explicit ChemicalAttackBall(const InitArg& arg); - ~ChemicalAttackBall() override; - - bool init_(sead::Heap* heap) override; - void enter_(ksys::act::ai::InlineParamPack* params) override; - void leave_() override; - void loadParams_() override; - -protected: - void calc_() override; - - // static_param at offset 0x80 - const bool* mIsUseMyRange_s{}; - // static_param at offset 0x88 - const int* mAttackType_s{}; -}; - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalElectricWaterBall.cpp b/src/Game/Actor/Action/actionChemicalElectricWaterBall.cpp index fd84875e..5bc0fc30 100644 --- a/src/Game/Actor/Action/actionChemicalElectricWaterBall.cpp +++ b/src/Game/Actor/Action/actionChemicalElectricWaterBall.cpp @@ -2,25 +2,24 @@ namespace uking::action { -ChemicalElectricWaterBall::ChemicalElectricWaterBall(const InitArg& arg) - : ChemicalAttackBall(arg) {} +ChemicalElectricWaterBall::ChemicalElectricWaterBall(const InitArg& arg) : ChemicalAttack(arg) {} ChemicalElectricWaterBall::~ChemicalElectricWaterBall() = default; bool ChemicalElectricWaterBall::init_(sead::Heap* heap) { - return ChemicalAttackBall::init_(heap); + return ChemicalAttack::init_(heap); } void ChemicalElectricWaterBall::enter_(ksys::act::ai::InlineParamPack* params) { - ChemicalAttackBall::enter_(params); + ChemicalAttack::enter_(params); } void ChemicalElectricWaterBall::leave_() { - ChemicalAttackBall::leave_(); + ChemicalAttack::leave_(); } void ChemicalElectricWaterBall::loadParams_() { - ChemicalAttackBall::loadParams_(); + ChemicalAttack::loadParams_(); getStaticParam(&mDeleteTime_s, "DeleteTime"); getStaticParam(&mTargetScale_s, "TargetScale"); getStaticParam(&mScaleKeep_s, "ScaleKeep"); @@ -28,7 +27,7 @@ void ChemicalElectricWaterBall::loadParams_() { } void ChemicalElectricWaterBall::calc_() { - ChemicalAttackBall::calc_(); + ChemicalAttack::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalElectricWaterBall.h b/src/Game/Actor/Action/actionChemicalElectricWaterBall.h index 58a6b06c..b932dffd 100644 --- a/src/Game/Actor/Action/actionChemicalElectricWaterBall.h +++ b/src/Game/Actor/Action/actionChemicalElectricWaterBall.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChemicalAttackBall.h" +#include "Game/Actor/Action/actionChemicalAttack.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ChemicalElectricWaterBall : public ChemicalAttackBall { - SEAD_RTTI_OVERRIDE(ChemicalElectricWaterBall, ChemicalAttackBall) +class ChemicalElectricWaterBall : public ChemicalAttack { + SEAD_RTTI_OVERRIDE(ChemicalElectricWaterBall, ChemicalAttack) public: explicit ChemicalElectricWaterBall(const InitArg& arg); ~ChemicalElectricWaterBall() override; diff --git a/src/Game/Actor/Action/actionChemicalPhysBall.cpp b/src/Game/Actor/Action/actionChemicalPhysBall.cpp index fc8e8abf..650c938a 100644 --- a/src/Game/Actor/Action/actionChemicalPhysBall.cpp +++ b/src/Game/Actor/Action/actionChemicalPhysBall.cpp @@ -2,29 +2,29 @@ namespace uking::action { -ChemicalPhysBall::ChemicalPhysBall(const InitArg& arg) : ChemicalAttackBall(arg) {} +ChemicalPhysBall::ChemicalPhysBall(const InitArg& arg) : ChemicalAttack(arg) {} ChemicalPhysBall::~ChemicalPhysBall() = default; bool ChemicalPhysBall::init_(sead::Heap* heap) { - return ChemicalAttackBall::init_(heap); + return ChemicalAttack::init_(heap); } void ChemicalPhysBall::enter_(ksys::act::ai::InlineParamPack* params) { - ChemicalAttackBall::enter_(params); + ChemicalAttack::enter_(params); } void ChemicalPhysBall::leave_() { - ChemicalAttackBall::leave_(); + ChemicalAttack::leave_(); } void ChemicalPhysBall::loadParams_() { - ChemicalAttackBall::loadParams_(); + ChemicalAttack::loadParams_(); getStaticParam(&mDeleteTime_s, "DeleteTime"); } void ChemicalPhysBall::calc_() { - ChemicalAttackBall::calc_(); + ChemicalAttack::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionChemicalPhysBall.h b/src/Game/Actor/Action/actionChemicalPhysBall.h index 0f8385b9..3af4d70e 100644 --- a/src/Game/Actor/Action/actionChemicalPhysBall.h +++ b/src/Game/Actor/Action/actionChemicalPhysBall.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChemicalAttackBall.h" +#include "Game/Actor/Action/actionChemicalAttack.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ChemicalPhysBall : public ChemicalAttackBall { - SEAD_RTTI_OVERRIDE(ChemicalPhysBall, ChemicalAttackBall) +class ChemicalPhysBall : public ChemicalAttack { + SEAD_RTTI_OVERRIDE(ChemicalPhysBall, ChemicalAttack) public: explicit ChemicalPhysBall(const InitArg& arg); ~ChemicalPhysBall() override; diff --git a/src/Game/Actor/Action/actionDragonFollow.cpp b/src/Game/Actor/Action/actionDragonFollow.cpp index 06bbcaf6..e964eaf0 100644 --- a/src/Game/Actor/Action/actionDragonFollow.cpp +++ b/src/Game/Actor/Action/actionDragonFollow.cpp @@ -2,29 +2,29 @@ namespace uking::action { -DragonFollow::DragonFollow(const InitArg& arg) : FollowChallenge(arg) {} +DragonFollow::DragonFollow(const InitArg& arg) : AppearFollowChallenge(arg) {} DragonFollow::~DragonFollow() = default; bool DragonFollow::init_(sead::Heap* heap) { - return FollowChallenge::init_(heap); + return AppearFollowChallenge::init_(heap); } void DragonFollow::enter_(ksys::act::ai::InlineParamPack* params) { - FollowChallenge::enter_(params); + AppearFollowChallenge::enter_(params); } void DragonFollow::leave_() { - FollowChallenge::leave_(); + AppearFollowChallenge::leave_(); } void DragonFollow::loadParams_() { - FollowChallenge::loadParams_(); + AppearFollowChallenge::loadParams_(); getStaticParam(&mDungeonName_s, "DungeonName"); } void DragonFollow::calc_() { - FollowChallenge::calc_(); + AppearFollowChallenge::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionDragonFollow.h b/src/Game/Actor/Action/actionDragonFollow.h index b28456f0..dacd954f 100644 --- a/src/Game/Actor/Action/actionDragonFollow.h +++ b/src/Game/Actor/Action/actionDragonFollow.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFollowChallenge.h" +#include "Game/Actor/Action/actionAppearFollowChallenge.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class DragonFollow : public FollowChallenge { - SEAD_RTTI_OVERRIDE(DragonFollow, FollowChallenge) +class DragonFollow : public AppearFollowChallenge { + SEAD_RTTI_OVERRIDE(DragonFollow, AppearFollowChallenge) public: explicit DragonFollow(const InitArg& arg); ~DragonFollow() override; diff --git a/src/Game/Actor/Action/actionEmitAttackBase.cpp b/src/Game/Actor/Action/actionEmitAttackBase.cpp new file mode 100644 index 00000000..d11c96e8 --- /dev/null +++ b/src/Game/Actor/Action/actionEmitAttackBase.cpp @@ -0,0 +1,35 @@ +#include "Game/Actor/Action/actionEmitAttackBase.h" + +namespace uking::action { + +EmitAttackBase::EmitAttackBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +EmitAttackBase::~EmitAttackBase() = default; + +bool EmitAttackBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void EmitAttackBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void EmitAttackBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void EmitAttackBase::loadParams_() { + getStaticParam(&mAttackIntensity_s, "AttackIntensity"); + getStaticParam(&mAttackMinPower_s, "AttackMinPower"); + getMapUnitParam(&mAttackPower_m, "AttackPower"); + getMapUnitParam(&mAttackPowerForPlayer_m, "AttackPowerForPlayer"); + getMapUnitParam(&mScaleTime_m, "ScaleTime"); + getMapUnitParam(&mRange_m, "Range"); + getMapUnitParam(&mRigidBodyName_m, "RigidBodyName"); +} + +void EmitAttackBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionEmitAttackBase.h b/src/Game/Actor/Action/actionEmitAttackBase.h new file mode 100644 index 00000000..e4d3f547 --- /dev/null +++ b/src/Game/Actor/Action/actionEmitAttackBase.h @@ -0,0 +1,37 @@ +#pragma once + +#include "KingSystem/ActorSystem/actAiAction.h" + +namespace uking::action { + +class EmitAttackBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(EmitAttackBase, ksys::act::ai::Action) +public: + explicit EmitAttackBase(const InitArg& arg); + ~EmitAttackBase() override; + + bool init_(sead::Heap* heap) override; + void enter_(ksys::act::ai::InlineParamPack* params) override; + void leave_() override; + void loadParams_() override; + +protected: + void calc_() override; + + // static_param at offset 0x20 + const int* mAttackIntensity_s{}; + // static_param at offset 0x28 + const int* mAttackMinPower_s{}; + // map_unit_param at offset 0x30 + const int* mAttackPower_m{}; + // map_unit_param at offset 0x38 + const int* mAttackPowerForPlayer_m{}; + // map_unit_param at offset 0x40 + const float* mScaleTime_m{}; + // map_unit_param at offset 0x48 + const float* mRange_m{}; + // map_unit_param at offset 0x50 + sead::SafeString mRigidBodyName_m{}; +}; + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterBlownOff.cpp b/src/Game/Actor/Action/actionFlyingCharacterBlownOff.cpp index 0b2de99d..361bac10 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterBlownOff.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterBlownOff.cpp @@ -3,24 +3,24 @@ namespace uking::action { FlyingCharacterBlownOff::FlyingCharacterBlownOff(const InitArg& arg) - : FlyingCharacterReaction(arg) {} + : FlyingCharacterFreeFallBase(arg) {} FlyingCharacterBlownOff::~FlyingCharacterBlownOff() = default; bool FlyingCharacterBlownOff::init_(sead::Heap* heap) { - return FlyingCharacterReaction::init_(heap); + return FlyingCharacterFreeFallBase::init_(heap); } void FlyingCharacterBlownOff::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterReaction::enter_(params); + FlyingCharacterFreeFallBase::enter_(params); } void FlyingCharacterBlownOff::leave_() { - FlyingCharacterReaction::leave_(); + FlyingCharacterFreeFallBase::leave_(); } void FlyingCharacterBlownOff::loadParams_() { - FlyingCharacterReaction::loadParams_(); + FlyingCharacterFreeFallBase::loadParams_(); getStaticParam(&mPosReduceRatioOnGround_s, "PosReduceRatioOnGround"); getStaticParam(&mRotReduceRatioOnGround_s, "RotReduceRatioOnGround"); getStaticParam(&mSpeed_s, "Speed"); @@ -30,7 +30,7 @@ void FlyingCharacterBlownOff::loadParams_() { } void FlyingCharacterBlownOff::calc_() { - FlyingCharacterReaction::calc_(); + FlyingCharacterFreeFallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterBlownOff.h b/src/Game/Actor/Action/actionFlyingCharacterBlownOff.h index 766d0b60..b8575739 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterBlownOff.h +++ b/src/Game/Actor/Action/actionFlyingCharacterBlownOff.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterReaction.h" +#include "Game/Actor/Action/actionFlyingCharacterFreeFallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterBlownOff : public FlyingCharacterReaction { - SEAD_RTTI_OVERRIDE(FlyingCharacterBlownOff, FlyingCharacterReaction) +class FlyingCharacterBlownOff : public FlyingCharacterFreeFallBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterBlownOff, FlyingCharacterFreeFallBase) public: explicit FlyingCharacterBlownOff(const InitArg& arg); ~FlyingCharacterBlownOff() override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp b/src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp index a6bc8443..95043574 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterDamageBase.cpp @@ -3,24 +3,24 @@ namespace uking::action { FlyingCharacterDamageBase::FlyingCharacterDamageBase(const InitArg& arg) - : FlyingCharacterReaction(arg) {} + : FlyingCharacterFreeFallBase(arg) {} FlyingCharacterDamageBase::~FlyingCharacterDamageBase() = default; bool FlyingCharacterDamageBase::init_(sead::Heap* heap) { - return FlyingCharacterReaction::init_(heap); + return FlyingCharacterFreeFallBase::init_(heap); } void FlyingCharacterDamageBase::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterReaction::enter_(params); + FlyingCharacterFreeFallBase::enter_(params); } void FlyingCharacterDamageBase::leave_() { - FlyingCharacterReaction::leave_(); + FlyingCharacterFreeFallBase::leave_(); } void FlyingCharacterDamageBase::loadParams_() { - FlyingCharacterReaction::loadParams_(); + FlyingCharacterFreeFallBase::loadParams_(); getStaticParam(&mHitImpactForceSmallSwordS_s, "HitImpactForceSmallSwordS"); getStaticParam(&mHitImpactForceSmallSwordL_s, "HitImpactForceSmallSwordL"); getStaticParam(&mHitImpactForceLargeSwordS_s, "HitImpactForceLargeSwordS"); @@ -39,7 +39,7 @@ void FlyingCharacterDamageBase::loadParams_() { } void FlyingCharacterDamageBase::calc_() { - FlyingCharacterReaction::calc_(); + FlyingCharacterFreeFallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.h b/src/Game/Actor/Action/actionFlyingCharacterDamageBase.h index 9c8eb532..f8d9c869 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterDamageBase.h +++ b/src/Game/Actor/Action/actionFlyingCharacterDamageBase.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterReaction.h" +#include "Game/Actor/Action/actionFlyingCharacterFreeFallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterDamageBase : public FlyingCharacterReaction { - SEAD_RTTI_OVERRIDE(FlyingCharacterDamageBase, FlyingCharacterReaction) +class FlyingCharacterDamageBase : public FlyingCharacterFreeFallBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterDamageBase, FlyingCharacterFreeFallBase) public: explicit FlyingCharacterDamageBase(const InitArg& arg); ~FlyingCharacterDamageBase() override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeFall.cpp b/src/Game/Actor/Action/actionFlyingCharacterFreeFall.cpp index a1d0239b..d2c53718 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterFreeFall.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeFall.cpp @@ -3,28 +3,28 @@ namespace uking::action { FlyingCharacterFreeFall::FlyingCharacterFreeFall(const InitArg& arg) - : FlyingCharacterReaction(arg) {} + : FlyingCharacterFreeFallBase(arg) {} FlyingCharacterFreeFall::~FlyingCharacterFreeFall() = default; bool FlyingCharacterFreeFall::init_(sead::Heap* heap) { - return FlyingCharacterReaction::init_(heap); + return FlyingCharacterFreeFallBase::init_(heap); } void FlyingCharacterFreeFall::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterReaction::enter_(params); + FlyingCharacterFreeFallBase::enter_(params); } void FlyingCharacterFreeFall::leave_() { - FlyingCharacterReaction::leave_(); + FlyingCharacterFreeFallBase::leave_(); } void FlyingCharacterFreeFall::loadParams_() { - FlyingCharacterReaction::loadParams_(); + FlyingCharacterFreeFallBase::loadParams_(); } void FlyingCharacterFreeFall::calc_() { - FlyingCharacterReaction::calc_(); + FlyingCharacterFreeFallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeFall.h b/src/Game/Actor/Action/actionFlyingCharacterFreeFall.h index 71949597..6771e982 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterFreeFall.h +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeFall.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterReaction.h" +#include "Game/Actor/Action/actionFlyingCharacterFreeFallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterFreeFall : public FlyingCharacterReaction { - SEAD_RTTI_OVERRIDE(FlyingCharacterFreeFall, FlyingCharacterReaction) +class FlyingCharacterFreeFall : public FlyingCharacterFreeFallBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterFreeFall, FlyingCharacterFreeFallBase) public: explicit FlyingCharacterFreeFall(const InitArg& arg); ~FlyingCharacterFreeFall() override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.cpp b/src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.cpp new file mode 100644 index 00000000..6ff5b9c2 --- /dev/null +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.cpp @@ -0,0 +1,33 @@ +#include "Game/Actor/Action/actionFlyingCharacterFreeFallBase.h" + +namespace uking::action { + +FlyingCharacterFreeFallBase::FlyingCharacterFreeFallBase(const InitArg& arg) + : ksys::act::ai::Action(arg) {} + +FlyingCharacterFreeFallBase::~FlyingCharacterFreeFallBase() = default; + +bool FlyingCharacterFreeFallBase::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void FlyingCharacterFreeFallBase::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void FlyingCharacterFreeFallBase::leave_() { + ksys::act::ai::Action::leave_(); +} + +void FlyingCharacterFreeFallBase::loadParams_() { + getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); + getStaticParam(&mRotReduceRatio_s, "RotReduceRatio"); + getStaticParam(&mIsControlRotation_s, "IsControlRotation"); + getStaticParam(&mIsSetBackLastState_s, "IsSetBackLastState"); +} + +void FlyingCharacterFreeFallBase::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterReaction.h b/src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.h similarity index 71% rename from src/Game/Actor/Action/actionFlyingCharacterReaction.h rename to src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.h index 8cb0a6b4..7f09422f 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterReaction.h +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeFallBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class FlyingCharacterReaction : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(FlyingCharacterReaction, ksys::act::ai::Action) +class FlyingCharacterFreeFallBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(FlyingCharacterFreeFallBase, ksys::act::ai::Action) public: - explicit FlyingCharacterReaction(const InitArg& arg); - ~FlyingCharacterReaction() override; + explicit FlyingCharacterFreeFallBase(const InitArg& arg); + ~FlyingCharacterFreeFallBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.cpp b/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.cpp index 6dba63c1..d8da0433 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.cpp @@ -3,24 +3,24 @@ namespace uking::action { FlyingCharacterFreeFallDie::FlyingCharacterFreeFallDie(const InitArg& arg) - : FlyingCharacterReaction(arg) {} + : FlyingCharacterFreeFallBase(arg) {} FlyingCharacterFreeFallDie::~FlyingCharacterFreeFallDie() = default; bool FlyingCharacterFreeFallDie::init_(sead::Heap* heap) { - return FlyingCharacterReaction::init_(heap); + return FlyingCharacterFreeFallBase::init_(heap); } void FlyingCharacterFreeFallDie::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterReaction::enter_(params); + FlyingCharacterFreeFallBase::enter_(params); } void FlyingCharacterFreeFallDie::leave_() { - FlyingCharacterReaction::leave_(); + FlyingCharacterFreeFallBase::leave_(); } void FlyingCharacterFreeFallDie::loadParams_() { - FlyingCharacterReaction::loadParams_(); + FlyingCharacterFreeFallBase::loadParams_(); getStaticParam(&mPosReduceRatioOnGround_s, "PosReduceRatioOnGround"); getStaticParam(&mRotReduceRatioOnGround_s, "RotReduceRatioOnGround"); getStaticParam(&mFallAS_s, "FallAS"); @@ -28,7 +28,7 @@ void FlyingCharacterFreeFallDie::loadParams_() { } void FlyingCharacterFreeFallDie::calc_() { - FlyingCharacterReaction::calc_(); + FlyingCharacterFreeFallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.h b/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.h index 292d676e..bb524efe 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.h +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeFallDie.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterReaction.h" +#include "Game/Actor/Action/actionFlyingCharacterFreeFallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterFreeFallDie : public FlyingCharacterReaction { - SEAD_RTTI_OVERRIDE(FlyingCharacterFreeFallDie, FlyingCharacterReaction) +class FlyingCharacterFreeFallDie : public FlyingCharacterFreeFallBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterFreeFallDie, FlyingCharacterFreeFallBase) public: explicit FlyingCharacterFreeFallDie(const InitArg& arg); ~FlyingCharacterFreeFallDie() override; diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeze.cpp b/src/Game/Actor/Action/actionFlyingCharacterFreeze.cpp index 813411d9..a2f23cdc 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterFreeze.cpp +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeze.cpp @@ -2,27 +2,28 @@ namespace uking::action { -FlyingCharacterFreeze::FlyingCharacterFreeze(const InitArg& arg) : FlyingCharacterReaction(arg) {} +FlyingCharacterFreeze::FlyingCharacterFreeze(const InitArg& arg) + : FlyingCharacterFreeFallBase(arg) {} bool FlyingCharacterFreeze::init_(sead::Heap* heap) { - return FlyingCharacterReaction::init_(heap); + return FlyingCharacterFreeFallBase::init_(heap); } void FlyingCharacterFreeze::enter_(ksys::act::ai::InlineParamPack* params) { - FlyingCharacterReaction::enter_(params); + FlyingCharacterFreeFallBase::enter_(params); } void FlyingCharacterFreeze::leave_() { - FlyingCharacterReaction::leave_(); + FlyingCharacterFreeFallBase::leave_(); } void FlyingCharacterFreeze::loadParams_() { - FlyingCharacterReaction::loadParams_(); + FlyingCharacterFreeFallBase::loadParams_(); getStaticParam(&mStopTime_s, "StopTime"); } void FlyingCharacterFreeze::calc_() { - FlyingCharacterReaction::calc_(); + FlyingCharacterFreeFallBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFlyingCharacterFreeze.h b/src/Game/Actor/Action/actionFlyingCharacterFreeze.h index a32aadd1..676c41c0 100644 --- a/src/Game/Actor/Action/actionFlyingCharacterFreeze.h +++ b/src/Game/Actor/Action/actionFlyingCharacterFreeze.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionFlyingCharacterReaction.h" +#include "Game/Actor/Action/actionFlyingCharacterFreeFallBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FlyingCharacterFreeze : public FlyingCharacterReaction { - SEAD_RTTI_OVERRIDE(FlyingCharacterFreeze, FlyingCharacterReaction) +class FlyingCharacterFreeze : public FlyingCharacterFreeFallBase { + SEAD_RTTI_OVERRIDE(FlyingCharacterFreeze, FlyingCharacterFreeFallBase) public: explicit FlyingCharacterFreeze(const InitArg& arg); diff --git a/src/Game/Actor/Action/actionFlyingCharacterReaction.cpp b/src/Game/Actor/Action/actionFlyingCharacterReaction.cpp deleted file mode 100644 index 5e554583..00000000 --- a/src/Game/Actor/Action/actionFlyingCharacterReaction.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "Game/Actor/Action/actionFlyingCharacterReaction.h" - -namespace uking::action { - -FlyingCharacterReaction::FlyingCharacterReaction(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -FlyingCharacterReaction::~FlyingCharacterReaction() = default; - -bool FlyingCharacterReaction::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void FlyingCharacterReaction::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void FlyingCharacterReaction::leave_() { - ksys::act::ai::Action::leave_(); -} - -void FlyingCharacterReaction::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mRotReduceRatio_s, "RotReduceRatio"); - getStaticParam(&mIsControlRotation_s, "IsControlRotation"); - getStaticParam(&mIsSetBackLastState_s, "IsSetBackLastState"); -} - -void FlyingCharacterReaction::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFollowAttack.cpp b/src/Game/Actor/Action/actionFollowAttack.cpp index 5f917a61..6a843c8a 100644 --- a/src/Game/Actor/Action/actionFollowAttack.cpp +++ b/src/Game/Actor/Action/actionFollowAttack.cpp @@ -2,30 +2,30 @@ namespace uking::action { -FollowAttack::FollowAttack(const InitArg& arg) : RotateTurnToTarget(arg) {} +FollowAttack::FollowAttack(const InitArg& arg) : ASPlayRotateTurnToTarget(arg) {} FollowAttack::~FollowAttack() = default; bool FollowAttack::init_(sead::Heap* heap) { - return RotateTurnToTarget::init_(heap); + return ASPlayRotateTurnToTarget::init_(heap); } void FollowAttack::enter_(ksys::act::ai::InlineParamPack* params) { - RotateTurnToTarget::enter_(params); + ASPlayRotateTurnToTarget::enter_(params); } void FollowAttack::leave_() { - RotateTurnToTarget::leave_(); + ASPlayRotateTurnToTarget::leave_(); } void FollowAttack::loadParams_() { - RotateTurnToTarget::loadParams_(); + ASPlayRotateTurnToTarget::loadParams_(); getStaticParam(&mForceKillMode_s, "ForceKillMode"); getStaticParam(&mIsRodDirHosei_s, "IsRodDirHosei"); } void FollowAttack::calc_() { - RotateTurnToTarget::calc_(); + ASPlayRotateTurnToTarget::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFollowAttack.h b/src/Game/Actor/Action/actionFollowAttack.h index 0b5cf323..965229ff 100644 --- a/src/Game/Actor/Action/actionFollowAttack.h +++ b/src/Game/Actor/Action/actionFollowAttack.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRotateTurnToTarget.h" +#include "Game/Actor/Action/actionASPlayRotateTurnToTarget.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FollowAttack : public RotateTurnToTarget { - SEAD_RTTI_OVERRIDE(FollowAttack, RotateTurnToTarget) +class FollowAttack : public ASPlayRotateTurnToTarget { + SEAD_RTTI_OVERRIDE(FollowAttack, ASPlayRotateTurnToTarget) public: explicit FollowAttack(const InitArg& arg); ~FollowAttack() override; diff --git a/src/Game/Actor/Action/actionFollowChallenge.cpp b/src/Game/Actor/Action/actionFollowChallenge.cpp deleted file mode 100644 index 8e12b5e2..00000000 --- a/src/Game/Actor/Action/actionFollowChallenge.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionFollowChallenge.h" - -namespace uking::action { - -FollowChallenge::FollowChallenge(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -FollowChallenge::~FollowChallenge() = default; - -bool FollowChallenge::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void FollowChallenge::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void FollowChallenge::leave_() { - ksys::act::ai::Action::leave_(); -} - -void FollowChallenge::loadParams_() { - getMapUnitParam(&mGimmickTimeLimit_m, "GimmickTimeLimit"); - getMapUnitParam(&mIsBillboard_m, "IsBillboard"); -} - -void FollowChallenge::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionFollowIgniteToBonePos.cpp b/src/Game/Actor/Action/actionFollowIgniteToBonePos.cpp index a4fc5f89..bbc0bae1 100644 --- a/src/Game/Actor/Action/actionFollowIgniteToBonePos.cpp +++ b/src/Game/Actor/Action/actionFollowIgniteToBonePos.cpp @@ -2,24 +2,24 @@ namespace uking::action { -FollowIgniteToBonePos::FollowIgniteToBonePos(const InitArg& arg) : RotateTurnToTarget(arg) {} +FollowIgniteToBonePos::FollowIgniteToBonePos(const InitArg& arg) : ASPlayRotateTurnToTarget(arg) {} FollowIgniteToBonePos::~FollowIgniteToBonePos() = default; bool FollowIgniteToBonePos::init_(sead::Heap* heap) { - return RotateTurnToTarget::init_(heap); + return ASPlayRotateTurnToTarget::init_(heap); } void FollowIgniteToBonePos::enter_(ksys::act::ai::InlineParamPack* params) { - RotateTurnToTarget::enter_(params); + ASPlayRotateTurnToTarget::enter_(params); } void FollowIgniteToBonePos::leave_() { - RotateTurnToTarget::leave_(); + ASPlayRotateTurnToTarget::leave_(); } void FollowIgniteToBonePos::loadParams_() { - RotateTurnToTarget::loadParams_(); + ASPlayRotateTurnToTarget::loadParams_(); getStaticParam(&mLocalOffSetX_s, "LocalOffSetX"); getStaticParam(&mLocalOffSetY_s, "LocalOffSetY"); getStaticParam(&mLocalOffSetZ_s, "LocalOffSetZ"); @@ -28,7 +28,7 @@ void FollowIgniteToBonePos::loadParams_() { } void FollowIgniteToBonePos::calc_() { - RotateTurnToTarget::calc_(); + ASPlayRotateTurnToTarget::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFollowIgniteToBonePos.h b/src/Game/Actor/Action/actionFollowIgniteToBonePos.h index 17dbcbd0..4cdfa5af 100644 --- a/src/Game/Actor/Action/actionFollowIgniteToBonePos.h +++ b/src/Game/Actor/Action/actionFollowIgniteToBonePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRotateTurnToTarget.h" +#include "Game/Actor/Action/actionASPlayRotateTurnToTarget.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FollowIgniteToBonePos : public RotateTurnToTarget { - SEAD_RTTI_OVERRIDE(FollowIgniteToBonePos, RotateTurnToTarget) +class FollowIgniteToBonePos : public ASPlayRotateTurnToTarget { + SEAD_RTTI_OVERRIDE(FollowIgniteToBonePos, ASPlayRotateTurnToTarget) public: explicit FollowIgniteToBonePos(const InitArg& arg); ~FollowIgniteToBonePos() override; diff --git a/src/Game/Actor/Action/actionFollowIgniteToSelfPos.cpp b/src/Game/Actor/Action/actionFollowIgniteToSelfPos.cpp index 80188db0..f0b784f5 100644 --- a/src/Game/Actor/Action/actionFollowIgniteToSelfPos.cpp +++ b/src/Game/Actor/Action/actionFollowIgniteToSelfPos.cpp @@ -2,28 +2,28 @@ namespace uking::action { -FollowIgniteToSelfPos::FollowIgniteToSelfPos(const InitArg& arg) : RotateTurnToTarget(arg) {} +FollowIgniteToSelfPos::FollowIgniteToSelfPos(const InitArg& arg) : ASPlayRotateTurnToTarget(arg) {} FollowIgniteToSelfPos::~FollowIgniteToSelfPos() = default; bool FollowIgniteToSelfPos::init_(sead::Heap* heap) { - return RotateTurnToTarget::init_(heap); + return ASPlayRotateTurnToTarget::init_(heap); } void FollowIgniteToSelfPos::enter_(ksys::act::ai::InlineParamPack* params) { - RotateTurnToTarget::enter_(params); + ASPlayRotateTurnToTarget::enter_(params); } void FollowIgniteToSelfPos::leave_() { - RotateTurnToTarget::leave_(); + ASPlayRotateTurnToTarget::leave_(); } void FollowIgniteToSelfPos::loadParams_() { - RotateTurnToTarget::loadParams_(); + ASPlayRotateTurnToTarget::loadParams_(); } void FollowIgniteToSelfPos::calc_() { - RotateTurnToTarget::calc_(); + ASPlayRotateTurnToTarget::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionFollowIgniteToSelfPos.h b/src/Game/Actor/Action/actionFollowIgniteToSelfPos.h index b0717780..b62680ae 100644 --- a/src/Game/Actor/Action/actionFollowIgniteToSelfPos.h +++ b/src/Game/Actor/Action/actionFollowIgniteToSelfPos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRotateTurnToTarget.h" +#include "Game/Actor/Action/actionASPlayRotateTurnToTarget.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class FollowIgniteToSelfPos : public RotateTurnToTarget { - SEAD_RTTI_OVERRIDE(FollowIgniteToSelfPos, RotateTurnToTarget) +class FollowIgniteToSelfPos : public ASPlayRotateTurnToTarget { + SEAD_RTTI_OVERRIDE(FollowIgniteToSelfPos, ASPlayRotateTurnToTarget) public: explicit FollowIgniteToSelfPos(const InitArg& arg); ~FollowIgniteToSelfPos() override; diff --git a/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.cpp b/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.cpp index 8246dca8..9c998d72 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.cpp +++ b/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.cpp @@ -3,29 +3,29 @@ namespace uking::action { ForkASTrgEmitShockWaveAtEnter::ForkASTrgEmitShockWaveAtEnter(const InitArg& arg) - : ForkASTrgEmitShockWave(arg) {} + : ForkEmitShockWave(arg) {} ForkASTrgEmitShockWaveAtEnter::~ForkASTrgEmitShockWaveAtEnter() = default; bool ForkASTrgEmitShockWaveAtEnter::init_(sead::Heap* heap) { - return ForkASTrgEmitShockWave::init_(heap); + return ForkEmitShockWave::init_(heap); } void ForkASTrgEmitShockWaveAtEnter::enter_(ksys::act::ai::InlineParamPack* params) { - ForkASTrgEmitShockWave::enter_(params); + ForkEmitShockWave::enter_(params); } void ForkASTrgEmitShockWaveAtEnter::leave_() { - ForkASTrgEmitShockWave::leave_(); + ForkEmitShockWave::leave_(); } void ForkASTrgEmitShockWaveAtEnter::loadParams_() { - ForkASTrgEmitShockWave::loadParams_(); + ForkEmitShockWave::loadParams_(); getStaticParam(&mOffsetPos_s, "OffsetPos"); } void ForkASTrgEmitShockWaveAtEnter::calc_() { - ForkASTrgEmitShockWave::calc_(); + ForkEmitShockWave::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.h b/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.h index 3b33f902..dc0ed365 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.h +++ b/src/Game/Actor/Action/actionForkASTrgEmitShockWaveAtEnter.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkASTrgEmitShockWave.h" +#include "Game/Actor/Action/actionForkEmitShockWave.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkASTrgEmitShockWaveAtEnter : public ForkASTrgEmitShockWave { - SEAD_RTTI_OVERRIDE(ForkASTrgEmitShockWaveAtEnter, ForkASTrgEmitShockWave) +class ForkASTrgEmitShockWaveAtEnter : public ForkEmitShockWave { + SEAD_RTTI_OVERRIDE(ForkASTrgEmitShockWaveAtEnter, ForkEmitShockWave) public: explicit ForkASTrgEmitShockWaveAtEnter(const InitArg& arg); ~ForkASTrgEmitShockWaveAtEnter() override; diff --git a/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.cpp b/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.cpp index d8ff9a07..2dcfd2f6 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.cpp +++ b/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.cpp @@ -2,30 +2,29 @@ namespace uking::action { -ForkASTrgEmitShockWavePos::ForkASTrgEmitShockWavePos(const InitArg& arg) - : ForkASTrgEmitShockWave(arg) {} +ForkASTrgEmitShockWavePos::ForkASTrgEmitShockWavePos(const InitArg& arg) : ForkEmitShockWave(arg) {} ForkASTrgEmitShockWavePos::~ForkASTrgEmitShockWavePos() = default; bool ForkASTrgEmitShockWavePos::init_(sead::Heap* heap) { - return ForkASTrgEmitShockWave::init_(heap); + return ForkEmitShockWave::init_(heap); } void ForkASTrgEmitShockWavePos::enter_(ksys::act::ai::InlineParamPack* params) { - ForkASTrgEmitShockWave::enter_(params); + ForkEmitShockWave::enter_(params); } void ForkASTrgEmitShockWavePos::leave_() { - ForkASTrgEmitShockWave::leave_(); + ForkEmitShockWave::leave_(); } void ForkASTrgEmitShockWavePos::loadParams_() { - ForkASTrgEmitShockWave::loadParams_(); + ForkEmitShockWave::loadParams_(); getStaticParam(&mOffsetPos_s, "OffsetPos"); } void ForkASTrgEmitShockWavePos::calc_() { - ForkASTrgEmitShockWave::calc_(); + ForkEmitShockWave::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.h b/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.h index c6e2b87e..56d60e0c 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.h +++ b/src/Game/Actor/Action/actionForkASTrgEmitShockWavePos.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkASTrgEmitShockWave.h" +#include "Game/Actor/Action/actionForkEmitShockWave.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkASTrgEmitShockWavePos : public ForkASTrgEmitShockWave { - SEAD_RTTI_OVERRIDE(ForkASTrgEmitShockWavePos, ForkASTrgEmitShockWave) +class ForkASTrgEmitShockWavePos : public ForkEmitShockWave { + SEAD_RTTI_OVERRIDE(ForkASTrgEmitShockWavePos, ForkEmitShockWave) public: explicit ForkASTrgEmitShockWavePos(const InitArg& arg); ~ForkASTrgEmitShockWavePos() override; diff --git a/src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.cpp b/src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.cpp new file mode 100644 index 00000000..8e166776 --- /dev/null +++ b/src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionForkBasicMessageDialogCtrl.h" + +namespace uking::action { + +ForkBasicMessageDialogCtrl::ForkBasicMessageDialogCtrl(const InitArg& arg) + : ksys::act::ai::Action(arg) {} + +ForkBasicMessageDialogCtrl::~ForkBasicMessageDialogCtrl() = default; + +bool ForkBasicMessageDialogCtrl::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void ForkBasicMessageDialogCtrl::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void ForkBasicMessageDialogCtrl::leave_() { + ksys::act::ai::Action::leave_(); +} + +void ForkBasicMessageDialogCtrl::loadParams_() { + getAITreeVariable(&mSimpleDialogUnit_a, "SimpleDialogUnit"); +} + +void ForkBasicMessageDialogCtrl::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSimpleMessageDialogCtrl.h b/src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.h similarity index 62% rename from src/Game/Actor/Action/actionSimpleMessageDialogCtrl.h rename to src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.h index c03444dc..92f5d46b 100644 --- a/src/Game/Actor/Action/actionSimpleMessageDialogCtrl.h +++ b/src/Game/Actor/Action/actionForkBasicMessageDialogCtrl.h @@ -4,11 +4,11 @@ namespace uking::action { -class SimpleMessageDialogCtrl : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SimpleMessageDialogCtrl, ksys::act::ai::Action) +class ForkBasicMessageDialogCtrl : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(ForkBasicMessageDialogCtrl, ksys::act::ai::Action) public: - explicit SimpleMessageDialogCtrl(const InitArg& arg); - ~SimpleMessageDialogCtrl() override; + explicit ForkBasicMessageDialogCtrl(const InitArg& arg); + ~ForkBasicMessageDialogCtrl() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.cpp b/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.cpp index 2da920b8..0c00920d 100644 --- a/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.cpp +++ b/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.cpp @@ -3,30 +3,30 @@ namespace uking::action { ForkBeastGanonMessageDialogCtrl::ForkBeastGanonMessageDialogCtrl(const InitArg& arg) - : SimpleMessageDialogCtrl(arg) {} + : ForkBasicMessageDialogCtrl(arg) {} ForkBeastGanonMessageDialogCtrl::~ForkBeastGanonMessageDialogCtrl() = default; bool ForkBeastGanonMessageDialogCtrl::init_(sead::Heap* heap) { - return SimpleMessageDialogCtrl::init_(heap); + return ForkBasicMessageDialogCtrl::init_(heap); } void ForkBeastGanonMessageDialogCtrl::enter_(ksys::act::ai::InlineParamPack* params) { - SimpleMessageDialogCtrl::enter_(params); + ForkBasicMessageDialogCtrl::enter_(params); } void ForkBeastGanonMessageDialogCtrl::leave_() { - SimpleMessageDialogCtrl::leave_(); + ForkBasicMessageDialogCtrl::leave_(); } void ForkBeastGanonMessageDialogCtrl::loadParams_() { - SimpleMessageDialogCtrl::loadParams_(); + ForkBasicMessageDialogCtrl::loadParams_(); getAITreeVariable(&mGanonBeastVoiceSequenceCount_a, "GanonBeastVoiceSequenceCount"); getAITreeVariable(&mInBeastGanonVoiceSequence_a, "InBeastGanonVoiceSequence"); } void ForkBeastGanonMessageDialogCtrl::calc_() { - SimpleMessageDialogCtrl::calc_(); + ForkBasicMessageDialogCtrl::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.h b/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.h index 8e480e0f..9ff0dee4 100644 --- a/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.h +++ b/src/Game/Actor/Action/actionForkBeastGanonMessageDialogCtrl.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSimpleMessageDialogCtrl.h" +#include "Game/Actor/Action/actionForkBasicMessageDialogCtrl.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkBeastGanonMessageDialogCtrl : public SimpleMessageDialogCtrl { - SEAD_RTTI_OVERRIDE(ForkBeastGanonMessageDialogCtrl, SimpleMessageDialogCtrl) +class ForkBeastGanonMessageDialogCtrl : public ForkBasicMessageDialogCtrl { + SEAD_RTTI_OVERRIDE(ForkBeastGanonMessageDialogCtrl, ForkBasicMessageDialogCtrl) public: explicit ForkBeastGanonMessageDialogCtrl(const InitArg& arg); ~ForkBeastGanonMessageDialogCtrl() override; diff --git a/src/Game/Actor/Action/actionForkASTrgEmitShockWave.cpp b/src/Game/Actor/Action/actionForkEmitShockWave.cpp similarity index 65% rename from src/Game/Actor/Action/actionForkASTrgEmitShockWave.cpp rename to src/Game/Actor/Action/actionForkEmitShockWave.cpp index 485919b9..d3f7aebd 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitShockWave.cpp +++ b/src/Game/Actor/Action/actionForkEmitShockWave.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionForkASTrgEmitShockWave.h" +#include "Game/Actor/Action/actionForkEmitShockWave.h" namespace uking::action { -ForkASTrgEmitShockWave::ForkASTrgEmitShockWave(const InitArg& arg) : ksys::act::ai::Action(arg) {} +ForkEmitShockWave::ForkEmitShockWave(const InitArg& arg) : ksys::act::ai::Action(arg) {} -ForkASTrgEmitShockWave::~ForkASTrgEmitShockWave() = default; +ForkEmitShockWave::~ForkEmitShockWave() = default; -bool ForkASTrgEmitShockWave::init_(sead::Heap* heap) { +bool ForkEmitShockWave::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void ForkASTrgEmitShockWave::enter_(ksys::act::ai::InlineParamPack* params) { +void ForkEmitShockWave::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void ForkASTrgEmitShockWave::leave_() { +void ForkEmitShockWave::leave_() { ksys::act::ai::Action::leave_(); } -void ForkASTrgEmitShockWave::loadParams_() { +void ForkEmitShockWave::loadParams_() { getStaticParam(&mPower_s, "Power"); getStaticParam(&mAttackIntensity_s, "AttackIntensity"); getStaticParam(&mEmitIntervalTime_s, "EmitIntervalTime"); @@ -33,7 +33,7 @@ void ForkASTrgEmitShockWave::loadParams_() { getStaticParam(&mShockWavePartsKey_s, "ShockWavePartsKey"); } -void ForkASTrgEmitShockWave::calc_() { +void ForkEmitShockWave::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionForkASTrgEmitShockWave.h b/src/Game/Actor/Action/actionForkEmitShockWave.h similarity index 83% rename from src/Game/Actor/Action/actionForkASTrgEmitShockWave.h rename to src/Game/Actor/Action/actionForkEmitShockWave.h index 88e98c4e..cb1e43c9 100644 --- a/src/Game/Actor/Action/actionForkASTrgEmitShockWave.h +++ b/src/Game/Actor/Action/actionForkEmitShockWave.h @@ -4,11 +4,11 @@ namespace uking::action { -class ForkASTrgEmitShockWave : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(ForkASTrgEmitShockWave, ksys::act::ai::Action) +class ForkEmitShockWave : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(ForkEmitShockWave, ksys::act::ai::Action) public: - explicit ForkASTrgEmitShockWave(const InitArg& arg); - ~ForkASTrgEmitShockWave() override; + explicit ForkEmitShockWave(const InitArg& arg); + ~ForkEmitShockWave() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionForkEmitShockWaveByContact.cpp b/src/Game/Actor/Action/actionForkEmitShockWaveByContact.cpp index 7b7e9442..12e24ade 100644 --- a/src/Game/Actor/Action/actionForkEmitShockWaveByContact.cpp +++ b/src/Game/Actor/Action/actionForkEmitShockWaveByContact.cpp @@ -3,29 +3,29 @@ namespace uking::action { ForkEmitShockWaveByContact::ForkEmitShockWaveByContact(const InitArg& arg) - : ForkASTrgEmitShockWave(arg) {} + : ForkEmitShockWave(arg) {} ForkEmitShockWaveByContact::~ForkEmitShockWaveByContact() = default; bool ForkEmitShockWaveByContact::init_(sead::Heap* heap) { - return ForkASTrgEmitShockWave::init_(heap); + return ForkEmitShockWave::init_(heap); } void ForkEmitShockWaveByContact::enter_(ksys::act::ai::InlineParamPack* params) { - ForkASTrgEmitShockWave::enter_(params); + ForkEmitShockWave::enter_(params); } void ForkEmitShockWaveByContact::leave_() { - ForkASTrgEmitShockWave::leave_(); + ForkEmitShockWave::leave_(); } void ForkEmitShockWaveByContact::loadParams_() { - ForkASTrgEmitShockWave::loadParams_(); + ForkEmitShockWave::loadParams_(); getStaticParam(&mRigidBodyName_s, "RigidBodyName"); } void ForkEmitShockWaveByContact::calc_() { - ForkASTrgEmitShockWave::calc_(); + ForkEmitShockWave::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionForkEmitShockWaveByContact.h b/src/Game/Actor/Action/actionForkEmitShockWaveByContact.h index fb12c930..4151b7b1 100644 --- a/src/Game/Actor/Action/actionForkEmitShockWaveByContact.h +++ b/src/Game/Actor/Action/actionForkEmitShockWaveByContact.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionForkASTrgEmitShockWave.h" +#include "Game/Actor/Action/actionForkEmitShockWave.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class ForkEmitShockWaveByContact : public ForkASTrgEmitShockWave { - SEAD_RTTI_OVERRIDE(ForkEmitShockWaveByContact, ForkASTrgEmitShockWave) +class ForkEmitShockWaveByContact : public ForkEmitShockWave { + SEAD_RTTI_OVERRIDE(ForkEmitShockWaveByContact, ForkEmitShockWave) public: explicit ForkEmitShockWaveByContact(const InitArg& arg); ~ForkEmitShockWaveByContact() override; diff --git a/src/Game/Actor/Action/actionGolemThrowPartsToTargetBase.cpp b/src/Game/Actor/Action/actionGolemThrowPartsBase.cpp similarity index 52% rename from src/Game/Actor/Action/actionGolemThrowPartsToTargetBase.cpp rename to src/Game/Actor/Action/actionGolemThrowPartsBase.cpp index 74e34d2e..5a4a5eb4 100644 --- a/src/Game/Actor/Action/actionGolemThrowPartsToTargetBase.cpp +++ b/src/Game/Actor/Action/actionGolemThrowPartsBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionGolemThrowPartsToTargetBase.h" +#include "Game/Actor/Action/actionGolemThrowPartsBase.h" namespace uking::action { -GolemThrowPartsToTargetBase::GolemThrowPartsToTargetBase(const InitArg& arg) : ActionWithAS(arg) {} +GolemThrowPartsBase::GolemThrowPartsBase(const InitArg& arg) : ActionWithAS(arg) {} -GolemThrowPartsToTargetBase::~GolemThrowPartsToTargetBase() = default; +GolemThrowPartsBase::~GolemThrowPartsBase() = default; -bool GolemThrowPartsToTargetBase::init_(sead::Heap* heap) { +bool GolemThrowPartsBase::init_(sead::Heap* heap) { return ActionWithAS::init_(heap); } -void GolemThrowPartsToTargetBase::enter_(ksys::act::ai::InlineParamPack* params) { +void GolemThrowPartsBase::enter_(ksys::act::ai::InlineParamPack* params) { ActionWithAS::enter_(params); } -void GolemThrowPartsToTargetBase::leave_() { +void GolemThrowPartsBase::leave_() { ActionWithAS::leave_(); } -void GolemThrowPartsToTargetBase::loadParams_() { +void GolemThrowPartsBase::loadParams_() { ActionWithPosAngReduce::loadParams_(); getStaticParam(&mASName_s, "ASName"); getStaticParam(&mTgtBodyName_s, "TgtBodyName"); @@ -28,7 +28,7 @@ void GolemThrowPartsToTargetBase::loadParams_() { getAITreeVariable(&mGolemChemicalController_a, "GolemChemicalController"); } -void GolemThrowPartsToTargetBase::calc_() { +void GolemThrowPartsBase::calc_() { ActionWithAS::calc_(); } diff --git a/src/Game/Actor/Action/actionGolemThrowPartsToTargetBase.h b/src/Game/Actor/Action/actionGolemThrowPartsBase.h similarity index 74% rename from src/Game/Actor/Action/actionGolemThrowPartsToTargetBase.h rename to src/Game/Actor/Action/actionGolemThrowPartsBase.h index 45df2efb..d313e866 100644 --- a/src/Game/Actor/Action/actionGolemThrowPartsToTargetBase.h +++ b/src/Game/Actor/Action/actionGolemThrowPartsBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class GolemThrowPartsToTargetBase : public ActionWithAS { - SEAD_RTTI_OVERRIDE(GolemThrowPartsToTargetBase, ActionWithAS) +class GolemThrowPartsBase : public ActionWithAS { + SEAD_RTTI_OVERRIDE(GolemThrowPartsBase, ActionWithAS) public: - explicit GolemThrowPartsToTargetBase(const InitArg& arg); - ~GolemThrowPartsToTargetBase() override; + explicit GolemThrowPartsBase(const InitArg& arg); + ~GolemThrowPartsBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionGolemThrowPartsToTarget.cpp b/src/Game/Actor/Action/actionGolemThrowPartsToTarget.cpp index fd7f08bc..4136278f 100644 --- a/src/Game/Actor/Action/actionGolemThrowPartsToTarget.cpp +++ b/src/Game/Actor/Action/actionGolemThrowPartsToTarget.cpp @@ -2,32 +2,31 @@ namespace uking::action { -GolemThrowPartsToTarget::GolemThrowPartsToTarget(const InitArg& arg) - : GolemThrowPartsToTargetBase(arg) {} +GolemThrowPartsToTarget::GolemThrowPartsToTarget(const InitArg& arg) : GolemThrowPartsBase(arg) {} GolemThrowPartsToTarget::~GolemThrowPartsToTarget() = default; bool GolemThrowPartsToTarget::init_(sead::Heap* heap) { - return GolemThrowPartsToTargetBase::init_(heap); + return GolemThrowPartsBase::init_(heap); } void GolemThrowPartsToTarget::enter_(ksys::act::ai::InlineParamPack* params) { - GolemThrowPartsToTargetBase::enter_(params); + GolemThrowPartsBase::enter_(params); } void GolemThrowPartsToTarget::leave_() { - GolemThrowPartsToTargetBase::leave_(); + GolemThrowPartsBase::leave_(); } void GolemThrowPartsToTarget::loadParams_() { - GolemThrowPartsToTargetBase::loadParams_(); + GolemThrowPartsBase::loadParams_(); getStaticParam(&mShootPitchMin_s, "ShootPitchMin"); getStaticParam(&mShootPitchMax_s, "ShootPitchMax"); getDynamicParam(&mTargetPos_d, "TargetPos"); } void GolemThrowPartsToTarget::calc_() { - GolemThrowPartsToTargetBase::calc_(); + GolemThrowPartsBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionGolemThrowPartsToTarget.h b/src/Game/Actor/Action/actionGolemThrowPartsToTarget.h index 4a941c99..1e9ad998 100644 --- a/src/Game/Actor/Action/actionGolemThrowPartsToTarget.h +++ b/src/Game/Actor/Action/actionGolemThrowPartsToTarget.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionGolemThrowPartsToTargetBase.h" +#include "Game/Actor/Action/actionGolemThrowPartsBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class GolemThrowPartsToTarget : public GolemThrowPartsToTargetBase { - SEAD_RTTI_OVERRIDE(GolemThrowPartsToTarget, GolemThrowPartsToTargetBase) +class GolemThrowPartsToTarget : public GolemThrowPartsBase { + SEAD_RTTI_OVERRIDE(GolemThrowPartsToTarget, GolemThrowPartsBase) public: explicit GolemThrowPartsToTarget(const InitArg& arg); ~GolemThrowPartsToTarget() override; diff --git a/src/Game/Actor/Action/actionHorseRideChargeCommand.cpp b/src/Game/Actor/Action/actionHorseRideChargeCommand.cpp index 6c2c622f..d02d43ae 100644 --- a/src/Game/Actor/Action/actionHorseRideChargeCommand.cpp +++ b/src/Game/Actor/Action/actionHorseRideChargeCommand.cpp @@ -2,28 +2,28 @@ namespace uking::action { -HorseRideChargeCommand::HorseRideChargeCommand(const InitArg& arg) : HorseRideMoveCommand(arg) {} +HorseRideChargeCommand::HorseRideChargeCommand(const InitArg& arg) : HorseRideSetGearCommand(arg) {} HorseRideChargeCommand::~HorseRideChargeCommand() = default; bool HorseRideChargeCommand::init_(sead::Heap* heap) { - return HorseRideMoveCommand::init_(heap); + return HorseRideSetGearCommand::init_(heap); } void HorseRideChargeCommand::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRideMoveCommand::enter_(params); + HorseRideSetGearCommand::enter_(params); } void HorseRideChargeCommand::leave_() { - HorseRideMoveCommand::leave_(); + HorseRideSetGearCommand::leave_(); } void HorseRideChargeCommand::loadParams_() { - HorseRideMoveCommand::loadParams_(); + HorseRideSetGearCommand::loadParams_(); } void HorseRideChargeCommand::calc_() { - HorseRideMoveCommand::calc_(); + HorseRideSetGearCommand::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideChargeCommand.h b/src/Game/Actor/Action/actionHorseRideChargeCommand.h index c945ac6d..39efe812 100644 --- a/src/Game/Actor/Action/actionHorseRideChargeCommand.h +++ b/src/Game/Actor/Action/actionHorseRideChargeCommand.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRideMoveCommand.h" +#include "Game/Actor/Action/actionHorseRideSetGearCommand.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideChargeCommand : public HorseRideMoveCommand { - SEAD_RTTI_OVERRIDE(HorseRideChargeCommand, HorseRideMoveCommand) +class HorseRideChargeCommand : public HorseRideSetGearCommand { + SEAD_RTTI_OVERRIDE(HorseRideChargeCommand, HorseRideSetGearCommand) public: explicit HorseRideChargeCommand(const InitArg& arg); ~HorseRideChargeCommand() override; diff --git a/src/Game/Actor/Action/actionHorseRideChaseCommand.cpp b/src/Game/Actor/Action/actionHorseRideChaseCommand.cpp index 083268de..de6806fd 100644 --- a/src/Game/Actor/Action/actionHorseRideChaseCommand.cpp +++ b/src/Game/Actor/Action/actionHorseRideChaseCommand.cpp @@ -2,29 +2,29 @@ namespace uking::action { -HorseRideChaseCommand::HorseRideChaseCommand(const InitArg& arg) : HorseRideMoveCommand(arg) {} +HorseRideChaseCommand::HorseRideChaseCommand(const InitArg& arg) : HorseRideSetGearCommand(arg) {} HorseRideChaseCommand::~HorseRideChaseCommand() = default; bool HorseRideChaseCommand::init_(sead::Heap* heap) { - return HorseRideMoveCommand::init_(heap); + return HorseRideSetGearCommand::init_(heap); } void HorseRideChaseCommand::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRideMoveCommand::enter_(params); + HorseRideSetGearCommand::enter_(params); } void HorseRideChaseCommand::leave_() { - HorseRideMoveCommand::leave_(); + HorseRideSetGearCommand::leave_(); } void HorseRideChaseCommand::loadParams_() { - HorseRideMoveCommand::loadParams_(); + HorseRideSetGearCommand::loadParams_(); getStaticParam(&mChaseKeepDist_s, "ChaseKeepDist"); } void HorseRideChaseCommand::calc_() { - HorseRideMoveCommand::calc_(); + HorseRideSetGearCommand::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideChaseCommand.h b/src/Game/Actor/Action/actionHorseRideChaseCommand.h index 2f0d0e64..e5193b64 100644 --- a/src/Game/Actor/Action/actionHorseRideChaseCommand.h +++ b/src/Game/Actor/Action/actionHorseRideChaseCommand.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRideMoveCommand.h" +#include "Game/Actor/Action/actionHorseRideSetGearCommand.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideChaseCommand : public HorseRideMoveCommand { - SEAD_RTTI_OVERRIDE(HorseRideChaseCommand, HorseRideMoveCommand) +class HorseRideChaseCommand : public HorseRideSetGearCommand { + SEAD_RTTI_OVERRIDE(HorseRideChaseCommand, HorseRideSetGearCommand) public: explicit HorseRideChaseCommand(const InitArg& arg); ~HorseRideChaseCommand() override; diff --git a/src/Game/Actor/Action/actionHorseRideMoveCommand.cpp b/src/Game/Actor/Action/actionHorseRideMoveCommand.cpp deleted file mode 100644 index 1651c466..00000000 --- a/src/Game/Actor/Action/actionHorseRideMoveCommand.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionHorseRideMoveCommand.h" - -namespace uking::action { - -HorseRideMoveCommand::HorseRideMoveCommand(const InitArg& arg) : HorseRideCommand(arg) {} - -HorseRideMoveCommand::~HorseRideMoveCommand() = default; - -bool HorseRideMoveCommand::init_(sead::Heap* heap) { - return HorseRideCommand::init_(heap); -} - -void HorseRideMoveCommand::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRideCommand::enter_(params); -} - -void HorseRideMoveCommand::leave_() { - HorseRideCommand::leave_(); -} - -void HorseRideMoveCommand::loadParams_() { - HorseRideCommand::loadParams_(); - getStaticParam(&mGear_s, "Gear"); -} - -void HorseRideMoveCommand::calc_() { - HorseRideCommand::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideMoveToCommand.cpp b/src/Game/Actor/Action/actionHorseRideMoveToCommand.cpp index 88b7f648..73fa225f 100644 --- a/src/Game/Actor/Action/actionHorseRideMoveToCommand.cpp +++ b/src/Game/Actor/Action/actionHorseRideMoveToCommand.cpp @@ -2,28 +2,28 @@ namespace uking::action { -HorseRideMoveToCommand::HorseRideMoveToCommand(const InitArg& arg) : HorseRideMoveCommand(arg) {} +HorseRideMoveToCommand::HorseRideMoveToCommand(const InitArg& arg) : HorseRideSetGearCommand(arg) {} HorseRideMoveToCommand::~HorseRideMoveToCommand() = default; bool HorseRideMoveToCommand::init_(sead::Heap* heap) { - return HorseRideMoveCommand::init_(heap); + return HorseRideSetGearCommand::init_(heap); } void HorseRideMoveToCommand::enter_(ksys::act::ai::InlineParamPack* params) { - HorseRideMoveCommand::enter_(params); + HorseRideSetGearCommand::enter_(params); } void HorseRideMoveToCommand::leave_() { - HorseRideMoveCommand::leave_(); + HorseRideSetGearCommand::leave_(); } void HorseRideMoveToCommand::loadParams_() { - HorseRideMoveCommand::loadParams_(); + HorseRideSetGearCommand::loadParams_(); } void HorseRideMoveToCommand::calc_() { - HorseRideMoveCommand::calc_(); + HorseRideSetGearCommand::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideMoveToCommand.h b/src/Game/Actor/Action/actionHorseRideMoveToCommand.h index 1d879e27..165a98a2 100644 --- a/src/Game/Actor/Action/actionHorseRideMoveToCommand.h +++ b/src/Game/Actor/Action/actionHorseRideMoveToCommand.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionHorseRideMoveCommand.h" +#include "Game/Actor/Action/actionHorseRideSetGearCommand.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class HorseRideMoveToCommand : public HorseRideMoveCommand { - SEAD_RTTI_OVERRIDE(HorseRideMoveToCommand, HorseRideMoveCommand) +class HorseRideMoveToCommand : public HorseRideSetGearCommand { + SEAD_RTTI_OVERRIDE(HorseRideMoveToCommand, HorseRideSetGearCommand) public: explicit HorseRideMoveToCommand(const InitArg& arg); ~HorseRideMoveToCommand() override; diff --git a/src/Game/Actor/Action/actionHorseRideSetGearCommand.cpp b/src/Game/Actor/Action/actionHorseRideSetGearCommand.cpp new file mode 100644 index 00000000..5ea5adeb --- /dev/null +++ b/src/Game/Actor/Action/actionHorseRideSetGearCommand.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionHorseRideSetGearCommand.h" + +namespace uking::action { + +HorseRideSetGearCommand::HorseRideSetGearCommand(const InitArg& arg) : HorseRideCommand(arg) {} + +HorseRideSetGearCommand::~HorseRideSetGearCommand() = default; + +bool HorseRideSetGearCommand::init_(sead::Heap* heap) { + return HorseRideCommand::init_(heap); +} + +void HorseRideSetGearCommand::enter_(ksys::act::ai::InlineParamPack* params) { + HorseRideCommand::enter_(params); +} + +void HorseRideSetGearCommand::leave_() { + HorseRideCommand::leave_(); +} + +void HorseRideSetGearCommand::loadParams_() { + HorseRideCommand::loadParams_(); + getStaticParam(&mGear_s, "Gear"); +} + +void HorseRideSetGearCommand::calc_() { + HorseRideCommand::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionHorseRideMoveCommand.h b/src/Game/Actor/Action/actionHorseRideSetGearCommand.h similarity index 67% rename from src/Game/Actor/Action/actionHorseRideMoveCommand.h rename to src/Game/Actor/Action/actionHorseRideSetGearCommand.h index a013e281..e91cc495 100644 --- a/src/Game/Actor/Action/actionHorseRideMoveCommand.h +++ b/src/Game/Actor/Action/actionHorseRideSetGearCommand.h @@ -5,11 +5,11 @@ namespace uking::action { -class HorseRideMoveCommand : public HorseRideCommand { - SEAD_RTTI_OVERRIDE(HorseRideMoveCommand, HorseRideCommand) +class HorseRideSetGearCommand : public HorseRideCommand { + SEAD_RTTI_OVERRIDE(HorseRideSetGearCommand, HorseRideCommand) public: - explicit HorseRideMoveCommand(const InitArg& arg); - ~HorseRideMoveCommand() override; + explicit HorseRideSetGearCommand(const InitArg& arg); + ~HorseRideSetGearCommand() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionLastBossBlowOff.cpp b/src/Game/Actor/Action/actionLastBossBlowOff.cpp new file mode 100644 index 00000000..f35740fd --- /dev/null +++ b/src/Game/Actor/Action/actionLastBossBlowOff.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionLastBossBlowOff.h" + +namespace uking::action { + +LastBossBlowOff::LastBossBlowOff(const InitArg& arg) : BlownOff(arg) {} + +LastBossBlowOff::~LastBossBlowOff() = default; + +bool LastBossBlowOff::init_(sead::Heap* heap) { + return BlownOff::init_(heap); +} + +void LastBossBlowOff::enter_(ksys::act::ai::InlineParamPack* params) { + BlownOff::enter_(params); +} + +void LastBossBlowOff::leave_() { + BlownOff::leave_(); +} + +void LastBossBlowOff::loadParams_() { + BlownOff::loadParams_(); +} + +void LastBossBlowOff::calc_() { + BlownOff::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossBlowOff.h b/src/Game/Actor/Action/actionLastBossBlowOff.h similarity index 68% rename from src/Game/Actor/Action/actionSiteBossBlowOff.h rename to src/Game/Actor/Action/actionLastBossBlowOff.h index 7cf2ecf7..d81aaa8a 100644 --- a/src/Game/Actor/Action/actionSiteBossBlowOff.h +++ b/src/Game/Actor/Action/actionLastBossBlowOff.h @@ -5,11 +5,11 @@ namespace uking::action { -class SiteBossBlowOff : public BlownOff { - SEAD_RTTI_OVERRIDE(SiteBossBlowOff, BlownOff) +class LastBossBlowOff : public BlownOff { + SEAD_RTTI_OVERRIDE(LastBossBlowOff, BlownOff) public: - explicit SiteBossBlowOff(const InitArg& arg); - ~SiteBossBlowOff() override; + explicit LastBossBlowOff(const InitArg& arg); + ~LastBossBlowOff() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionLyzalfosFlame.cpp b/src/Game/Actor/Action/actionLyzalfosFlame.cpp index 046b96c9..40240c1a 100644 --- a/src/Game/Actor/Action/actionLyzalfosFlame.cpp +++ b/src/Game/Actor/Action/actionLyzalfosFlame.cpp @@ -2,24 +2,24 @@ namespace uking::action { -LyzalfosFlame::LyzalfosFlame(const InitArg& arg) : ChemicalAttackBall(arg) {} +LyzalfosFlame::LyzalfosFlame(const InitArg& arg) : ChemicalAttack(arg) {} LyzalfosFlame::~LyzalfosFlame() = default; bool LyzalfosFlame::init_(sead::Heap* heap) { - return ChemicalAttackBall::init_(heap); + return ChemicalAttack::init_(heap); } void LyzalfosFlame::enter_(ksys::act::ai::InlineParamPack* params) { - ChemicalAttackBall::enter_(params); + ChemicalAttack::enter_(params); } void LyzalfosFlame::leave_() { - ChemicalAttackBall::leave_(); + ChemicalAttack::leave_(); } void LyzalfosFlame::loadParams_() { - ChemicalAttackBall::loadParams_(); + ChemicalAttack::loadParams_(); getStaticParam(&mLengthFrame_s, "LengthFrame"); getStaticParam(&mAtResetTime_s, "AtResetTime"); getStaticParam(&mAtChaseFrame_s, "AtChaseFrame"); @@ -30,7 +30,7 @@ void LyzalfosFlame::loadParams_() { } void LyzalfosFlame::calc_() { - ChemicalAttackBall::calc_(); + ChemicalAttack::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionLyzalfosFlame.h b/src/Game/Actor/Action/actionLyzalfosFlame.h index 1ee93a0f..32123599 100644 --- a/src/Game/Actor/Action/actionLyzalfosFlame.h +++ b/src/Game/Actor/Action/actionLyzalfosFlame.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChemicalAttackBall.h" +#include "Game/Actor/Action/actionChemicalAttack.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class LyzalfosFlame : public ChemicalAttackBall { - SEAD_RTTI_OVERRIDE(LyzalfosFlame, ChemicalAttackBall) +class LyzalfosFlame : public ChemicalAttack { + SEAD_RTTI_OVERRIDE(LyzalfosFlame, ChemicalAttack) public: explicit LyzalfosFlame(const InitArg& arg); ~LyzalfosFlame() override; diff --git a/src/Game/Actor/Action/actionNoticeTurn.cpp b/src/Game/Actor/Action/actionNoticeTurn.cpp index b471c098..d4cbf2ac 100644 --- a/src/Game/Actor/Action/actionNoticeTurn.cpp +++ b/src/Game/Actor/Action/actionNoticeTurn.cpp @@ -2,29 +2,29 @@ namespace uking::action { -NoticeTurn::NoticeTurn(const InitArg& arg) : RotateTurnToTarget(arg) {} +NoticeTurn::NoticeTurn(const InitArg& arg) : ASPlayRotateTurnToTarget(arg) {} NoticeTurn::~NoticeTurn() = default; bool NoticeTurn::init_(sead::Heap* heap) { - return RotateTurnToTarget::init_(heap); + return ASPlayRotateTurnToTarget::init_(heap); } void NoticeTurn::enter_(ksys::act::ai::InlineParamPack* params) { - RotateTurnToTarget::enter_(params); + ASPlayRotateTurnToTarget::enter_(params); } void NoticeTurn::leave_() { - RotateTurnToTarget::leave_(); + ASPlayRotateTurnToTarget::leave_(); } void NoticeTurn::loadParams_() { - RotateTurnToTarget::loadParams_(); + ASPlayRotateTurnToTarget::loadParams_(); getStaticParam(&mNoDoubleNoticeTime_s, "NoDoubleNoticeTime"); } void NoticeTurn::calc_() { - RotateTurnToTarget::calc_(); + ASPlayRotateTurnToTarget::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionNoticeTurn.h b/src/Game/Actor/Action/actionNoticeTurn.h index 3ccd30ee..823f83da 100644 --- a/src/Game/Actor/Action/actionNoticeTurn.h +++ b/src/Game/Actor/Action/actionNoticeTurn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionRotateTurnToTarget.h" +#include "Game/Actor/Action/actionASPlayRotateTurnToTarget.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class NoticeTurn : public RotateTurnToTarget { - SEAD_RTTI_OVERRIDE(NoticeTurn, RotateTurnToTarget) +class NoticeTurn : public ASPlayRotateTurnToTarget { + SEAD_RTTI_OVERRIDE(NoticeTurn, ASPlayRotateTurnToTarget) public: explicit NoticeTurn(const InitArg& arg); ~NoticeTurn() override; diff --git a/src/Game/Actor/Action/actionOctarockBalloon.cpp b/src/Game/Actor/Action/actionOctarockBalloon.cpp index 0c5237e9..2198b8aa 100644 --- a/src/Game/Actor/Action/actionOctarockBalloon.cpp +++ b/src/Game/Actor/Action/actionOctarockBalloon.cpp @@ -2,24 +2,24 @@ namespace uking::action { -OctarockBalloon::OctarockBalloon(const InitArg& arg) : OctarockBalloonBase(arg) {} +OctarockBalloon::OctarockBalloon(const InitArg& arg) : BalloonRopeBase(arg) {} OctarockBalloon::~OctarockBalloon() = default; bool OctarockBalloon::init_(sead::Heap* heap) { - return OctarockBalloonBase::init_(heap); + return BalloonRopeBase::init_(heap); } void OctarockBalloon::enter_(ksys::act::ai::InlineParamPack* params) { - OctarockBalloonBase::enter_(params); + BalloonRopeBase::enter_(params); } void OctarockBalloon::leave_() { - OctarockBalloonBase::leave_(); + BalloonRopeBase::leave_(); } void OctarockBalloon::loadParams_() { - OctarockBalloonBase::loadParams_(); + BalloonRopeBase::loadParams_(); getStaticParam(&mTargetScale_s, "TargetScale"); getStaticParam(&mStartSignTimer_s, "StartSignTimer"); getStaticParam(&mStartASName_s, "StartASName"); @@ -27,7 +27,7 @@ void OctarockBalloon::loadParams_() { } void OctarockBalloon::calc_() { - OctarockBalloonBase::calc_(); + BalloonRopeBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionOctarockBalloon.h b/src/Game/Actor/Action/actionOctarockBalloon.h index 86d79fd6..299c8667 100644 --- a/src/Game/Actor/Action/actionOctarockBalloon.h +++ b/src/Game/Actor/Action/actionOctarockBalloon.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionOctarockBalloonBase.h" +#include "Game/Actor/Action/actionBalloonRopeBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class OctarockBalloon : public OctarockBalloonBase { - SEAD_RTTI_OVERRIDE(OctarockBalloon, OctarockBalloonBase) +class OctarockBalloon : public BalloonRopeBase { + SEAD_RTTI_OVERRIDE(OctarockBalloon, BalloonRopeBase) public: explicit OctarockBalloon(const InitArg& arg); ~OctarockBalloon() override; diff --git a/src/Game/Actor/Action/actionPriestBossCloneFastWarp.cpp b/src/Game/Actor/Action/actionPriestBossCloneFastWarp.cpp new file mode 100644 index 00000000..4917c319 --- /dev/null +++ b/src/Game/Actor/Action/actionPriestBossCloneFastWarp.cpp @@ -0,0 +1,29 @@ +#include "Game/Actor/Action/actionPriestBossCloneFastWarp.h" + +namespace uking::action { + +PriestBossCloneFastWarp::PriestBossCloneFastWarp(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +PriestBossCloneFastWarp::~PriestBossCloneFastWarp() = default; + +bool PriestBossCloneFastWarp::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void PriestBossCloneFastWarp::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void PriestBossCloneFastWarp::leave_() { + ksys::act::ai::Action::leave_(); +} + +void PriestBossCloneFastWarp::loadParams_() { + getAITreeVariable(&mPriestBossMetaAIUnit_a, "PriestBossMetaAIUnit"); +} + +void PriestBossCloneFastWarp::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionPriestBossWarpOrVanish.h b/src/Game/Actor/Action/actionPriestBossCloneFastWarp.h similarity index 64% rename from src/Game/Actor/Action/actionPriestBossWarpOrVanish.h rename to src/Game/Actor/Action/actionPriestBossCloneFastWarp.h index 3e5e4dc4..df2e0b7b 100644 --- a/src/Game/Actor/Action/actionPriestBossWarpOrVanish.h +++ b/src/Game/Actor/Action/actionPriestBossCloneFastWarp.h @@ -4,11 +4,11 @@ namespace uking::action { -class PriestBossWarpOrVanish : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(PriestBossWarpOrVanish, ksys::act::ai::Action) +class PriestBossCloneFastWarp : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(PriestBossCloneFastWarp, ksys::act::ai::Action) public: - explicit PriestBossWarpOrVanish(const InitArg& arg); - ~PriestBossWarpOrVanish() override; + explicit PriestBossCloneFastWarp(const InitArg& arg); + ~PriestBossCloneFastWarp() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionPriestBossFastWarpMove.cpp b/src/Game/Actor/Action/actionPriestBossFastWarpMove.cpp index a75f59a7..1d7881d2 100644 --- a/src/Game/Actor/Action/actionPriestBossFastWarpMove.cpp +++ b/src/Game/Actor/Action/actionPriestBossFastWarpMove.cpp @@ -2,24 +2,24 @@ namespace uking::action { -PriestBossFastWarpMove::PriestBossFastWarpMove(const InitArg& arg) : PriestBossWarpOrVanish(arg) {} +PriestBossFastWarpMove::PriestBossFastWarpMove(const InitArg& arg) : PriestBossCloneFastWarp(arg) {} PriestBossFastWarpMove::~PriestBossFastWarpMove() = default; bool PriestBossFastWarpMove::init_(sead::Heap* heap) { - return PriestBossWarpOrVanish::init_(heap); + return PriestBossCloneFastWarp::init_(heap); } void PriestBossFastWarpMove::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossWarpOrVanish::enter_(params); + PriestBossCloneFastWarp::enter_(params); } void PriestBossFastWarpMove::leave_() { - PriestBossWarpOrVanish::leave_(); + PriestBossCloneFastWarp::leave_(); } void PriestBossFastWarpMove::loadParams_() { - PriestBossWarpOrVanish::loadParams_(); + PriestBossCloneFastWarp::loadParams_(); getStaticParam(&mAfterImage0AppearFrame_s, "AfterImage0AppearFrame"); getStaticParam(&mAfterImage1AppearFrame_s, "AfterImage1AppearFrame"); getStaticParam(&mAppearFrame_s, "AppearFrame"); @@ -33,7 +33,7 @@ void PriestBossFastWarpMove::loadParams_() { } void PriestBossFastWarpMove::calc_() { - PriestBossWarpOrVanish::calc_(); + PriestBossCloneFastWarp::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionPriestBossFastWarpMove.h b/src/Game/Actor/Action/actionPriestBossFastWarpMove.h index 7b3c9849..13411b58 100644 --- a/src/Game/Actor/Action/actionPriestBossFastWarpMove.h +++ b/src/Game/Actor/Action/actionPriestBossFastWarpMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionPriestBossWarpOrVanish.h" +#include "Game/Actor/Action/actionPriestBossCloneFastWarp.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PriestBossFastWarpMove : public PriestBossWarpOrVanish { - SEAD_RTTI_OVERRIDE(PriestBossFastWarpMove, PriestBossWarpOrVanish) +class PriestBossFastWarpMove : public PriestBossCloneFastWarp { + SEAD_RTTI_OVERRIDE(PriestBossFastWarpMove, PriestBossCloneFastWarp) public: explicit PriestBossFastWarpMove(const InitArg& arg); ~PriestBossFastWarpMove() override; diff --git a/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.cpp b/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.cpp index eac01493..ea5280f2 100644 --- a/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.cpp +++ b/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.cpp @@ -3,29 +3,29 @@ namespace uking::action { PriestBossShadowCloneVanish::PriestBossShadowCloneVanish(const InitArg& arg) - : PriestBossWarpOrVanish(arg) {} + : PriestBossCloneFastWarp(arg) {} PriestBossShadowCloneVanish::~PriestBossShadowCloneVanish() = default; bool PriestBossShadowCloneVanish::init_(sead::Heap* heap) { - return PriestBossWarpOrVanish::init_(heap); + return PriestBossCloneFastWarp::init_(heap); } void PriestBossShadowCloneVanish::enter_(ksys::act::ai::InlineParamPack* params) { - PriestBossWarpOrVanish::enter_(params); + PriestBossCloneFastWarp::enter_(params); } void PriestBossShadowCloneVanish::leave_() { - PriestBossWarpOrVanish::leave_(); + PriestBossCloneFastWarp::leave_(); } void PriestBossShadowCloneVanish::loadParams_() { - PriestBossWarpOrVanish::loadParams_(); + PriestBossCloneFastWarp::loadParams_(); getStaticParam(&mDelayFrames_s, "DelayFrames"); } void PriestBossShadowCloneVanish::calc_() { - PriestBossWarpOrVanish::calc_(); + PriestBossCloneFastWarp::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.h b/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.h index 7a9f7095..1c23f087 100644 --- a/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.h +++ b/src/Game/Actor/Action/actionPriestBossShadowCloneVanish.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionPriestBossWarpOrVanish.h" +#include "Game/Actor/Action/actionPriestBossCloneFastWarp.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PriestBossShadowCloneVanish : public PriestBossWarpOrVanish { - SEAD_RTTI_OVERRIDE(PriestBossShadowCloneVanish, PriestBossWarpOrVanish) +class PriestBossShadowCloneVanish : public PriestBossCloneFastWarp { + SEAD_RTTI_OVERRIDE(PriestBossShadowCloneVanish, PriestBossCloneFastWarp) public: explicit PriestBossShadowCloneVanish(const InitArg& arg); ~PriestBossShadowCloneVanish() override; diff --git a/src/Game/Actor/Action/actionPriestBossWarpOrVanish.cpp b/src/Game/Actor/Action/actionPriestBossWarpOrVanish.cpp deleted file mode 100644 index 38e642fd..00000000 --- a/src/Game/Actor/Action/actionPriestBossWarpOrVanish.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionPriestBossWarpOrVanish.h" - -namespace uking::action { - -PriestBossWarpOrVanish::PriestBossWarpOrVanish(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -PriestBossWarpOrVanish::~PriestBossWarpOrVanish() = default; - -bool PriestBossWarpOrVanish::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void PriestBossWarpOrVanish::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void PriestBossWarpOrVanish::leave_() { - ksys::act::ai::Action::leave_(); -} - -void PriestBossWarpOrVanish::loadParams_() { - getAITreeVariable(&mPriestBossMetaAIUnit_a, "PriestBossMetaAIUnit"); -} - -void PriestBossWarpOrVanish::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionRotateTurnToTarget.cpp b/src/Game/Actor/Action/actionRotateTurnToTarget.cpp deleted file mode 100644 index 9ad46c3a..00000000 --- a/src/Game/Actor/Action/actionRotateTurnToTarget.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "Game/Actor/Action/actionRotateTurnToTarget.h" - -namespace uking::action { - -RotateTurnToTarget::RotateTurnToTarget(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -RotateTurnToTarget::~RotateTurnToTarget() = default; - -bool RotateTurnToTarget::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void RotateTurnToTarget::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void RotateTurnToTarget::leave_() { - ksys::act::ai::Action::leave_(); -} - -void RotateTurnToTarget::loadParams_() { - getStaticParam(&mAngSpd_s, "AngSpd"); - getStaticParam(&mIsJumpType_s, "IsJumpType"); - getStaticParam(&mASName_s, "ASName"); - getDynamicParam(&mTargetPos_d, "TargetPos"); - getStaticParam(&mIsChangeable_s, "IsChangeable"); -} - -void RotateTurnToTarget::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSandwormTackleMove.cpp b/src/Game/Actor/Action/actionSandwormTackleMove.cpp index 4bf66f33..fe3f019a 100644 --- a/src/Game/Actor/Action/actionSandwormTackleMove.cpp +++ b/src/Game/Actor/Action/actionSandwormTackleMove.cpp @@ -2,24 +2,24 @@ namespace uking::action { -SandwormTackleMove::SandwormTackleMove(const InitArg& arg) : AtkTackleMove(arg) {} +SandwormTackleMove::SandwormTackleMove(const InitArg& arg) : TackleAttack(arg) {} SandwormTackleMove::~SandwormTackleMove() = default; bool SandwormTackleMove::init_(sead::Heap* heap) { - return AtkTackleMove::init_(heap); + return TackleAttack::init_(heap); } void SandwormTackleMove::enter_(ksys::act::ai::InlineParamPack* params) { - AtkTackleMove::enter_(params); + TackleAttack::enter_(params); } void SandwormTackleMove::leave_() { - AtkTackleMove::leave_(); + TackleAttack::leave_(); } void SandwormTackleMove::loadParams_() { - AtkTackleMove::loadParams_(); + TackleAttack::loadParams_(); getStaticParam(&mTargetSandOffset_s, "TargetSandOffset"); getStaticParam(&mSandOffsetSpeed_s, "SandOffsetSpeed"); getStaticParam(&mEatRadius_s, "EatRadius"); @@ -28,7 +28,7 @@ void SandwormTackleMove::loadParams_() { } void SandwormTackleMove::calc_() { - AtkTackleMove::calc_(); + TackleAttack::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSandwormTackleMove.h b/src/Game/Actor/Action/actionSandwormTackleMove.h index 80d1f00d..3c1e0c11 100644 --- a/src/Game/Actor/Action/actionSandwormTackleMove.h +++ b/src/Game/Actor/Action/actionSandwormTackleMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionAtkTackleMove.h" +#include "Game/Actor/Action/actionTackleAttack.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SandwormTackleMove : public AtkTackleMove { - SEAD_RTTI_OVERRIDE(SandwormTackleMove, AtkTackleMove) +class SandwormTackleMove : public TackleAttack { + SEAD_RTTI_OVERRIDE(SandwormTackleMove, TackleAttack) public: explicit SandwormTackleMove(const InitArg& arg); ~SandwormTackleMove() override; diff --git a/src/Game/Actor/Action/actionSetFlag.cpp b/src/Game/Actor/Action/actionSetFlag.cpp new file mode 100644 index 00000000..f17943c4 --- /dev/null +++ b/src/Game/Actor/Action/actionSetFlag.cpp @@ -0,0 +1,15 @@ +#include "Game/Actor/Action/actionSetFlag.h" + +namespace uking::action { + +SetFlag::SetFlag(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +SetFlag::~SetFlag() = default; + +bool SetFlag::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void SetFlag::loadParams_() {} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSetGetFlagBase.h b/src/Game/Actor/Action/actionSetFlag.h similarity index 52% rename from src/Game/Actor/Action/actionSetGetFlagBase.h rename to src/Game/Actor/Action/actionSetFlag.h index 21594d79..d9d45a61 100644 --- a/src/Game/Actor/Action/actionSetGetFlagBase.h +++ b/src/Game/Actor/Action/actionSetFlag.h @@ -4,11 +4,11 @@ namespace uking::action { -class SetGetFlagBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SetGetFlagBase, ksys::act::ai::Action) +class SetFlag : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(SetFlag, ksys::act::ai::Action) public: - explicit SetGetFlagBase(const InitArg& arg); - ~SetGetFlagBase() override; + explicit SetFlag(const InitArg& arg); + ~SetFlag() override; bool init_(sead::Heap* heap) override; void loadParams_() override; diff --git a/src/Game/Actor/Action/actionSetGetFlag.cpp b/src/Game/Actor/Action/actionSetGetFlag.cpp index e9cef83d..32badf77 100644 --- a/src/Game/Actor/Action/actionSetGetFlag.cpp +++ b/src/Game/Actor/Action/actionSetGetFlag.cpp @@ -2,16 +2,16 @@ namespace uking::action { -SetGetFlag::SetGetFlag(const InitArg& arg) : SetGetFlagBase(arg) {} +SetGetFlag::SetGetFlag(const InitArg& arg) : SetFlag(arg) {} SetGetFlag::~SetGetFlag() = default; bool SetGetFlag::init_(sead::Heap* heap) { - return SetGetFlagBase::init_(heap); + return SetFlag::init_(heap); } void SetGetFlag::loadParams_() { - SetGetFlagBase::loadParams_(); + SetFlag::loadParams_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSetGetFlag.h b/src/Game/Actor/Action/actionSetGetFlag.h index bb45ac0c..41a74463 100644 --- a/src/Game/Actor/Action/actionSetGetFlag.h +++ b/src/Game/Actor/Action/actionSetGetFlag.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSetGetFlagBase.h" +#include "Game/Actor/Action/actionSetFlag.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SetGetFlag : public SetGetFlagBase { - SEAD_RTTI_OVERRIDE(SetGetFlag, SetGetFlagBase) +class SetGetFlag : public SetFlag { + SEAD_RTTI_OVERRIDE(SetGetFlag, SetFlag) public: explicit SetGetFlag(const InitArg& arg); ~SetGetFlag() override; diff --git a/src/Game/Actor/Action/actionSetGetFlagBase.cpp b/src/Game/Actor/Action/actionSetGetFlagBase.cpp deleted file mode 100644 index c96e3333..00000000 --- a/src/Game/Actor/Action/actionSetGetFlagBase.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "Game/Actor/Action/actionSetGetFlagBase.h" - -namespace uking::action { - -SetGetFlagBase::SetGetFlagBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -SetGetFlagBase::~SetGetFlagBase() = default; - -bool SetGetFlagBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SetGetFlagBase::loadParams_() {} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSetGetFlagByActorName.cpp b/src/Game/Actor/Action/actionSetGetFlagByActorName.cpp index 622e4b99..728faf0a 100644 --- a/src/Game/Actor/Action/actionSetGetFlagByActorName.cpp +++ b/src/Game/Actor/Action/actionSetGetFlagByActorName.cpp @@ -2,16 +2,16 @@ namespace uking::action { -SetGetFlagByActorName::SetGetFlagByActorName(const InitArg& arg) : SetGetFlagBase(arg) {} +SetGetFlagByActorName::SetGetFlagByActorName(const InitArg& arg) : SetFlag(arg) {} SetGetFlagByActorName::~SetGetFlagByActorName() = default; bool SetGetFlagByActorName::init_(sead::Heap* heap) { - return SetGetFlagBase::init_(heap); + return SetFlag::init_(heap); } void SetGetFlagByActorName::loadParams_() { - SetGetFlagBase::loadParams_(); + SetFlag::loadParams_(); getDynamicParam(&mActorName_d, "ActorName"); } diff --git a/src/Game/Actor/Action/actionSetGetFlagByActorName.h b/src/Game/Actor/Action/actionSetGetFlagByActorName.h index cd0cfbcd..ae5edc22 100644 --- a/src/Game/Actor/Action/actionSetGetFlagByActorName.h +++ b/src/Game/Actor/Action/actionSetGetFlagByActorName.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSetGetFlagBase.h" +#include "Game/Actor/Action/actionSetFlag.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SetGetFlagByActorName : public SetGetFlagBase { - SEAD_RTTI_OVERRIDE(SetGetFlagByActorName, SetGetFlagBase) +class SetGetFlagByActorName : public SetFlag { + SEAD_RTTI_OVERRIDE(SetGetFlagByActorName, SetFlag) public: explicit SetGetFlagByActorName(const InitArg& arg); ~SetGetFlagByActorName() override; diff --git a/src/Game/Actor/Action/actionSimpleMessageDialogCtrl.cpp b/src/Game/Actor/Action/actionSimpleMessageDialogCtrl.cpp deleted file mode 100644 index 0b998b67..00000000 --- a/src/Game/Actor/Action/actionSimpleMessageDialogCtrl.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionSimpleMessageDialogCtrl.h" - -namespace uking::action { - -SimpleMessageDialogCtrl::SimpleMessageDialogCtrl(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -SimpleMessageDialogCtrl::~SimpleMessageDialogCtrl() = default; - -bool SimpleMessageDialogCtrl::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void SimpleMessageDialogCtrl::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void SimpleMessageDialogCtrl::leave_() { - ksys::act::ai::Action::leave_(); -} - -void SimpleMessageDialogCtrl::loadParams_() { - getAITreeVariable(&mSimpleDialogUnit_a, "SimpleDialogUnit"); -} - -void SimpleMessageDialogCtrl::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossBlowOff.cpp b/src/Game/Actor/Action/actionSiteBossBlowOff.cpp deleted file mode 100644 index 13032913..00000000 --- a/src/Game/Actor/Action/actionSiteBossBlowOff.cpp +++ /dev/null @@ -1,29 +0,0 @@ -#include "Game/Actor/Action/actionSiteBossBlowOff.h" - -namespace uking::action { - -SiteBossBlowOff::SiteBossBlowOff(const InitArg& arg) : BlownOff(arg) {} - -SiteBossBlowOff::~SiteBossBlowOff() = default; - -bool SiteBossBlowOff::init_(sead::Heap* heap) { - return BlownOff::init_(heap); -} - -void SiteBossBlowOff::enter_(ksys::act::ai::InlineParamPack* params) { - BlownOff::enter_(params); -} - -void SiteBossBlowOff::leave_() { - BlownOff::leave_(); -} - -void SiteBossBlowOff::loadParams_() { - BlownOff::loadParams_(); -} - -void SiteBossBlowOff::calc_() { - BlownOff::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossBowBlowOff.cpp b/src/Game/Actor/Action/actionSiteBossBowBlowOff.cpp index f562448f..eb716911 100644 --- a/src/Game/Actor/Action/actionSiteBossBowBlowOff.cpp +++ b/src/Game/Actor/Action/actionSiteBossBowBlowOff.cpp @@ -2,24 +2,24 @@ namespace uking::action { -SiteBossBowBlowOff::SiteBossBowBlowOff(const InitArg& arg) : SiteBossBlowOff(arg) {} +SiteBossBowBlowOff::SiteBossBowBlowOff(const InitArg& arg) : LastBossBlowOff(arg) {} SiteBossBowBlowOff::~SiteBossBowBlowOff() = default; bool SiteBossBowBlowOff::init_(sead::Heap* heap) { - return SiteBossBlowOff::init_(heap); + return LastBossBlowOff::init_(heap); } void SiteBossBowBlowOff::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossBlowOff::enter_(params); + LastBossBlowOff::enter_(params); } void SiteBossBowBlowOff::leave_() { - SiteBossBlowOff::leave_(); + LastBossBlowOff::leave_(); } void SiteBossBowBlowOff::loadParams_() { - SiteBossBlowOff::loadParams_(); + LastBossBlowOff::loadParams_(); getStaticParam(&mAddForceRecoverTime_s, "AddForceRecoverTime"); getStaticParam(&mIsRemoveCharacterController_s, "IsRemoveCharacterController"); getStaticParam(&mForceRecoverDist_s, "ForceRecoverDist"); @@ -27,7 +27,7 @@ void SiteBossBowBlowOff::loadParams_() { } void SiteBossBowBlowOff::calc_() { - SiteBossBlowOff::calc_(); + LastBossBlowOff::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossBowBlowOff.h b/src/Game/Actor/Action/actionSiteBossBowBlowOff.h index b0a4c1a8..d81df4b0 100644 --- a/src/Game/Actor/Action/actionSiteBossBowBlowOff.h +++ b/src/Game/Actor/Action/actionSiteBossBowBlowOff.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSiteBossBlowOff.h" +#include "Game/Actor/Action/actionLastBossBlowOff.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SiteBossBowBlowOff : public SiteBossBlowOff { - SEAD_RTTI_OVERRIDE(SiteBossBowBlowOff, SiteBossBlowOff) +class SiteBossBowBlowOff : public LastBossBlowOff { + SEAD_RTTI_OVERRIDE(SiteBossBowBlowOff, LastBossBlowOff) public: explicit SiteBossBowBlowOff(const InitArg& arg); ~SiteBossBowBlowOff() override; diff --git a/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.cpp b/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.cpp index bbaffb5b..c47b813d 100644 --- a/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.cpp +++ b/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.cpp @@ -3,24 +3,24 @@ namespace uking::action { SiteBossLswordAtkWithChemical::SiteBossLswordAtkWithChemical(const InitArg& arg) - : SiteBossLswordAtk(arg) {} + : SiteBossLswordAttack(arg) {} SiteBossLswordAtkWithChemical::~SiteBossLswordAtkWithChemical() = default; bool SiteBossLswordAtkWithChemical::init_(sead::Heap* heap) { - return SiteBossLswordAtk::init_(heap); + return SiteBossLswordAttack::init_(heap); } void SiteBossLswordAtkWithChemical::enter_(ksys::act::ai::InlineParamPack* params) { - SiteBossLswordAtk::enter_(params); + SiteBossLswordAttack::enter_(params); } void SiteBossLswordAtkWithChemical::leave_() { - SiteBossLswordAtk::leave_(); + SiteBossLswordAttack::leave_(); } void SiteBossLswordAtkWithChemical::loadParams_() { - SiteBossLswordAtk::loadParams_(); + SiteBossLswordAttack::loadParams_(); getStaticParam(&mEmitNum_s, "EmitNum"); getStaticParam(&mEmitInterval_s, "EmitInterval"); getStaticParam(&mEmitAttackDamage_s, "EmitAttackDamage"); @@ -41,7 +41,7 @@ void SiteBossLswordAtkWithChemical::loadParams_() { } void SiteBossLswordAtkWithChemical::calc_() { - SiteBossLswordAtk::calc_(); + SiteBossLswordAttack::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.h b/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.h index cfd080b6..16178fba 100644 --- a/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.h +++ b/src/Game/Actor/Action/actionSiteBossLswordAtkWithChemical.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionSiteBossLswordAtk.h" +#include "Game/Actor/Action/actionSiteBossLswordAttack.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class SiteBossLswordAtkWithChemical : public SiteBossLswordAtk { - SEAD_RTTI_OVERRIDE(SiteBossLswordAtkWithChemical, SiteBossLswordAtk) +class SiteBossLswordAtkWithChemical : public SiteBossLswordAttack { + SEAD_RTTI_OVERRIDE(SiteBossLswordAtkWithChemical, SiteBossLswordAttack) public: explicit SiteBossLswordAtkWithChemical(const InitArg& arg); ~SiteBossLswordAtkWithChemical() override; diff --git a/src/Game/Actor/Action/actionSiteBossLswordAtk.cpp b/src/Game/Actor/Action/actionSiteBossLswordAttack.cpp similarity index 71% rename from src/Game/Actor/Action/actionSiteBossLswordAtk.cpp rename to src/Game/Actor/Action/actionSiteBossLswordAttack.cpp index b39ae75f..e00e7d9d 100644 --- a/src/Game/Actor/Action/actionSiteBossLswordAtk.cpp +++ b/src/Game/Actor/Action/actionSiteBossLswordAttack.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionSiteBossLswordAtk.h" +#include "Game/Actor/Action/actionSiteBossLswordAttack.h" namespace uking::action { -SiteBossLswordAtk::SiteBossLswordAtk(const InitArg& arg) : ksys::act::ai::Action(arg) {} +SiteBossLswordAttack::SiteBossLswordAttack(const InitArg& arg) : ksys::act::ai::Action(arg) {} -SiteBossLswordAtk::~SiteBossLswordAtk() = default; +SiteBossLswordAttack::~SiteBossLswordAttack() = default; -bool SiteBossLswordAtk::init_(sead::Heap* heap) { +bool SiteBossLswordAttack::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void SiteBossLswordAtk::enter_(ksys::act::ai::InlineParamPack* params) { +void SiteBossLswordAttack::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void SiteBossLswordAtk::leave_() { +void SiteBossLswordAttack::leave_() { ksys::act::ai::Action::leave_(); } -void SiteBossLswordAtk::loadParams_() { +void SiteBossLswordAttack::loadParams_() { getStaticParam(&mAtMinDamage_s, "AtMinDamage"); getStaticParam(&mAttackPower_s, "AttackPower"); getStaticParam(&mAddAttackPower_s, "AddAttackPower"); @@ -38,7 +38,7 @@ void SiteBossLswordAtk::loadParams_() { getDynamicParam(&mTargetPos_d, "TargetPos"); } -void SiteBossLswordAtk::calc_() { +void SiteBossLswordAttack::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionSiteBossLswordAtk.h b/src/Game/Actor/Action/actionSiteBossLswordAttack.h similarity index 87% rename from src/Game/Actor/Action/actionSiteBossLswordAtk.h rename to src/Game/Actor/Action/actionSiteBossLswordAttack.h index b9bca3b7..15caae2d 100644 --- a/src/Game/Actor/Action/actionSiteBossLswordAtk.h +++ b/src/Game/Actor/Action/actionSiteBossLswordAttack.h @@ -4,11 +4,11 @@ namespace uking::action { -class SiteBossLswordAtk : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(SiteBossLswordAtk, ksys::act::ai::Action) +class SiteBossLswordAttack : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(SiteBossLswordAttack, ksys::act::ai::Action) public: - explicit SiteBossLswordAtk(const InitArg& arg); - ~SiteBossLswordAtk() override; + explicit SiteBossLswordAttack(const InitArg& arg); + ~SiteBossLswordAttack() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionStopOnObj.cpp b/src/Game/Actor/Action/actionStopOnObj.cpp new file mode 100644 index 00000000..489ad1b1 --- /dev/null +++ b/src/Game/Actor/Action/actionStopOnObj.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionStopOnObj.h" + +namespace uking::action { + +StopOnObj::StopOnObj(const InitArg& arg) : ksys::act::ai::Action(arg) {} + +StopOnObj::~StopOnObj() = default; + +bool StopOnObj::init_(sead::Heap* heap) { + return ksys::act::ai::Action::init_(heap); +} + +void StopOnObj::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Action::enter_(params); +} + +void StopOnObj::leave_() { + ksys::act::ai::Action::leave_(); +} + +void StopOnObj::loadParams_() { + getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); + getStaticParam(&mRotReduceRatio_s, "RotReduceRatio"); +} + +void StopOnObj::calc_() { + ksys::act::ai::Action::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionWaitOnObjBase.h b/src/Game/Actor/Action/actionStopOnObj.h similarity index 71% rename from src/Game/Actor/Action/actionWaitOnObjBase.h rename to src/Game/Actor/Action/actionStopOnObj.h index 59419f64..ef527f31 100644 --- a/src/Game/Actor/Action/actionWaitOnObjBase.h +++ b/src/Game/Actor/Action/actionStopOnObj.h @@ -4,11 +4,11 @@ namespace uking::action { -class WaitOnObjBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(WaitOnObjBase, ksys::act::ai::Action) +class StopOnObj : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(StopOnObj, ksys::act::ai::Action) public: - explicit WaitOnObjBase(const InitArg& arg); - ~WaitOnObjBase() override; + explicit StopOnObj(const InitArg& arg); + ~StopOnObj() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionTackleAttack.cpp b/src/Game/Actor/Action/actionTackleAttack.cpp new file mode 100644 index 00000000..998b34df --- /dev/null +++ b/src/Game/Actor/Action/actionTackleAttack.cpp @@ -0,0 +1,30 @@ +#include "Game/Actor/Action/actionTackleAttack.h" + +namespace uking::action { + +TackleAttack::TackleAttack(const InitArg& arg) : TackleMove(arg) {} + +TackleAttack::~TackleAttack() = default; + +bool TackleAttack::init_(sead::Heap* heap) { + return TackleMove::init_(heap); +} + +void TackleAttack::enter_(ksys::act::ai::InlineParamPack* params) { + TackleMove::enter_(params); +} + +void TackleAttack::leave_() { + TackleMove::leave_(); +} + +void TackleAttack::loadParams_() { + TackleMove::loadParams_(); + getStaticParam(&mAtkSensorName_s, "AtkSensorName"); +} + +void TackleAttack::calc_() { + TackleMove::calc_(); +} + +} // namespace uking::action diff --git a/src/Game/Actor/Action/actionAtkTackleMove.h b/src/Game/Actor/Action/actionTackleAttack.h similarity index 73% rename from src/Game/Actor/Action/actionAtkTackleMove.h rename to src/Game/Actor/Action/actionTackleAttack.h index d2e97c1d..1de916ab 100644 --- a/src/Game/Actor/Action/actionAtkTackleMove.h +++ b/src/Game/Actor/Action/actionTackleAttack.h @@ -5,11 +5,11 @@ namespace uking::action { -class AtkTackleMove : public TackleMove { - SEAD_RTTI_OVERRIDE(AtkTackleMove, TackleMove) +class TackleAttack : public TackleMove { + SEAD_RTTI_OVERRIDE(TackleAttack, TackleMove) public: - explicit AtkTackleMove(const InitArg& arg); - ~AtkTackleMove() override; + explicit TackleAttack(const InitArg& arg); + ~TackleAttack() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionTurnAndChargeAndShoot.cpp b/src/Game/Actor/Action/actionTurnAndChargeAndShoot.cpp index c331414f..0bc17296 100644 --- a/src/Game/Actor/Action/actionTurnAndChargeAndShoot.cpp +++ b/src/Game/Actor/Action/actionTurnAndChargeAndShoot.cpp @@ -2,29 +2,29 @@ namespace uking::action { -TurnAndChargeAndShoot::TurnAndChargeAndShoot(const InitArg& arg) : ChargeAndShoot(arg) {} +TurnAndChargeAndShoot::TurnAndChargeAndShoot(const InitArg& arg) : ArrowChargeAndShoot(arg) {} TurnAndChargeAndShoot::~TurnAndChargeAndShoot() = default; bool TurnAndChargeAndShoot::init_(sead::Heap* heap) { - return ChargeAndShoot::init_(heap); + return ArrowChargeAndShoot::init_(heap); } void TurnAndChargeAndShoot::enter_(ksys::act::ai::InlineParamPack* params) { - ChargeAndShoot::enter_(params); + ArrowChargeAndShoot::enter_(params); } void TurnAndChargeAndShoot::leave_() { - ChargeAndShoot::leave_(); + ArrowChargeAndShoot::leave_(); } void TurnAndChargeAndShoot::loadParams_() { - ChargeAndShoot::loadParams_(); + ArrowChargeAndShoot::loadParams_(); getStaticParam(&mRotSpeed_s, "RotSpeed"); } void TurnAndChargeAndShoot::calc_() { - ChargeAndShoot::calc_(); + ArrowChargeAndShoot::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionTurnAndChargeAndShoot.h b/src/Game/Actor/Action/actionTurnAndChargeAndShoot.h index f9d99439..15e5e416 100644 --- a/src/Game/Actor/Action/actionTurnAndChargeAndShoot.h +++ b/src/Game/Actor/Action/actionTurnAndChargeAndShoot.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChargeAndShoot.h" +#include "Game/Actor/Action/actionArrowChargeAndShoot.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class TurnAndChargeAndShoot : public ChargeAndShoot { - SEAD_RTTI_OVERRIDE(TurnAndChargeAndShoot, ChargeAndShoot) +class TurnAndChargeAndShoot : public ArrowChargeAndShoot { + SEAD_RTTI_OVERRIDE(TurnAndChargeAndShoot, ArrowChargeAndShoot) public: explicit TurnAndChargeAndShoot(const InitArg& arg); ~TurnAndChargeAndShoot() override; diff --git a/src/Game/Actor/Action/actionWaitOnObj.cpp b/src/Game/Actor/Action/actionWaitOnObj.cpp index 734256c4..dea1bce1 100644 --- a/src/Game/Actor/Action/actionWaitOnObj.cpp +++ b/src/Game/Actor/Action/actionWaitOnObj.cpp @@ -2,31 +2,31 @@ namespace uking::action { -WaitOnObj::WaitOnObj(const InitArg& arg) : WaitOnObjBase(arg) {} +WaitOnObj::WaitOnObj(const InitArg& arg) : StopOnObj(arg) {} WaitOnObj::~WaitOnObj() = default; bool WaitOnObj::init_(sead::Heap* heap) { - return WaitOnObjBase::init_(heap); + return StopOnObj::init_(heap); } void WaitOnObj::enter_(ksys::act::ai::InlineParamPack* params) { - WaitOnObjBase::enter_(params); + StopOnObj::enter_(params); } void WaitOnObj::leave_() { - WaitOnObjBase::leave_(); + StopOnObj::leave_(); } void WaitOnObj::loadParams_() { - WaitOnObjBase::loadParams_(); + StopOnObj::loadParams_(); getStaticParam(&mTime_s, "Time"); getStaticParam(&mTimeRand_s, "TimeRand"); getStaticParam(&mASName_s, "ASName"); } void WaitOnObj::calc_() { - WaitOnObjBase::calc_(); + StopOnObj::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWaitOnObj.h b/src/Game/Actor/Action/actionWaitOnObj.h index 83292984..fcff5cab 100644 --- a/src/Game/Actor/Action/actionWaitOnObj.h +++ b/src/Game/Actor/Action/actionWaitOnObj.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWaitOnObjBase.h" +#include "Game/Actor/Action/actionStopOnObj.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WaitOnObj : public WaitOnObjBase { - SEAD_RTTI_OVERRIDE(WaitOnObj, WaitOnObjBase) +class WaitOnObj : public StopOnObj { + SEAD_RTTI_OVERRIDE(WaitOnObj, StopOnObj) public: explicit WaitOnObj(const InitArg& arg); ~WaitOnObj() override; diff --git a/src/Game/Actor/Action/actionWaitOnObjBase.cpp b/src/Game/Actor/Action/actionWaitOnObjBase.cpp deleted file mode 100644 index 305dc859..00000000 --- a/src/Game/Actor/Action/actionWaitOnObjBase.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Game/Actor/Action/actionWaitOnObjBase.h" - -namespace uking::action { - -WaitOnObjBase::WaitOnObjBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} - -WaitOnObjBase::~WaitOnObjBase() = default; - -bool WaitOnObjBase::init_(sead::Heap* heap) { - return ksys::act::ai::Action::init_(heap); -} - -void WaitOnObjBase::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Action::enter_(params); -} - -void WaitOnObjBase::leave_() { - ksys::act::ai::Action::leave_(); -} - -void WaitOnObjBase::loadParams_() { - getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); - getStaticParam(&mRotReduceRatio_s, "RotReduceRatio"); -} - -void WaitOnObjBase::calc_() { - ksys::act::ai::Action::calc_(); -} - -} // namespace uking::action diff --git a/src/Game/Actor/Action/actionWaterUpDownMoveBase.cpp b/src/Game/Actor/Action/actionWaterDepthMoveBase.cpp similarity index 58% rename from src/Game/Actor/Action/actionWaterUpDownMoveBase.cpp rename to src/Game/Actor/Action/actionWaterDepthMoveBase.cpp index c48c6d05..7b368c71 100644 --- a/src/Game/Actor/Action/actionWaterUpDownMoveBase.cpp +++ b/src/Game/Actor/Action/actionWaterDepthMoveBase.cpp @@ -1,24 +1,24 @@ -#include "Game/Actor/Action/actionWaterUpDownMoveBase.h" +#include "Game/Actor/Action/actionWaterDepthMoveBase.h" namespace uking::action { -WaterUpDownMoveBase::WaterUpDownMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} +WaterDepthMoveBase::WaterDepthMoveBase(const InitArg& arg) : ksys::act::ai::Action(arg) {} -WaterUpDownMoveBase::~WaterUpDownMoveBase() = default; +WaterDepthMoveBase::~WaterDepthMoveBase() = default; -bool WaterUpDownMoveBase::init_(sead::Heap* heap) { +bool WaterDepthMoveBase::init_(sead::Heap* heap) { return ksys::act::ai::Action::init_(heap); } -void WaterUpDownMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { +void WaterDepthMoveBase::enter_(ksys::act::ai::InlineParamPack* params) { ksys::act::ai::Action::enter_(params); } -void WaterUpDownMoveBase::leave_() { +void WaterDepthMoveBase::leave_() { ksys::act::ai::Action::leave_(); } -void WaterUpDownMoveBase::loadParams_() { +void WaterDepthMoveBase::loadParams_() { getStaticParam(&mInWaterDepth_s, "InWaterDepth"); getStaticParam(&mPosReduceRatio_s, "PosReduceRatio"); getStaticParam(&mRotReduceRatio_s, "RotReduceRatio"); @@ -28,7 +28,7 @@ void WaterUpDownMoveBase::loadParams_() { getStaticParam(&mASName_s, "ASName"); } -void WaterUpDownMoveBase::calc_() { +void WaterDepthMoveBase::calc_() { ksys::act::ai::Action::calc_(); } diff --git a/src/Game/Actor/Action/actionWaterUpDownMoveBase.h b/src/Game/Actor/Action/actionWaterDepthMoveBase.h similarity index 79% rename from src/Game/Actor/Action/actionWaterUpDownMoveBase.h rename to src/Game/Actor/Action/actionWaterDepthMoveBase.h index 7980a5dc..e71d0e44 100644 --- a/src/Game/Actor/Action/actionWaterUpDownMoveBase.h +++ b/src/Game/Actor/Action/actionWaterDepthMoveBase.h @@ -4,11 +4,11 @@ namespace uking::action { -class WaterUpDownMoveBase : public ksys::act::ai::Action { - SEAD_RTTI_OVERRIDE(WaterUpDownMoveBase, ksys::act::ai::Action) +class WaterDepthMoveBase : public ksys::act::ai::Action { + SEAD_RTTI_OVERRIDE(WaterDepthMoveBase, ksys::act::ai::Action) public: - explicit WaterUpDownMoveBase(const InitArg& arg); - ~WaterUpDownMoveBase() override; + explicit WaterDepthMoveBase(const InitArg& arg); + ~WaterDepthMoveBase() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Action/actionWaterUpDownMove.cpp b/src/Game/Actor/Action/actionWaterUpDownMove.cpp index c88ca567..8613ab41 100644 --- a/src/Game/Actor/Action/actionWaterUpDownMove.cpp +++ b/src/Game/Actor/Action/actionWaterUpDownMove.cpp @@ -2,30 +2,30 @@ namespace uking::action { -WaterUpDownMove::WaterUpDownMove(const InitArg& arg) : WaterUpDownMoveBase(arg) {} +WaterUpDownMove::WaterUpDownMove(const InitArg& arg) : WaterDepthMoveBase(arg) {} WaterUpDownMove::~WaterUpDownMove() = default; bool WaterUpDownMove::init_(sead::Heap* heap) { - return WaterUpDownMoveBase::init_(heap); + return WaterDepthMoveBase::init_(heap); } void WaterUpDownMove::enter_(ksys::act::ai::InlineParamPack* params) { - WaterUpDownMoveBase::enter_(params); + WaterDepthMoveBase::enter_(params); } void WaterUpDownMove::leave_() { - WaterUpDownMoveBase::leave_(); + WaterDepthMoveBase::leave_(); } void WaterUpDownMove::loadParams_() { - WaterUpDownMoveBase::loadParams_(); + WaterDepthMoveBase::loadParams_(); getStaticParam(&mStartDepth_s, "StartDepth"); getStaticParam(&mTargetDepth_s, "TargetDepth"); } void WaterUpDownMove::calc_() { - WaterUpDownMoveBase::calc_(); + WaterDepthMoveBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWaterUpDownMove.h b/src/Game/Actor/Action/actionWaterUpDownMove.h index 3733633c..4bf11bb5 100644 --- a/src/Game/Actor/Action/actionWaterUpDownMove.h +++ b/src/Game/Actor/Action/actionWaterUpDownMove.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionWaterUpDownMoveBase.h" +#include "Game/Actor/Action/actionWaterDepthMoveBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WaterUpDownMove : public WaterUpDownMoveBase { - SEAD_RTTI_OVERRIDE(WaterUpDownMove, WaterUpDownMoveBase) +class WaterUpDownMove : public WaterDepthMoveBase { + SEAD_RTTI_OVERRIDE(WaterUpDownMove, WaterDepthMoveBase) public: explicit WaterUpDownMove(const InitArg& arg); ~WaterUpDownMove() override; diff --git a/src/Game/Actor/Action/actionWindCutter.cpp b/src/Game/Actor/Action/actionWindCutter.cpp index bed737ad..154c662a 100644 --- a/src/Game/Actor/Action/actionWindCutter.cpp +++ b/src/Game/Actor/Action/actionWindCutter.cpp @@ -2,24 +2,24 @@ namespace uking::action { -WindCutter::WindCutter(const InitArg& arg) : ChemicalAttack(arg) {} +WindCutter::WindCutter(const InitArg& arg) : EmitAttackBase(arg) {} WindCutter::~WindCutter() = default; bool WindCutter::init_(sead::Heap* heap) { - return ChemicalAttack::init_(heap); + return EmitAttackBase::init_(heap); } void WindCutter::enter_(ksys::act::ai::InlineParamPack* params) { - ChemicalAttack::enter_(params); + EmitAttackBase::enter_(params); } void WindCutter::leave_() { - ChemicalAttack::leave_(); + EmitAttackBase::leave_(); } void WindCutter::loadParams_() { - ChemicalAttack::loadParams_(); + EmitAttackBase::loadParams_(); getStaticParam(&mLevelAtkMult_s, "LevelAtkMult"); getStaticParam(&mLevelBaseScaleAdd_s, "LevelBaseScaleAdd"); getStaticParam(&mLevelRangeMult_s, "LevelRangeMult"); @@ -31,7 +31,7 @@ void WindCutter::loadParams_() { } void WindCutter::calc_() { - ChemicalAttack::calc_(); + EmitAttackBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Action/actionWindCutter.h b/src/Game/Actor/Action/actionWindCutter.h index 6ced6bec..641f3cfc 100644 --- a/src/Game/Actor/Action/actionWindCutter.h +++ b/src/Game/Actor/Action/actionWindCutter.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Action/actionChemicalAttack.h" +#include "Game/Actor/Action/actionEmitAttackBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class WindCutter : public ChemicalAttack { - SEAD_RTTI_OVERRIDE(WindCutter, ChemicalAttack) +class WindCutter : public EmitAttackBase { + SEAD_RTTI_OVERRIDE(WindCutter, EmitAttackBase) public: explicit WindCutter(const InitArg& arg); ~WindCutter() override; diff --git a/src/Game/Actor/Camera/Action/CMakeLists.txt b/src/Game/Actor/Camera/Action/CMakeLists.txt index 832d91e5..a09c8a2d 100644 --- a/src/Game/Actor/Camera/Action/CMakeLists.txt +++ b/src/Game/Actor/Camera/Action/CMakeLists.txt @@ -93,8 +93,8 @@ target_sources(uking PRIVATE actionCameraLockOn.h actionCameraLockOnAimingAt.cpp actionCameraLockOnAimingAt.h - actionCameraLockOnBase.cpp - actionCameraLockOnBase.h + actionCameraTrackBase.cpp + actionCameraTrackBase.h actionCameraMagneCatch.cpp actionCameraMagneCatch.h actionCameraMotorcycle.cpp diff --git a/src/Game/Actor/Camera/Action/actionCameraLockOn.cpp b/src/Game/Actor/Camera/Action/actionCameraLockOn.cpp index 9a3f90a2..c052f6a6 100644 --- a/src/Game/Actor/Camera/Action/actionCameraLockOn.cpp +++ b/src/Game/Actor/Camera/Action/actionCameraLockOn.cpp @@ -2,6 +2,6 @@ namespace uking::action { -CameraLockOn::CameraLockOn(const InitArg& arg) : CameraLockOnBase(arg) {} +CameraLockOn::CameraLockOn(const InitArg& arg) : CameraTrackBase(arg) {} } // namespace uking::action diff --git a/src/Game/Actor/Camera/Action/actionCameraLockOn.h b/src/Game/Actor/Camera/Action/actionCameraLockOn.h index 0f1c69c9..a9070521 100644 --- a/src/Game/Actor/Camera/Action/actionCameraLockOn.h +++ b/src/Game/Actor/Camera/Action/actionCameraLockOn.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Camera/Action/actionCameraLockOnBase.h" +#include "Game/Actor/Camera/Action/actionCameraTrackBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class CameraLockOn : public CameraLockOnBase { - SEAD_RTTI_OVERRIDE(CameraLockOn, CameraLockOnBase) +class CameraLockOn : public CameraTrackBase { + SEAD_RTTI_OVERRIDE(CameraLockOn, CameraTrackBase) public: explicit CameraLockOn(const InitArg& arg); diff --git a/src/Game/Actor/Camera/Action/actionCameraLockOnBase.cpp b/src/Game/Actor/Camera/Action/actionCameraLockOnBase.cpp deleted file mode 100644 index 11909364..00000000 --- a/src/Game/Actor/Camera/Action/actionCameraLockOnBase.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "Game/Actor/Camera/Action/actionCameraLockOnBase.h" - -namespace uking::action { - -CameraLockOnBase::CameraLockOnBase(const InitArg& arg) : CameraAction(arg) {} - -CameraLockOnBase::~CameraLockOnBase() = default; - -} // namespace uking::action diff --git a/src/Game/Actor/Camera/Action/actionCameraMagneCatch.cpp b/src/Game/Actor/Camera/Action/actionCameraMagneCatch.cpp index 7ebb1ca3..d7b5ea2b 100644 --- a/src/Game/Actor/Camera/Action/actionCameraMagneCatch.cpp +++ b/src/Game/Actor/Camera/Action/actionCameraMagneCatch.cpp @@ -2,7 +2,7 @@ namespace uking::action { -CameraMagneCatch::CameraMagneCatch(const InitArg& arg) : CameraLockOnBase(arg) {} +CameraMagneCatch::CameraMagneCatch(const InitArg& arg) : CameraTrackBase(arg) {} CameraMagneCatch::~CameraMagneCatch() = default; diff --git a/src/Game/Actor/Camera/Action/actionCameraMagneCatch.h b/src/Game/Actor/Camera/Action/actionCameraMagneCatch.h index 0e168b0a..dabca2b5 100644 --- a/src/Game/Actor/Camera/Action/actionCameraMagneCatch.h +++ b/src/Game/Actor/Camera/Action/actionCameraMagneCatch.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Camera/Action/actionCameraLockOnBase.h" +#include "Game/Actor/Camera/Action/actionCameraTrackBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class CameraMagneCatch : public CameraLockOnBase { - SEAD_RTTI_OVERRIDE(CameraMagneCatch, CameraLockOnBase) +class CameraMagneCatch : public CameraTrackBase { + SEAD_RTTI_OVERRIDE(CameraMagneCatch, CameraTrackBase) public: explicit CameraMagneCatch(const InitArg& arg); ~CameraMagneCatch() override; diff --git a/src/Game/Actor/Camera/Action/actionCameraTrackBase.cpp b/src/Game/Actor/Camera/Action/actionCameraTrackBase.cpp new file mode 100644 index 00000000..2d38286e --- /dev/null +++ b/src/Game/Actor/Camera/Action/actionCameraTrackBase.cpp @@ -0,0 +1,9 @@ +#include "Game/Actor/Camera/Action/actionCameraTrackBase.h" + +namespace uking::action { + +CameraTrackBase::CameraTrackBase(const InitArg& arg) : CameraAction(arg) {} + +CameraTrackBase::~CameraTrackBase() = default; + +} // namespace uking::action diff --git a/src/Game/Actor/Camera/Action/actionCameraLockOnBase.h b/src/Game/Actor/Camera/Action/actionCameraTrackBase.h similarity index 51% rename from src/Game/Actor/Camera/Action/actionCameraLockOnBase.h rename to src/Game/Actor/Camera/Action/actionCameraTrackBase.h index 3593930c..8880f9fc 100644 --- a/src/Game/Actor/Camera/Action/actionCameraLockOnBase.h +++ b/src/Game/Actor/Camera/Action/actionCameraTrackBase.h @@ -5,11 +5,11 @@ namespace uking::action { -class CameraLockOnBase : public CameraAction { - SEAD_RTTI_OVERRIDE(CameraLockOnBase, CameraAction) +class CameraTrackBase : public CameraAction { + SEAD_RTTI_OVERRIDE(CameraTrackBase, CameraAction) public: - explicit CameraLockOnBase(const InitArg& arg); - ~CameraLockOnBase() override; + explicit CameraTrackBase(const InitArg& arg); + ~CameraTrackBase() override; protected: }; diff --git a/src/Game/Actor/Horse/AI/CMakeLists.txt b/src/Game/Actor/Horse/AI/CMakeLists.txt index b579b09e..be696a44 100644 --- a/src/Game/Actor/Horse/AI/CMakeLists.txt +++ b/src/Game/Actor/Horse/AI/CMakeLists.txt @@ -17,10 +17,10 @@ target_sources(uking PRIVATE aiHorseRiddenByNPCBase.h aiHorseWanderAI.cpp aiHorseWanderAI.h - aiNonPlayerHorseRide.cpp - aiNonPlayerHorseRide.h aiRideHorseAI.cpp aiRideHorseAI.h + aiRideHorseNonPlayer.cpp + aiRideHorseNonPlayer.h aiWildHorseDefWanderAI.cpp aiWildHorseDefWanderAI.h ) diff --git a/src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.cpp b/src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.cpp deleted file mode 100644 index ba112e7f..00000000 --- a/src/Game/Actor/Horse/AI/aiNonPlayerHorseRide.cpp +++ /dev/null @@ -1,23 +0,0 @@ -#include "Game/Actor/Horse/AI/aiNonPlayerHorseRide.h" - -namespace uking::ai { - -NonPlayerHorseRide::NonPlayerHorseRide(const InitArg& arg) : ksys::act::ai::Ai(arg) {} - -NonPlayerHorseRide::~NonPlayerHorseRide() = default; - -bool NonPlayerHorseRide::init_(sead::Heap* heap) { - return ksys::act::ai::Ai::init_(heap); -} - -void NonPlayerHorseRide::enter_(ksys::act::ai::InlineParamPack* params) { - ksys::act::ai::Ai::enter_(params); -} - -void NonPlayerHorseRide::leave_() { - ksys::act::ai::Ai::leave_(); -} - -void NonPlayerHorseRide::loadParams_() {} - -} // namespace uking::ai diff --git a/src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.cpp b/src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.cpp new file mode 100644 index 00000000..fb4c7a4f --- /dev/null +++ b/src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.cpp @@ -0,0 +1,23 @@ +#include "Game/Actor/Horse/AI/aiRideHorseNonPlayer.h" + +namespace uking::ai { + +RideHorseNonPlayer::RideHorseNonPlayer(const InitArg& arg) : ksys::act::ai::Ai(arg) {} + +RideHorseNonPlayer::~RideHorseNonPlayer() = default; + +bool RideHorseNonPlayer::init_(sead::Heap* heap) { + return ksys::act::ai::Ai::init_(heap); +} + +void RideHorseNonPlayer::enter_(ksys::act::ai::InlineParamPack* params) { + ksys::act::ai::Ai::enter_(params); +} + +void RideHorseNonPlayer::leave_() { + ksys::act::ai::Ai::leave_(); +} + +void RideHorseNonPlayer::loadParams_() {} + +} // namespace uking::ai diff --git a/src/Game/Actor/AI/aiMotorcycleRootBase.h b/src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.h similarity index 59% rename from src/Game/Actor/AI/aiMotorcycleRootBase.h rename to src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.h index df034e61..d2122967 100644 --- a/src/Game/Actor/AI/aiMotorcycleRootBase.h +++ b/src/Game/Actor/Horse/AI/aiRideHorseNonPlayer.h @@ -4,11 +4,11 @@ namespace uking::ai { -class MotorcycleRootBase : public ksys::act::ai::Ai { - SEAD_RTTI_OVERRIDE(MotorcycleRootBase, ksys::act::ai::Ai) +class RideHorseNonPlayer : public ksys::act::ai::Ai { + SEAD_RTTI_OVERRIDE(RideHorseNonPlayer, ksys::act::ai::Ai) public: - explicit MotorcycleRootBase(const InitArg& arg); - ~MotorcycleRootBase() override; + explicit RideHorseNonPlayer(const InitArg& arg); + ~RideHorseNonPlayer() override; bool init_(sead::Heap* heap) override; void enter_(ksys::act::ai::InlineParamPack* params) override; diff --git a/src/Game/Actor/Player/Action/CMakeLists.txt b/src/Game/Actor/Player/Action/CMakeLists.txt index feb1cdce..21d13add 100644 --- a/src/Game/Actor/Player/Action/CMakeLists.txt +++ b/src/Game/Actor/Player/Action/CMakeLists.txt @@ -101,8 +101,8 @@ target_sources(uking PRIVATE actionPlayerForkDropWeaponWithSpeed.h actionPlayerFrontRoll.cpp actionPlayerFrontRoll.h - actionPlayerGlide.cpp - actionPlayerGlide.h + actionPlayerParashawlGlideBase.cpp + actionPlayerParashawlGlideBase.h actionPlayerGrabPut.cpp actionPlayerGrabPut.h actionPlayerGrabReady.cpp diff --git a/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.cpp b/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.cpp index 46139294..acd0d178 100644 --- a/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.cpp +++ b/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.cpp @@ -2,24 +2,24 @@ namespace uking::action { -PlayerKokkoGlide::PlayerKokkoGlide(const InitArg& arg) : PlayerGlide(arg) {} +PlayerKokkoGlide::PlayerKokkoGlide(const InitArg& arg) : PlayerParashawlGlideBase(arg) {} void PlayerKokkoGlide::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerGlide::enter_(params); + PlayerParashawlGlideBase::enter_(params); } void PlayerKokkoGlide::leave_() { - PlayerGlide::leave_(); + PlayerParashawlGlideBase::leave_(); } void PlayerKokkoGlide::loadParams_() { - PlayerGlide::loadParams_(); + PlayerParashawlGlideBase::loadParams_(); getStaticParam(&mEnergyGlide_s, "EnergyGlide"); getStaticParam(&mNoEnergyTime_s, "NoEnergyTime"); } void PlayerKokkoGlide::calc_() { - PlayerGlide::calc_(); + PlayerParashawlGlideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.h b/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.h index 12772cf0..2beb8d61 100644 --- a/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.h +++ b/src/Game/Actor/Player/Action/actionPlayerKokkoGlide.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Player/Action/actionPlayerGlide.h" +#include "Game/Actor/Player/Action/actionPlayerParashawlGlideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PlayerKokkoGlide : public PlayerGlide { - SEAD_RTTI_OVERRIDE(PlayerKokkoGlide, PlayerGlide) +class PlayerKokkoGlide : public PlayerParashawlGlideBase { + SEAD_RTTI_OVERRIDE(PlayerKokkoGlide, PlayerParashawlGlideBase) public: explicit PlayerKokkoGlide(const InitArg& arg); diff --git a/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.cpp b/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.cpp index 38d10f9a..6a45a2bf 100644 --- a/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.cpp +++ b/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.cpp @@ -2,24 +2,24 @@ namespace uking::action { -PlayerParashawlGlide::PlayerParashawlGlide(const InitArg& arg) : PlayerGlide(arg) {} +PlayerParashawlGlide::PlayerParashawlGlide(const InitArg& arg) : PlayerParashawlGlideBase(arg) {} void PlayerParashawlGlide::enter_(ksys::act::ai::InlineParamPack* params) { - PlayerGlide::enter_(params); + PlayerParashawlGlideBase::enter_(params); } void PlayerParashawlGlide::leave_() { - PlayerGlide::leave_(); + PlayerParashawlGlideBase::leave_(); } void PlayerParashawlGlide::loadParams_() { - PlayerGlide::loadParams_(); + PlayerParashawlGlideBase::loadParams_(); getStaticParam(&mEnergyGlide_s, "EnergyGlide"); getStaticParam(&mNoEnergyTime_s, "NoEnergyTime"); } void PlayerParashawlGlide::calc_() { - PlayerGlide::calc_(); + PlayerParashawlGlideBase::calc_(); } } // namespace uking::action diff --git a/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.h b/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.h index 4e84daf6..0cfd0925 100644 --- a/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.h +++ b/src/Game/Actor/Player/Action/actionPlayerParashawlGlide.h @@ -1,12 +1,12 @@ #pragma once -#include "Game/Actor/Player/Action/actionPlayerGlide.h" +#include "Game/Actor/Player/Action/actionPlayerParashawlGlideBase.h" #include "KingSystem/ActorSystem/actAiAction.h" namespace uking::action { -class PlayerParashawlGlide : public PlayerGlide { - SEAD_RTTI_OVERRIDE(PlayerParashawlGlide, PlayerGlide) +class PlayerParashawlGlide : public PlayerParashawlGlideBase { + SEAD_RTTI_OVERRIDE(PlayerParashawlGlide, PlayerParashawlGlideBase) public: explicit PlayerParashawlGlide(const InitArg& arg); diff --git a/src/Game/Actor/Player/Action/actionPlayerGlide.cpp b/src/Game/Actor/Player/Action/actionPlayerParashawlGlideBase.cpp similarity index 69% rename from src/Game/Actor/Player/Action/actionPlayerGlide.cpp rename to src/Game/Actor/Player/Action/actionPlayerParashawlGlideBase.cpp index 7a9ea78d..c5620c6b 100644 --- a/src/Game/Actor/Player/Action/actionPlayerGlide.cpp +++ b/src/Game/Actor/Player/Action/actionPlayerParashawlGlideBase.cpp @@ -1,18 +1,18 @@ -#include "Game/Actor/Player/Action/actionPlayerGlide.h" +#include "Game/Actor/Player/Action/actionPlayerParashawlGlideBase.h" namespace uking::action { -PlayerGlide::PlayerGlide(const InitArg& arg) : PlayerAction(arg) {} +PlayerParashawlGlideBase::PlayerParashawlGlideBase(const InitArg& arg) : PlayerAction(arg) {} -void PlayerGlide::enter_(ksys::act::ai::InlineParamPack* params) { +void PlayerParashawlGlideBase::enter_(ksys::act::ai::InlineParamPack* params) { PlayerAction::enter_(params); } -void PlayerGlide::leave_() { +void PlayerParashawlGlideBase::leave_() { PlayerAction::leave_(); } -void PlayerGlide::loadParams_() { +void PlayerParashawlGlideBase::loadParams_() { getStaticParam(&mGlideSpeedMax_s, "GlideSpeedMax"); getStaticParam(&mLv2GlideSpeedMax_s, "Lv2GlideSpeedMax"); getStaticParam(&mGlideBodyFrontX_s, "GlideBodyFrontX"); @@ -27,7 +27,7 @@ void PlayerGlide::loadParams_() { getStaticParam(&mGlideNoSideAngle_s, "GlideNoSideAngle"); } -void PlayerGlide::calc_() { +void PlayerParashawlGlideBase::calc_() { PlayerAction::calc_(); } diff --git a/src/Game/Actor/Player/Action/actionPlayerGlide.h b/src/Game/Actor/Player/Action/actionPlayerParashawlGlideBase.h similarity index 87% rename from src/Game/Actor/Player/Action/actionPlayerGlide.h rename to src/Game/Actor/Player/Action/actionPlayerParashawlGlideBase.h index 58064e04..ac04cbf4 100644 --- a/src/Game/Actor/Player/Action/actionPlayerGlide.h +++ b/src/Game/Actor/Player/Action/actionPlayerParashawlGlideBase.h @@ -5,10 +5,10 @@ namespace uking::action { -class PlayerGlide : public PlayerAction { - SEAD_RTTI_OVERRIDE(PlayerGlide, PlayerAction) +class PlayerParashawlGlideBase : public PlayerAction { + SEAD_RTTI_OVERRIDE(PlayerParashawlGlideBase, PlayerAction) public: - explicit PlayerGlide(const InitArg& arg); + explicit PlayerParashawlGlideBase(const InitArg& arg); void enter_(ksys::act::ai::InlineParamPack* params) override; void leave_() override;