fixed resource bug, fixed combat view