Skip to content

Ensure a nonzero value is used for Mini Event stat changes #9

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

Merged
rftrdev merged 1 commit into from
Oct 20, 2022
Merged

Ensure a nonzero value is used for Mini Event stat changes #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion GameVersion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,6 @@

CHAR8 czVersionNumber[16] = { "Build 10.10.22" }; //YY.MM.DD
CHAR16 zTrackingNumber[16] = { L"Z" };
CHAR16 zRevisionNumber[16] = { L"Revision 9402" };
CHAR16 zRevisionNumber[16] = { L"Revision 9403" };

// SAVE_GAME_VERSION is defined in header, change it there
27 changes: 15 additions & 12 deletions Strategic/MiniEvents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bLife = min(gMercProfiles[merc->ubProfile].bLife, gMercProfiles[merc->ubProfile].bLifeMax);
merc->usValueGoneUp &= ~( HEALTH_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bLifeDelta += amount;
merc->usValueGoneUp |= HEALTH_INCREASE;
Expand All @@ -364,7 +364,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bStrength = merc->stats.bStrength;
merc->usValueGoneUp &= ~( STRENGTH_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bStrengthDelta += amount;
merc->usValueGoneUp |= STRENGTH_INCREASE;
Expand All @@ -382,7 +382,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bAgility = merc->stats.bAgility;
merc->usValueGoneUp &= ~( AGIL_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bAgilityDelta += amount;
merc->usValueGoneUp |= AGIL_INCREASE;
Expand All @@ -400,7 +400,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bDexterity = merc->stats.bDexterity;
merc->usValueGoneUp &= ~( DEX_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bDexterityDelta += amount;
merc->usValueGoneUp |= DEX_INCREASE;
Expand All @@ -418,7 +418,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bWisdom = merc->stats.bWisdom;
merc->usValueGoneUp &= ~( WIS_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bWisdomDelta += amount;
merc->usValueGoneUp |= WIS_INCREASE;
Expand All @@ -435,7 +435,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bLeadership = merc->stats.bLeadership;
merc->usValueGoneUp &= ~( LDR_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bLeadershipDelta += amount;
merc->usValueGoneUp |= LDR_INCREASE;
Expand All @@ -452,7 +452,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bMarksmanship = merc->stats.bMarksmanship;
merc->usValueGoneUp &= ~( MRK_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bMarksmanshipDelta += amount;
merc->usValueGoneUp |= MRK_INCREASE;
Expand All @@ -469,7 +469,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bMechanical = merc->stats.bMechanical;
merc->usValueGoneUp &= ~( MECH_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bMechanicDelta += amount;
merc->usValueGoneUp |= MECH_INCREASE;
Expand All @@ -486,7 +486,7 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bExplosive = merc->stats.bExplosive;
merc->usValueGoneUp &= ~( EXP_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bExplosivesDelta += amount;
merc->usValueGoneUp |= EXP_INCREASE;
Expand All @@ -503,16 +503,19 @@ namespace MiniEventHelpers
gMercProfiles[merc->ubProfile].bMedical = merc->stats.bMedical;
merc->usValueGoneUp &= ~( MED_INCREASE );
}
else
else if (amount > 0)
{
gMercProfiles[merc->ubProfile].bMedicalDelta += amount;
merc->usValueGoneUp |= MED_INCREASE;
}
break;
}

BuildStatChangeString(wTempString, merc->GetName(), amount > 0, amount > 0 ? amount : -amount, statId);
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, wTempString );
if (amount != 0)
{
BuildStatChangeString(wTempString, merc->GetName(), amount > 0, amount > 0 ? amount : -amount, statId);
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, wTempString );
}
});

return 0;
Expand Down