FIX: Fixed shooting effect
Fixed tower shooting
Fixed merge conflicts