Skip to content

Commit

Permalink
No more being offal + Fishers
Browse files Browse the repository at this point in the history
Co-authored-by: Anton Simakov <[email protected]>
  • Loading branch information
TheShadowFerret and GuardianDll committed Sep 3, 2024
1 parent b87e895 commit 031c4be
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 17 deletions.
11 changes: 3 additions & 8 deletions data/json/hobbies.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,7 @@
"prof_knapping",
"prof_carving",
"prof_butchering_basic",
"prof_skinning_basic",
"prof_butchery_offal"
"prof_skinning_basic"
],
"traits": [ "OUTDOORSMAN" ]
},
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
8 changes: 3 additions & 5 deletions data/json/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -3995,8 +3995,7 @@
"prof_trapsetting",
"prof_knives_familiar",
"prof_butchering_basic",
"prof_skinning_basic",
"prof_butchery_offal"
"prof_skinning_basic"
],
"recipes": [ "beartrap" ],
"items": {
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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": [
Expand Down
5 changes: 2 additions & 3 deletions data/mods/Magiclysm/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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 },
Expand Down
2 changes: 1 addition & 1 deletion data/mods/innawood/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down

0 comments on commit 031c4be

Please sign in to comment.