From 64eb72a092525d9a6ca12b82129abb8deaf141ce Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Fri, 7 Aug 2020 20:25:36 -0400
Subject: [PATCH] Add description text to damage consequences

---
 src/game/combat/consequences.ts |  6 ++++++
 src/game/creatures/goldeneye.ts | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/game/combat/consequences.ts b/src/game/combat/consequences.ts
index 13c7515..788c9a1 100644
--- a/src/game/combat/consequences.ts
+++ b/src/game/combat/consequences.ts
@@ -48,6 +48,12 @@ export class DamageConsequence extends Consequence {
       target.takeDamage(damage)
     )
   }
+
+  describePair (user: Creature, target: Creature): LogEntry {
+    return new LogLine(
+      this.damageFormula.describe(user, target)
+    )
+  }
 }
 
 /**
diff --git a/src/game/creatures/goldeneye.ts b/src/game/creatures/goldeneye.ts
index 0f2422b..5ac9fa2 100644
--- a/src/game/creatures/goldeneye.ts
+++ b/src/game/creatures/goldeneye.ts
@@ -1,5 +1,5 @@
 import { Creature } from "../creature"
-import { Damage, DamageType, ConstantDamageFormula, Vigor, Side, GroupAction, FractionDamageFormula, DamageFormula, UniformRandomDamageFormula, CompositionAction, StatusEffect } from '../combat'
+import { Damage, DamageType, ConstantDamageFormula, Vigor, Side, GroupAction, FractionDamageFormula, DamageFormula, UniformRandomDamageFormula, CompositionAction, StatusEffect, CompositeDamageFormula } from '../combat'
 import { MalePronouns, ImproperNoun, Verb, ProperNoun, ToBe, SoloLineArgs } from '../language'
 import { VoreType, NormalContainer, Vore, InnerVoreContainer, Container } from '../vore'
 import { TransferAction } from '../combat/actions'
@@ -170,16 +170,16 @@ export class Goldeneye extends Creature {
             )
           ),
           new DamageConsequence(
-            new FractionDamageFormula([
-              { fraction: 0.75, target: Vigor.Health, type: DamageType.Pure }
-            ])
-          ),
-          new DamageConsequence(
-            new ConstantDamageFormula(
-              new Damage(
-                { amount: 50, target: Vigor.Health, type: DamageType.Crush }
+            new CompositeDamageFormula([
+              new FractionDamageFormula([
+                { fraction: 0.75, target: Vigor.Health, type: DamageType.Pure }
+              ]),
+              new ConstantDamageFormula(
+                new Damage(
+                  { amount: 50, target: Vigor.Health, type: DamageType.Crush }
+                )
               )
-            )
+            ])
           ),
           new StatusConsequence(
             () => new StunEffect(3)