-
-
Notifications
You must be signed in to change notification settings - Fork 125
Change target Owner on warhead impact #1118
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
base: develop
Are you sure you want to change the base?
Changes from 13 commits
55664e1
6b6f924
f00d0e6
3de494f
0078e96
9215933
ddc364c
aef9ebb
053a3d0
a01fd7d
723551e
1770c6b
30c3ee4
0b51abf
84a4a6c
75b58dc
23e7605
4eeeff7
f05ebbf
e2d0c38
66ba905
4541bac
e4593a7
63125f9
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| +0 −25 | .gitattributes | |
| +0 −58 | DropPodLocomotionClass.h | |
| +0 −5 | EventClass.h | |
| +1,691 −1,691 | GeneralDefinitions.h | |
| +4 −21 | HouseClass.h | |
| +125 −125 | LoadOptionsClass.h | |
| +551 −551 | MapClass.h | |
| +7 −4 | SpawnManagerClass.h | |
| +4 −40 | TacticalClass.h | |
| +6 −14 | Timer.h | |
| +6 −18 | Unsorted.h | |
| +0 −17 | WWMouseClass.h | |
| +0 −1 | YRpp.props |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -127,6 +127,11 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI) | |
| this->DecloakDamagedTargets.Read(exINI, pSection, "DecloakDamagedTargets"); | ||
| this->ShakeIsLocal.Read(exINI, pSection, "ShakeIsLocal"); | ||
| this->ApplyModifiersOnNegativeDamage.Read(exINI, pSection, "ApplyModifiersOnNegativeDamage"); | ||
| this->ChangeOwner.Read(exINI, pSection, "IsOwnerChanger"); | ||
| this->ChangeOwner_MindControl.Read(exINI, pSection, "IsOwnerChanger.SetAsMindControl"); | ||
| this->ChangeOwner_Anim.Read(exINI, pSection, "IsOwnerChanger.ControlAnim"); | ||
| this->ChangeOwner_Threshold.Read(exINI, pSection, "IsOwnerChanger.HealthThreshold"); | ||
Coronia marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| this->ChangeOwner_AffectElites.Read(exINI, pSection, "IsOwnerChanger.AffectElites"); | ||
|
||
|
|
||
| // Crits | ||
| this->Crit_Chance.Read(exINI, pSection, "Crit.Chance"); | ||
|
|
@@ -242,6 +247,7 @@ void WarheadTypeExt::ExtData::LoadFromINIFile(CCINIClass* const pINI) | |
| || this->Convert_Pairs.size() > 0 | ||
| || this->InflictLocomotor | ||
| || this->RemoveInflictedLocomotor | ||
| || this->ChangeOwner | ||
| ); | ||
| } | ||
|
|
||
|
|
@@ -270,6 +276,11 @@ void WarheadTypeExt::ExtData::Serialize(T& Stm) | |
| .Process(this->DecloakDamagedTargets) | ||
| .Process(this->ShakeIsLocal) | ||
| .Process(this->ApplyModifiersOnNegativeDamage) | ||
| .Process(this->ChangeOwner) | ||
| .Process(this->ChangeOwner_MindControl) | ||
| .Process(this->ChangeOwner_Anim) | ||
| .Process(this->ChangeOwner_Threshold) | ||
| .Process(this->ChangeOwner_AffectElites) | ||
|
|
||
| .Process(this->Crit_Chance) | ||
| .Process(this->Crit_ApplyChancePerTarget) | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,6 +41,11 @@ class WarheadTypeExt | |
| Valueable<bool> DecloakDamagedTargets; | ||
| Valueable<bool> ShakeIsLocal; | ||
| Valueable<bool> ApplyModifiersOnNegativeDamage; | ||
| Valueable<bool> ChangeOwner; | ||
| Valueable<bool> ChangeOwner_MindControl; | ||
| Nullable<AnimTypeClass*> ChangeOwner_Anim; | ||
| Valueable<double> ChangeOwner_Threshold; | ||
| Valueable<bool> ChangeOwner_AffectElites; | ||
|
|
||
| Valueable<double> Crit_Chance; | ||
| Valueable<bool> Crit_ApplyChancePerTarget; | ||
|
|
@@ -155,6 +160,11 @@ class WarheadTypeExt | |
| , DecloakDamagedTargets { true } | ||
| , ShakeIsLocal { false } | ||
| , ApplyModifiersOnNegativeDamage { false } | ||
| , ChangeOwner { false } | ||
| , ChangeOwner_MindControl { false } | ||
| , ChangeOwner_Anim {} | ||
| , ChangeOwner_Threshold { 1.0 } | ||
| , ChangeOwner_AffectElites { true } | ||
|
|
||
| , Crit_Chance { 0.0 } | ||
| , Crit_ApplyChancePerTarget { false } | ||
|
|
@@ -250,6 +260,7 @@ class WarheadTypeExt | |
| void ApplyConvert(HouseClass* pHouse, TechnoClass* pTarget); | ||
| void ApplyLocomotorInfliction(TechnoClass* pTarget); | ||
| void ApplyLocomotorInflictionReset(TechnoClass* pTarget); | ||
| void ApplyOwnerChange(HouseClass* pHouse, TechnoClass* pTarget); | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The addition of the Consider adding error handling within the |
||
|
|
||
| public: | ||
| void Detonate(TechnoClass* pOwner, HouseClass* pHouse, BulletExt::ExtData* pBullet, CoordStruct coords); | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.