Especially @Grey Roger and @Jack Rackham: I just remembered I still had to do something about those "soldier weapons during boarding", so see attached for my proposal. I excluded Pirates from the soldier weapons at sea, since it seems really weird for them to always have the same type of weapons. For real soldiers, I restored the original ARF code (from before @Jack Rackham's additions) and made some slight tweaks myself. If this does what I think it should, you should no longer see bayonets at sea; though you may still get the Musketoon in the later time periods. Does this seem like a good idea? Or would some further tweaks be needed?