added 2_code_combat