Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added three sliders for multiplying damage #478

Merged
merged 7 commits into from
Jun 20, 2022
Merged

Added three sliders for multiplying damage #478

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b7d2bdc
Added three sliders for multiplying damage:
1SDANi Jun 14, 2022
72acbc0
Included tooltips
1SDANi Jun 14, 2022
42340b3
Modified func_80837B18 to handle the modified flag the same as Player…
1SDANi Jun 15, 2022
c6368ff
hotfix of a dumb oversight
1SDANi Jun 15, 2022
0c9ef62
Fixed an oversight that led to compile failure on Linux and probably …
1SDANi Jun 15, 2022
89375f8
I keep missing dumb mistakes.
1SDANi Jun 15, 2022
ddd37c3
Oh crud it's because I declared func_80837B18_modified after func_808…
1SDANi Jun 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions libultraship/libultraship/SohImGuiImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,6 +851,9 @@ namespace SohImGui {
EnhancementSliderInt("Text Speed: %dx", "##TEXTSPEED", "gTextSpeed", 1, 5, "");
EnhancementSliderInt("King Zora Speed: %dx", "##WEEPSPEED", "gMweepSpeed", 1, 5, "");
EnhancementSliderInt("Vine/Ladder Climb speed +%d", "##CLIMBSPEED", "gClimbSpeed", 0, 12, "");
EnhancementSliderInt("Damage Multiplier %dx", "##DAMAGEMUL", "gDamageMul", 1, 4, "");
EnhancementSliderInt("Fall Damage Multiplier %dx", "##FALLDAMAGEMUL", "gFallDamageMul", 1, 4, "");
EnhancementSliderInt("Void Damage Multiplier %dx", "##VOIDDAMAGEMUL", "gVoidDamageMul", 1, 4, "");

EnhancementCheckbox("Skip Text", "gSkipText");
Tooltip("Holding down B skips text");
Expand Down
25 changes: 18 additions & 7 deletions soh/src/overlays/actors/ovl_player_actor/z_player.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,7 @@ s32 func_80852F38(GlobalContext* globalCtx, Player* this);
s32 func_80852FFC(GlobalContext* globalCtx, Actor* actor, s32 csMode);
void func_80853080(Player* this, GlobalContext* globalCtx);
s32 Player_InflictDamage(GlobalContext* globalCtx, s32 damage);
s32 Player_InflictDamageModified(GlobalContext* globalCtx, s32 damage, u8 modified);
void func_80853148(GlobalContext* globalCtx, Actor* actor);

// .bss part 1
Expand Down Expand Up @@ -3516,12 +3517,18 @@ void func_80837AFC(Player* this, s32 timer) {
this->unk_88F = 0;
}

s32 func_80837B18(GlobalContext* globalCtx, Player* this, s32 damage) {
s32 func_80837B18(GlobalContext* globalCtx, Player* this, s32 damage, u8 modified) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure how to feel about directly modifying a function like this. Perhaps something like:
return Health_ChangeBy(globalCtx, damage * CVar_GetS32("gDamageMul", 1)
If gDamageMul isn't set or adjusted, it should work as normal; if it is, only then do we take account of the multiplier.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The problem is that that function also handles damage not modified by gDamageMul. I could do the same thing I did with Player_InflictDamage where the function definition stays the same but is just a wrapper for another function where modifier is always true. Heck, I might as well do that now just for consistency's sake.

if ((this->invincibilityTimer != 0) || (this->actor.category != ACTORCAT_PLAYER)) {
return 1;
}

return Health_ChangeBy(globalCtx, damage);
s32 modifiedDamage = damage;
if (modified)
{
modifiedDamage *= CVar_GetS32("gDamageMul", 1);
}

return Health_ChangeBy(globalCtx, modifiedDamage);
}

void func_80837B60(Player* this) {
Expand Down Expand Up @@ -3555,7 +3562,7 @@ void func_80837C0C(GlobalContext* globalCtx, Player* this, s32 arg2, f32 arg3, f

func_8002F7DC(&this->actor, NA_SE_PL_DAMAGE);

if (!func_80837B18(globalCtx, this, 0 - this->actor.colChkInfo.damage)) {
if (!func_80837B18(globalCtx, this, 0 - this->actor.colChkInfo.damage, true)) {
this->stateFlags2 &= ~PLAYER_STATE2_7;
if (!(this->actor.bgCheckFlags & 1) && !(this->stateFlags1 & PLAYER_STATE1_27)) {
func_80837B9C(this, globalCtx);
Expand Down Expand Up @@ -3747,7 +3754,7 @@ s32 func_808382DC(Player* this, GlobalContext* globalCtx) {

if (this->unk_A86 != 0) {
if (!Player_InBlockingCsMode(globalCtx, this)) {
Player_InflictDamage(globalCtx, -16);
Player_InflictDamageModified(globalCtx, -16 * CVar_GetS32("gVoidDamageMul", 1), false);
this->unk_A86 = 0;
}
}
Expand Down Expand Up @@ -8279,7 +8286,7 @@ s32 func_80843E64(GlobalContext* globalCtx, Player* this) {

impactInfo = &D_80854600[impactIndex];

if (Player_InflictDamage(globalCtx, impactInfo->damage)) {
if (Player_InflictDamageModified(globalCtx, impactInfo->damage * CVar_GetS32("gFallDamageMul", 1), false)) {
return -1;
}

Expand Down Expand Up @@ -13221,7 +13228,7 @@ void func_8084FBF4(Player* this, GlobalContext* globalCtx) {
LinkAnimation_Update(globalCtx, &this->skelAnime);
func_808382BC(this);

if (((this->unk_850 % 25) != 0) || func_80837B18(globalCtx, this, -1)) {
if (((this->unk_850 % 25) != 0) || func_80837B18(globalCtx, this, -1, true)) {
if (DECR(this->unk_850) == 0) {
func_80839F90(this, globalCtx);
}
Expand Down Expand Up @@ -14829,9 +14836,13 @@ void func_80853080(Player* this, GlobalContext* globalCtx) {
}

s32 Player_InflictDamage(GlobalContext* globalCtx, s32 damage) {
return Player_InflictDamageModified(globalCtx, damage, true);
}

s32 Player_InflictDamageModified(GlobalContext* globalCtx, s32 damage, u8 modified) {
Player* this = GET_PLAYER(globalCtx);

if (!Player_InBlockingCsMode(globalCtx, this) && !func_80837B18(globalCtx, this, damage)) {
if (!Player_InBlockingCsMode(globalCtx, this) && !func_80837B18(globalCtx, this, damage, modified)) {
this->stateFlags2 &= ~PLAYER_STATE2_7;
return 1;
}
Expand Down