diff --git a/data/json/hobbies.json b/data/json/hobbies.json index e8472c38ee578..32707f5d77aa1 100644 --- a/data/json/hobbies.json +++ b/data/json/hobbies.json @@ -218,8 +218,7 @@ "prof_knapping", "prof_carving", "prof_butchering_basic", - "prof_skinning_basic", - "prof_butchery_offal" + "prof_skinning_basic" ], "traits": [ "OUTDOORSMAN" ] }, @@ -855,19 +854,14 @@ "points": -3, "traits": [ "ANTIFRUIT", "MEATARIAN" ], "skills": [ { "level": 2, "name": "survival" }, { "level": 2, "name": "cooking" } ], -<<<<<<< HEAD - "proficiencies": [ "prof_knives_familiar", "prof_knife_skills", "prof_butchering_basic", "prof_skinning_basic" ] -======= "proficiencies": [ "prof_knives_familiar", "prof_knife_skills", "prof_butchering_basic", "prof_skinning_basic", - "prof_butchery_offal", "prof_gross_anatomy", "prof_intro_biology" ] ->>>>>>> 24a8c64fce7 (Professions & hobbies know Gross Anatomy) }, { "type": "profession", @@ -1172,7 +1166,8 @@ "points": 1, "description": "A quiet day at the lake would be a welcome break from the hordes. Though, now that you think about it, the fish have been acting strangely vicious lately too.", "skills": [ { "level": 2, "name": "survival" }, { "level": 1, "name": "swimming" } ], - "traits": [ "OUTDOORSMAN" ] + "traits": [ "OUTDOORSMAN" ], + "proficiencies": [ "prof_butchering_basic" ] }, { "subtype": "hobby", diff --git a/data/json/professions.json b/data/json/professions.json index 8778f937474b9..d2313b4ffca28 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -3995,8 +3995,7 @@ "prof_trapsetting", "prof_knives_familiar", "prof_butchering_basic", - "prof_skinning_basic", - "prof_butchery_offal" + "prof_skinning_basic" ], "recipes": [ "beartrap" ], "items": { @@ -5078,8 +5077,7 @@ "prof_auto_rifles_familiar", "prof_gross_anatomy", "prof_butchering_basic", - "prof_skinning_basic", - "prof_butchery_offal" + "prof_skinning_basic" ], "skills": [ { "level": 4, "name": "gun" }, @@ -5274,7 +5272,7 @@ "description": "You spent most of your days fishing in the swamp, getting by quietly on your catch. You found the buzzing of insects enjoyable, but recently they've gotten bigger and meaner. Now their horrible noises have you spooked - you just hope the fish aren't as nasty.", "points": 2, "skills": [ { "level": 5, "name": "survival" }, { "level": 2, "name": "swimming" } ], - "proficiencies": [ "prof_fibers", "prof_knives_familiar" ], + "proficiencies": [ "prof_fibers", "prof_knives_familiar", "prof_butchering_basic" ], "items": { "both": { "entries": [ diff --git a/data/mods/Magiclysm/professions.json b/data/mods/Magiclysm/professions.json index c340420377eaf..d41fcdbe820c0 100644 --- a/data/mods/Magiclysm/professions.json +++ b/data/mods/Magiclysm/professions.json @@ -701,7 +701,7 @@ { "id": "druid_summon_brambles", "level": 3 } ], "skills": [ { "level": 4, "name": "survival" }, { "level": 3, "name": "spellcraft" } ], - "proficiencies": [ "prof_knives_familiar", "prof_butchering_basic", "prof_skinning_basic", "prof_butchering_offal" ], + "proficiencies": [ "prof_knives_familiar", "prof_butchering_basic", "prof_skinning_basic" ], "traits": [ "ANIMALEMPATH", "SLOWREADER", "DRUID" ], "items": { "both": { @@ -735,8 +735,7 @@ "prof_knives_familiar", "prof_gross_anatomy", "prof_butchering_basic", - "prof_skinning_basic", - "prof_butchering_offal" + "prof_skinning_basic" ], "spells": [ { "id": "druid_naturebow1", "level": 4 }, diff --git a/data/mods/innawood/professions.json b/data/mods/innawood/professions.json index 7e79a1dfed0e6..bdf58089d53d5 100644 --- a/data/mods/innawood/professions.json +++ b/data/mods/innawood/professions.json @@ -294,7 +294,7 @@ "points": 3, "skills": [ { "level": 2, "name": "swimming" }, { "level": 2, "name": "survival" } ], "traits": [ "OUTDOORSMAN" ], - "proficiencies": [ "prof_fibers", "prof_knives_familiar" ], + "proficiencies": [ "prof_fibers", "prof_knives_familiar", "prof_butchering_basic" ], "items": { "both": { "entries": [