CastrumNubis/forgotten-friends
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use interaction resolve matching

Browse Source
This commit is contained in:
Dustlint
2026-03-27 20:03:50 +01:00
parent ecc82a9dce
commit 5858e2808d
5 changed files with 110 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app/dexie/entities/chibis.ts
View File

@@ -1,7 +1,14 @@
import { Chibi, ChibiId } from "../../types/chibi/chibi";
import { Chibi, ChibiId, ChibiStatBar } from "../../types/chibi/chibi";
import { EChibiName } from "../../types/chibi/chibi-name";
import { EChibiStateName } from "../../types/chibi/chibi-state-name";
export const statBar = (current: number, max: number): ChibiStatBar => {
return {
current,
max
}
}
export const MAX_STAT_VALUE: number = 100000;
export const CHIBIS: Chibi[] = [
@@ -12,11 +19,11 @@ export const CHIBIS: Chibi[] = [
spritePath: '',
experience: 0,
unlocked: true,
happyness: MAX_STAT_VALUE,
health: MAX_STAT_VALUE,
hunger: MAX_STAT_VALUE,
boredom: MAX_STAT_VALUE,
energy: MAX_STAT_VALUE,
happyness: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
health: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
hunger: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
boredom: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
energy: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
attentionSpan: 1000,
recoveryRate: 1000,
constitution: 1000,
@@ -24,4 +31,23 @@ export const CHIBIS: Chibi[] = [
maintenanceCals: 0,
state: EChibiStateName.Sleeping
},
{
id: '238df3e7-3003-4471-91f5-a7ecf3151e18' as ChibiId,
name: EChibiName.Caethya,
iconPath: '',
spritePath: '',
experience: 0,
unlocked: true,
happyness: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
health: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
hunger: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
boredom: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
energy: statBar(MAX_STAT_VALUE, MAX_STAT_VALUE),
attentionSpan: 1000,
recoveryRate: 1000,
constitution: 1000,
power: 1000,
maintenanceCals: 0,
state: EChibiStateName.Idle
},
];

46
src/app/logic/chibi-behaviour/brains/aperio.brain.ts
View File

@@ -6,6 +6,8 @@ import { Food } from "../../../types/food";
import { RandomOutcome, RandomService } from "../../random.service";
import { IBrain } from "../brain";
export type InteractionMap = { [key in EChibiStateName]: InteractionRecord | undefined }
export type ChibiInteraction<T = null> = {
name: EChibiInteraction;
payload: T;
@@ -37,7 +39,7 @@ export class Aperio implements IBrain {
private preferredFoods: string[] = [];
private state: ChibiState = STATES[this.defaultState];
private interactionMap: { [key in EChibiStateName]: InteractionRecord | undefined } = {
private interactionMap: InteractionMap = {
[EChibiStateName.Sleeping]: {
[EChibiInteraction.WakeUp]: (interaction: ChibiInteraction): ChibiState => this.wakeUp(interaction),
},
@@ -65,6 +67,9 @@ export class Aperio implements IBrain {
exist(): void {
this.timeInCurrentState++;
//this sucks, resolve should be generic
//stuff into an existMap which contains the resolve functions
//then find correct function to execute the same way we do for interactions
this.resolveAwake();
this.resolveSleeping();
this.resolveGrumbling();
@@ -73,11 +78,8 @@ export class Aperio implements IBrain {
resolveInteraction(interaction: ChibiInteraction): void {
this.timeSinceLastInteraction = 0;
const specificMatch: ResolutionFunction | undefined = this.interactionMap[this.state.name]?.[interaction.name];
const awakeMatch: ResolutionFunction | undefined = this.interactionMap[EChibiStateName.Awake]?.[interaction.name];
const asleepMatch: ResolutionFunction | undefined = this.interactionMap[EChibiStateName.Sleeping]?.[interaction.name];
const resolution: ResolutionFunction | undefined = specificMatch || (this.isAwake() ? awakeMatch : asleepMatch);
console.log(`specific match: ${specificMatch}`);
const resolution = this.matchInteraction(this.interactionMap, interaction.name, STATES[this.chibi.state]);
console.log('resolution', resolution);
console.log(`${this.chibi.name} should ${interaction.name} with payload: ${interaction.payload}`);
if (resolution) {
this.changeState(resolution(interaction));
@@ -88,6 +90,17 @@ export class Aperio implements IBrain {
return isState(this.state, EChibiStateName.Awake);
}
matchInteraction(map: InteractionMap, interaction: EChibiInteraction, state: ChibiState): ResolutionFunction | undefined {
const directMatch = map?.[state.name]?.[interaction];
if (directMatch) {
return directMatch;
}
if (state.parent) {
return this.matchInteraction(map, interaction, state.parent);
}
return undefined;
}
// resolvers
// functions which auitomatically resolve based on the existence cycle
@@ -107,16 +120,6 @@ export class Aperio implements IBrain {
}
}
increaseHappyness(increase: number): void {
console.log(`${this.chibi.name} happyness increases.`);
this.chibi.happyness = this.chibi.happyness + increase;
}
saddenedByNeglect(neglectTime: number, sadness: number): void {
console.log(`${this.chibi.name} happyness decreases.`);
this.chibi.happyness = this.chibi.happyness - (neglectTime * sadness);
}
resolveSleeping(): void {
if (isState(this.state, EChibiStateName.Sleeping)) {
console.log(`${this.chibi.name} is sleeping.`);
@@ -147,6 +150,17 @@ export class Aperio implements IBrain {
}
}
private increaseHappyness(increase: number): void {
console.log(`${this.chibi.name} happyness increases.`);
this.chibi.happyness.current = this.chibi.happyness.current + increase;
}
private saddenedByNeglect(neglectTime: number, sadness: number): void {
console.log(`${this.chibi.name} happyness decreases.`);
this.chibi.happyness.current = this.chibi.happyness.current - (neglectTime * sadness);
}
private changeState(state: ChibiState): void {
this.previousState = this.state.name;
this.state = state;

68
src/app/pages/interactions/interactions.component.html
View File

@@ -14,43 +14,45 @@
}
</div>
<div class="h-1/3 min-h-20 bg-primary-300 relative">
<ff-food-pantry
[isVisible]="shownMenu == EInteractionMenuState.Pantry"
(onClose)="closeMenu()"
(onFoodChosen)="interact(EChibiInteraction.Feed, $event)"
></ff-food-pantry>
@if (chibi()) {
<ff-food-pantry
[isVisible]="shownMenu == EInteractionMenuState.Pantry"
(onClose)="closeMenu()"
(onFoodChosen)="interact(EChibiInteraction.Feed, $event)"
></ff-food-pantry>
<ff-inventory
[isVisible]="shownMenu == EInteractionMenuState.Inventory"
(onClose)="closeMenu()"
></ff-inventory>
<ff-inventory
[isVisible]="shownMenu == EInteractionMenuState.Inventory"
(onClose)="closeMenu()"
></ff-inventory>
<ff-visitor-list
[isVisible]="shownMenu == EInteractionMenuState.VisitorList"
(onClose)="closeMenu()"
[host]="chibi()"
[visitors]="[]"
></ff-visitor-list>
<ff-visitor-list
[isVisible]="shownMenu == EInteractionMenuState.VisitorList"
(onClose)="closeMenu()"
[host]="chibi()"
[visitors]="[]"
></ff-visitor-list>
<div class="flex flex-row gap-5 py-4 container mx-auto">
<ff-button (click)="openInventory()">{{
lang.game.actions.giveItem
}}</ff-button>
<ff-button (click)="openFoodPantry()">{{
lang.game.actions.feed
}}</ff-button>
<ff-button (click)="openVisitorList()">{{
lang.game.actions.inviteVisitor
}}</ff-button>
@if (isAwake()) {
<ff-button (click)="interact(EChibiInteraction.WakeUp)">{{
lang.game.actions.wakeUp
<div class="flex flex-row gap-5 py-4 container mx-auto">
<ff-button (click)="openInventory()">{{
lang.game.actions.giveItem
}}</ff-button>
} @else {
<ff-button (click)="interact(EChibiInteraction.PutToSleep)">{{
lang.game.actions.putToSleep
<ff-button (click)="openFoodPantry()">{{
lang.game.actions.feed
}}</ff-button>
}
</div>
<ff-button (click)="openVisitorList()">{{
lang.game.actions.inviteVisitor
}}</ff-button>
@if (isAwake()) {
<ff-button (click)="interact(EChibiInteraction.PutToSleep)">{{
lang.game.actions.putToSleep
}}</ff-button>
} @else {
<ff-button (click)="interact(EChibiInteraction.WakeUp)">{{
lang.game.actions.wakeUp
}}</ff-button>
}
</div>
}
</div>
</div>

1
src/app/pages/interactions/interactions.component.ts
View File

@@ -78,6 +78,7 @@ export class InteractionsComponent extends TranslateableComponent implements OnD
this.brain.resolveInteraction({ name: interaction, payload: item } as ChibiInteraction<Food>);
}
public openFoodPantry(): void {
this.interactionMenuState.set(EInteractionMenuState.Pantry);
}

19
src/app/types/chibi/chibi.ts
View File

@@ -8,7 +8,7 @@ export type ChibiPreview = {
id: ChibiId;
name: EChibiName;
iconPath: string;
happyness: number;
happyness: ChibiStatBar;
level: number;
};
@@ -23,11 +23,11 @@ export type Chibi = {
} & ChibiWellnessStats & ChibiTraits;
export type ChibiWellnessStats = {
happyness: number;
health: number;
hunger: number; //feed them
boredom: number; //do activities to alleviate boredom
energy: number; //let them rest
happyness: ChibiStatBar;
health: ChibiStatBar;
hunger: ChibiStatBar; //feed them
boredom: ChibiStatBar; //do activities to alleviate boredom
energy: ChibiStatBar; //let them rest
};
export type ChibiTraits = {
@@ -36,4 +36,9 @@ export type ChibiTraits = {
constitution: number; //how resistant they are to damage
power: number; //how much damage they deal
maintenanceCals: number; //how quickly they get hungry
};
};
export type ChibiStatBar = {
current: number;
max: number;
}