From 1b5cc1926fc37fc07a92d6f13fb8716bab6e9ae8 Mon Sep 17 00:00:00 2001
From: Fen Dweller <chemicalcrux@gmail.com>
Date: Wed, 15 Jul 2020 11:50:43 -0400
Subject: [PATCH] Display vore stats properly

---
 src/components/Statblock.vue | 22 ++++++++--------------
 src/game/combat.ts           | 20 ++++++++++++++++++++
 src/game/entity.ts           | 11 ++++++++---
 src/game/interface.ts        | 15 ++++++++-------
 src/game/vore.ts             | 17 +++++------------
 5 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/components/Statblock.vue b/src/components/Statblock.vue
index f610c23..cd1c295 100644
--- a/src/components/Statblock.vue
+++ b/src/components/Statblock.vue
@@ -25,20 +25,12 @@
     </div>
     <br>
     <div class="stat-line">
-      <div class="stat-entry">
-        <i class="fas fa-weight-hanging" />
-        <div> {{ subject.bulk }} </div>
+      <div class="stat-entry" v-for="stat in Object.keys(subject.voreStats)" v-bind:key="stat">
+        <i :class="voreStatIcons[stat]" />
+        <div>{{subject.voreStats[stat]}}</div>
         <div class="tooltip-template">
-          <div class="tooltip-title"> Bulk </div>
-          <div class="tooltip-body"> How much space you take up </div>
-        </div>
-      </div>
-      <div class="stat-entry">
-        <i class="fas fa-utensils" />
-        <div> {{ subject.containers.reduce((total, container) => total + container.contents.length, 0) }} </div>
-        <div class="tooltip-template">
-          <div class="tooltip-title"> Prey Count </div>
-          <div class="tooltip-body"> How many things you've eaten </div>
+          <div class="tooltip-title">{{ stat }}</div>
+          <div class="tooltip-body">{{ voreStatDescs[stat] }}</div>
         </div>
       </div>
     </div>
@@ -51,7 +43,7 @@
 <script lang="ts">
 import { Component, Prop, Vue, Watch, Emit } from 'vue-property-decorator'
 import { Creature, POV } from '@/game/entity'
-import { Stats, Stat, StatIcons, StatDescs, Vigor, VigorIcons, VigorDescs } from '@/game/combat'
+import { Stats, Stat, StatIcons, StatDescs, Vigor, VigorIcons, VigorDescs, VoreStatDescs, VoreStatIcons } from '@/game/combat'
 import ContainerView from './ContainerView.vue'
 import tippy from 'tippy.js'
 import 'tippy.js/dist/tippy.css'
@@ -67,8 +59,10 @@ export default class Statblock extends Vue {
 
   private vigorIcons = VigorIcons
   private statIcons = StatIcons
+  private voreStatIcons = VoreStatIcons
   private vigorDescs = VigorDescs
   private statDescs = StatDescs
+  private voreStatDescs = VoreStatDescs
   private vigor = Vigor
 
   firstperson: POV = POV.First
diff --git a/src/game/combat.ts b/src/game/combat.ts
index a2dfa18..1c5ee32 100644
--- a/src/game/combat.ts
+++ b/src/game/combat.ts
@@ -65,6 +65,26 @@ export const StatDescs: {[key in Stat]: string} = {
   Charm: 'Your mental power'
 }
 
+export enum VoreStat {
+  Mass = "Mass",
+  Bulk = "Bulk",
+  PreyCount = "Prey Count"
+}
+
+export type VoreStats = {[key in VoreStat]: number}
+
+export const VoreStatIcons: {[key in VoreStat]: string} = {
+  [VoreStat.Mass]: "fas fa-weight",
+  [VoreStat.Bulk]: "fas fa-weight-hanging",
+  [VoreStat.PreyCount]: "fas fa-utensils"
+}
+
+export const VoreStatDescs: {[key in VoreStat]: string} = {
+  [VoreStat.Mass]: "How much you weigh",
+  [VoreStat.Bulk]: "Your weight, plus the weigh of your prey",
+  [VoreStat.PreyCount]: "How many creatures you've got inside of you"
+}
+
 export interface CombatTest {
   test: (user: Creature, target: Creature) => boolean;
   odds: (user: Creature, target: Creature) => number;
diff --git a/src/game/entity.ts b/src/game/entity.ts
index cca3f12..b2c63d1 100644
--- a/src/game/entity.ts
+++ b/src/game/entity.ts
@@ -1,7 +1,7 @@
-import { DamageType, Damage, Combatant, Stats, Action, Vigor } from './combat'
+import { DamageType, Damage, Combatant, Stats, Action, Vigor, VoreStats, VoreStat } from './combat'
 import { Noun, Pronoun } from './language'
 import { LogEntry, LogLine } from './interface'
-import { Vore, Container, VoreType, VoreStat, VoreStats } from './vore'
+import { Vore, Container, VoreType } from './vore'
 
 export enum POV {First, Third}
 
@@ -67,6 +67,11 @@ export class Creature extends Vore implements Combatant {
                   return total + prey.voreStats.Bulk
                 },
                 0
+              ) + container.digested.reduce(
+                (total: number, prey: Vore) => {
+                  return total + prey.voreStats.Bulk
+                },
+                0
               )
             },
             this.Mass
@@ -78,7 +83,7 @@ export class Creature extends Vore implements Combatant {
             (total: number, container: Container) => {
               return total + container.contents.reduce(
                 (total: number, prey: Vore) => {
-                  return total + prey.voreStats[VoreStat.PreyCount]
+                  return total + 1 + prey.voreStats[VoreStat.PreyCount]
                 },
                 0
               )
diff --git a/src/game/interface.ts b/src/game/interface.ts
index 1d63bab..0875772 100644
--- a/src/game/interface.ts
+++ b/src/game/interface.ts
@@ -1,4 +1,4 @@
-import { Stat, Vigor, StatDescs, VigorDescs, StatIcons, VigorIcons } from './combat'
+import { Stat, Vigor, StatDescs, VigorDescs, StatIcons, VigorIcons, VoreStat, VoreStatIcons, VoreStatDescs } from './combat'
 import tippy from 'tippy.js'
 
 /**
@@ -135,7 +135,7 @@ export class FAElem implements LogEntry {
  * A tooltip is attached to the symbol
  */
 export class PropElem implements LogEntry {
-  constructor (private prop: Stat | Vigor, private value: number|null = null) {
+  constructor (private prop: Stat | Vigor | VoreStat, private value: number|null = null) {
 
   }
 
@@ -146,6 +146,8 @@ export class PropElem implements LogEntry {
       cls = StatIcons[this.prop as Stat]
     } else if (this.prop in Vigor) {
       cls = VigorIcons[this.prop as Vigor]
+    } else if (this.prop in Vigor) {
+      cls = VoreStatIcons[this.prop as VoreStat]
     } else {
       // this shouldn't be possible, given the typing...
       cls = "fas fa-exclamation-triangle"
@@ -163,15 +165,14 @@ export class PropElem implements LogEntry {
     tooltipTemplate.appendChild(tooltipTitle)
     tooltipTemplate.appendChild(tooltipBody)
 
-    if (this.prop in Stat) {
-      tooltipTitle.textContent = this.prop
-    } else if (this.prop in Vigor) {
-      tooltipTitle.textContent = this.prop
-    }
+    tooltipTitle.textContent = this.prop
+
     if (this.prop in Stat) {
       tooltipBody.textContent = StatDescs[this.prop as Stat]
     } else if (this.prop in Vigor) {
       tooltipBody.textContent = VigorDescs[this.prop as Vigor]
+    } else if (this.prop in VoreStat) {
+      tooltipBody.textContent = VoreStatDescs[this.prop as VoreStat]
     }
 
     if (this.value !== null) {
diff --git a/src/game/vore.ts b/src/game/vore.ts
index 6d8a966..7961236 100644
--- a/src/game/vore.ts
+++ b/src/game/vore.ts
@@ -1,5 +1,5 @@
 import { Entity, Mortal, POV, Creature } from './entity'
-import { Damage, DamageType, Stats, Actionable, Action, Vigor } from './combat'
+import { Damage, DamageType, Stats, Actionable, Action, Vigor, VoreStats } from './combat'
 import { LogLines, LogEntry, CompositeLog, LogLine } from './interface'
 import { Noun, Pronoun, POVPair, POVPairArgs, ImproperNoun, POVSolo } from './language'
 import { DigestAction, DevourAction, ReleaseAction, StruggleAction } from './combat/actions'
@@ -11,14 +11,6 @@ export enum VoreType {
   Unbirth = "Unbirthing"
 }
 
-export enum VoreStat {
-  Mass = "Mass",
-  Bulk = "Bulk",
-  PreyCount = "Prey Count"
-}
-
-export type VoreStats = {[key in VoreStat]: number}
-
 export abstract class Vore implements Mortal {
   abstract name: Noun;
   abstract pronouns: Pronoun;
@@ -120,7 +112,7 @@ abstract class NormalContainer implements Container {
     }
 
     tick (dt: number): LogEntry {
-      const digested: Array<Vore> = []
+      const justDigested: Array<Vore> = []
 
       const scaled = this.damage.scale(dt / 60)
 
@@ -129,12 +121,13 @@ abstract class NormalContainer implements Container {
         damageResults.push(prey.takeDamage(scaled))
 
         if (prey.vigors[Vigor.Health] <= 0) {
-          digested.push(prey)
+          this.digested.push(prey)
+          justDigested.push(prey)
         }
       })
 
       const tickedEntries = new LogLines(...this.contents.map(prey => this.tickLines.run(this.owner, prey, { damage: scaled })))
-      const digestedEntries = new LogLines(...digested.map(prey => this.digest(prey)))
+      const digestedEntries = new LogLines(...justDigested.map(prey => this.digest(prey)))
 
       this.contents = this.contents.filter(prey => {
         return prey.vigors[Vigor.Health] > 0