[2862] Improve phase 2 transitions for Onyxia

Signed-off-by: Xfurry <xfurry@scriptdev2.com>