Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docs/Whats-New.md
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,7 @@ Phobos fixes:
- Fixed an interaction error between the engineer and the Ares rubble (by FlyStar)
- Fixed the projection location of selectbox when over elevated bridge (by NetsuNegi)
- Fixed an issue where the game would only use `Weapon1` and `Weapon2` for auto-targeting even when `MultiWeapon=yes` was set (by FlyStar)
- Fixed a game load crash caused by `MultiWeapon.IsSecondary=-1` or non-projectile weapons (by FlyStar)

Fixes / interactions with other extensions:
- Allowed `AuxBuilding` and Ares' `SW.Aux/NegBuildings` to count building upgrades (by Ollerus)
Expand Down
8 changes: 6 additions & 2 deletions src/Ext/TechnoType/Body.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -389,14 +389,18 @@ void TechnoTypeExt::ExtData::UpdateAdditionalAttributes()

if (pWeapon)
{
this->ThreatTypes.X |= pWeapon->AllowedThreats();
if (pWeapon->Projectile)
this->ThreatTypes.X |= pWeapon->AllowedThreats();

this->CombatDamages.X += (pWeapon->Damage + pWeapon->AmbientDamage);
num++;
}

if (pEliteWeapon)
{
this->ThreatTypes.Y |= pEliteWeapon->AllowedThreats();
if (pEliteWeapon->Projectile)
this->ThreatTypes.Y |= pEliteWeapon->AllowedThreats();

this->CombatDamages.Y += (pEliteWeapon->Damage + pEliteWeapon->AmbientDamage);
eliteNum++;
}
Expand Down
Loading