mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-08 18:43:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

A bit of shield gauge cleanup

Browse Source
This commit is contained in:
robojumper
2025-05-15 19:30:39 +02:00
parent c7a094982d
commit b10472dac9
6 changed files with 104 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/a/d_a_itembase.h
+15
View File
@@ -2,6 +2,7 @@
#define D_A_ITEMBASE_H
#include "d/a/obj/d_a_obj_base.h"
#include "m/m_vec.h"
enum ITEM_ID {
/* 0x000 */ ITEM_NONE = 0,
@@ -210,6 +211,20 @@ enum ITEM_ID {
/* 0x1FF */ MAX_ITEM_ID = 511
};
enum SHIELD_TYPE_e {
/* 0x00 */ SHIELD_WOODEN_SHIELD = 0,
/* 0x01 */ SHIELD_BANDED_SHIELD = 1,
/* 0x02 */ SHIELD_BRACED_SHIELD = 2,
/* 0x03 */ SHIELD_IRON_SHIELD = 3,
/* 0x04 */ SHIELD_REINFORCED_SHIELD = 4,
/* 0x05 */ SHIELD_FORTIFIED_SHIELD = 5,
/* 0x06 */ SHIELD_SACRED_SHIELD = 6,
/* 0x07 */ SHIELD_DIVINE_SHIELD = 7,
/* 0x08 */ SHIELD_GODDESS_SHIELD = 8,
/* 0x09 */ SHIELD_HYLIAN_SHIELD = 9,
/* 0x0A */ SHIELD_NONE = 10,
};
struct ItemFlagStruct {
u8 mField_0x00;
u8 mField_0x01;
include/d/lyt/meter/d_lyt_meter.h
+4 -4
View File
@@ -421,17 +421,17 @@ public:
}
}
static f32 getShieldLevel() {
static f32 getShieldMaxDurability() {
if (sInstance != nullptr) {
return sInstance->mMain.mShield.getLevel();
return sInstance->mMain.mShield.getMaxDurability();
} else {
return 0.0f;
}
}
static f32 getShieldGaugePercentMaybe() {
static f32 getShieldCurrentDurability() {
if (sInstance != nullptr) {
return sInstance->mMain.mShield.getGaugePercentMaybe();
return sInstance->mMain.mShield.getCurrentDurability();
} else {
return 0.0f;
}
include/d/lyt/meter/d_lyt_meter_shield_gauge.h
+11 -11
View File
@@ -31,8 +31,8 @@ public:
mpOwnerPane = pane;
}
f32 getGaugePercentMaybe() const {
return field_0x2E0;
f32 getCurrentDurability() const {
return mCurrentDurability;
}
void setfield_0x318(s32 v) {
@@ -43,8 +43,8 @@ public:
return field_0x31D;
}
f32 getLevel() const {
return field_0x2F0;
f32 getMaxDurability() const {
return mMaxDurability;
}
private:
@@ -63,22 +63,22 @@ private:
/* 0x0D8 */ d2d::AnmGroup_c mAnm[8];
/* 0x2D8 */ d2d::AnmGroup_c *mpContainerAnmGroup;
/* 0x2DC */ nw4r::lyt::Pane *mpOwnerPane;
/* 0x2E0 */ f32 field_0x2E0;
/* 0x2E0 */ f32 mCurrentDurability;
/* 0x2E4 */ f32 field_0x2E4;
/* 0x2E8 */ f32 field_0x2E8;
/* 0x2EC */ f32 field_0x2EC;
/* 0x2F0 */ f32 field_0x2F0;
/* 0x2E8 */ f32 mSavedDurability;
/* 0x2EC */ f32 mAnimatingDurability;
/* 0x2F0 */ f32 mMaxDurability;
/* 0x2F4 */ f32 field_0x2F4;
/* 0x2F8 */ f32 field_0x2F8;
/* 0x2FC */ s32 field_0x2FC;
/* 0x300 */ f32 field_0x300;
/* 0x304 */ f32 field_0x304;
/* 0x308 */ s32 field_0x308;
/* 0x308 */ s32 mCurrentShieldPouchSlot;
/* 0x30C */ u8 field_0x30C;
/* 0x30D */ u8 field_0x30D;
/* 0x30E */ u8 field_0x30E;
/* 0x310 */ s32 field_0x310;
/* 0x314 */ s32 field_0x314;
/* 0x310 */ s32 mShieldType;
/* 0x314 */ s32 mSavedShieldType;
/* 0x318 */ s32 field_0x318;
/* 0x31C */ u8 field_0x31C;
/* 0x31D */ u8 field_0x31D;