More work on combat and scripting.