From ccdf60b6afdf4fdaa983f544d06aea56906625d3 Mon Sep 17 00:00:00 2001
From: saschahi <39934087+saschahi@users.noreply.github.com>
Date: Thu, 18 Mar 2021 17:01:25 +0100
Subject: [PATCH] Adding traits

Adding traits
---
 Traitlist.json | 1736 ++++++++++++++++++++++++++++++++++++++++++++++++
 index.html     |   37 +-
 2 files changed, 1770 insertions(+), 3 deletions(-)
 create mode 100644 Traitlist.json

diff --git a/Traitlist.json b/Traitlist.json
new file mode 100644
index 00000000..efc129e0
--- /dev/null
+++ b/Traitlist.json
@@ -0,0 +1,1736 @@
+{
+  "traits": [
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Abrasive",
+      "degree": 0,
+      "name": "abrasive",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "kind",
+          "charismatic",
+          "verycharismatic",
+          "perceptive",
+          "veryperceptive"
+        ],
+        "customName": false,
+        "stats": [
+          "+3 melee"
+        ]
+      },
+      "description": "Pawn always says exactly what's on his mind, especially if it's bugging him. That tends to rub people the wrong way.",
+      "stats": [
+        "+3 melee"
+      ],
+      "conflicts": [
+        "kind",
+        "charismatic",
+        "verycharismatic",
+        "perceptive",
+        "veryperceptive"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "AnnoyingVoice",
+      "degree": 0,
+      "name": "annoyingvoice",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "charismatic",
+          "verycharismatic"
+        ],
+        "customName": false,
+        "stats": [
+          "x110% move speed",
+          "x150% recreation power"
+        ]
+      },
+      "description": "Pawn's voice has a particularly grating, nasal quality to it, and he tends to talk in barked, garbled phrases. This predisposes others to dislike him.",
+      "stats": [
+        "x110% move speed",
+        "x150% recreation power"
+      ],
+      "conflicts": [
+        "charismatic",
+        "verycharismatic"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Ascetic",
+      "degree": 0,
+      "name": "ascetic",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "greedy",
+          "jealous",
+          "gourmand"
+        ],
+        "customName": false,
+        "stats": [
+          "Artistic meditation focus type disabled.",
+          "Minimal meditation focus type allowed."
+        ]
+      },
+      "description": "Pawn has forsaken physical comforts and enjoyments in favor of a simple, pure lifestyle. he will become unhappy if if he has a bedroom that's too impressive. he also dislikes fancy food and prefers to eat raw. he never judges others by their appearance.",
+      "stats": [
+        "Artistic meditation focus type disabled.",
+        "Minimal meditation focus type allowed."
+      ],
+      "conflicts": [
+        "greedy",
+        "jealous",
+        "gourmand"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Beauty",
+      "degree": 2,
+      "name": "beautiful",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+2.0 beauty"
+        ]
+      },
+      "description": "Pawn is exceptionally beautiful, with an exotic-yet-familiar facial structure and an arresting gaze. People are attracted to him before he even opens his mouth.",
+      "stats": [
+        "+2.0 beauty"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Bloodlust",
+      "degree": 0,
+      "name": "bloodlust",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "animalfriend",
+          "charismatic",
+          "verycharismatic"
+        ],
+        "customName": false,
+        "stats": [
+          "Morbid meditation focus type allowed."
+        ]
+      },
+      "description": "Pawn gets a rush from hurting people, and never minds the sight of blood or death. he is four times as likely to start a social fight as others.",
+      "stats": [
+        "Morbid meditation focus type allowed."
+      ],
+      "conflicts": [
+        "animalfriend",
+        "charismatic",
+        "verycharismatic"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "BodyPurist",
+      "degree": 0,
+      "name": "bodypurist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "transhumanist"
+        ],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn believes the human body is limited for a reason. To him, artificial body parts are unethical and disgusting.",
+      "stats": [],
+      "conflicts": [
+        "transhumanist"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Brawler",
+      "degree": 0,
+      "name": "brawler",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "carefulshooter",
+          "trigger-happy",
+          "wimp",
+          "carefulshooter",
+          "trigger-happy",
+          "gunnut"
+        ],
+        "customName": false,
+        "stats": [
+          "Shoot frenzy inspiration disabled.",
+          "+4 melee",
+          "-4 shooting",
+          "+4.0 melee hit chance"
+        ]
+      },
+      "description": "Pawn likes to fight up close and personal. his accuracy is greatly increased in melee combat, but he'll be very unhappy if asked to carry a ranged weapon.",
+      "stats": [
+        "Shoot frenzy inspiration disabled.",
+        "+4 melee",
+        "-4 shooting",
+        "+4.0 melee hit chance"
+      ],
+      "conflicts": [
+        "carefulshooter",
+        "trigger-happy",
+        "wimp",
+        "carefulshooter",
+        "trigger-happy",
+        "gunnut"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Cannibal",
+      "degree": 0,
+      "name": "cannibal",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Morbid meditation focus type allowed."
+        ]
+      },
+      "description": "Pawn was taught that eating human meat is wrong and horrible. But one time, long ago, he tried it... and he liked it.",
+      "stats": [
+        "Morbid meditation focus type allowed."
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "ShootingAccuracy",
+      "degree": 1,
+      "name": "carefulshooter",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "brawler"
+        ],
+        "customName": false,
+        "stats": [
+          "+25% aiming time",
+          "+5.0 shooting accuracy"
+        ]
+      },
+      "description": "Pawn takes more time to aim when shooting. he shoots less often than others, but with more accuracy.",
+      "stats": [
+        "+25% aiming time",
+        "+5.0 shooting accuracy"
+      ],
+      "conflicts": [
+        "brawler"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "FT_Charisma",
+      "degree": 1,
+      "name": "charismatic",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "abrasive",
+          "bloodlust",
+          "idiotsavant",
+          "annoyingvoice"
+        ],
+        "customName": false,
+        "stats": [
+          "+2 social",
+          "+10.00% negotiation ability",
+          "+20.00% social impact",
+          "+5.00% trade price improvement"
+        ]
+      },
+      "description": "Pawn has a charismatic personality. he gets bonuses to all human-like social interactions.",
+      "stats": [
+        "+2 social",
+        "+10.00% negotiation ability",
+        "+20.00% social impact",
+        "+5.00% trade price improvement"
+      ],
+      "conflicts": [
+        "abrasive",
+        "bloodlust",
+        "idiotsavant",
+        "annoyingvoice"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "DrugDesire",
+      "degree": 2,
+      "name": "chemicalfascination",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+3 medical",
+          "+3 plants"
+        ]
+      },
+      "description": "Pawn is utterly fascinated with chemical sources of enjoyment. Consuming recreational drugs will create a good mood, while abstaining will lead to increasing frustration over time and possibly drug binges. he will ignore directives to not use recreational drugs, and will consume more than a normal person.",
+      "stats": [
+        "+3 medical",
+        "+3 plants"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "DrugDesire",
+      "degree": 1,
+      "name": "chemicalinterest",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+1 medical",
+          "+1 plants"
+        ]
+      },
+      "description": "Pawn has an unusual interest in chemical sources of enjoyment. Consuming recreational drugs will create a good mood, while abstaining will lead to increasing frustration over time and possible drug binges. he will ignore directives to not use recreational drugs, and will consume more than a normal person.",
+      "stats": [
+        "+1 medical",
+        "+1 plants"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "CreepyBreathing",
+      "degree": 0,
+      "name": "creepybreathing",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn breathes heavily all the time, and sweats constantly. People find it creepy.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "NaturalMood",
+      "degree": -2,
+      "name": "depressive",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+3 animals",
+          "x110% tame animal chance",
+          "x115% train animal chance"
+        ]
+      },
+      "description": "Pawn is perenially unhappy. he has trouble sustaining a good mood even when everything is fine.",
+      "stats": [
+        "+3 animals",
+        "x110% tame animal chance",
+        "x115% train animal chance"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "FastLearner",
+      "degree": 0,
+      "name": "fastlearner",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "idiotsavant",
+          "stupid",
+          "oblivious"
+        ],
+        "customName": false,
+        "stats": [
+          "+75% global learning factor"
+        ]
+      },
+      "description": "Pawn has a knack for learning. he picks things up much faster than others.",
+      "stats": [
+        "+75% global learning factor"
+      ],
+      "conflicts": [
+        "idiotsavant",
+        "stupid",
+        "oblivious"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "SpeedOffset",
+      "degree": 1,
+      "name": "fastwalker",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl",
+          "rooted"
+        ],
+        "customName": false,
+        "stats": [
+          "+0.20 move speed"
+        ]
+      },
+      "description": "Pawn likes to be where he's going. he walks quicker than most people.",
+      "stats": [
+        "+0.20 move speed"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl",
+        "rooted"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Gourmand",
+      "degree": 0,
+      "name": "gourmand",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "ascetic"
+        ],
+        "customName": false,
+        "stats": [
+          "Only mental break \"Binging_Food\" allowed.",
+          "+4 cooking",
+          "x75% eating speed"
+        ]
+      },
+      "description": "Pawn's life revolves around food. he gets hungry quickly, and will occasionally be overcome with the urge to eat ravenously, even when not hungry.",
+      "stats": [
+        "Only mental break \"Binging_Food\" allowed.",
+        "+4 cooking",
+        "x75% eating speed"
+      ],
+      "conflicts": [
+        "ascetic"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "GreatMemory",
+      "degree": 0,
+      "name": "greatmemory",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+25% global learning factor"
+        ]
+      },
+      "description": "Pawn has a fantastic memory for detail. he will learn new skills slightly faster than other people.",
+      "stats": [
+        "+25% global learning factor"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Greedy",
+      "degree": 0,
+      "name": "greedy",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "ascetic",
+          "jealous"
+        ],
+        "customName": false,
+        "stats": [
+          "x133% eating speed",
+          "x150% carrying capacity"
+        ]
+      },
+      "description": "Pawn needs a really impressive bedroom. he gets a mood loss if he doesn't get what he wants.",
+      "stats": [
+        "x133% eating speed",
+        "x150% carrying capacity"
+      ],
+      "conflicts": [
+        "ascetic",
+        "jealous"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Industriousness",
+      "degree": 1,
+      "name": "hardworker",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl"
+        ],
+        "customName": false,
+        "stats": [
+          "+20% global work speed"
+        ]
+      },
+      "description": "Pawn is a natural hard worker and will finish tasks faster than most.",
+      "stats": [
+        "+20% global work speed"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Industriousness",
+      "degree": 2,
+      "name": "industrious",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl"
+        ],
+        "customName": false,
+        "stats": [
+          "+35% global work speed"
+        ]
+      },
+      "description": "Pawn has an easy time staying on-task and focused, and gets things done much faster than the average person.",
+      "stats": [
+        "+35% global work speed"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Nerves",
+      "degree": 2,
+      "name": "iron-willed",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "enduring",
+          "veryenduring",
+          "toosmart"
+        ],
+        "customName": false,
+        "stats": [
+          "-18% mental break threshold"
+        ]
+      },
+      "description": "Pawn's will is an iron shield. he keeps going through thick and thin, when others broke down long before.",
+      "stats": [
+        "-18% mental break threshold"
+      ],
+      "conflicts": [
+        "enduring",
+        "veryenduring",
+        "toosmart"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Jealous",
+      "degree": 0,
+      "name": "jealous",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "ascetic",
+          "greedy"
+        ],
+        "customName": false,
+        "stats": [
+          "Morbid meditation focus type allowed.",
+          "+3 social",
+          "x115% negotiation ability",
+          "x115% trade price improvement"
+        ]
+      },
+      "description": "For Pawn, it's degrading to have a less impressive bedroom than someone else. he gets a mood loss if any colonist has a more impressive bedroom.",
+      "stats": [
+        "Morbid meditation focus type allowed.",
+        "+3 social",
+        "x115% negotiation ability",
+        "x115% trade price improvement"
+      ],
+      "conflicts": [
+        "ascetic",
+        "greedy"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "SpeedOffset",
+      "degree": 2,
+      "name": "jogger",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl",
+          "rooted"
+        ],
+        "customName": false,
+        "stats": [
+          "+0.40 move speed"
+        ]
+      },
+      "description": "Pawn always moves with a sense of urgency - so much so that others often fail to keep up.",
+      "stats": [
+        "+0.40 move speed"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl",
+        "rooted"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Kind",
+      "degree": 0,
+      "name": "kind",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "abrasive",
+          "psychopath"
+        ],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn is exceptionally kind. he has a special way of using kind words to brighten someone's day. he never insults others, and never judges people by their appearance.",
+      "stats": [],
+      "conflicts": [
+        "abrasive",
+        "psychopath"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Industriousness",
+      "degree": -1,
+      "name": "lazy",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl"
+        ],
+        "customName": false,
+        "stats": [
+          "-20% global work speed",
+          "x90% mental break threshold"
+        ]
+      },
+      "description": "Pawn is a little bit lazy.",
+      "stats": [
+        "-20% global work speed",
+        "x90% mental break threshold"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Masochist",
+      "degree": 0,
+      "name": "masochist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Morbid meditation focus type allowed."
+        ]
+      },
+      "description": "For Pawn, there's something exciting about getting hurt. he doesn't know why, he's just wired differently.",
+      "stats": [
+        "Morbid meditation focus type allowed."
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "DislikesMen",
+      "degree": 0,
+      "name": "misandrist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn really dislikes and distrusts men.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "DislikesWomen",
+      "degree": 0,
+      "name": "misogynist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn really dislikes and distrusts women.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Nerves",
+      "degree": -1,
+      "name": "nervous",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "enduring",
+          "veryenduring",
+          "toosmart"
+        ],
+        "customName": false,
+        "stats": [
+          "+2 intellectual",
+          "+8% mental break threshold",
+          "x110% global learning factor"
+        ]
+      },
+      "description": "Pawn tends to crack under pressure.",
+      "stats": [
+        "+2 intellectual",
+        "+8% mental break threshold",
+        "x110% global learning factor"
+      ],
+      "conflicts": [
+        "enduring",
+        "veryenduring",
+        "toosmart"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Neurotic",
+      "degree": 1,
+      "name": "neurotic",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+20% global work speed",
+          "+8% mental break threshold"
+        ]
+      },
+      "description": "Pawn likes to have things squared away. he will work harder than most to attain this state of affairs, but his nerves can get the better of him.",
+      "stats": [
+        "+20% global work speed",
+        "+8% mental break threshold"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "NightOwl",
+      "degree": 0,
+      "name": "nightowl",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn likes to be up during the night, and sleep during the day.\n\nhe gets a mood bonus if awake at night (23h-6h) and mood loss if awake during the day (11h-18h).\n\nhe doesn't get a mood penalty for being in the dark.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Nimble",
+      "degree": 0,
+      "name": "nimble",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+15.0 melee dodge chance",
+          "x10% trap spring chance"
+        ]
+      },
+      "description": "Pawn has remarkable kinesthetic intelligence. he seems to dance around danger with preternatural grace.",
+      "stats": [
+        "+15.0 melee dodge chance",
+        "x10% trap spring chance"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Nudist",
+      "degree": 0,
+      "name": "nudist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn enjoys the feeling of freedom that comes from being nude. he can handle clothing, but will be happier without it.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "NaturalMood",
+      "degree": 1,
+      "name": "optimist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn is naturally optimistic about life. It's hard to get him down.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "NaturalMood",
+      "degree": -1,
+      "name": "pessimist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+2 animals",
+          "x105% tame animal chance",
+          "x110% train animal chance"
+        ]
+      },
+      "description": "Pawn tends to look on the bad side of life.",
+      "stats": [
+        "+2 animals",
+        "x105% tame animal chance",
+        "x110% train animal chance"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Beauty",
+      "degree": 1,
+      "name": "pretty",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+1.0 beauty"
+        ]
+      },
+      "description": "Pawn has a pretty face, which predisposes people to like him.",
+      "stats": [
+        "+1.0 beauty"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "PsychicSensitivity",
+      "degree": -2,
+      "name": "psychicallydeaf",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "-100% psychic sensitivity"
+        ]
+      },
+      "description": "Pawn's mind works on a psychic frequency different from everyone else. he just isn't affected by psychic phenomena.",
+      "stats": [
+        "-100% psychic sensitivity"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "PsychicSensitivity",
+      "degree": -1,
+      "name": "psychicallydull",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "-50% psychic sensitivity"
+        ]
+      },
+      "description": "Pawn's mind is psychically out of tune with others. he isn't as affected by psychic phenomena.",
+      "stats": [
+        "-50% psychic sensitivity"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "PsychicSensitivity",
+      "degree": 2,
+      "name": "psychicallyhypersensitive",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+80% psychic sensitivity"
+        ]
+      },
+      "description": "Pawn's mind is like a psychic tuning fork. he is extremely sensitive to psychic phenomena.",
+      "stats": [
+        "+80% psychic sensitivity"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "PsychicSensitivity",
+      "degree": 1,
+      "name": "psychicallysensitive",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+40% psychic sensitivity"
+        ]
+      },
+      "description": "Pawn's mind is unusually sensitive to psychic phenomena.",
+      "stats": [
+        "+40% psychic sensitivity"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Psychopath",
+      "degree": 0,
+      "name": "psychopath",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Morbid meditation focus type allowed."
+        ]
+      },
+      "description": "Pawn has no empathy. The suffering of others doesn't bother him at all. he doesn't mind if others are butchered, left unburied, imprisoned, or sold to slavery - unless it affects him. he also feels no mood boost from socializing.",
+      "stats": [
+        "Morbid meditation focus type allowed."
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Pyromaniac",
+      "degree": 0,
+      "name": "pyromaniac",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Flame meditation focus type allowed.",
+          "Only mental break \"FireStartingSpree\" allowed.",
+          "x115% Maximum comfortable temperature"
+        ]
+      },
+      "description": "Pawn loves fire. he will never extinguish fires. To relieve stress, he will occasionally go on random fire starting sprees. This happens more often if his mood is low.",
+      "stats": [
+        "Flame meditation focus type allowed.",
+        "Only mental break \"FireStartingSpree\" allowed.",
+        "x115% Maximum comfortable temperature"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "QuickSleeper",
+      "degree": 0,
+      "name": "quicksleeper",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+50% rest rate multiplier"
+        ]
+      },
+      "description": "Pawn doesn't need as much sleep as the average person. Whether he's sleeping on a bed or on the ground, he will be fully rested in about two thirds the usual time.",
+      "stats": [
+        "+50% rest rate multiplier"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "NaturalMood",
+      "degree": 2,
+      "name": "sanguine",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn is just naturally upbeat about his situation, pretty much all the time, no matter what it is.",
+      "stats": [],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Immunity",
+      "degree": -1,
+      "name": "sickly",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+4 medical"
+        ]
+      },
+      "description": "Pawn has an awful immune system. he gets sick more often than usual, frequently with illnesses that nobody in the colony has been afflicted by.",
+      "stats": [
+        "+4 medical"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Industriousness",
+      "degree": -2,
+      "name": "slothful",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl"
+        ],
+        "customName": false,
+        "stats": [
+          "-35% global work speed",
+          "x80% mental break threshold"
+        ]
+      },
+      "description": "Pawn loves idleness and hates anything productive. he moves slowly and rarely stays focused on a task.",
+      "stats": [
+        "-35% global work speed",
+        "x80% mental break threshold"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "SlowLearner",
+      "degree": 0,
+      "name": "slowlearner",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "toosmart"
+        ],
+        "customName": false,
+        "stats": [
+          "-75% global learning factor",
+          "x110% global work speed",
+          "x125% general labor speed"
+        ]
+      },
+      "description": "Pawn is slow on the uptake. he learns much slower than others.",
+      "stats": [
+        "-75% global learning factor",
+        "x110% global work speed",
+        "x125% general labor speed"
+      ],
+      "conflicts": [
+        "toosmart"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "SpeedOffset",
+      "degree": -1,
+      "name": "slowpoke",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "actionboy",
+          "actiongirl",
+          "rooted"
+        ],
+        "customName": false,
+        "stats": [
+          "Go frenzy inspiration disabled.",
+          "-0.20 move speed"
+        ]
+      },
+      "description": "Pawn is always falling behind the group whenever he goes anywhere.",
+      "stats": [
+        "Go frenzy inspiration disabled.",
+        "-0.20 move speed"
+      ],
+      "conflicts": [
+        "actionboy",
+        "actiongirl",
+        "rooted"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Beauty",
+      "degree": -2,
+      "name": "staggeringlyugly",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Inspired trade inspiration disabled.",
+          "Inspired recruitment inspiration disabled.",
+          "-2.0 beauty",
+          "x115% global work speed"
+        ]
+      },
+      "description": "Pawn is staggeringly ugly. his face looks like a cross between a drawing by an untalented child, a malformed fetus in a jar of formaldehyde, and a piece of modern art. Others must exert conscious effort to look at him while conversing.",
+      "stats": [
+        "Inspired trade inspiration disabled.",
+        "Inspired recruitment inspiration disabled.",
+        "-2.0 beauty",
+        "x115% global work speed"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Nerves",
+      "degree": 1,
+      "name": "steadfast",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "enduring",
+          "veryenduring",
+          "toosmart"
+        ],
+        "customName": false,
+        "stats": [
+          "-9% mental break threshold"
+        ]
+      },
+      "description": "Pawn is mentally tough and won't break down under stresses that would crack most people.",
+      "stats": [
+        "-9% mental break threshold"
+      ],
+      "conflicts": [
+        "enduring",
+        "veryenduring",
+        "toosmart"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Immunity",
+      "degree": 1,
+      "name": "super-immune",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+30% immunity gain speed"
+        ]
+      },
+      "description": "Pawn has a naturally powerful immune system. he will gain immunity much faster than a normal person would, and can survive illnesses that would kill others.",
+      "stats": [
+        "+30% immunity gain speed"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "DrugDesire",
+      "degree": -1,
+      "name": "teetotaler",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Binging on drug mental state disabled."
+        ]
+      },
+      "description": "Pawn abhors the idea of gaining pleasure from chemicals. he strictly avoids alcohol and recreational drugs.",
+      "stats": [
+        "Binging on drug mental state disabled."
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "TooSmart",
+      "degree": 0,
+      "name": "toosmart",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "iron-willed",
+          "steadfast",
+          "nervous",
+          "volatile",
+          "slowlearner"
+        ],
+        "customName": false,
+        "stats": [
+          "+75% global learning factor",
+          "+12% mental break threshold"
+        ]
+      },
+      "description": "Pawn is too smart for his own good. he learns everything much faster than everyone, but can be quite eccentric.",
+      "stats": [
+        "+75% global learning factor",
+        "+12% mental break threshold"
+      ],
+      "conflicts": [
+        "iron-willed",
+        "steadfast",
+        "nervous",
+        "volatile",
+        "slowlearner"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "TorturedArtist",
+      "degree": 0,
+      "name": "torturedartist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Go frenzy inspiration disabled.",
+          "Shoot frenzy inspiration disabled.",
+          "Inspired trade inspiration disabled.",
+          "Inspired recruitment inspiration disabled.",
+          "Inspired surgery inspiration disabled.",
+          "Inspired taming inspiration disabled.",
+          "Morbid meditation focus type allowed.",
+          "+2 artistic"
+        ]
+      },
+      "description": "Pawn feels alienated and misunderstood by other human beings. he will have a constant mood debuff, but gain a chance (50%) to get a creativity inspiration after a mental break.",
+      "stats": [
+        "Go frenzy inspiration disabled.",
+        "Shoot frenzy inspiration disabled.",
+        "Inspired trade inspiration disabled.",
+        "Inspired recruitment inspiration disabled.",
+        "Inspired surgery inspiration disabled.",
+        "Inspired taming inspiration disabled.",
+        "Morbid meditation focus type allowed.",
+        "+2 artistic"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Tough",
+      "degree": 0,
+      "name": "tough",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "x50% incoming damage multiplier"
+        ]
+      },
+      "description": "Pawn has thick skin, dense flesh, and durable bones. he takes much less damage than other people from the same blows. he is extremely hard to kill.",
+      "stats": [
+        "x50% incoming damage multiplier"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Transhumanist",
+      "degree": 0,
+      "name": "transhumanist",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "bodypurist"
+        ],
+        "customName": false,
+        "stats": []
+      },
+      "description": "Pawn feels limited in his feeble human body. he often dreams of being enhanced by artificial body parts.",
+      "stats": [],
+      "conflicts": [
+        "bodypurist"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "ShootingAccuracy",
+      "degree": -1,
+      "name": "trigger-happy",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "brawler"
+        ],
+        "customName": false,
+        "stats": [
+          "-50% aiming time",
+          "-5.0 shooting accuracy"
+        ]
+      },
+      "description": "Pew! Pew! Pew! Pawn just likes pulling the trigger. he shoots faster than others, but less accurately.",
+      "stats": [
+        "-50% aiming time",
+        "-5.0 shooting accuracy"
+      ],
+      "conflicts": [
+        "brawler"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Beauty",
+      "degree": -1,
+      "name": "ugly",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Inspired recruitment inspiration disabled.",
+          "-1.0 beauty",
+          "x110% global work speed"
+        ]
+      },
+      "description": "Pawn is somewhat ugly. This subtly repels others during social interactions.",
+      "stats": [
+        "Inspired recruitment inspiration disabled.",
+        "-1.0 beauty",
+        "x110% global work speed"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Undergrounder",
+      "degree": 0,
+      "name": "undergrounder",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "Morbid meditation focus type allowed."
+        ]
+      },
+      "description": "Pawn has no need to experience the outdoors or light. he will never feel cooped up or get cabin fever, no matter how long he stays inside, and is not bothered by darkness.",
+      "stats": [
+        "Morbid meditation focus type allowed."
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Neurotic",
+      "degree": 2,
+      "name": "veryneurotic",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [],
+        "customName": false,
+        "stats": [
+          "+40% global work speed",
+          "+14% mental break threshold"
+        ]
+      },
+      "description": "Pawn feels constantly nervous about everything that has to get done. he will work extremely hard to attain this state of affairs, but his nerves can easily get the better of him.",
+      "stats": [
+        "+40% global work speed",
+        "+14% mental break threshold"
+      ],
+      "conflicts": [],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Nerves",
+      "degree": -2,
+      "name": "volatile",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "enduring",
+          "veryenduring",
+          "toosmart"
+        ],
+        "customName": false,
+        "stats": [
+          "+3 intellectual",
+          "+15% mental break threshold",
+          "x115% global learning factor"
+        ]
+      },
+      "description": "Pawn is on a hair-trigger all the time. he is the first to break in any tough situation.",
+      "stats": [
+        "+3 intellectual",
+        "+15% mental break threshold",
+        "x115% global learning factor"
+      ],
+      "conflicts": [
+        "enduring",
+        "veryenduring",
+        "toosmart"
+      ],
+      "bypassLimit": false
+    },
+    {
+      "canAdd": true,
+      "canRemove": true,
+      "addPrice": 5000,
+      "removePrice": 5000,
+      "defName": "Wimp",
+      "degree": 0,
+      "name": "wimp",
+      "data": {
+        "canBypassLimit": false,
+        "conflicts": [
+          "brawler",
+          "gunnut",
+          "rooted",
+          "intimidating",
+          "veryintimidating",
+          "agile",
+          "ninja-like",
+          "enduring",
+          "veryenduring"
+        ],
+        "customName": false,
+        "stats": [
+          "+3 medical",
+          "-60% pain shock threshold",
+          "x120% move speed"
+        ]
+      },
+      "description": "Pawn is weak and cowardly. Even a little pain will immobilize him.",
+      "stats": [
+        "+3 medical",
+        "-60% pain shock threshold",
+        "x120% move speed"
+      ],
+      "conflicts": [
+        "brawler",
+        "gunnut",
+        "rooted",
+        "intimidating",
+        "veryintimidating",
+        "agile",
+        "ninja-like",
+        "enduring",
+        "veryenduring"
+      ],
+      "bypassLimit": false
+    }
+  ],
+  "total": 64
+}
diff --git a/index.html b/index.html
index 6adab66b..8d228c9b 100644
--- a/index.html
+++ b/index.html
@@ -14,6 +14,7 @@
     <script type="text/javascript">
         const itemListURL = "https://raw.githubusercontent.com/twitchtoolkit/item-list/master/StoreItems.json";
         const eventListURL = "https://raw.githubusercontent.com/twitchtoolkit/item-list/master/StoreEvents.json";
+		const traitListURL = "https://raw.githubusercontent.com/twitchtoolkit/item-list/master/Traitlist.json";
     </script>
 </head>
 
@@ -49,7 +50,7 @@ <h1 class="display-3">TwitchToolkit</h1>
                     <li class="list-group-item">!modsettings - gives user info on how many coins are being earned and global settings</li>
                     <li class="list-group-item">!giftcoins - Syntax: !giftcoins @username 100 - give another viewer your coins</li>
                     <li class="list-group-item">!toolkitcmds - shows all available commands to the user, this does not translate by default so it can be universally recognized.</li>
-                    <li class="list-group-item">!buy ticket - join the viewer name queue</li>
+                    <li class="list-group-item">!joinqueue - join the viewer name queue</li>
                     <li class="list-group-item">!mypawnstory - view information about your pawns backstory</li>
                     <li class="list-group-item">!mypawnskills - view information about your pawns skills</li>
                 </ul>
@@ -68,6 +69,9 @@ <h1 class="display-3">TwitchToolkit</h1>
                                     <button class="btn btn-success" ng-class="{'active': (selected == '2')}" ng-click='selected=2'>
                                         Events
                                     </button>
+									<button class="btn btn-success" ng-class="{'active': (selected == '3')}" ng-click='selected=3'>
+                                        Traits
+									</button>
                                 </div>
                                 <div class="form-group row">
                                     <label class="col-sm-2 col-form-label" for="">Price Between:</label>
@@ -93,7 +97,7 @@ <h1 class="display-3">TwitchToolkit</h1>
                             </div>
                             <p>
                                 <button type="button" class="btn btn-primary sort" data-sort="abr">
-                                    Sort
+                                    Sort by Name
                                 </button>
                                 <button type="button" class="btn btn-primary sort" data-sort="price">
                                     Sort by Price
@@ -242,7 +246,24 @@ <h1 class="display-3">TwitchToolkit</h1>
 
             eventList = new List('events', options, eventData);
         });
-
+		
+		let traitList = null;
+		$.getJSON(traitListURL, function(data) {
+			var options = {
+				valueNames: ['name', 'description', 'addPrice', 'removePrice'],
+				item: '<tr><td class="name" scope="row"></td><td class="description"></td><td class="addPrice"></td><td class="removePrice"></td></tr>'
+			};
+			
+			var traitData = [];
+			$.each(data.traits, function(index, value) {
+				if (value["addPrice"] > 0) {
+					traitData.push(value);
+				}
+			});
+			
+			traitList = new List('traits', options, traitData);
+		});
+		
         $("#item-price-min").keyup(function() {
             updateItemFilter();
         });
@@ -275,6 +296,16 @@ <h1 class="display-3">TwitchToolkit</h1>
                 return allow;
             });
         }
+		traitList.filter(function(item) {
+                var allow = true;
+                if (minPrice != "" && parseInt(item.values().addPrice) < minPrice) {
+                    allow = false;
+                }
+                if (maxPrice != "" && parseInt(item.values().addPrice) > maxPrice) {
+                    allow = false;
+                }
+                return allow;
+            });
     </script>
     <script type="text/javascript">
         var tabs = angular.module('tabs', [])