Change to damage calculations
Remove references to faction strings
Remove reference to player