More work on combat / actions, some DismissableDialogState fixes
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma