feat: new residence model

Cygnusfear · Oct 16, 2023 · 3319b58 · 3319b58
1 parent 3970b8b
commit 3319b58
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 3 deletions.
diff --git a/packages/client/public/models/facilities.glb b/packages/client/public/models/facilities.glb
diff --git a/packages/client/src/components/ui/colorWheel.tsx b/packages/client/src/components/ui/colorWheel.tsx
@@ -1,11 +1,15 @@
 import { useState } from "react";
 import Wheel from "@uiw/react-color-wheel";
-import { ColorResult, hsvaToHex } from "@uiw/color-convert";
+import { ColorResult, hexToHsva } from "@uiw/color-convert";
 import { useStore } from "@/game/store";
+import { getRandom } from "@/lib/utils";
+import { palette } from "@/game/utils/palette";
+
+const randomColor = getRandom(palette.buildingSecondary);
 
 function ColorWheel() {
-  const [hsva, setHsva] = useState({ h: 214, s: 43, v: 90, a: 1 });
-  const [hex, setHex] = useState(hsvaToHex({ h: 214, s: 43, v: 90, a: 1 }));
+  const [hsva, setHsva] = useState(hexToHsva(randomColor));
+  const [hex, setHex] = useState(randomColor);
   const {
     input: {
       cursor: { setCursor },

diff --git a/packages/client/src/game/data/entities.ts b/packages/client/src/game/data/entities.ts
@@ -92,6 +92,21 @@ const EntityData = {
       variants: ModelData.scaffold,
       tags: [],
     },
+    miner: {
+      entityTypeId: 105,
+      name: "Crystal Miner",
+      blurb: "Needs to be placed next to a Crystal",
+      description: "",
+      image: "scaffold.webp",
+      costs: [
+        ["gravity", 1],
+        ["power", 2],
+        ["LAPU", 350],
+      ],
+      produces: [],
+      variants: ModelData.miner,
+      tags: [],
+    },
   } as { [key: string]: FacilityDataType },
   resources: {
     crystalFloat: {

diff --git a/packages/client/src/game/data/models.ts b/packages/client/src/game/data/models.ts
@@ -22,6 +22,12 @@ const ModelData: ModelDataGroupType = {
       materials: [],
       colors: ["secondary", "primary"],
     },
+    {
+      name: "Residence00",
+      nodes: ["CubaMid005", "CubaTop003", "CubaPole003"],
+      materials: [],
+      colors: ["secondary", "primary", "primary"],
+    },
     {
       name: "Residence02",
       nodes: ["CubaMid000", "CubaTop001", "CubaBottom000"],
@@ -75,6 +81,14 @@ const ModelData: ModelDataGroupType = {
       colors: ["secondary", "primary"],
     },
   ],
+  miner: [
+    {
+      name: "Miner000",
+      nodes: ["Miner000", "Miner001"],
+      materials: [],
+      colors: ["secondary", "primary"],
+    },
+  ],
   scaffold: [
     {
       name: "Scaffold000",