From 917a26ef84c1c8e4baab3c746cefbc31693c366d Mon Sep 17 00:00:00 2001
From: "Standing-StormStanding-Storm git config --global user.name
 Standing-Storm git config --global user.name Standing-Storm"
 <dorchadas@gmail.com>
Date: Wed, 21 Feb 2024 20:06:07 -0600
Subject: [PATCH] Fixes

---
 data/mods/BombasticPerks/perkmenu.json | 24 ++++++++++++------------
 data/mods/BombasticPerks/perks.json    | 12 ++++++++----
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/data/mods/BombasticPerks/perkmenu.json b/data/mods/BombasticPerks/perkmenu.json
index 8c1673d64e21c..ebd2872ca9c3b 100644
--- a/data/mods/BombasticPerks/perkmenu.json
+++ b/data/mods/BombasticPerks/perkmenu.json
@@ -5,7 +5,7 @@
     "dynamic_line": "Lifestyle Perks:\nLevel <u_val:current_level>.\n<u_val:num_perks> perk points to spend.\nCurrent EXP: <u_val:available_exp>.\nEXP to next level: <u_val:exp_to_perk>.",
     "responses": [
       {
-        "condition": { "not": { "u_has_trait": "perk_STR_UP" } },
+        "condition": { "and": [ { "not": { "u_has_trait": "perk_STR_UP" } }, { "not": { "u_has_trait": "perk_STR_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_STR_UP>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_STR_UP>", "target_var": { "context_val": "trait_name" } },
@@ -19,12 +19,12 @@
             "target_var": { "context_val": "trait_requirement_description" },
             "i18n": true
           },
-          { "set_condition": "perk_condition", "condition": { "math": [ "0", "==", "0" ] } }
+          { "set_condition": "perk_condition", "condition": { "not": { "u_has_trait": "perk_STR_UP_2" } } }
         ],
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_STR_UP_2" } },
+        "condition": { "and": [ { "u_has_trait": "perk_STR_UP" }, { "not": { "u_has_trait": "perk_STR_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_STR_UP_2>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_STR_UP_2>", "target_var": { "context_val": "trait_name" } },
@@ -42,7 +42,7 @@
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_DEX_UP" } },
+        "condition": { "and": [ { "not": { "u_has_trait": "perk_DEX_UP" } }, { "not": { "u_has_trait": "perk_DEX_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_DEX_UP>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_DEX_UP>", "target_var": { "context_val": "trait_name" } },
@@ -56,12 +56,12 @@
             "target_var": { "context_val": "trait_requirement_description" },
             "i18n": true
           },
-          { "set_condition": "perk_condition", "condition": { "math": [ "0", "==", "0" ] } }
+          { "set_condition": "perk_condition", "condition": { "not": { "u_has_trait": "perk_DEX_UP_2" } } }
         ],
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_DEX_UP_2" } },
+        "condition": { "and": [ { "u_has_trait": "perk_DEX_UP" }, { "not": { "u_has_trait": "perk_DEX_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_DEX_UP_2>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_DEX_UP_2>", "target_var": { "context_val": "trait_name" } },
@@ -79,7 +79,7 @@
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_INT_UP" } },
+        "condition": { "and": [ { "not": { "u_has_trait": "perk_INT_UP" } }, { "not": { "u_has_trait": "perk_INT_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_INT_UP>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_INT_UP>", "target_var": { "context_val": "trait_name" } },
@@ -93,12 +93,12 @@
             "target_var": { "context_val": "trait_requirement_description" },
             "i18n": true
           },
-          { "set_condition": "perk_condition", "condition": { "math": [ "0", "==", "0" ] } }
+          { "set_condition": "perk_condition", "condition": { "not": { "u_has_trait": "perk_INT_UP_2" } } }
         ],
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_INT_UP_2" } },
+        "condition": { "and": [ { "u_has_trait": "perk_INT_UP" }, { "not": { "u_has_trait": "perk_INT_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_INT_UP_2>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_INT_UP_2>", "target_var": { "context_val": "trait_name" } },
@@ -116,7 +116,7 @@
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_PER_UP" } },
+        "condition": { "and": [ { "not": { "u_has_trait": "perk_PER_UP" } }, { "not": { "u_has_trait": "perk_PER_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_PER_UP>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_PER_UP>", "target_var": { "context_val": "trait_name" } },
@@ -130,12 +130,12 @@
             "target_var": { "context_val": "trait_requirement_description" },
             "i18n": true
           },
-          { "set_condition": "perk_condition", "condition": { "math": [ "0", "==", "0" ] } }
+          { "set_condition": "perk_condition", "condition": { "not": { "u_has_trait": "perk_PER_UP_2" } } }
         ],
         "topic": "TALK_PERK_MENU_SELECT"
       },
       {
-        "condition": { "not": { "u_has_trait": "perk_PER_UP_2" } },
+        "condition": { "and": [ { "u_has_trait": "perk_PER_UP" }, { "not": { "u_has_trait": "perk_PER_UP_2" } } ] },
         "text": "Gain [<trait_name:perk_PER_UP_2>]",
         "effect": [
           { "set_string_var": "<trait_name:perk_PER_UP_2>", "target_var": { "context_val": "trait_name" } },
diff --git a/data/mods/BombasticPerks/perks.json b/data/mods/BombasticPerks/perks.json
index 890fe0ec4052f..a458c25e3c02c 100644
--- a/data/mods/BombasticPerks/perks.json
+++ b/data/mods/BombasticPerks/perks.json
@@ -27,8 +27,9 @@
     "type": "mutation",
     "id": "perk_STR_UP_2",
     "name": { "str": "Even Stronger" },
-    "points": 2,
+    "points": 0,
     "description": "You HAVE been working out.  +2 Strength.",
+    "prereqs": [ "perk_STR_UP" ],
     "category": [ "perk" ],
     "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "STRENGTH", "add": 2 } ] } ]
   },
@@ -46,8 +47,9 @@
     "type": "mutation",
     "id": "perk_DEX_UP_2",
     "name": { "str": "Even Faster" },
-    "points": 2,
+    "points": 0,
     "description": "You HAVE been doing cardio.  +2 Dexterity.",
+    "prereqs": [ "perk_DEX_UP" ],
     "category": [ "perk" ],
     "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "DEXTERITY", "add": 2 } ] } ]
   },
@@ -65,8 +67,9 @@
     "type": "mutation",
     "id": "perk_INT_UP_2",
     "name": { "str": "Even Smarter" },
-    "points": 2,
+    "points": 0,
     "description": "You HAVE been reading.  +2 Intelligence.",
+    "prereqs": [ "perk_INT_UP" ],
     "category": [ "perk" ],
     "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "INTELLIGENCE", "add": 2 } ] } ]
   },
@@ -84,8 +87,9 @@
     "type": "mutation",
     "id": "perk_PER_UP_2",
     "name": { "str": "Even Sharper" },
-    "points": 2,
+    "points": 0,
     "description": "You HAVE been staring out into the middle distance.  +2 Perception.",
+    "prereqs": [ "perk_PER_UP" ],
     "category": [ "perk" ],
     "enchantments": [ { "condition": "ALWAYS", "values": [ { "value": "PERCEPTION", "add": 2 } ] } ]
   },