pyrex/fledgling
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases Wiki Activity

autoformat the world

Browse Source
This commit is contained in:
Kistaro Windrider 2025-02-23 22:25:19 -08:00
parent 2837461add
commit 3a968af5ca
Signed by: kistaro
SSH Key Fingerprint: SHA256:TBE2ynfmJqsAf0CP6gsflA0q5X5wD5fVKWPsZ7eVUg8
4 changed files with 429 additions and 416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/playerprogress.ts
View File

@ -4,8 +4,8 @@ import { getThralls, ItemStage, LifeStage, Thrall } from "./thralls.ts";
import { SaveFileV1, mustBeSaveFileV1 } from "./saveformat.ts"; import { SaveFileV1, mustBeSaveFileV1 } from "./saveformat.ts";
interface NewRoundConfig { interface NewRoundConfig {
asSuccessor: SuccessorOption, asSuccessor: SuccessorOption;
withWish: Wish | null, withWish: Wish | null;
} }
export class PlayerProgress { export class PlayerProgress {
@ -59,23 +59,27 @@ export class PlayerProgress {
INT: file.stats.int, INT: file.stats.int,
CHA: file.stats.cha, CHA: file.stats.cha,
PSI: file.stats.psi, PSI: file.stats.psi,
} };
this.#talents = { this.#talents = {
AGI: file.talents.agi, AGI: file.talents.agi,
INT: file.talents.int, INT: file.talents.int,
CHA: file.talents.cha, CHA: file.talents.cha,
PSI: file.talents.psi, PSI: file.talents.psi,
} };
this.#isInPenance = file.isInPenance, (this.#isInPenance = file.isInPenance),
this.#wish = file.wishId >= 0 ? {id: file.wishId} : null; (this.#wish = file.wishId >= 0 ? { id: file.wishId } : null);
this.#exp = file.exp; this.#exp = file.exp;
this.#blood = file.blood; this.#blood = file.blood;
this.#itemsPurloined = file.itemsPurloined; this.#itemsPurloined = file.itemsPurloined;
this.#skillsLearned = file.skillsLearned; this.#skillsLearned = file.skillsLearned;
this.#untrimmedSkillsAvailable = file.untrimmedSkillsAvailableIds.map((id) => {return {id: id}}); this.#untrimmedSkillsAvailable = file.untrimmedSkillsAvailableIds.map(
(id) => {
return { id: id };
},
);
this.#thrallsUnlocked = file.thrallsUnlocked; this.#thrallsUnlocked = file.thrallsUnlocked;
this.#thrallDamage = {}; this.#thrallDamage = {};
for(let i = 0; i < file.thrallDamage.length; ++i) { for (let i = 0; i < file.thrallDamage.length; ++i) {
this.#thrallDamage[i] = file.thrallDamage[i]; this.#thrallDamage[i] = file.thrallDamage[i];
} }
this.#thrallsObtainedItem = file.thrallsObtainedItem; this.#thrallsObtainedItem = file.thrallsObtainedItem;
@ -252,7 +256,7 @@ export class PlayerProgress {
return this.#untrimmedSkillsAvailable.map((s) => s.id); return this.#untrimmedSkillsAvailable.map((s) => s.id);
} }
getLearnedSkills() : Skill[] { getLearnedSkills(): Skill[] {
let learnedSkills = []; let learnedSkills = [];
for (let s of this.#skillsLearned.values()) { for (let s of this.#skillsLearned.values()) {
learnedSkills.push({ id: s }); learnedSkills.push({ id: s });
@ -260,7 +264,7 @@ export class PlayerProgress {
return learnedSkills; return learnedSkills;
} }
getRawLearnedSkills() : number[] { getRawLearnedSkills(): number[] {
return [...this.#skillsLearned]; return [...this.#skillsLearned];
} }
@ -283,7 +287,7 @@ export class PlayerProgress {
return this.#thrallsUnlocked.indexOf(thrall.id) != -1; return this.#thrallsUnlocked.indexOf(thrall.id) != -1;
} }
getUnlockedThrallIds() : number[] { getUnlockedThrallIds(): number[] {
return [...this.#thrallsUnlocked]; return [...this.#thrallsUnlocked];
} }
@ -328,7 +332,7 @@ export class PlayerProgress {
this.#thrallsObtainedItem.push(thrall.id); this.#thrallsObtainedItem.push(thrall.id);
} }
getThrallObtainedItemIds() : number[] { getThrallObtainedItemIds(): number[] {
return [...this.#thrallsObtainedItem]; return [...this.#thrallsObtainedItem];
} }
@ -339,7 +343,7 @@ export class PlayerProgress {
this.#thrallsDeliveredItem.push(thrall.id); this.#thrallsDeliveredItem.push(thrall.id);
} }
getThrallDeliveredItemIds() : number[] { getThrallDeliveredItemIds(): number[] {
return [...this.#thrallsDeliveredItem]; return [...this.#thrallsDeliveredItem];
} }
@ -374,7 +378,7 @@ export function initPlayerProgress(
asSuccessor: SuccessorOption, asSuccessor: SuccessorOption,
withWish: Wish | null, withWish: Wish | null,
) { ) {
active = new PlayerProgress({asSuccessor:asSuccessor, withWish:withWish}); active = new PlayerProgress({ asSuccessor: asSuccessor, withWish: withWish });
} }
export function getPlayerProgress(): PlayerProgress { export function getPlayerProgress(): PlayerProgress {

84
src/save.ts
View File

@ -1,7 +1,7 @@
import { getPlayerProgress } from "./playerprogress" import { getPlayerProgress } from "./playerprogress";
import { getStateManager } from "./statemanager"; import { getStateManager } from "./statemanager";
import { getThralls } from "./thralls"; import { getThralls } from "./thralls";
import {SaveFileV1, StatCounterV1} from "./saveformat"; import { SaveFileV1, StatCounterV1 } from "./saveformat";
export interface SaveFile { export interface SaveFile {
version: string; version: string;
@ -16,8 +16,8 @@ export function mustBeSaveFileV1(obj: unknown): SaveFileV1 {
if (obj === undefined || obj === null) { if (obj === undefined || obj === null) {
throw new Error("nonexistent"); throw new Error("nonexistent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`not an object; was ${typeof(obj)}`); throw new Error(`not an object; was ${typeof obj}`);
} }
if (!("version" in obj)) { if (!("version" in obj)) {
@ -42,7 +42,10 @@ export function mustBeSaveFileV1(obj: unknown): SaveFileV1 {
blood: mustGetNumber(obj, "blood"), blood: mustGetNumber(obj, "blood"),
itemsPurloined: mustGetNumber(obj, "itemsPurloined"), itemsPurloined: mustGetNumber(obj, "itemsPurloined"),
skillsLearned: mustGetNumberArray(obj, "skillsLearned"), skillsLearned: mustGetNumberArray(obj, "skillsLearned"),
untrimmedSkillsAvailableIds: mustGetNumberArray(obj, "untrimmedSkillsAvailableIds"), untrimmedSkillsAvailableIds: mustGetNumberArray(
obj,
"untrimmedSkillsAvailableIds",
),
thrallsUnlocked: mustGetNumberArray(obj, "thrallsUnlocked"), thrallsUnlocked: mustGetNumberArray(obj, "thrallsUnlocked"),
thrallDamage: mustGetNumberArray(obj, "thrallDamage"), thrallDamage: mustGetNumberArray(obj, "thrallDamage"),
thrallsObtainedItem: mustGetNumberArray(obj, "thrallsObtainedItem"), thrallsObtainedItem: mustGetNumberArray(obj, "thrallsObtainedItem"),
@ -50,55 +53,55 @@ export function mustBeSaveFileV1(obj: unknown): SaveFileV1 {
}; };
} }
function mustGetNumber(obj: object, key: string) : number { function mustGetNumber(obj: object, key: string): number {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "number") { if (typeof val !== "number") {
throw new Error(`not a number: ${key}: ${val}`); throw new Error(`not a number: ${key}: ${val}`);
} }
return val; return val;
} }
function mustGetString(obj: object, key: string) : string { function mustGetString(obj: object, key: string): string {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "string") { if (typeof val !== "string") {
throw new Error(`not a string: ${key}: ${val}`); throw new Error(`not a string: ${key}: ${val}`);
} }
return val; return val;
} }
function mustGetStatCounterV1(obj: object, key: string) : StatCounterV1 { function mustGetStatCounterV1(obj: object, key: string): StatCounterV1 {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "object") { if (typeof val !== "object") {
throw new Error(`not an object: ${key}: ${val}`); throw new Error(`not an object: ${key}: ${val}`);
} }
@ -118,42 +121,42 @@ function mustGetStatCounterV1(obj: object, key: string) : StatCounterV1 {
} }
} }
function mustGetBoolean(obj: object, key: string) : boolean { function mustGetBoolean(obj: object, key: string): boolean {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "boolean") { if (typeof val !== "boolean") {
throw new Error(`not boolean: ${key}: ${val}`); throw new Error(`not boolean: ${key}: ${val}`);
} }
return val; return val;
} }
function mustGetNumberArray(obj: object, key: string) : number[] { function mustGetNumberArray(obj: object, key: string): number[] {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "object") { if (typeof val !== "object") {
throw new Error(`not an object: ${key}: ${val}`); throw new Error(`not an object: ${key}: ${val}`);
} }
for (const x of val) { for (const x of val) {
if (typeof(x) !== "number") { if (typeof x !== "number") {
throw new Error(`contained non-number item in ${key}: ${val}`); throw new Error(`contained non-number item in ${key}: ${val}`);
} }
} }
@ -163,7 +166,7 @@ function mustGetNumberArray(obj: object, key: string) : number[] {
/// The result of attempting to load a V1 save file. /// The result of attempting to load a V1 save file.
interface SaveFileV1LoadResult { interface SaveFileV1LoadResult {
// If present and valid, the loaded file. // If present and valid, the loaded file.
file : SaveFileV1 | null; file: SaveFileV1 | null;
/// A file loading error, if any. If `file` is present, this refers /// A file loading error, if any. If `file` is present, this refers
/// to an error reading from the *other* slot. /// to an error reading from the *other* slot.
@ -210,17 +213,17 @@ function readBestSave(): SaveFileV1LoadResult {
const from1 = readFromSlot("FLEDGLING_SLOT_1"); const from1 = readFromSlot("FLEDGLING_SLOT_1");
const from2 = readFromSlot("FLEDGLING_SLOT_2"); const from2 = readFromSlot("FLEDGLING_SLOT_2");
if (from1.file && from2.file) { if (from1.file && from2.file) {
return (from1.file.revision > from2.file.revision) ? from1 : from2; return from1.file.revision > from2.file.revision ? from1 : from2;
} }
var errors : string[] = []; var errors: string[] = [];
if (from1.error) { if (from1.error) {
errors = ["slot 1 error: " + from1.error]; errors = ["slot 1 error: " + from1.error];
} }
if (from2.error) { if (from2.error) {
errors.push("slot 2 error: " + from2.error); errors.push("slot 2 error: " + from2.error);
} }
var msg : string | null = errors.length > 0 ? errors.join("\n") : null; var msg: string | null = errors.length > 0 ? errors.join("\n") : null;
if (from1.file) { if (from1.file) {
return { return {
file: from1.file, file: from1.file,
@ -236,17 +239,20 @@ function readBestSave(): SaveFileV1LoadResult {
} }
export function save() { export function save() {
const targetSlot : SaveSlot = (readBestSave().slot === "FLEDGLING_SLOT_1") ? "FLEDGLING_SLOT_2" : "FLEDGLING_SLOT_1"; const targetSlot: SaveSlot =
readBestSave().slot === "FLEDGLING_SLOT_1"
? "FLEDGLING_SLOT_2"
: "FLEDGLING_SLOT_1";
return saveIntoSlot(targetSlot); return saveIntoSlot(targetSlot);
} }
function extractCurrentState() : SaveFileV1 { function extractCurrentState(): SaveFileV1 {
const progress = getPlayerProgress(); const progress = getPlayerProgress();
const stateManager = getStateManager(); const stateManager = getStateManager();
var thrallDamage : number[] = []; var thrallDamage: number[] = [];
const nThralls = getThralls().length; const nThralls = getThralls().length;
for (let i = 0; i < nThralls; ++i) { for (let i = 0; i < nThralls; ++i) {
thrallDamage.push(progress.getThrallDamage({id: i})); thrallDamage.push(progress.getThrallDamage({ id: i }));
} }
return { return {
version: "fledgling_save_v1", version: "fledgling_save_v1",

63
src/saveformat.ts
View File

@ -1,4 +1,4 @@
export interface StatCounterV1{ export interface StatCounterV1 {
agi: number; agi: number;
int: number; int: number;
cha: number; cha: number;
@ -35,8 +35,8 @@ export function mustBeSaveFileV1(obj: unknown): SaveFileV1 {
if (obj === undefined || obj === null) { if (obj === undefined || obj === null) {
throw new Error("nonexistent"); throw new Error("nonexistent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`not an object; was ${typeof(obj)}`); throw new Error(`not an object; was ${typeof obj}`);
} }
if (!("version" in obj)) { if (!("version" in obj)) {
@ -61,7 +61,10 @@ export function mustBeSaveFileV1(obj: unknown): SaveFileV1 {
blood: mustGetNumber(obj, "blood"), blood: mustGetNumber(obj, "blood"),
itemsPurloined: mustGetNumber(obj, "itemsPurloined"), itemsPurloined: mustGetNumber(obj, "itemsPurloined"),
skillsLearned: mustGetNumberArray(obj, "skillsLearned"), skillsLearned: mustGetNumberArray(obj, "skillsLearned"),
untrimmedSkillsAvailableIds: mustGetNumberArray(obj, "untrimmedSkillsAvailableIds"), untrimmedSkillsAvailableIds: mustGetNumberArray(
obj,
"untrimmedSkillsAvailableIds",
),
thrallsUnlocked: mustGetNumberArray(obj, "thrallsUnlocked"), thrallsUnlocked: mustGetNumberArray(obj, "thrallsUnlocked"),
thrallDamage: mustGetNumberArray(obj, "thrallDamage"), thrallDamage: mustGetNumberArray(obj, "thrallDamage"),
thrallsObtainedItem: mustGetNumberArray(obj, "thrallsObtainedItem"), thrallsObtainedItem: mustGetNumberArray(obj, "thrallsObtainedItem"),
@ -69,55 +72,55 @@ export function mustBeSaveFileV1(obj: unknown): SaveFileV1 {
}; };
} }
function mustGetNumber(obj: object, key: string) : number { function mustGetNumber(obj: object, key: string): number {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "number") { if (typeof val !== "number") {
throw new Error(`not a number: ${key}: ${val}`); throw new Error(`not a number: ${key}: ${val}`);
} }
return val; return val;
} }
function mustGetString(obj: object, key: string) : string { function mustGetString(obj: object, key: string): string {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "string") { if (typeof val !== "string") {
throw new Error(`not a string: ${key}: ${val}`); throw new Error(`not a string: ${key}: ${val}`);
} }
return val; return val;
} }
function mustGetStatCounterV1(obj: object, key: string) : StatCounterV1 { function mustGetStatCounterV1(obj: object, key: string): StatCounterV1 {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "object") { if (typeof val !== "object") {
throw new Error(`not an object: ${key}: ${val}`); throw new Error(`not an object: ${key}: ${val}`);
} }
@ -137,42 +140,42 @@ function mustGetStatCounterV1(obj: object, key: string) : StatCounterV1 {
} }
} }
function mustGetBoolean(obj: object, key: string) : boolean { function mustGetBoolean(obj: object, key: string): boolean {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "boolean") { if (typeof val !== "boolean") {
throw new Error(`not boolean: ${key}: ${val}`); throw new Error(`not boolean: ${key}: ${val}`);
} }
return val; return val;
} }
function mustGetNumberArray(obj: object, key: string) : number[] { function mustGetNumberArray(obj: object, key: string): number[] {
if (obj === null || obj === undefined) { if (obj === null || obj === undefined) {
throw new Error("container absent"); throw new Error("container absent");
} }
if (typeof(obj) !== "object") { if (typeof obj !== "object") {
throw new Error(`container was not an object; was ${typeof(obj)}`); throw new Error(`container was not an object; was ${typeof obj}`);
} }
if (!(key in obj)) { if (!(key in obj)) {
throw new Error(`missing number: ${key}`); throw new Error(`missing number: ${key}`);
} }
const dict = obj as {[key:string]:any}; const dict = obj as { [key: string]: any };
const val = dict[key]; const val = dict[key];
if (typeof(val) !== "object") { if (typeof val !== "object") {
throw new Error(`not an object: ${key}: ${val}`); throw new Error(`not an object: ${key}: ${val}`);
} }
for (const x of val) { for (const x of val) {
if (typeof(x) !== "number") { if (typeof x !== "number") {
throw new Error(`contained non-number item in ${key}: ${val}`); throw new Error(`contained non-number item in ${key}: ${val}`);
} }
} }

2
src/statemanager.ts
View File

@ -18,7 +18,7 @@ export class StateManager {
#turn: number; #turn: number;
#revision: number; #revision: number;
constructor(file?:SaveFileV1) { constructor(file?: SaveFileV1) {
this.#turn = file?.turn ?? 1; this.#turn = file?.turn ?? 1;
this.#revision = file?.revision ?? 1; this.#revision = file?.revision ?? 1;
} }