From 85e7bd0cba0fdad563a50a55dce2768e424cda36 Mon Sep 17 00:00:00 2001
From: Juno <geckyjuno@gmail.com>
Date: Wed, 4 Mar 2026 14:50:57 -0500
Subject: [PATCH] Added additional data, fixed dupes

---
 src/pages/Main.tsx      | 19 ++++++++++++++-----
 src/typing/girlTypes.ts | 38 +++++++++++++++++++-------------------
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/pages/Main.tsx b/src/pages/Main.tsx
index 2a1bdda..d915ee4 100644
--- a/src/pages/Main.tsx
+++ b/src/pages/Main.tsx
@@ -34,6 +34,7 @@ const Main: Component = () => {
         immunities = [...immunities, ...currentGirl.immunities];
       }
     });
+
     const girlT = {
       ...girlTypes,
     };
@@ -55,18 +56,26 @@ const Main: Component = () => {
 
     counts.forEach((value, key) =>
       rows
-        .find((val) => val.mul === value && key != "None" && key != undefined)
+        .find(
+          (val) =>
+            val.mul === value &&
+            key != "None" &&
+            key != undefined &&
+            !immunities.find((x) => girlTypes[x] === key),
+        )
         ?.girls.push(key),
     );
 
-    const finalRows = rows.map((value) => {
-      return { mul: 1 * Math.pow(2, value.mul), girls: value.girls };
-    });
+    const finalRows = rows
+      .map((value) => {
+        return { mul: 1 * Math.pow(2, value.mul), girls: value.girls };
+      })
+      .filter((value) => value.girls.length > 0);
 
     if (immunities.length > 0) {
       finalRows.push({
         mul: 0,
-        girls: [...immunities.map((value) => girlTypes[value])],
+        girls: [...[...new Set(immunities)].map((value) => girlTypes[value])],
       });
     }
 
diff --git a/src/typing/girlTypes.ts b/src/typing/girlTypes.ts
index 922a831..59cd56a 100644
--- a/src/typing/girlTypes.ts
+++ b/src/typing/girlTypes.ts
@@ -127,8 +127,8 @@ export const Kitty: girlType = {
   displayName: "KITTY",
   displayImage: ImgKitty,
   type: girlTypes.Kitty,
-  strengths: [],
-  weaknesses: [],
+  strengths: [girlTypes.Knight, girlTypes.Kitty, girlTypes.Bird, girlTypes.Plushy, girlTypes.Rat, girlTypes.Angel, girlTypes.Fish],
+  weaknesses: [girlTypes.Puppy, girlTypes.Little, girlTypes.Dragon, girlTypes.Bug, girlTypes.Goddess, girlTypes.Snake, girlTypes.Horror, girlTypes.Plant, girlTypes.Handler],
   immunities: []
 }
 
@@ -137,9 +137,9 @@ export const Robot: girlType = {
   displayName: "ROBOT",
   displayImage: ImgRobot,
   type: girlTypes.Robot,
-  strengths: [],
-  weaknesses: [],
-  immunities: []
+  strengths: [girlTypes.Little, girlTypes.Princess, girlTypes.Goddess, girlTypes.Witch, girlTypes.Mommy, girlTypes.Clown, girlTypes.Slut],
+  weaknesses: [girlTypes.Gamer, girlTypes.Were, girlTypes.Bug, girlTypes.Nerd, girlTypes.Slime, girlTypes.Handler],
+  immunities: [girlTypes.Vampire]
 }
 
 //Maid
@@ -147,8 +147,8 @@ export const Maid: girlType = {
   displayName: "MAID",
   displayImage: ImgMaid,
   type: girlTypes.Maid,
-  strengths: [],
-  weaknesses: [],
+  strengths: [girlTypes.Dragon, girlTypes.Gamer, girlTypes.Horror, girlTypes.Cow],
+  weaknesses: [girlTypes.Vampire, girlTypes.Brat, girlTypes.Princess, girlTypes.Bug, girlTypes.Rat, girlTypes.Slime, girlTypes.Spider],
   immunities: []
 }
 
@@ -157,9 +157,9 @@ export const Vampire: girlType = {
   displayName: "VAMPIR",
   displayImage: ImgVampire,
   type: girlTypes.Vampire,
-  strengths: [],
-  weaknesses: [],
-  immunities: []
+  strengths: [girlTypes.Maid, girlTypes.Little, girlTypes.Sister, girlTypes.Princess, girlTypes.Gamer, girlTypes.Nerd, girlTypes.Goth, girlTypes.Mommy, girlTypes.Clown],
+  weaknesses: [girlTypes.Knight, girlTypes.Robot, girlTypes.Doll, girlTypes.Plushy, girlTypes.Goddess, girlTypes.Angel, girlTypes.Slut],
+  immunities: [girlTypes.Vampire]
 }
 
 //Brat
@@ -167,8 +167,8 @@ export const Brat: girlType = {
   displayName: "BRAT",
   displayImage: ImgBrat,
   type: girlTypes.Brat,
-  strengths: [],
-  weaknesses: [],
+  strengths: [girlTypes.Brat],
+  weaknesses: [girlTypes.Maid, girlTypes.Sister, girlTypes.Princess, girlTypes.Goddess, girlTypes.Demon, girlTypes.Angel, girlTypes.Mommy, girlTypes.Plant, girlTypes.Slut],
   immunities: []
 }
 
@@ -177,8 +177,8 @@ export const Little: girlType = {
   displayName: "LITTLE",
   displayImage: ImgLittle,
   type: girlTypes.Little,
-  strengths: [],
-  weaknesses: [],
+  strengths: [girlTypes.Knight, girlTypes.Kitty, girlTypes.Sister, girlTypes.Doll, girlTypes.Plushy, girlTypes.Fox, girlTypes.Slut, girlTypes.Handler],
+  weaknesses: [girlTypes.Puppy, girlTypes.Vampire, girlTypes.Fairy, girlTypes.Dragon, girlTypes.Were, girlTypes.Bug, girlTypes.Demon, girlTypes.Witch, girlTypes.Snake, girlTypes.Horror, girlTypes.Mommy, girlTypes.Plant, girlTypes.Clown, girlTypes.Spider, girlTypes.Alien],
   immunities: []
 }
 
@@ -187,8 +187,8 @@ export const Sister: girlType = {
   displayName: "SISTER",
   displayImage: ImgSister,
   type: girlTypes.Sister,
-  strengths: [],
-  weaknesses: [],
+  strengths: [girlTypes.Doll, girlTypes.Gamer, girlTypes.Bird, girlTypes.Plushy, girlTypes.Nerd, girlTypes.Goth, girlTypes.Bunny, girlTypes.Fox, girlTypes.Horse],
+  weaknesses: [girlTypes.Vampire, girlTypes.Brat, girlTypes.Little, girlTypes.Sister, girlTypes.Bug, girlTypes.Horror, girlTypes.Mommy, girlTypes.Slut],
   immunities: []
 }
 
@@ -197,9 +197,9 @@ export const Princess: girlType = {
   displayName: "PRNCSS",
   displayImage: ImgPrincess,
   type: girlTypes.Princess,
-  strengths: [],
-  weaknesses: [],
-  immunities: []
+  strengths: [girlTypes.Bird, girlTypes.Deer, girlTypes.Bunny, girlTypes.Fox],
+  weaknesses: [girlTypes.Vampire, girlTypes.Brat, girlTypes.Princess, girlTypes.Dragon, girlTypes.Demon, girlTypes.Witch, girlTypes.Slut, girlTypes.Pirate],
+  immunities: [girlTypes.Knight]
 }
 
 //Fairy