simplify groovy code, should not use the stack as it is a replacement event
Edit combat abilities to match card text.
Merge