From 8e39b5986bdd2806feb884c51539c22cd62986f6 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Sat, 18 Jun 2022 08:57:32 -0400 Subject: [PATCH] Make struggles exit to the correct container Previously, even things like 'stomach to throat' would completely escape. Now, they go to the correct place. --- src/game/combat/actions.ts | 2 +- src/game/vore.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/combat/actions.ts b/src/game/combat/actions.ts index 84339b5..2cb0b96 100644 --- a/src/game/combat/actions.ts +++ b/src/game/combat/actions.ts @@ -244,7 +244,7 @@ export class StruggleMoveAction extends Action { execute (user: Creature, target: Creature): LogEntry { if (user.containedIn !== null) { - return new LogLines(this.successLine(user, target, { container: this.from }), user.containedIn.release(user)) + return new LogLines(this.successLine(user, target, { container: this.from }), user.containedIn.exit(user), this.to.enter(user)) } else { return new LogLine("Vore's bugged!") } diff --git a/src/game/vore.ts b/src/game/vore.ts index 1991739..cea9404 100644 --- a/src/game/vore.ts +++ b/src/game/vore.ts @@ -297,7 +297,7 @@ export abstract class DefaultContainer implements Container { tickLine (user: Creature, target: Creature, args: { damage: Damage }): LogEntry { const options = [ - new LogLine(`${user.name.capital} ${user.name.conjugate(Words.Churns)} ${target.name.objective} ${this.strugglePreposition} ${user.pronouns.possessive} ${this.name} for `, args.damage.renderShort(), `.`), + new LogLine(`${user.name.capital} ${Words.Churns.present}} ${target.name.objective} ${this.strugglePreposition} ${user.pronouns.possessive} ${this.name} for `, args.damage.renderShort(), `.`), new LogLine(`${user.name.capital.possessive} ${this.name} ${this.name.conjugate(Words.Churns)}, ${Words.Churns.present} ${target.name.objective} for `, args.damage.renderShort(), `.`), new LogLine(`${target.name.capital} ${target.name.conjugate(Words.Struggle)} ${this.strugglePreposition} ${user.name.possessive} ${Words.Slick} ${this.name} as it ${Words.Churns.singular} ${target.pronouns.objective} for `, args.damage.renderShort(), `.`) ]