Altered Enemy class
Merge remote-tracking branch 'jreale4/master'
Compacted equipment.