Alpha2.5 Sne update

Rebuild Vimes' fight script with Sne's ideas