AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
metaforce/Runtime/MP1/World/CJellyZap.hpp

64 lines
2.9 KiB
C++
Raw Permalink Normal View History

Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
#pragma once
General: Normalize RuntimeCommon include paths Performs the same normalizing done to the RuntimeCommonB target, now all of the runtime headers have normalized include paths.
2019-09-28 02:53:03 +00:00
#include "Runtime/World/CPatterned.hpp"
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
Rename everything
2021-04-10 08:42:06 +00:00
namespace metaforce::MP1 {
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
class CJellyZap : public CPatterned {
u32 x568_ = 0;
CDamageInfo x56c_attackDamage;
float x588_attackRadius;
float x58c_;
float x590_;
float x594_;
float x598_;
CJellyZap fixes
2020-03-16 02:00:52 +00:00
float x59c_priority;
float x5a0_repulseRadius;
float x5a4_attractRadius;
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
float x5a8_attackDelay;
float x5ac_;
float x5b0_;
float x5b4_;
RuntimeCommon: Make use of bitfield initializers where applicable Continues and finishes the migration towards initializing all bitfield members where applicable
2020-04-21 07:22:41 +00:00
bool x5b8_24_ : 1 = false;
bool x5b8_25_ : 1 = false;
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
bool x5b8_26_ : 1;
CJellyZap fixes
2020-03-16 02:00:52 +00:00
void AddSelfToFishCloud(CStateManager&, float, float, bool);
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
void AddRepulsor(CStateManager&);
void AddAttractor(CStateManager&);
void RemoveSelfFromFishCloud(CStateManager&);
void RemoveAllAttractors(CStateManager&);
RuntimeCommon: Use const on member functions where applicable Adds missing const qualifiers on class member functions that don't modify instance state.
2019-08-14 10:04:11 +00:00
bool ClosestToPlayer(const CStateManager&) const;
CJellyZap fixes
2020-03-16 02:00:52 +00:00
bool sub801d8190() const { return x568_ != 1; }
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
public:
General: Resolve several -Wextra-semi warnings Remove redundant semicolons and also amends some macros to require semicolon termination.
2020-08-23 19:03:33 +00:00
DEFINE_PATTERNED(JellyZap);
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
CJellyZap fixes
2021-04-26 03:16:16 +00:00
CJellyZap(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
Reformat pass
2021-06-07 19:29:18 +00:00
CModelData&& mData, const CDamageInfo& attackDamage, bool b1, float attackRadius, float f2, float f3,
float f4, float attackDelay, float f6, float f7, float f8, float priority, float repulseRadius,
float attractRadius, float f12, const CPatternedInfo& pInfo, const CActorParameters& actParms);
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
RuntimeCommon: Use override where applicable Continues the override modernization by applying it to the main RuntimeCommon target. Resolves around 1100+ cases where override can be used.
2019-08-09 19:46:49 +00:00
void Accept(IVisitor&) override;
void AcceptScriptMsg(EScriptObjectMessage, TUniqueId, CStateManager&) override;
void Think(float, CStateManager&) override;
void DoUserAnimEvent(CStateManager&, const CInt32POINode&, EUserEventType, float dt) override;
CJellyZap fixes
2021-04-26 03:16:16 +00:00
void KnockBack(const zeus::CVector3f&, CStateManager&, const CDamageInfo& info, EKnockBackType type, bool inDeferred,
float magnitude) override;
CJellyZap fixes
2020-03-16 02:00:52 +00:00
const CDamageVulnerability* GetDamageVulnerability() const override { return CAi::GetDamageVulnerability(); }
const CDamageVulnerability* GetDamageVulnerability(const zeus::CVector3f& pos, const zeus::CVector3f& dir,
const CDamageInfo& info) const override;
EWeaponCollisionResponseTypes GetCollisionResponseType(const zeus::CVector3f&, const zeus::CVector3f&,
const CWeaponMode&, EProjectileAttrib) const override {
return sub801d8190() ? EWeaponCollisionResponseTypes::Unknown89 : EWeaponCollisionResponseTypes::Unknown39;
}
RuntimeCommon: Use override where applicable Continues the override modernization by applying it to the main RuntimeCommon target. Resolves around 1100+ cases where override can be used.
2019-08-09 19:46:49 +00:00
void Attack(CStateManager&, EStateMsg, float) override;
void Suck(CStateManager&, EStateMsg, float) override;
void Active(CStateManager&, EStateMsg, float) override;
void InActive(CStateManager&, EStateMsg, float) override;
void Flinch(CStateManager&, EStateMsg, float) override;
bool ShouldAttack(CStateManager&, float) override { return x330_stateMachineState.GetTime() > x5a8_attackDelay; }
bool ShouldSpecialAttack(CStateManager& mgr, float) override { return ClosestToPlayer(mgr); }
bool InAttackPosition(CStateManager&, float) override;
bool InDetectionRange(CStateManager&, float) override;
Fix IA4 encoding/decoding
2019-02-12 01:58:12 +00:00
};
Rename everything
2021-04-10 08:42:06 +00:00
} // namespace metaforce::MP1