wip
parent
b19401c343
commit
43addc4072
|
|
@ -34,6 +34,10 @@ tasks:
|
|||
cmds:
|
||||
- histoire build
|
||||
|
||||
build:
|
||||
cmds:
|
||||
- vite build
|
||||
|
||||
integrate:
|
||||
deps: [check]
|
||||
cmds:
|
||||
|
|
|
|||
|
|
@ -29,11 +29,12 @@
|
|||
"prettier-plugin-svelte": "^2.10.0",
|
||||
"showdown": "^2.1.0",
|
||||
"svelte": "^3.58.0",
|
||||
"svelte-preprocess": "^5.0.3",
|
||||
"typescript": "^5.0.4",
|
||||
"vitest": "^0.30.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"@reduxjs/toolkit": "^1.9.5",
|
||||
"@reduxjs/toolkit": "==2.0.0-alpha.5 ",
|
||||
"@yanick/updeep-remeda": "^2.2.0",
|
||||
"beercss": "^3.1.3",
|
||||
"histoire": "^0.16.1",
|
||||
|
|
@ -45,7 +46,7 @@
|
|||
"reselect": "^4.1.8",
|
||||
"svelte-copy-clipboard-action": "^0.0.3",
|
||||
"svelte-moveable": "^0.38.1",
|
||||
"updux": "link:../../updux",
|
||||
"updux": "file:/home/yanick/work/javascript/updux/updux-5.1.0.tgz",
|
||||
"vite": "^4.3.3",
|
||||
"yaml": "^2.2.2"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,168 +0,0 @@
|
|||
import { combineReducers, configureStore, createSlice } from "@reduxjs/toolkit";
|
||||
import R from "remeda";
|
||||
|
||||
import * as propulsion from "./propulsion";
|
||||
import * as structure from "./structure";
|
||||
import * as weaponry from "./weaponry/index.js";
|
||||
import * as carrier from "./carrier";
|
||||
import * as identification from "./identification.js";
|
||||
import * as shipReqs from "./shipReqs";
|
||||
import * as engine from "./engine";
|
||||
|
||||
const shipSlice = createSlice({
|
||||
name: "ship",
|
||||
initialState: {},
|
||||
reducers: {},
|
||||
extraReducers(builder) {
|
||||
builder.addMatcher(
|
||||
() => true,
|
||||
combineReducers({
|
||||
identification: identification.reducer,
|
||||
propulsion: propulsion.reducer,
|
||||
structure: structure.reducer,
|
||||
weaponry: weaponry.reducer,
|
||||
carrier: carrier.reducer,
|
||||
engine: engine.reducer,
|
||||
})
|
||||
);
|
||||
},
|
||||
});
|
||||
|
||||
export function createStore() {
|
||||
return configureStore({
|
||||
reducer: shipSlice.reducer,
|
||||
});
|
||||
}
|
||||
|
||||
export const actions = {
|
||||
...shipReqs.actions,
|
||||
...shipSlice.actions,
|
||||
...identification.actions,
|
||||
...engine.actions,
|
||||
...propulsion.actions,
|
||||
};
|
||||
|
||||
/**
|
||||
import * as propulsion from "./propulsion/index.js";
|
||||
import { calculateDriveReqs } from "./propulsion/drive.js";
|
||||
import { ftlReqsReaction } from "./propulsion/ftl.js";
|
||||
import * as structure from "./structure/index.js";
|
||||
import * as carrier from "./carrier.js";
|
||||
import * as weaponry from "./weaponry/index.js";
|
||||
import * as shipReqs from "./shipReqs.js";
|
||||
import { screensReqsReaction } from "./structure/screens.js";
|
||||
import { createSlice } from "@reduxjs/toolkit";
|
||||
|
||||
|
||||
const initialState = {
|
||||
propulsion: propulsion.initialState,
|
||||
identification: identification.initialState,
|
||||
structure: structure.initialState,
|
||||
carrier: carrier.initialState,
|
||||
weaponry: weaponry.initialState,
|
||||
shipReqs: shipReqs.initialState,
|
||||
}
|
||||
|
||||
const shipSlice = createSlice({
|
||||
name: "ship",
|
||||
),
|
||||
});
|
||||
|
||||
|
||||
|
||||
|
||||
const dux = new Updux({
|
||||
subduxes: {
|
||||
identification,
|
||||
propulsion,
|
||||
structure,
|
||||
carrier,
|
||||
weaponry,
|
||||
},
|
||||
initial: {
|
||||
reqs: { cost: 0, mass: 10, usedMass: 0 },
|
||||
},
|
||||
actions: {
|
||||
setShipReqs: null,
|
||||
setUITransform: null,
|
||||
resetLayout: null,
|
||||
resetShip: null,
|
||||
},
|
||||
});
|
||||
|
||||
function resetUITransform(thing) {
|
||||
if (typeof thing !== "object") return thing;
|
||||
|
||||
return u.map(
|
||||
(v, k) => (k === "uiTransform" ? "" : resetUITransform(v)),
|
||||
thing
|
||||
);
|
||||
}
|
||||
|
||||
dux.setMutation("resetShip", () => () => dux.initial);
|
||||
|
||||
dux.setMutation("resetLayout", () => resetUITransform);
|
||||
|
||||
dux.setMutation("setUITransform", ({ system, systemId, translate }) => {
|
||||
const transform = translate
|
||||
? `translate(${translate[0]}px,${translate[1]}px)`
|
||||
: "";
|
||||
|
||||
switch (system) {
|
||||
case "firecons":
|
||||
return u.updateIn("weaponry.firecons.uiTransform", transform);
|
||||
|
||||
case "weapon":
|
||||
return u.updateIn(
|
||||
"weaponry.weapons",
|
||||
u.map(u.if(({ id }) => id === systemId, u({ uiTransform: transform })))
|
||||
);
|
||||
|
||||
case "screens":
|
||||
return u.updateIn("structure.screens.uiTransform", transform);
|
||||
|
||||
case "hull":
|
||||
return u.updateIn("structure.hull.uiTransform", transform);
|
||||
|
||||
case "internalSystems":
|
||||
const path = "structure.uiTransform";
|
||||
return u.updateIn(path, transform);
|
||||
|
||||
case "ftl":
|
||||
return u.updateIn("propulsion.ftl.uiTransform", transform);
|
||||
|
||||
case "drive":
|
||||
return u.updateIn("propulsion.drive.uiTransform", transform);
|
||||
|
||||
default:
|
||||
return (state) => state;
|
||||
}
|
||||
});
|
||||
|
||||
dux.addReaction(calculateDriveReqs);
|
||||
dux.addReaction(ftlReqsReaction);
|
||||
dux.addReaction(screensReqsReaction);
|
||||
|
||||
dux.addReaction((store) => (state) => {
|
||||
let cost = 0;
|
||||
let mass = 0;
|
||||
|
||||
let subsystems = Object.values(state);
|
||||
|
||||
while (subsystems.length > 0) {
|
||||
const subsystem = subsystems.shift();
|
||||
if (typeof subsystem !== "object") continue;
|
||||
|
||||
if (subsystem.reqs) {
|
||||
cost += subsystem.reqs.cost;
|
||||
mass += subsystem.reqs.mass;
|
||||
}
|
||||
|
||||
subsystems.push(...Object.values(subsystem));
|
||||
}
|
||||
|
||||
store.dispatch.setShipReqs({ cost, usedMass: mass });
|
||||
});
|
||||
|
||||
export default dux;
|
||||
*/
|
||||
|
|
@ -2,7 +2,6 @@ import { reqs, type Reqs } from "$lib/shipDux/reqs";
|
|||
import Updux, { createPayloadAction } from "updux";
|
||||
import u from "@yanick/updeep-remeda";
|
||||
import { createSelector } from "reselect";
|
||||
import prepare from "immer";
|
||||
|
||||
type Layer = number;
|
||||
|
||||
|
|
@ -22,24 +21,20 @@ export const armorDux = new Updux({
|
|||
actions: { setNbrArmorLayers, setArmorRating },
|
||||
});
|
||||
|
||||
armorDux.addMutation(setArmorRating, ({ index, rating }) =>
|
||||
prepare((state) => {
|
||||
state.layers[index] = rating;
|
||||
state.reqs = calcArmorReqs(state.layers);
|
||||
})
|
||||
);
|
||||
armorDux.addMutation(setArmorRating, ({ index, rating }) => (state) => {
|
||||
state.layers[index] = rating;
|
||||
state.reqs = calcArmorReqs(state.layers);
|
||||
});
|
||||
|
||||
armorDux.addMutation(setNbrArmorLayers, (nbrLayers) =>
|
||||
prepare((state) => {
|
||||
while (state.layers.length > nbrLayers) {
|
||||
state.layers.pop();
|
||||
}
|
||||
while (state.layers.length < nbrLayers) {
|
||||
state.layers.push(0);
|
||||
}
|
||||
state.reqs = calcArmorReqs(state.layers);
|
||||
})
|
||||
);
|
||||
armorDux.addMutation(setNbrArmorLayers, (nbrLayers) => (state) => {
|
||||
while (state.layers.length > nbrLayers) {
|
||||
state.layers.pop();
|
||||
}
|
||||
while (state.layers.length < nbrLayers) {
|
||||
state.layers.push(0);
|
||||
}
|
||||
state.reqs = calcArmorReqs(state.layers);
|
||||
});
|
||||
|
||||
function calcArmorReqs(layers: Layer[]): Reqs {
|
||||
const mass = 2 * layers.reduce((a, b) => a + b, 0);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
|
||||
|
||||
/* Language and Environment */
|
||||
"target": "es2022" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
|
||||
"target": "esnext" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
|
||||
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
|
||||
// "jsx": "preserve", /* Specify what JSX code is generated. */
|
||||
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
|
||||
|
|
@ -67,7 +67,6 @@
|
|||
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
|
||||
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
|
||||
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
|
||||
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
|
||||
|
||||
/* Interop Constraints */
|
||||
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
|
||||
|
|
|
|||
Loading…
Reference in New Issue