Updated upkeep calculation (fix training soldier ignored)