Fixing combat
Changed the logic of collision detection, moving the collision detection into the main combat function instead of having separate ones.
Moved all the bullets from being linked to the enemy/player to being in the main combat function