falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ksys/res: Update DamageParam for seadEnum change

This commit is contained in:
Léo Lam 2021-04-21 17:41:47 +02:00
parent f9d6eedc9f
commit 502df1d149
No known key found for this signature in database
GPG Key ID: 0DF30F9081000741
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/KingSystem/Resource/resResourceDamageParam.cpp
View File

@ -9,25 +9,27 @@ bool DamageParam::parse_(u8* data, size_t, sead::Heap* heap) {
mDamageTypeBuffer.allocBufferAssert(DamageSource::size() * DamageSize::size(), heap); mDamageTypeBuffer.allocBufferAssert(DamageSource::size() * DamageSize::size(), heap);
sead::FormatFixedSafeString<64> str; sead::FormatFixedSafeString<64> str;
for (auto source : DamageSource{}) { for (int i = 0; i < DamageSource::size(); ++i) {
str.format("%s", source.text()); str.format("%s", DamageSource::text(i));
mDamageRateBuffer[source.getRelativeIndex()].init(1.0, str, "", &mDamageRateObj); mDamageRateBuffer[i].init(1.0, str, "", &mDamageRateObj);
} }
for (auto source : DamageSource{}) { for (int source = 0; source < DamageSource::size(); ++source) {
for (auto size : DamageSize{}) { for (int size = 0; size < DamageSize::size(); ++size) {
str.format("%s-%s", source.text(), size.text()); str.format("%s-%s", DamageSource::text(source), DamageSize::text(size));
const auto i = source.getRelativeIndex();
const auto j = size.getRelativeIndex();
if (source == DamageSource::Arrow) { if (source == DamageSource::Arrow) {
mDamageTypeBuffer.get(i * 4 + j)->init("通常ダメージ", str, "", &mReactionTableObj); mDamageTypeBuffer.get(source * 4 + size)
} else if (j == DamageSize::Large || j == DamageSize::Huge || ->init("通常ダメージ", str, "", &mReactionTableObj);
} else if (size == DamageSize::Large || size == DamageSize::Huge ||
source == DamageSource::Bomb || source == DamageSource::LargeSword) { source == DamageSource::Bomb || source == DamageSource::LargeSword) {
mDamageTypeBuffer.get(i * 4 + j)->init("吹っ飛び", str, "", &mReactionTableObj); mDamageTypeBuffer.get(source * 4 + size)
} else if (j == DamageSize::Middle) { ->init("吹っ飛び", str, "", &mReactionTableObj);
mDamageTypeBuffer.get(i * 4 + j)->init("中ダメージ", str, "", &mReactionTableObj); } else if (size == DamageSize::Middle) {
mDamageTypeBuffer.get(source * 4 + size)
->init("中ダメージ", str, "", &mReactionTableObj);
} else { } else {
mDamageTypeBuffer.get(i * 4 + j)->init("通常ダメージ", str, "", &mReactionTableObj); mDamageTypeBuffer.get(source * 4 + size)
->init("通常ダメージ", str, "", &mReactionTableObj);
} }
} }
} }