[Merge] From Unstable Pt4

[Fix] Wound and enhance packs will check for droid vs building and just
use the highest

Nov 24