From ef5b8f2857b84330088d43548c15fbe6888d7b39 Mon Sep 17 00:00:00 2001
From: ebolite <moldehchez@gmail.com>
Date: Sat, 24 Aug 2019 10:02:51 -0500
Subject: [PATCH] Make Sweet Tooth a starting trait (#33477)

* Changed Sweet Tooth to be a starting trait

* Added Sweet Tooth starting trait to NPCs

Removed ANTIJUNK from possible starting traits, created a new trait group with both PROJUNK and ANTIJUNK and added that group to possible starting traits. Possibility 5 because of allergy.
---
 data/json/mutations/mutations.json  | 1 +
 data/json/npcs/starting_traits.json | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json
index 413290e265da5..a8626c1a3e896 100644
--- a/data/json/mutations/mutations.json
+++ b/data/json/mutations/mutations.json
@@ -1013,6 +1013,7 @@
     "name": "Sweet Tooth",
     "points": 1,
     "description": "You have a soft spot for processed foods, and gain a morale bonus from eating them.",
+    "starting_trait": true,
     "cancels": [ "ANTIJUNK" ],
     "changes_to": [ "PROJUNK2" ],
     "category": [ "MOUSE", "INSECT" ]
diff --git a/data/json/npcs/starting_traits.json b/data/json/npcs/starting_traits.json
index 0a3cb9e8b2b1a..34272a8a7d085 100644
--- a/data/json/npcs/starting_traits.json
+++ b/data/json/npcs/starting_traits.json
@@ -33,6 +33,7 @@
       { "group": "trait_group_TOUGH", "prob": 20 },
       { "group": "trait_group_WEAKSCENT", "prob": 10 },
       { "group": "trait_group_PAINRESIST", "prob": 10 },
+      { "group": "trait_group_PROJUNK", "prob": 5 },
       { "trait": "DEFT", "prob": 10 },
       { "trait": "DISRESISTANT", "prob": 10 },
       { "trait": "ADRENALINE", "prob": 10 },
@@ -58,7 +59,6 @@
       { "trait": "MEATARIAN", "prob": 5 },
       { "trait": "HOARDER", "prob": 10 },
       { "trait": "JITTERY", "prob": 10 },
-      { "trait": "ANTIJUNK", "prob": 5 },
       { "trait": "LACTOSE", "prob": 10 },
       { "trait": "VEGETARIAN", "prob": 15 },
       { "trait": "MOODSWINGS", "prob": 10 },
@@ -250,5 +250,11 @@
     "id": "trait_group_PAINRESIST",
     "subtype": "distribution",
     "traits": [ { "trait": "PAINRESIST" }, { "trait": "MORE_PAIN" } ]
+  },
+  {
+    "type": "trait_group",
+    "id": "trait_group_PROJUNK",
+    "subtype": "distribution",
+    "traits": [ { "trait": "PROJUNK" }, { "trait": "ANTIJUNK" } ]
   }
 ]