PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match CPlayerState::CalculateItemCollectionRate 

Thanks Roeming for the help
This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-04 22:46:42 +03:00
parent 5a4def3076
commit 7d5775a78a
No known key found for this signature in database
GPG Key ID: E224F951761145F8
1 changed files with 15 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/MetroidPrime/Player/CPlayerState.cpp
View File

@ -417,46 +417,22 @@ void CPlayerState::SetIsFusionEnabled(bool val) { x0_26_fusion = val; }
int CPlayerState::GetTotalPickupCount() const { return 99; } int CPlayerState::GetTotalPickupCount() const { return 99; }
int CPlayerState::CalculateItemCollectionRate() const { int CPlayerState::CalculateItemCollectionRate() const {
int total = 0;
int pbCount = GetItemCapacity(kIT_PowerBombs); int pbCount = GetItemCapacity(kIT_PowerBombs);
if (pbCount >= 4) return GetItemCapacity(kIT_IceBeam) + GetItemCapacity(kIT_WaveBeam) +
pbCount = pbCount - 3; GetItemCapacity(kIT_PlasmaBeam) + GetItemCapacity(kIT_Missiles) / 5 +
GetItemCapacity(kIT_MorphBallBombs) + (pbCount >= 4 ? pbCount - 3 : pbCount) +
total += GetItemCapacity(kIT_WaveBeam); GetItemCapacity(kIT_Flamethrower) + GetItemCapacity(kIT_ThermalVisor) +
int iceBeam = GetItemCapacity(kIT_IceBeam); GetItemCapacity(kIT_ChargeBeam) + GetItemCapacity(kIT_SuperMissile) +
total += GetItemCapacity(kIT_PlasmaBeam); GetItemCapacity(kIT_GrappleBeam) + GetItemCapacity(kIT_XRayVisor) +
total += GetItemCapacity(kIT_Missiles) / 5; GetItemCapacity(kIT_IceSpreader) + GetItemCapacity(kIT_SpaceJumpBoots) +
GetItemCapacity(kIT_MorphBall) + GetItemCapacity(kIT_BoostBall) +
int aux = total + GetItemCapacity(kIT_MorphBallBombs); GetItemCapacity(kIT_SpiderBall) + GetItemCapacity(kIT_GravitySuit) +
total = aux + pbCount; GetItemCapacity(kIT_VariaSuit) + GetItemCapacity(kIT_EnergyTanks) +
total += GetItemCapacity(kIT_Flamethrower); GetItemCapacity(kIT_Truth) + GetItemCapacity(kIT_Strength) + GetItemCapacity(kIT_Elder) +
total += GetItemCapacity(kIT_ThermalVisor); GetItemCapacity(kIT_Wild) + GetItemCapacity(kIT_Lifegiver) + GetItemCapacity(kIT_Warrior) +
total += GetItemCapacity(kIT_ChargeBeam); GetItemCapacity(kIT_Chozo) + GetItemCapacity(kIT_Nature) + GetItemCapacity(kIT_Sun) +
total += GetItemCapacity(kIT_SuperMissile); GetItemCapacity(kIT_World) + GetItemCapacity(kIT_Spirit) + GetItemCapacity(kIT_Newborn) +
total += GetItemCapacity(kIT_GrappleBeam); GetItemCapacity(kIT_Wavebuster);
total += GetItemCapacity(kIT_XRayVisor);
total += GetItemCapacity(kIT_IceSpreader);
total += GetItemCapacity(kIT_SpaceJumpBoots);
total += GetItemCapacity(kIT_MorphBall);
total += GetItemCapacity(kIT_BoostBall);
total += GetItemCapacity(kIT_SpiderBall);
total += GetItemCapacity(kIT_GravitySuit);
total += GetItemCapacity(kIT_VariaSuit);
total += GetItemCapacity(kIT_EnergyTanks);
total += GetItemCapacity(kIT_Truth);
total += GetItemCapacity(kIT_Strength);
total += GetItemCapacity(kIT_Elder);
total += GetItemCapacity(kIT_Wild);
total += GetItemCapacity(kIT_Lifegiver);
total += GetItemCapacity(kIT_Warrior);
total += GetItemCapacity(kIT_Chozo);
total += GetItemCapacity(kIT_Nature);
total += GetItemCapacity(kIT_Sun);
total += GetItemCapacity(kIT_World);
total += GetItemCapacity(kIT_Spirit);
total += GetItemCapacity(kIT_Newborn);
return iceBeam + total + GetItemCapacity(kIT_Wavebuster);
} }
int CPlayerState::GetMissileCostForAltAttack() const { int CPlayerState::GetMissileCostForAltAttack() const {