diff --git a/src/game/combat.ts b/src/game/combat.ts index bdfa9c5..e041f25 100644 --- a/src/game/combat.ts +++ b/src/game/combat.ts @@ -164,8 +164,16 @@ export class AttackAction extends TogetherAction { new FormatText(`${args.damage}`, FormatOpt.Damage), ` damage` )], - [[POV.Third, POV.First], (user, target, args) => new LogLines(`${user.name.capital} hits you for ${args.damage} damage`)], - [[POV.Third, POV.Third], (user, target, args) => new LogLines(`${user.name.capital} hits ${target.name.capital} for ${args.damage} damage`)] + [[POV.Third, POV.First], (user, target, args) => new LogLine( + `${user.name.capital} smacks you for `, + new FormatText(`${args.damage}`, FormatOpt.Damage), + ` damage` + )], + [[POV.Third, POV.Third], (user, target, args) => new LogLine( + `${user.name.capital} smacks ${target.name} for `, + new FormatText(`${args.damage}`, FormatOpt.Damage), + ` damage` + )] ]) protected failLines: POVPair = new POVPair([ @@ -277,8 +285,8 @@ export class DigestAction extends SelfAction { } execute (user: Creature, target: Creature): LogEntry { - const results = new CompositeLog(...user.containers.map(container => container.tick(60))) - return new CompositeLog(this.lines.run(user, target), results) + const results = this.container.tick(60) + return new CompositeLog(results) } } diff --git a/src/game/creatures/wolf.ts b/src/game/creatures/wolf.ts index 8a49f97..7f0ff82 100644 --- a/src/game/creatures/wolf.ts +++ b/src/game/creatures/wolf.ts @@ -5,7 +5,7 @@ import { VoreType, Stomach, Bowels } from '../vore' class BiteAction extends AttackAction { constructor () { - super(new Damage({ amount: 10, type: DamageType.Pierce })) + super(new Damage({ amount: 10, type: DamageType.Slash })) } } diff --git a/src/game/vore.ts b/src/game/vore.ts index 1be3735..91e6b87 100644 --- a/src/game/vore.ts +++ b/src/game/vore.ts @@ -89,15 +89,18 @@ abstract class NormalContainer implements Container { const start = prey.health prey.takeDamage(this.damage.scale(dt / 3600)) const end = prey.health + if (start > 0 && end <= 0) { digested.push(prey) - } else if (start > -100 && end <= -100) { + } + + if (start > -100 && end <= -100) { absorbed.push(prey) } }) const digestedEntries = new CompositeLog(...digested.map(prey => this.digest(prey))) - const absorbedEntries = new CompositeLog(...digested.map(prey => this.absorb(prey))) + const absorbedEntries = new CompositeLog(...absorbed.map(prey => this.absorb(prey))) this.contents = this.contents.filter(prey => { return prey.health > -100