From 5cb40c3cb244d3b9088c53d899d5fb873c5a4edf Mon Sep 17 00:00:00 2001
From: Mark Steele <msteele999@gmail.com>
Date: Wed, 10 Jul 2024 09:50:19 -0400
Subject: [PATCH] fixed level calculation to consider ALL prime attributes,
 removed height and weight from modifyer files as they are not relevant to
 calculations

---
 data/dwarf_gristlegrim_modifiers.json | 4 +---
 data/dwarf_midgardian_modifiers.json  | 4 +---
 data/elf_modifiers.json               | 4 +---
 data/fairie_modifiers.json            | 4 +---
 data/hobb_modifiers.json              | 4 +---
 data/human_modifiers.json             | 4 +---
 data/leprechaun_modifiers.json        | 4 +---
 main.py                               | 2 +-
 8 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/data/dwarf_gristlegrim_modifiers.json b/data/dwarf_gristlegrim_modifiers.json
index c87a1c2..9f18410 100644
--- a/data/dwarf_gristlegrim_modifiers.json
+++ b/data/dwarf_gristlegrim_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 0.75,
     "IQ": 1,
     "WIZ": 1,
-    "CHA": 1,
-    "Height": 0.67,
-    "Weight": 2
+    "CHA": 1
 }
diff --git a/data/dwarf_midgardian_modifiers.json b/data/dwarf_midgardian_modifiers.json
index c87a1c2..9f18410 100644
--- a/data/dwarf_midgardian_modifiers.json
+++ b/data/dwarf_midgardian_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 0.75,
     "IQ": 1,
     "WIZ": 1,
-    "CHA": 1,
-    "Height": 0.67,
-    "Weight": 2
+    "CHA": 1
 }
diff --git a/data/elf_modifiers.json b/data/elf_modifiers.json
index 70280e1..f38bd1b 100644
--- a/data/elf_modifiers.json
+++ b/data/elf_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 1,
     "IQ": 1.5,
     "WIZ": 1.5,
-    "CHA": 1.5,
-    "Height": 1.1,
-    "Weight": 1
+    "CHA": 1.5
 }
diff --git a/data/fairie_modifiers.json b/data/fairie_modifiers.json
index ef61a01..a6a9a83 100644
--- a/data/fairie_modifiers.json
+++ b/data/fairie_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 1.5,
     "IQ": 1,
     "WIZ": 2,
-    "CHA": 1.5,
-    "Height": 0.1,
-    "Weight": 0.01
+    "CHA": 1.5
 }
diff --git a/data/hobb_modifiers.json b/data/hobb_modifiers.json
index b0f6cd4..4d0a747 100644
--- a/data/hobb_modifiers.json
+++ b/data/hobb_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 1.5,
     "IQ": 1,
     "WIZ": 1,
-    "CHA": 1,
-    "Height": 0.5,
-    "Weight": 0.75
+    "CHA": 1
 }
diff --git a/data/human_modifiers.json b/data/human_modifiers.json
index 12b8366..cc84a38 100644
--- a/data/human_modifiers.json
+++ b/data/human_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 1,
     "IQ": 1,
     "WIZ": 1,
-    "CHA": 1,
-    "Height": 1,
-    "Weight": 1
+    "CHA": 1
 }
diff --git a/data/leprechaun_modifiers.json b/data/leprechaun_modifiers.json
index 93a408f..3686e28 100644
--- a/data/leprechaun_modifiers.json
+++ b/data/leprechaun_modifiers.json
@@ -5,7 +5,5 @@
     "LK": 1.5,
     "IQ": 1.25,
     "WIZ": 1.5,
-    "CHA": 1,
-    "Height": 0.33,
-    "Weight": 0.10
+    "CHA": 1
 }
diff --git a/main.py b/main.py
index aa61ed9..a7a937a 100644
--- a/main.py
+++ b/main.py
@@ -62,7 +62,7 @@ def calculate_wt_possible(self):
         self.wt_possible = self.attributes["STR"] * 100
 
     def calculate_level(self):
-        prime_attributes = ["STR", "DEX", "IQ", "WIZ"]  # Prime attributes for level calculation
+        prime_attributes = ["STR", "CON", "DEX", "SPD", "LK", "IQ", "WIZ", "CHA"]  # Prime attributes for level calculation
         highest_prime = max(self.attributes[attr] for attr in prime_attributes)
         self.level = floor(highest_prime / 10)