modified collision detection, added CombatObject, first CombatSystem