Merge pull request #2593 from BibliothecaDAO/next

BibliothecaDAO · Dec 24, 2024 · b2c0ce3 · b2c0ce3
2 parents b2849c7 + 3b90c91
commit b2c0ce3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 43 deletions.
diff --git a/client/package.json b/client/package.json
@@ -17,8 +17,8 @@
   },
   "dependencies": {
     "@bibliothecadao/eternum": "workspace:^",
-    "@cartridge/connector": "0.5.6",
-    "@cartridge/controller": "0.5.6",
+    "@cartridge/connector": "0.5.7",
+    "@cartridge/controller": "0.5.7",
     "@dojoengine/core": "1.0.4-alpha.3.1.0",
     "@dojoengine/create-burner": "1.0.4-alpha.3.1.0",
     "@dojoengine/react": "1.0.4-alpha.3.1.0",

diff --git a/client/src/dojo/modelManager/ResourceManager.ts b/client/src/dojo/modelManager/ResourceManager.ts
@@ -204,14 +204,6 @@ export class ResourceManager {
 
     let consumptionRate = Number(production.consumption_rate);
 
-    // Check if this is a Wonder producing Lords
-    const isWonder =
-      getComponentValue(this.setup.components.Realm, getEntityIdFromKeys([BigInt(this.entityId)]))?.has_wonder || false;
-
-    if (isWonder && resourceId === ResourcesIds.Lords) {
-      consumptionRate = consumptionRate * 0.1; // 10% of normal production rate for Wonders
-    }
-
     const difference = Number(production.production_rate) - consumptionRate;
     return [difference > 0, difference];
   }

diff --git a/landing/package.json b/landing/package.json
@@ -17,8 +17,8 @@
     "@ark-project/core": "3.0.0-beta.1",
     "@ark-project/react": "2.0.0-beta.2",
     "@bibliothecadao/eternum": "workspace:^",
-    "@cartridge/connector": "^0.5.6",
-    "@cartridge/controller": "^0.5.6",
+    "@cartridge/connector": "^0.5.7",
+    "@cartridge/controller": "^0.5.7",
     "@dojoengine/core": "1.0.3-alpha.2",
     "@dojoengine/create-burner": "1.0.3-alpha.2",
     "@dojoengine/react": "1.0.3-alpha.2",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml