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.

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

Fix: Helix and Overlord addons are now colored red when affected by Frenzy #132

Merged
merged 1 commit into from
Sep 1, 2021

Conversation

alanblack166
Copy link
Contributor

With these changes, the Helix and Overlord addons will now be properly tinted red when their parent unit is affected by Frenzy.

With these changes, the Helix and Overlord addons will now be properly tinted red when their parent unit is affected by Frenzy.
@xezon xezon self-requested a review September 1, 2021 10:40
@commy2
Copy link
Collaborator

commy2 commented Sep 1, 2021

Does this mean mobile Gattlings now fire faster due to Avenger blue laser?

@alanblack166
Copy link
Contributor Author

Should not be the case.

@xezon
Copy link
Collaborator

xezon commented Sep 1, 2021

I tested all factions. All units look good.

shot_20210901_204721_1

shot_20210901_204857_2

shot_20210901_205024_3

shot_20210901_205641_4

; Patch104p @bugfix hanfield 01/09/2021 Added WeaponBonus parameters for Frenzy that nullify the bonus but allow it to color the Gattling Cannon.
WeaponBonus = FRENZY_ONE DAMAGE 90%
WeaponBonus = FRENZY_TWO DAMAGE 80%
WeaponBonus = FRENZY_THREE DAMAGE 70%
Copy link
Collaborator

Choose a reason for hiding this comment

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

Hmm. Are we sure this negates it correctly?

  WeaponBonus = FRENZY_ONE    DAMAGE 110% ; Granted by a China Generals power
  WeaponBonus = FRENZY_TWO    DAMAGE 120%
  WeaponBonus = FRENZY_THREE  DAMAGE 130%

VS

  WeaponBonus           = FRENZY_ONE DAMAGE 90%
  WeaponBonus           = FRENZY_TWO DAMAGE 80%
  WeaponBonus           = FRENZY_THREE DAMAGE 70%

It may be calculated like so:

1,1 * 0,9 = 0,99 = 99%
1,2 * 0,8 = 0,96 = 96%
1,3 * 0,7 = 0,91 = 91%

Right now we count on it being calculated like so:

(1,1 + 0,9) / 2 = 1,00 = 100%
(1,2 + 0,8) / 2 = 1,00 = 100%
(1,3 + 0,7) / 2 = 1,00 = 100%

But that is not clear (to me).

@alanblack166
Copy link
Contributor Author

The latter calculation is accurate. We use such means in ROTR for weapons that are not meant to gain any bonuses.

@xezon xezon merged commit 2cce1be into main Sep 1, 2021
@xamorish xamorish deleted the nproject-overlord-helix-frenzy-visual-fix branch September 2, 2021 20:37
@commy2
Copy link
Collaborator

commy2 commented Sep 3, 2021

The actual calculation works like this:

total = (bonus_1 - 1) + (bonus_2 - 1) + 1

So

bonus_1 = 110%
bonus_2 = 90%

=> total = 100%

bonus_1 = 110%
bonus_2 = 120%

=> total = 130%

which is, admittedly, counter intuitive.

xezon pushed a commit that referenced this pull request Aug 28, 2022
…#132)

With these changes, the Helix and Overlord addons will now be properly tinted red when their parent unit is affected by Frenzy.
@xezon xezon added Bug Something is not working right Minor Severity: Minor < Major < Critical < Blocker China Affects China faction labels Jan 18, 2023
@xezon xezon changed the title Helix and Overlord addons are now colored red when affected by Frenzy Fix: Helix and Overlord addons are now colored red when affected by Frenzy Mar 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something is not working right China Affects China faction Minor Severity: Minor < Major < Critical < Blocker
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants