From bbcb05b9469af498b727a3601d164da171b75417 Mon Sep 17 00:00:00 2001 From: cha0s Date: Sun, 28 Jan 2024 11:18:33 -0600 Subject: [PATCH] refactor: gathering --- packages/app/package.json | 20 ++++++++++---------- packages/bootstrap/package.json | 6 +++--- packages/combat/package.json | 10 +++++----- packages/combat/src/index.js | 14 ++++++++++---- packages/core/package.json | 12 ++++++------ packages/farm/package.json | 8 ++++---- packages/inventory/package.json | 10 +++++----- packages/universe/package.json | 12 ++++++------ 8 files changed, 49 insertions(+), 43 deletions(-) diff --git a/packages/app/package.json b/packages/app/package.json index c06b7b0..49ff6d8 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -25,20 +25,20 @@ "@avocado/resource": "^4.0.0", "@avocado/s13n": "^4.0.0", "@avocado/topdown": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/passport-local-react": "^3.0.0", - "@flecks/passport-react": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/react-redux": "^3.0.0", - "@flecks/redux": "^3.0.0", - "@flecks/socket": "^3.0.0", - "@flecks/web": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/passport-local-react": "^3.1.3", + "@flecks/passport-react": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/react-redux": "^3.1.3", + "@flecks/redux": "^3.1.3", + "@flecks/socket": "^3.1.3", + "@flecks/web": "^3.1.3", "@humus/inventory": "^4.0.0", "fscreen": "^1.2.0", "react-joystick-component": "^4.0.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/bootstrap/package.json b/packages/bootstrap/package.json index 5dc30c5..1477aad 100644 --- a/packages/bootstrap/package.json +++ b/packages/bootstrap/package.json @@ -17,10 +17,10 @@ "server.js" ], "dependencies": { - "@flecks/core": "^3.0.0" + "@flecks/core": "^3.1.3" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/combat/package.json b/packages/combat/package.json index 376a446..4bebc95 100644 --- a/packages/combat/package.json +++ b/packages/combat/package.json @@ -26,14 +26,14 @@ "@avocado/react": "^4.0.0", "@avocado/resource": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1", "lodash.flatten": "^4.4.0" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/combat/src/index.js b/packages/combat/src/index.js index 9536fc7..4522dc4 100644 --- a/packages/combat/src/index.js +++ b/packages/combat/src/index.js @@ -18,8 +18,10 @@ export const hooks = { const context = require.context('./interactions', false, /from-.*-to.*\.js$/); return context.keys().map((path) => context(path).default); }, + '@flecks/core.gathered': () => ({ + affinities: {}, + }), '@flecks/core.starting': (flecks) => { - flecks.humus.combat.Affinities = flecks.gather('@humus/combat.affinities'); const interactions = flatten(flecks.invokeFlat('@humus/combat.interactions')) .reduce( (r, interaction) => { @@ -46,15 +48,19 @@ export const hooks = { export const mixin = (Flecks) => class FlecksWithHumusCombat extends Flecks { - constructor(...args) { - super(...args); + constructor(runtime) { + super(runtime); if (!this.humus) { this.humus = {}; } if (!this.humus.combat) { this.humus.combat = {}; } - this.humus.combat.Affinities = {}; + Object.defineProperty( + this.humus.combat, + 'Affinities', + {get: () => this.gathered('@humus/combat.affinities')}, + ); this.humus.combat.interactions = () => {}; } diff --git a/packages/core/package.json b/packages/core/package.json index 0e7554d..844c575 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -38,15 +38,15 @@ "@avocado/timing": "^4.0.0", "@avocado/topdown": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/redux": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/redux": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1", "is-electron": "^2.2.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/farm/package.json b/packages/farm/package.json index 34fdd1b..3600373 100644 --- a/packages/farm/package.json +++ b/packages/farm/package.json @@ -25,12 +25,12 @@ "@avocado/math": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/inventory/package.json b/packages/inventory/package.json index 4857f37..5547316 100644 --- a/packages/inventory/package.json +++ b/packages/inventory/package.json @@ -22,13 +22,13 @@ "@avocado/behavior": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/socket": "^3.1.3", "debug": "4.3.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } } diff --git a/packages/universe/package.json b/packages/universe/package.json index d5ea57a..9208a27 100644 --- a/packages/universe/package.json +++ b/packages/universe/package.json @@ -27,16 +27,16 @@ "@avocado/s13n": "^4.0.0", "@avocado/timing": "^4.0.0", "@avocado/traits": "^4.0.0", - "@flecks/core": "^3.0.0", - "@flecks/react": "^3.0.0", - "@flecks/redux": "^3.0.0", - "@flecks/socket": "^3.0.0", + "@flecks/core": "^3.1.3", + "@flecks/react": "^3.1.3", + "@flecks/redux": "^3.1.3", + "@flecks/socket": "^3.1.3", "@humus/app": "^4.0.0", "debug": "4.3.1", "express": "^4.17.1" }, "devDependencies": { - "@flecks/build": "^3.0.0", - "@flecks/fleck": "^3.0.0" + "@flecks/build": "^3.1.3", + "@flecks/fleck": "^3.1.3" } }