Add initial setup for combat modes