improved attack framework

Everything that's needed for things to work now exists. Things do not
yet actually work.
Merge remote-tracking branch 'origin/combat' into combat

Conflicts:
	ProjectIntroGT/ProjectIntroGT/ProjectIntroGT.csproj.Debug.cachefile
	ProjectIntroGT/ProjectIntroGT/bin/x86/Debug/ProjectIntroGT.exe
	ProjectIntroGT/ProjectIntroGT/bin/x86/Debug/ProjectIntroGT.pdb

	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/ProjectIntroGT.csproj.FileListAbsolute.txt
	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/ProjectIntroGT.exe
	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/ProjectIntroGT.pdb

	ProjectIntroGT/ProjectIntroGT/obj/x86/Debug/cachefile-{6B33DE88-CBEF-4057-9FFA-9D74D4E20220}-targetpath.txt