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

Jump to bottom

Move vetDamage total inside instigator check #6110

Open
wants to merge 9 commits into
base: deploy/fafdevelop
Choose a base branch
from
+16 −3
Open

Move vetDamage total inside instigator check #6110

Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5a36ba8
move vetDamage total inside instigator check
clyfordv Apr 23, 2024
c7d2392
condense VetDamage and VetInstigators into one table
clyfordv Apr 23, 2024
0c3e307
add MassValueKilled stat
clyfordv Apr 23, 2024
8b54347
Revert "condense VetDamage and VetInstigators into one table"
clyfordv Apr 23, 2024
e9c6733
MassValueKilled -> VetMassKillCredit
clyfordv Apr 24, 2024
fb57fb4
use GetEntityById instead of vetInstigators (for profiling experiment)
clyfordv Apr 25, 2024
c2a96ef
Merge branch 'deploy/fafdevelop' into VetExperienceUnderpaymentFix
clyfordv May 14, 2024
8ab0b5a
changelog
clyfordv May 14, 2024
b4ffddf
Revert "use GetEntityById instead of vetInstigators (for profiling ex…
clyfordv May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 9 additions & 2 deletions lua/defaultcomponents.lua
View file
Open in desktop
Expand Up @@ -610,10 +610,12 @@ VeterancyComponent = ClassSimple {

-- optionally, these fields are defined too to inform UI of our veterancy status
if blueprint.VetEnabled then
self:UpdateStat('VetLevel', 0)
self:UpdateStat('VetExperience', 0)
self:UpdateStat('VetLevel', 0)
self:UpdateStat('MassValueKilled', 0)
self.VetExperience = 0
self.VetLevel = 0
self.MassValueKilled = 0
end
end,

Expand All @@ -624,12 +626,12 @@ VeterancyComponent = ClassSimple {
---@param damageType DamageType unused
DoTakeDamage = function(self, instigator, amount, vector, damageType)
amount = MathMin(amount, self:GetMaxHealth())
self.VetDamageTaken = self.VetDamageTaken + amount
if instigator and
instigator.IsUnit and
(not IsDestroyed(instigator)) and
IsEnemy(self.Army, instigator.Army)
then
self.VetDamageTaken = self.VetDamageTaken + amount
local entityId = instigator.EntityId
local vetInstigators = self.VetInstigators
local vetDamage = self.VetDamage
Expand Down Expand Up @@ -665,6 +667,11 @@ VeterancyComponent = ClassSimple {
return
end

-- Update a mass value killed stat, not used
-- by veterancy but potentially useful to the player
self.MassValueKilled = self.MassValueKilled + experience
Copy link
Member

Choose a reason for hiding this comment

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

The other veterancy values start with Vet, I think this one should too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

let's do VetMassKillCredit

Copy link
Contributor

Choose a reason for hiding this comment

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

How about VetMassKilled?

self:UpdateStat('MassValueKilled', self.MassValueKilled)

local currExperience = self.VetExperience
local currLevel = self.VetLevel

Expand Down