Merge pull request #16 from blinktenor/master

Add monsters and QoL improvements
Glazelf · Oct 2, 2023 · 0680e59 · 0680e59
2 parents dc10392 + 9fd0f97
commit 0680e59
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 5 deletions.
diff --git a/objects/monsters.json b/objects/monsters.json
@@ -6050,6 +6050,24 @@
             ]
         ]
     },
+    "hunter_mech": {
+        "name": "Hunter Mech",
+        "number": null,
+        "rank": "F",
+        "family": "_material",
+        "description": null,
+        "drops": null,
+        "growth": null,
+        "talents": null,
+        "traits": null,
+        "resistances": null,
+        "synthesis": [
+            [
+                "_material",
+                "restless_armor"
+            ]
+        ]
+    },
     "slime_knight": {
         "name": "Slime Knight",
         "number": null,
@@ -6106,6 +6124,7 @@
     },
     "restless_armour": {
         "name": "Restless Armour",
+
         "number": null,
         "rank": "F",
         "family": "_undead",

diff --git a/public/families/_boss_icon.png b/public/families/_boss_icon.png
diff --git a/public/families/_undead_icon.png b/public/families/_undead_icon.png
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -24,7 +24,7 @@ body {
 }
 
 .monster-container {
-  width: 20%;
+  width: 9%;
   margin-left: auto;
   margin-right: auto;
   color: black;
@@ -42,7 +42,7 @@ body {
 
 .icon-container {
   margin-top: 16px;
-  width: 66%;
+  width: 37%;
   margin-left: auto;
   margin-right: auto;
 }
diff --git a/src/components/FamilySelector.tsx b/src/components/FamilySelector.tsx
@@ -3,7 +3,7 @@
 import React, { FC } from 'react';
 
 interface FamilySelectorProps {
-  updateFilter: Function;
+  updateFilter: object;
 }
 
 const FamilySelector: FC<FamilySelectorProps> = ({ updateFilter }) => {
@@ -18,7 +18,7 @@ const FamilySelector: FC<FamilySelectorProps> = ({ updateFilter }) => {
     { name: 'Undead', family: '_undead', alt: 'undead family' },
   ];
 
-  const handleFamilyClick = (familyName: string) => {
+  const handleFamilyClick = (familyName) => {
     updateFilter(familyName);
   };
 
@@ -28,7 +28,7 @@ const FamilySelector: FC<FamilySelectorProps> = ({ updateFilter }) => {
         <img
           key={index}
           className='family-icon'
-          src={`./public/families/${family.family}_icon.png`}
+          src={`/families/${family.family}_icon.png`}
           alt={family.alt}
           onClick={() => handleFamilyClick(family.family)}
         />