STR_Warrior was right.

Simplified code.