Tweak some conditions, try to fix enemy AI, fail
Merge remote-tracking branch 'origin/master'