Prevent one object in combat multiple times, auto button-positioning in prompt state
Merge branch 'master' of https://github.com/floAr/ADG_Scarlet_Gamma
Some Prompt state fixes, relevant for combat