*Weapon: fix minor targeting issues due to underwater state definition