I changed my turn structure. Now its not a single units turn but a single players turn where he can use action points as suited. This resolves dealing with weird buff/debuff duration as well as the playstyle of green/tactics color as well as bricking
I should really do paper tests before getting to programme. Luckily the changes were quite straightforward so I'm happy