As was previously discussed in separate threads, several viable options were proposed for adequately changing the Factory.

No, there weren't. In that same thread, after suggestions were made to change the speed or arrangement, it was rightly noted that they would likely still find a way to take it, but it would be even more difficult and convoluted. So, the viability of these options still needs to be proven, which is quite challenging.

Perhaps a radical option will be implemented: mandatory retreat for the attacker after 100 (or another number) rounds of combat (in any combat). This would also solve the problem of a draw in a "handcuffs" situation in a battle between players.