Skip to content

Commit

Permalink
Merge pull request #132 from Pistonight/update_cookdata_comment
Browse files Browse the repository at this point in the history
Rename CookData::getStaminaRecoverValue -> getEffectDurationFrames
  • Loading branch information
leoetlino authored Dec 30, 2024
2 parents aa3914c + 64122c5 commit d5128f8
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
4 changes: 2 additions & 2 deletions src/Game/UI/uiPauseMenuDataMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2125,8 +2125,8 @@ int compareFood(const PouchItem* lhs, const PouchItem* rhs, ksys::act::InfoData*
if (st1 < st2)
return 1;

const auto sv1 = lhs->getCookData().getStaminaRecoverValue();
const auto sv2 = rhs->getCookData().getStaminaRecoverValue();
const auto sv1 = lhs->getCookData().getEffectDurationFrames();
const auto sv2 = rhs->getCookData().getEffectDurationFrames();
// Higher is better
if (sv1 > sv2)
return -1;
Expand Down
11 changes: 9 additions & 2 deletions src/Game/UI/uiPauseMenuDataMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ struct CookTagInfo {
class PouchItem {
public:
struct CookData {
f32 getStaminaRecoverValue() const { return f32(mEffectDuration) * 30.0f; }
f32 getEffectDurationFrames() const { return f32(mEffectDuration) * 30.0f; }
void setHealthRecover(int hp) { mHealthRecover = hp; }
void setEffectDuration(int seconds) { mEffectDuration = seconds; }
void setSellPrice(int price) { mSellPrice = price; }
Expand All @@ -160,12 +160,19 @@ class PouchItem {
f32 getEffectId() const { return mEffect.x; }
f32 getEffectLevel() const { return mEffect.y; }

/// Number of quarter-hearts to recover,
/// for hearty food, this is number of yellow hearts (not quarter-hearts)
int mHealthRecover;
int mEffectDuration; // for potions, in seconds
int mSellPrice;

/// x - CookEffectId enum, but stored as f32
/// y - level (1.0f, 2.0f, or 3.0f)
/// y - level:
/// - For Hearty (LifeMaxUp), this is also the number of yellow hearts
/// - For Stamina (GutsRecover), this is 0.0-3000.0 where each wheel is 1000.0
/// - For Endura (ExGutsMaxUp), this is 0-15, where each wheel is 5
/// - With 5 endura carrot + crit you can only get to 12
/// - For other, this is the level of the effect (1.0f, 2.0f, or 3.0f)
sead::Vector2f mEffect;
};

Expand Down

0 comments on commit d5128f8

Please sign in to comment.