From e4b9ecaf2548451ca621b272b69e7a3cc7f1ea0a Mon Sep 17 00:00:00 2001
From: Anton Simakov <67688115+GuardianDll@users.noreply.github.com>
Date: Fri, 29 Mar 2024 18:21:14 +0100
Subject: [PATCH] whoever obsoleted this traits did it bad

---
 .../npcs/mutant_npcs/trait_groups.json        | 33 ++-----------------
 data/mods/Aftershock/player/professions.json  |  2 +-
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json
index af303aa0a94a8..7087b12afe497 100644
--- a/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json
+++ b/data/mods/Aftershock/npcs/mutant_npcs/trait_groups.json
@@ -1071,14 +1071,8 @@
     "subtype": "collection",
     "traits": [
       { "trait": "PATCHFUR", "prob": 50 },
-      { "trait": "LEATHER_FEET", "prob": 50 },
-      { "trait": "SKINFOLDS", "prob": 50 },
       { "trait": "HAULER", "prob": 50 },
-      { "trait": "WEAKJOINTS", "prob": 50 },
       { "trait": "UPLIFTED" },
-      { "trait": "ELEPHANTINE_SMELL", "prob": 50 },
-      { "trait": "SPECAILIZED_DIET", "prob": 50 },
-      { "trait": "ELEPHANTINE_SMELL", "prob": 50 },
       { "trait": "CRUSHINGFEET", "prob": 50 },
       { "trait": "HERBIVORE", "prob": 50 },
       { "trait": "FACEBUMPS", "prob": 50 }
@@ -1088,30 +1082,13 @@
     "type": "trait_group",
     "id": "trait_group_mastodon_nonthres",
     "subtype": "collection",
-    "traits": [
-      { "trait": "MUT_TANK", "prob": 50 },
-      { "trait": "TUSKS", "prob": 50 },
-      { "distribution": [ { "trait": "SHORTFUR" }, { "trait": "MEDIUMFUR" } ] }
-    ]
+    "traits": [ { "trait": "TUSKS", "prob": 50 } ]
   },
   {
     "type": "trait_group",
     "id": "trait_group_mastodon_postthres",
     "subtype": "collection",
-    "traits": [
-      { "trait": "THRESH_MASTODON" },
-      { "distribution": [ { "trait": "ELEPHANTINE" }, { "trait": "ELEPHANTINE_OK" } ] },
-      { "trait": "MUT_TANK2", "prob": 50 },
-      { "trait": "GIGANTIC", "prob": 20 },
-      { "trait": "GIGANTIC_OK", "prob": 20 },
-      { "trait": "TUSKS_POINTED", "prob": 50 },
-      {
-        "distribution": [
-          { "trait": "TRUMPET" },
-          { "collection": [ { "trait": "BIG_FOOD" }, { "trait": "LARGE_DIET" }, { "trait": "FLUSH" } ] }
-        ]
-      }
-    ]
+    "traits": [ { "trait": "THRESH_MASTODON" }, { "trait": "TUSKS_POINTED", "prob": 50 }, { "trait": "TRUMPET" } ]
   },
   {
     "type": "trait_group",
@@ -1119,14 +1096,8 @@
     "subtype": "collection",
     "traits": [
       { "trait": "PATCHFUR", "prob": 50 },
-      { "trait": "LEATHER_FEET", "prob": 50 },
-      { "trait": "SKINFOLDS", "prob": 50 },
       { "trait": "HAULER", "prob": 50 },
-      { "trait": "WEAKJOINTS", "prob": 50 },
       { "trait": "UPLIFTED" },
-      { "trait": "ELEPHANTINE_SMELL", "prob": 50 },
-      { "trait": "SPECAILIZED_DIET", "prob": 50 },
-      { "trait": "ELEPHANTINE_SMELL", "prob": 50 },
       { "trait": "CRUSHINGFEET", "prob": 50 },
       { "trait": "HERBIVORE", "prob": 50 },
       { "trait": "FACEBUMPS", "prob": 50 }
diff --git a/data/mods/Aftershock/player/professions.json b/data/mods/Aftershock/player/professions.json
index 354c650d938b9..ca08fbd3c81f1 100644
--- a/data/mods/Aftershock/player/professions.json
+++ b/data/mods/Aftershock/player/professions.json
@@ -377,7 +377,7 @@
       { "level": 3, "name": "bashing" }
     ],
     "proficiencies": [ "prof_batons_familiar", "prof_auto_pistols_familiar" ],
-    "traits": [ "PROF_SWAT", "UPLIFTED", "THRESH_MASTODON", "MUT_TANK", "TUSKS", "HUGE_OK" ],
+    "traits": [ "PROF_SWAT", "UPLIFTED", "THRESH_MASTODON", "TUSKS", "HUGE_OK" ],
     "//": "Need to add XL gear for MASTODON's in more items.",
     "items": {
       "both": {