primeret/echoes
0
0
Fork 0
mirror of https://github.com/PrimeDecomp/echoes.git synced 2026-07-12 18:18:57 -07:00
Code Issues Packages Projects Releases Wiki Activity

Some CDamageInfo

Browse Source
This commit is contained in:
Henrique Gemignani Passos Lima
2026-06-07 01:46:03 +03:00
parent 5deed2ad82
commit 7c58bd096f
7 changed files with 141 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/G2ME01/splits.txt
+3
View File
@@ -81,6 +81,9 @@ MetroidPrime/CHealthInfo.cpp:
MetroidPrime/Player/CGameOptions.cpp:
.text start:0x80160C20 end:0x80161D04
MetroidPrime/CDamageInfo.cpp:
.text start:0x80189FD4 end:0x8018A188
MetroidPrime/Weapons/CPowerBeam.cpp:
.text start:0x801D4FC8 end:0x801D5C70
.data start:0x803B72B0 end:0x803B7310
config/G2ME01/symbols.txt
+1 -1
View File
@@ -6493,7 +6493,7 @@ fn_80189CA8 = .text:0x80189CA8; // type:function size:0x58
fn_80189D00 = .text:0x80189D00; // type:function size:0x1FC
fn_80189EFC = .text:0x80189EFC; // type:function size:0xD8 align:4
fn_80189FD4 = .text:0x80189FD4; // type:function size:0xC4
fn_8018A098 = .text:0x8018A098; // type:function size:0xF0 align:4
ApplyDoubleDamage__11CDamageInfoCFRC12CPlayerState = .text:0x8018A098; // type:function size:0xF0 align:4
fn_8018A188 = .text:0x8018A188; // type:function size:0xA8
fn_8018A230 = .text:0x8018A230; // type:function size:0xBC
fn_8018A2EC = .text:0x8018A2EC; // type:function size:0x2D8 align:4
config/G2MP01/symbols.txt
+3 -3
View File
@@ -17013,9 +17013,9 @@ lbl_803A79B0 = .rodata:0x803A79B0; // type:object size:0x10 data:4byte
lbl_803A79C0 = .rodata:0x803A79C0; // type:object size:0x8
lbl_803A79C8 = .rodata:0x803A79C8; // type:object size:0x8
lbl_803A79D0 = .rodata:0x803A79D0; // type:object size:0x10
lbl_803A79E0 = .rodata:0x803A79E0; // type:object size:0x1B4 data:4byte
lbl_803A7B94 = .rodata:0x803A7B94; // type:object size:0x70 data:byte
lbl_803A7C04 = .rodata:0x803A7C04; // type:object size:0x10
kPowerUpMax = .rodata:0x803A79E0; // type:object size:0x1B4 data:4byte
kShouldPersist = .rodata:0x803A7B94; // type:object size:0x70 data:byte
kMissileCosts = .rodata:0x803A7C04; // type:object size:0x10
lbl_803A7C14 = .rodata:0x803A7C14; // type:object size:0x2C data:4byte
lbl_803A7C40 = .rodata:0x803A7C40; // type:object size:0x8
lbl_803A7C48 = .rodata:0x803A7C48; // type:object size:0xC0 data:4byte
configure.py
+1
View File
@@ -343,6 +343,7 @@ config.libs = [
Object(NonMatching, "MetroidPrime/Weapons/CPowerBeam.cpp"),
Object(NonMatching, "MetroidPrime/CPhysicsActor.cpp"),
Object(NonMatching, "MetroidPrime/CActor.cpp"),
Object(NonMatching, "MetroidPrime/CDamageInfo.cpp"),
Object(NonMatching, "MetroidPrime/ScriptObjects/CScriptSpawnPoint.cpp"),
Object(NonMatching, "MetroidPrime/CRuleSet.cpp"),
Object(NonMatching, "MetroidPrime/Player/CPlayer.cpp"),
include/MetroidPrime/CDamageInfo.hpp
+69 -11
View File
@@ -1,19 +1,77 @@
#ifndef _CDAMAGEINFO
#define _CDAMAGEINFO
#include "MetroidPrime/CStateManager.hpp"
#include "types.h"
struct CDamageInfo {
ushort weaponMode1;
ushort weaponMode2;
float damage;
float radiusDamageAmount;
float damageRadius;
float knockbackPower;
short x14;
short x16;
short x18;
bool noImmunity;
#include "MetroidPrime/TGameTypes.hpp"
#include "MetroidPrime/Weapons/WeaponTypes.hpp"
class CDamageVulnerability;
class CDamageInfo {
public:
// CDamageInfo()
// : x0_weaponMode(CWeaponMode::Invalid())
// , x8_damage(0.f)
// , xc_radiusDamage(0.f)
// , x10_radius(0.f)
// , x14_knockback(0.f)
// , x18_24_noImmunity(false) {}
// CDamageInfo(const CWeaponMode& mode, const float damage, const float radius,
// const float knockback, const bool noImmunity = false)
// : x0_weaponMode(mode)
// , x8_damage(damage)
// , xc_radiusDamage(x8_damage)
// , x10_radius(radius)
// , x14_knockback(knockback)
// , x18_24_noImmunity(noImmunity) {}
CDamageInfo(CInputStream& in);
CDamageInfo(const CDamageInfo&, float);
CDamageInfo ApplyDoubleDamage(const CPlayerState& state) const;
ushort GetWeaponMode1() const { return m_weaponMode1; }
ushort GetWeaponMode2() const { return m_weaponMode2; }
// void SetWeaponMode(const CWeaponMode& mode) { x0_weaponMode = mode; }
float GetRadius() const { return m_damageRadius; }
void SetRadius(float r) { m_damageRadius = r; }
float GetKnockBackPower() const { return m_knockbackPower; }
void SetKnockBackPower(float k) { m_knockbackPower = k; }
float GetDamage() const { return m_damage; }
void SetDamage(float d) { m_damage = d; }
bool HasNoDamage() const { return m_damage <= 0.0f; }
float GetDamage(const CDamageVulnerability& dVuln) const;
float GetRadiusDamage() const { return m_radiusDamageAmount; }
void SetRadiusDamage(float r) { m_radiusDamageAmount = r; }
float GetRadiusDamage(const CDamageVulnerability& dVuln) const;
bool NoImmunity() const { return m_noImmunity; }
void SetNoImmunity(bool b) { m_noImmunity = b; }
void MultiplyDamage(const float m) {
m_damage = m * m_damage;
m_radiusDamageAmount = m * m_radiusDamageAmount;
m_knockbackPower = m * m_knockbackPower;
}
void MultiplyDamageAndRadius(float m) {
m_damage *= m;
m_radiusDamageAmount *= m;
m_damageRadius *= m;
m_knockbackPower *= m;
}
private:
ushort m_weaponMode1;
ushort m_weaponMode2;
float m_damage;
float m_radiusDamageAmount;
float m_damageRadius;
float m_knockbackPower;
short m_x14;
short m_x16;
short m_x18;
bool m_noImmunity;
};
#endif // _CDAMAGEINFO
src/MetroidPrime/CDamageInfo.cpp
+62
View File
@@ -0,0 +1,62 @@
#include "MetroidPrime/CDamageInfo.hpp"
// #include "Kyoto/Streams/CInputStream.hpp"
// #include "MetroidPrime/CDamageVulnerability.hpp"
#include "MetroidPrime/Player/CPlayerState.hpp"
// CDamageInfo::CDamageInfo(CInputStream& in)
// : x0_weaponMode(CWeaponMode::Invalid()), x18_24_noImmunity(false) {
// in.ReadLong();
// x0_weaponMode = CWeaponMode(EWeaponType(in.ReadLong()));
// x8_damage = in.ReadFloat();
// xc_radiusDamage = x8_damage;
// x10_radius = in.ReadFloat();
// x14_knockback = in.ReadFloat();
// }
// float CDamageInfo::GetDamage(const CDamageVulnerability& dVuln) const {
// EVulnerability vuln = dVuln.GetVulnerability(x0_weaponMode, false);
// if (vuln == kVN_Deflect)
// return 0.f;
// else if (vuln == kVN_Weak)
// return 2.f * x8_damage;
// return x8_damage;
// }
// float CDamageInfo::GetRadiusDamage(const CDamageVulnerability& dVuln) const {
// EVulnerability vuln = dVuln.GetVulnerability(x0_weaponMode, false);
// if (vuln == kVN_Deflect) {
// return 0.f;
// }
// if (vuln == kVN_Weak) {
// return 2.f * xc_radiusDamage;
// }
// return xc_radiusDamage;
// }
// CDamageInfo::CDamageInfo(const CDamageInfo& other, float dt)
// : x0_weaponMode(other.x0_weaponMode)
// , x8_damage(other.x8_damage * (60 * dt))
// , xc_radiusDamage(x8_damage)
// , x10_radius(other.x10_radius)
// , x14_knockback(other.x14_knockback)
// , x18_24_noImmunity(true) {}
// CDamageInfo CDamageInfo::MakeScaledForTime(const float dt) const {
// return CDamageInfo(x0_weaponMode, x8_damage * (60.f * dt), x10_radius, x14_knockback, true);
// }
CDamageInfo CDamageInfo::ApplyDoubleDamage(const CPlayerState& state) const {
int amount = state.GetItemAmount(CPlayerState::kIT_DoubleDamage, true);
if (amount == 0) {
return *this;
} else {
return CDamageInfo(*this, 2.f * amount);
}
return *this;
}
src/MetroidPrime/CHealthInfo.cpp
+2 -2
View File
@@ -17,8 +17,8 @@ CHealthInfo::CHealthInfo(float hp, float resist)
, flagB(false) {}
void CHealthInfo::fn_80142094(const CDamageInfo& dmgInfo, TUniqueId id1, TUniqueId id2, bool a, bool b) {
unkA = dmgInfo.weaponMode1;
unkB = dmgInfo.weaponMode2;
unkA = dmgInfo.GetWeaponMode1();
unkB = dmgInfo.GetWeaponMode2();
uidA = id1;
uidB = id2;
flagA = a;