So I, uh, just now found out that I can set states to last for a certain number of *actions* rather than turns. Given that the battle system I'm using isn't really turn-based, that would definitely help with making them behave more consistently. So, I think I'm going to try that and see if it breaks anything.