From 7a23dabdd1ea6b0041f997f8419d01730a345ff3 Mon Sep 17 00:00:00 2001 From: Fen Dweller Date: Fri, 10 Jul 2020 12:06:47 -0400 Subject: [PATCH] Add header; add more vore actions Containers can now offer actions to their contents. --- .eslintrc.js | 3 +- public/index.html | 3 +- public/reset.css | 48 +++++++++++ src/App.vue | 15 ++-- src/assets/logo.png | Bin 6849 -> 0 bytes src/components/Combat.vue | 12 ++- src/components/Header.vue | 29 +++++++ src/game/combat.ts | 168 +++++++++++++++++++++++++------------ src/game/creatures/wolf.ts | 12 +-- src/game/entity.ts | 10 ++- src/game/vore.ts | 107 +++++++++++++++++++---- 11 files changed, 314 insertions(+), 93 deletions(-) create mode 100644 public/reset.css delete mode 100644 src/assets/logo.png create mode 100644 src/components/Header.vue diff --git a/.eslintrc.js b/.eslintrc.js index b422f1e..f85257d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -15,6 +15,7 @@ module.exports = { 'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off', 'no-useless-constructor': 'off', - '@typescript-eslint/no-unused-vars': 'off' + '@typescript-eslint/no-unused-vars': 'off', + 'quotes': 'off' } } diff --git a/public/index.html b/public/index.html index 4123528..3736fa1 100644 --- a/public/index.html +++ b/public/index.html @@ -4,7 +4,8 @@ - + + <%= htmlWebpackPlugin.options.title %> diff --git a/public/reset.css b/public/reset.css new file mode 100644 index 0000000..e29c0f5 --- /dev/null +++ b/public/reset.css @@ -0,0 +1,48 @@ +/* http://meyerweb.com/eric/tools/css/reset/ + v2.0 | 20110126 + License: none (public domain) +*/ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td, +article, aside, canvas, details, embed, +figure, figcaption, footer, header, hgroup, +menu, nav, output, ruby, section, summary, +time, mark, audio, video { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; +} +/* HTML5 display-role reset for older browsers */ +article, aside, details, figcaption, figure, +footer, header, hgroup, menu, nav, section { + display: block; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +table { + border-collapse: collapse; + border-spacing: 0; +} diff --git a/src/App.vue b/src/App.vue index 15cdfc2..5f0a152 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,9 +1,6 @@ @@ -11,12 +8,13 @@ @@ -35,6 +34,8 @@ export default class App extends Vue { diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 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

Your moves

- - + +
{{actionDescription}}

Enemy moves

- - + +
@@ -71,4 +71,8 @@ a { display: flex; justify-content: center; } +.combat-button { + width: 100px; + height: 100px; +} diff --git a/src/components/Header.vue b/src/components/Header.vue new file mode 100644 index 0000000..230c4fe --- /dev/null +++ b/src/components/Header.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/game/combat.ts b/src/game/combat.ts index aa611e2..d8a05ee 100644 --- a/src/game/combat.ts +++ b/src/game/combat.ts @@ -39,46 +39,42 @@ export enum Stat { export type Stats = {[key in Stat]: number} -export enum State { - Normal = 'Normal', - Grappled = 'Grappled', - Grappling = 'Grappling', - Eaten = 'Eaten' -} - export interface Combatant { actions: Array; } export abstract class Action { - allowed (user: Creature, target: Creature) { - return this.userStates.has(user.state) && this.targetStates.has(target.state) - } + abstract allowed (user: Creature, target: Creature): boolean + abstract execute(user: Creature, target: Creature): LogEntry - abstract execute(user: Creature, target: Creature): LogEntry + constructor (public name: string, public desc: string) { - constructor (public name: string, public desc: string, public userStates: Set, public targetStates: Set) { + } - } + toString (): string { + return this.name + } +} - toString (): string { - return this.name - } +export interface Actionable { + actions: Array; } abstract class SelfAction extends Action { allowed (user: Creature, target: Creature) { - if (user === target) { - return super.allowed(user, target) - } else { - return false - } + return user === target } } abstract class PairAction extends Action { allowed (user: Creature, target: Creature) { - if (user !== target) { + return user !== target + } +} + +abstract class TogetherAction extends PairAction { + allowed (user: Creature, target: Creature) { + if (user.containedIn === target.containedIn) { return super.allowed(user, target) } else { return false @@ -86,7 +82,7 @@ abstract class PairAction extends Action { } } -export class AttackAction extends PairAction { +export class AttackAction extends TogetherAction { protected lines: POVActionPicker = { [POV.First]: { [POV.First]: (user, target) => new LogLines('You bite...yourself?'), @@ -99,7 +95,7 @@ export class AttackAction extends PairAction { } constructor (protected damage: Damage) { - super('Attack', 'Attack the enemy', new Set([State.Normal]), new Set([State.Normal])) + super('Attack', 'Attack the enemy') } execute (user: Creature, target: Creature): LogEntry { @@ -108,7 +104,7 @@ export class AttackAction extends PairAction { } } -export class DevourAction extends PairAction { +export class DevourAction extends TogetherAction { protected lines: POVActionPicker = { [POV.First]: { [POV.First]: (user, target) => new LogLines('You devour...yourself?'), @@ -121,11 +117,11 @@ export class DevourAction extends PairAction { } constructor (protected container: Container) { - super('Devour', 'Try to consume your foe', new Set([State.Normal]), new Set([State.Normal])) + super('Devour', 'Try to consume your foe') + this.name += ` (${container.name})` } execute (user: Creature, target: Creature): LogEntry { - target.state = State.Eaten return new CompositeLog(this.lines[user.perspective][target.perspective](user, target), this.container.consume(target)) } } @@ -142,48 +138,116 @@ export class StruggleAction extends PairAction { } } - constructor () { - super('Struggle', 'Try to escape your predator', new Set([State.Eaten]), new Set([State.Normal])) + allowed (user: Creature, target: Creature) { + if (user.containedIn === this.container) { + return super.allowed(user, target) + } else { + return false + } + } + + constructor (public container: Container) { + super('Struggle', 'Try to escape your predator') } execute (user: Creature, target: Creature): LogEntry { if (user.containedIn) { - user.state = State.Normal return new CompositeLog(this.lines[user.perspective][target.perspective](user, target), user.containedIn.release(user)) } else { return new LogLines("The prey wasn't actually eaten...") } } } export class DigestAction extends SelfAction { - protected lines: POVActionPicker = { - [POV.First]: { - [POV.First]: (user, target) => new LogLines('You rub your stomach'), - [POV.Third]: (user, target) => new LogLines("You can't digest for other people...") - }, - [POV.Third]: { - [POV.First]: (user, target) => new LogLines("Other people can't digest for you..."), - [POV.Third]: (user, target) => new LogLines(user.name.capital + ' rubs ' + user.pronouns.possessive + ' gut.') - } + protected lines: POVActionPicker = { + [POV.First]: { + [POV.First]: (user, target) => new LogLines('You rub your stomach'), + [POV.Third]: (user, target) => new LogLines("You can't digest for other people...") + }, + [POV.Third]: { + [POV.First]: (user, target) => new LogLines("Other people can't digest for you..."), + [POV.Third]: (user, target) => new LogLines(user.name.capital + ' rubs ' + user.pronouns.possessive + ' gut.') } + } - allowed (user: Creature, target: Creature) { - if (user.containers.some(container => { - return container.contents.length > 0 - })) { - return super.allowed(user, target) - } else { - return false - } + allowed (user: Creature, target: Creature) { + if (this.container.owner === user && this.container.contents.length > 0) { + return super.allowed(user, target) + } else { + return false } + } + + constructor (protected container: Container) { + super('Digest', 'Digest all of your current prey') + this.name += ` (${container.name})` + } + + execute (user: Creature, target: Creature): LogEntry { + const results = new CompositeLog(...user.containers.map(container => container.tick(60))) + return new CompositeLog(this.lines[user.perspective][target.perspective](user, target), results) + } +} - constructor () { - super('Digest', 'Digest all of your current prey', new Set([State.Normal]), new Set([State.Normal])) +export class ReleaseAction extends PairAction { + protected lines: POVActionPicker = { + [POV.First]: { + [POV.First]: (user, target) => new LogLines(`You can't release yourself`), + [POV.Third]: (user, target) => new LogLines(`You hork up ${target.name}}`) + }, + [POV.Third]: { + [POV.First]: (user, target) => new LogLines(`${user.name.capital} horks you up`), + [POV.Third]: (user, target) => new LogLines(`${user.name.capital} horks up ${target.name.capital}`) } + } - execute (user: Creature, target: Creature): LogEntry { - const results = new CompositeLog(...user.containers.map(container => container.tick(60))) - return new CompositeLog(this.lines[user.perspective][target.perspective](user, target), results) + allowed (user: Creature, target: Creature) { + if (target.containedIn === this.container) { + return super.allowed(user, target) + } else { + return false } + } + + constructor (protected container: Container) { + super('Release', 'Release one of your prey') + this.name += ` (${container.name})` + } + + execute (user: Creature, target: Creature): LogEntry { + const results = this.container.release(target) + return new CompositeLog(this.lines[user.perspective][target.perspective](user, target), results) + } +} + +export class TransferAction extends PairAction { + protected lines: POVActionPicker = { + [POV.First]: { + [POV.First]: (user, target) => new LogLines(), + [POV.Third]: (user, target) => new LogLines(`You push your prey from your ${this.from.name} to your ${this.to.name}`) + }, + [POV.Third]: { + [POV.First]: (user, target) => new LogLines(`You're shoved from ${user.name}'s ${this.from.name} to their ${this.to.name}`), + [POV.Third]: (user, target) => new LogLines(`${user.name.capital} pushes ${target.name} from their ${this.from.name} to their ${this.to.name}`) + } + } + + allowed (user: Creature, target: Creature) { + if (target.containedIn === this.from) { + return super.allowed(user, target) + } else { + return false + } + } + + constructor (protected from: Container, protected to: Container) { + super('Transfer', `Shove your prey from your ${from.name} to your ${to.name}`) + } + + execute (user: Creature, target: Creature): LogEntry { + this.from.release(target) + this.to.consume(target) + return this.lines[user.perspective][target.perspective](user, target) + } } export interface CombatTest { diff --git a/src/game/creatures/wolf.ts b/src/game/creatures/wolf.ts index 0d67665..e94928d 100644 --- a/src/game/creatures/wolf.ts +++ b/src/game/creatures/wolf.ts @@ -1,7 +1,7 @@ import { Creature, POV } from '../entity' -import { Stat, Damage, DamageType, AttackAction, DevourAction, StruggleAction, DigestAction } from '../combat' +import { Stat, Damage, DamageType, AttackAction, StruggleAction, TransferAction } from '../combat' import { MalePronouns, ImproperNoun } from '../language' -import { VoreType, Stomach } from '../vore' +import { VoreType, Stomach, Bowels } from '../vore' import { LogLines } from '../interface' class BiteAction extends AttackAction { @@ -21,8 +21,10 @@ export class Wolf extends Creature { const stomach = new Stomach(this, 50, new Damage({ amount: 50, type: DamageType.Acid }, { amount: 500, type: DamageType.Crush })) this.containers.push(stomach) - this.actions.push(new DevourAction(stomach)) - this.actions.push(new StruggleAction()) - this.actions.push(new DigestAction()) + const bowels = new Bowels(this, 50, new Damage({ amount: 50, type: DamageType.Acid }, { amount: 500, type: DamageType.Crush })) + + this.containers.push(bowels) + + this.actions.push(new TransferAction(bowels, stomach)) } } diff --git a/src/game/entity.ts b/src/game/entity.ts index 8b9e759..d78d1f9 100644 --- a/src/game/entity.ts +++ b/src/game/entity.ts @@ -1,4 +1,4 @@ -import { DamageType, Damage, Combatant, Stats, State, Action } from './combat' +import { DamageType, Damage, Combatant, Stats, Action } from './combat' import { Noun, Pronoun } from './language' import { Pred, Prey, Container, VoreType } from './vore' @@ -24,7 +24,6 @@ export class Creature implements Mortal, Pred, Prey, Combatant { maxHealth = 100 resistances: Map = new Map() perspective: POV = POV.Third - state: State = State.Normal containers: Array = [] actions: Array = []; private baseBulk: number; @@ -55,7 +54,12 @@ export class Creature implements Mortal, Pred, Prey, Combatant { } validActions (target: Creature): Array { - return this.actions.filter(action => { + let choices = this.actions.concat(this.containers.flatMap(container => container.actions)) + + if (this.containedIn !== null) { + choices = choices.concat(this.containedIn.actions) + } + return choices.filter(action => { return action.allowed(this, target) }) } diff --git a/src/game/vore.ts b/src/game/vore.ts index 7cc4f58..3aa34c3 100644 --- a/src/game/vore.ts +++ b/src/game/vore.ts @@ -1,7 +1,6 @@ import { Entity, Mortal, POV } from './entity' -import { Damage } from './combat' +import { Damage, Actionable, Action, DevourAction, DigestAction, ReleaseAction, StruggleAction } from './combat' import { LogLines, LogEntry, CompositeLog } from './interface' -import { ProperNoun } from './language' export enum VoreType {Oral} export interface Prey extends Mortal { @@ -15,21 +14,23 @@ export interface Pred extends Entity { containers: Array; } -export interface Container { - name: string; - voreTypes: Set; - contents: Array; - capacity: number; - fullness: number; - canTake: (prey: Prey) => boolean; - consume: (prey: Prey) => LogEntry; - release: (prey: Prey) => LogEntry; - struggle: (prey: Prey) => LogEntry; - tick: (dt: number) => LogEntry; - describe: () => LogEntry; - digest: (prey: Prey) => LogEntry; - absorb: (prey: Prey) => LogEntry; - dispose: (preys: Prey[]) => LogEntry; +export interface Container extends Actionable { + name: string; + owner: Pred; + voreTypes: Set; + contents: Array; + capacity: number; + fullness: number; + canTake: (prey: Prey) => boolean; + consume: (prey: Prey) => LogEntry; + release: (prey: Prey) => LogEntry; + struggle: (prey: Prey) => LogEntry; + tick: (dt: number) => LogEntry; + describe: () => LogEntry; + digest: (prey: Prey) => LogEntry; + absorb: (prey: Prey) => LogEntry; + dispose: (preys: Prey[]) => LogEntry; + actions: Array; } abstract class NormalContainer implements Container { @@ -112,14 +113,23 @@ abstract class NormalContainer implements Container { return new LogLines('GLORP') } - constructor (public name: string, protected owner: Pred, public voreTypes: Set, public capacity: number, private damage: Damage) { + actions: Array + + constructor (public name: string, public owner: Pred, public voreTypes: Set, public capacity: number, private damage: Damage) { this.contents = [] + + this.actions = [] } } export class Stomach extends NormalContainer { constructor (owner: Pred, capacity: number, damage: Damage) { super('Stomach', owner, new Set([VoreType.Oral]), capacity, damage) + + this.actions.push(new DevourAction(this)) + this.actions.push(new DigestAction(this)) + this.actions.push(new ReleaseAction(this)) + this.actions.push(new StruggleAction(this)) } consume (prey: Prey): LogEntry { @@ -172,3 +182,64 @@ export class Stomach extends NormalContainer { } } } + +export class Bowels extends NormalContainer { + constructor (owner: Pred, capacity: number, damage: Damage) { + super('Bowels', owner, new Set([VoreType.Oral]), capacity, damage) + + this.actions.push(new DevourAction(this)) + this.actions.push(new DigestAction(this)) + this.actions.push(new ReleaseAction(this)) + this.actions.push(new StruggleAction(this)) + } + + consume (prey: Prey): LogEntry { + super.consume(prey) + + const predPOV = this.owner.perspective + const preyPOV = prey.perspective + if (predPOV === POV.First && preyPOV === POV.Third) { + return new LogLines(prey.name.capital + ' slides down into your bowels') + } else if (predPOV === POV.Third && preyPOV === POV.First) { + return new LogLines(this.owner.name.capital + "'s guts swell as you slush down into " + this.owner.pronouns.possessive + ' bowels') + } else if (predPOV === POV.Third && preyPOV === POV.Third) { + return new LogLines(this.owner.name.capital + "'s belly fills with the struggling form of " + prey.name) + } else { + return new LogLines('FIX ME!') + } + } + + digest (prey: Prey): LogEntry { + super.digest(prey) + + const predPOV = this.owner.perspective + const preyPOV = prey.perspective + + if (predPOV === POV.First && preyPOV === POV.Third) { + return new LogLines('Your bowels finishes off ' + prey.name) + } else if (predPOV === POV.Third && preyPOV === POV.First) { + return new LogLines(this.owner.name.capital + ' digests you') + } else if (predPOV === POV.Third && preyPOV === POV.Third) { + return new LogLines(this.owner.name.capital + ' finishes digesting ' + prey.name) + } else { + return new LogLines('FIX ME!') + } + } + + absorb (prey: Prey): LogEntry { + super.absorb(prey) + + const predPOV = this.owner.perspective + const preyPOV = prey.perspective + + if (predPOV === POV.First && preyPOV === POV.Third) { + return new LogLines("Your bowels melts down what's left of " + prey.name) + } else if (predPOV === POV.Third && preyPOV === POV.First) { + return new LogLines(this.owner.name.capital + ' finishes absorbing you') + } else if (predPOV === POV.Third && preyPOV === POV.Third) { + return new LogLines(this.owner.name.capital + ' fully absorbs ' + prey.name) + } else { + return new LogLines('FIX ME!') + } + } +}