hatred fix

client/src/components/game.component.jsx

@@ -148,12 +148,8 @@ function GamePanel(props) {
         );
     }
 
-    function resolutionEl(r) {
-        return <div>{JSON.stringify(resolution)}</div>;
-    }
-
     const selectedSkills = resolution
-        ? resolutionEl(resolution)
+        ? <div>&nbsp;</div>
         : playerTeam.cryps.map((c, i) => stackElement(c, i));
 
     // const mobileSkills = activeCryp

client/src/utils.jsx

@@ -188,7 +188,10 @@ function getCombatText(cryp, resolution) {
 
     if (type === 'Damage') {
         const { skill, amount, mitigation, colour } = event;
-        return amount;
+        const mitigationText = mitigation
+            ? `(${mitigation})`
+            : '';
+        return `${amount} ${mitigationText}`;
     }
 
     if (type === 'Healing') {