From 604452b16ae70a22e9efdb2b947b0ba91da2a27f Mon Sep 17 00:00:00 2001 From: jacopouggeri Date: Wed, 3 Sep 2025 00:32:58 +0100 Subject: [PATCH] 1.21 update proposal --- ZZCakeBuild/CakeBuild.csproj | 4 +- .../survival-config-characterclasses.json | 451 ------------------ .../game/patches/survival-config-traits.json | 448 ----------------- .../config/characterclasses.json | 129 +++++ .../theworkingclasses/config/traits.json | 248 ++++++++++ .../itemtypes/utility/wctraitmanual.json | 2 +- .../assets/theworkingclasses/lang/en.json | 2 +- .../survival-blocktypes-charcoalpile.json | 0 .../survival-blocktypes-cloth-wallpaper.json | 0 .../blocks}/survival-blocktypes-coalpile.json | 0 ...rvival-blocktypes-plant-crop-amaranth.json | 0 ...urvival-blocktypes-plant-crop-cabbage.json | 0 ...survival-blocktypes-plant-crop-carrot.json | 0 ...urvival-blocktypes-plant-crop-cassava.json | 0 .../survival-blocktypes-plant-crop-flax.json | 0 .../survival-blocktypes-plant-crop-onion.json | 0 ...urvival-blocktypes-plant-crop-parsnip.json | 0 ...survival-blocktypes-plant-crop-peanut.json | 0 ...vival-blocktypes-plant-crop-pineapple.json | 0 .../survival-blocktypes-plant-crop-rice.json | 0 .../survival-blocktypes-plant-crop-rye.json | 0 ...urvival-blocktypes-plant-crop-soybean.json | 0 .../survival-blocktypes-plant-crop-spelt.json | 0 ...vival-blocktypes-plant-crop-sunflower.json | 0 ...survival-blocktypes-plant-crop-turnip.json | 0 ...ival-blocktypes-plant-fruittreebranch.json | 0 ...vival-blocktypes-plant-leaves-branchy.json | 0 ...rvival-blocktypes-plant-leaves-normal.json | 0 .../survival-blocktypes-wood-pitkiln.json | 0 ...urvival-blocktypes-wood-woodtyped-log.json | 0 .../combatoverhaul/coclasses.json | 338 ++++++------- .../recipes/grid/artisan.json | 76 +-- .../recipes/grid/hedgewitch.json | 6 +- .../theworkingclasses/recipes/grid/miner.json | 2 +- theworkingclasses/modinfo.json | 2 +- theworkingclasses/theworkingclasses.csproj | 2 +- 36 files changed, 594 insertions(+), 1116 deletions(-) delete mode 100644 theworkingclasses/assets/game/patches/survival-config-characterclasses.json delete mode 100644 theworkingclasses/assets/game/patches/survival-config-traits.json create mode 100644 theworkingclasses/assets/theworkingclasses/config/characterclasses.json create mode 100644 theworkingclasses/assets/theworkingclasses/config/traits.json rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-charcoalpile.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-cloth-wallpaper.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-coalpile.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-amaranth.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-cabbage.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-carrot.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-cassava.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-flax.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-onion.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-parsnip.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-peanut.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-pineapple.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-rice.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-rye.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-soybean.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-spelt.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-sunflower.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-crop-turnip.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-fruittreebranch.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-leaves-branchy.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-plant-leaves-normal.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-wood-pitkiln.json (100%) rename theworkingclasses/assets/{game/patches => theworkingclasses/patches/blocks}/survival-blocktypes-wood-woodtyped-log.json (100%) diff --git a/ZZCakeBuild/CakeBuild.csproj b/ZZCakeBuild/CakeBuild.csproj index 10a6061..550e805 100644 --- a/ZZCakeBuild/CakeBuild.csproj +++ b/ZZCakeBuild/CakeBuild.csproj @@ -1,12 +1,12 @@  Exe - net7.0 + net8.0 $(MSBuildProjectDirectory) - + diff --git a/theworkingclasses/assets/game/patches/survival-config-characterclasses.json b/theworkingclasses/assets/game/patches/survival-config-characterclasses.json deleted file mode 100644 index 631fd7d..0000000 --- a/theworkingclasses/assets/game/patches/survival-config-characterclasses.json +++ /dev/null @@ -1,451 +0,0 @@ -[ - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "miner", - "traits": [ - "miner", - "prospector", - "mason", - "tough", - "myopic", - "heavyhanded" - ], - "gear": [ - { - "type": "item", - "code": "clothes-upperbody-miner" - }, - { - "type": "item", - "code": "clothes-shoulder-clockmaker-apron" - }, - { - "type": "item", - "code": "clothes-nadiya-lowerbody-miner-clean" - }, - { - "type": "item", - "code": "clothes-nadiya-foot-miner" - }, - { - "type": "item", - "code": "clothes-face-hunter-mask" - }, - { - "type": "item", - "code": "clothes-nadiya-waist-miner" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "farmer", - "traits": [ - "farmer", - "greenfingered", - "animalfriend", - "strongshoulders", - "nervous", - "claustrophobic" - ], - "gear": [ - { - "type": "item", - "code": "clothes-head-straw-hat" - }, - { - "type": "item", - "code": "clothes-nadiya-face-grain" - }, - { - "type": "item", - "code": "clothes-upperbody-clockmaker-shirt" - }, - { - "type": "item", - "code": "clothes-shoulder-jord-robe" - }, - { - "type": "item", - "code": "clothes-nadiya-lowerbody-shepherd" - }, - { - "type": "item", - "code": "clothes-foot-forlorn-shoes" - }, - { - "type": "item", - "code": "clothes-nadiya-hand-blacksmith" - }, - { - "type": "item", - "code": "clothes-nadiya-waist-shepherd" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "lumberjack", - "traits": [ - "lumberjack", - "forester", - "burner", - "woodsman", - "kind", - "heavyhanded" - ], - "gear": [ - { - "type": "item", - "code": "theworkingclasses:clothes-upperbody-lumberjack-shirt" - }, - { - "type": "item", - "code": "theworkingclasses:clothes-lowerbody-lumberjack-pants-fancy" - }, - { - "type": "item", - "code": "clothes-foot-metalcap-boots" - }, - { - "type": "item", - "code": "clothes-neck-acorn-amulet" - }, - { - "type": "item", - "code": "clothes-nadiya-arm-guard-bracers" - }, - { - "type": "item", - "code": "clothes-waist-peasant-strap" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "blacksmith", - "traits": [ - "smith", - "cokefurnacemaster", - "mender", - "strongarms", - "nearsighted", - "heavyhanded" - ], - "gear": [ - { - "type": "item", - "code": "clothes-shoulder-blacksmith-apron" - }, - { - "type": "item", - "code": "clothes-upperbody-temptress-velvet-shirt" - }, - { - "type": "item", - "code": "clothes-lowerbody-blackguard-leggings" - }, - { - "type": "item", - "code": "clothes-nadiya-foot-blacksmith" - }, - { - "type": "item", - "code": "theworkingclasses:clothes-face-welding-mask" - }, - { - "type": "item", - "code": "clothes-hand-heavy-leather-gloves" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "cook", - "traits": [ - "knifeexpert", - "firestarter", - "practicedbutcher", - "inventiveinthekitchen", - "refinedtaste", - "nearsighted" - ], - "gear": [ - { - "type": "item", - "code": "clothes-upperbody-linen-tunic" - }, - { - "type": "item", - "code": "clothes-lowerbody-homespun-pants" - }, - { - "type": "item", - "code": "clothes-foot-soldier-boots" - }, - { - "type": "item", - "code": "clothes-hand-commoner-gloves" - }, - { - "type": "item", - "code": "clothes-upperbodyover-surgeon" - }, - { - "type": "item", - "code": "clothes-nadiya-waist-peasant1" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "alchemist", - "traits": [ - "forager", - "carefultouch", - "philosopher", - "temporallyaware", - "weak", - "nearsighted" - ], - "gear": [ - { - "type": "item", - "code": "clothes-head-alchemist" - }, - { - "type": "item", - "code": "clothes-face-tailor-mask" - }, - { - "type": "item", - "code": "clothes-shoulder-alchemist" - }, - { - "type": "item", - "code": "clothes-upperbody-azure-embroidered-shirt" - }, - { - "type": "item", - "code": "clothes-hand-malefactor-gloves" - }, - { - "type": "item", - "code": "clothes-nadiya-waist-alchemist" - }, - { - "type": "item", - "code": "clothes-lowerbody-commoner-trousers" - }, - { - "type": "item", - "code": "clothes-foot-blackguard-shoes" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "squire", - "traits": [ - "fleetfooted", - "healthy", - "forager", - "versatile", - "hungry", - "claustrophobic" - ], - "gear": [ - { - "type": "item", - "code": "clothes-arm-leather-bracers" - }, - { - "type": "item", - "code": "clothes-hand-forlorn-bracer" - }, - { - "type": "item", - "code": "clothes-shoulder-squire-tunic" - }, - { - "type": "item", - "code": "clothes-upperbody-marketeer" - }, - { - "type": "item", - "code": "clothes-waist-squire-belt" - }, - { - "type": "item", - "code": "clothes-lowerbody-aristocrat-leggings" - }, - { - "type": "item", - "code": "clothes-foot-worn-leather-boots" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "potter", - "traits": [ - "potter", - "digger", - "artisan", - "strongarms", - "civil", - "kind" - ], - "gear": [ - { - "type": "item", - "code": "clothes-shoulder-woolen-scarf" - }, - { - "type": "item", - "code": "clothes-upperbody-hunters-green" - }, - { - "type": "item", - "code": "clothes-nadiya-upperbodyover-coat-short" - }, - { - "type": "item", - "code": "clothes-nadiya-waist-peasant1" - }, - { - "type": "item", - "code": "clothes-lowerbody-pastoral-pants" - }, - { - "type": "item", - "code": "clothes-nadiya-foot-peasantbrown" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "carpenter", - "traits": [ - "carpenter", - "fitter", - "millwright", - "strongarms", - "civil", - "hungry" - ], - "gear": [ - { - "type": "item", - "code": "clothes-face-leather-reinforced-mask" - }, - { - "type": "item", - "code": "clothes-hand-commoner-gloves" - }, - { - "type": "item", - "code": "clothes-nadiya-upperbodyover-coat-short" - }, - { - "type": "item", - "code": "clothes-upperbody-woolen-shirt" - }, - { - "type": "item", - "code": "clothes-waist-sturdy-belt" - }, - { - "type": "item", - "code": "clothes-lowerbody-pastoral-pants" - }, - { - "type": "item", - "code": "clothes-foot-forlorn-shoes" - } - ] - } - }, - { - "file": "config/characterclasses.json", - "op": "add", - "path": "/-", - "value": { - "code": "healer", - "traits": [ - "healthy", - "fleetfooted", - "forager", - "hedgewitch", - "kind", - "claustrophobic" - ], - "gear": [ - { - "type": "item", - "code": "clothes-face-hunter-mask" - }, - { - "type": "item", - "code": "clothes-nadiya-arm-barber-pouch" - }, - { - "type": "item", - "code": "clothes-shoulder-hooded-cape" - }, - { - "type": "item", - "code": "clothes-nadiya-upperbody-beekeeper" - }, - { - "type": "item", - "code": "clothes-waist-alchemist" - }, - { - "type": "item", - "code": "clothes-lowerbody-marketeer" - }, - { - "type": "item", - "code": "clothes-nadiya-foot-guard" - } - ] - } - } - -] \ No newline at end of file diff --git a/theworkingclasses/assets/game/patches/survival-config-traits.json b/theworkingclasses/assets/game/patches/survival-config-traits.json deleted file mode 100644 index 1b9acac..0000000 --- a/theworkingclasses/assets/game/patches/survival-config-traits.json +++ /dev/null @@ -1,448 +0,0 @@ -[ - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "miner", - "type": "positive", - "attributes": { - "oreDropRate": 0.25, - "miningSpeedMul": 0.5 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "digger", - "type": "positive", - "attributes": { - "miningSpeedMul": 0.3 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "wallbuilder", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "stonecunning", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "prospector", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "tough", - "type": "positive", - "attributes": { - "maxhealthExtraPoints": 2, - "meleeWeaponsDamage": 0.15 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "myopic", - "type": "negative", - "attributes": { - "rangedWeaponsDamage": -0.2, - "rangedWeaponsAcc": -0.3, - "bowDrawingStrength": -0.2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "farmer", - "type": "positive", - "attributes": { - "produceDropRate": 0.3 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "strongshoulders", - "type": "positive", - "attributes": { - "rangedWeaponsDamage": 0.2, - "bowDrawingStrength": 0.2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "greenfingered", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "resilient", - "type": "positive", - "attributes": { - "maxhealthExtraPoints": 3 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "healthy", - "type": "positive", - "attributes": { - "maxhealthExtraPoints": 2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "versatile", - "type": "positive", - "attributes": { - "meleeWeaponsDamage": 0.15, - "rangedWeaponsDamage": 0.2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "hedgewitch", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "lumberjack", - "type": "positive", - "attributes": { - "woodDropRate": 0.10, - "stickDropRate": 0.3, - "meleeWeaponsDamage": 0.15 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "woodsman", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "forester", - "type": "positive", - "attributes": { - "fruittreeDropRate": 1, - "treeseedDropRate": 2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "carpenter", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "fitter", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "millwright", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "sailwright", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "burner", - "type": "positive", - "attributes": { - "charcoalPileDropRate": 0.35 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "mason", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "potter", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "artisan", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "smith", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "cokefurnacemaster", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "strongarms", - "type": "positive", - "attributes": { - "meleeWeaponsDamage": 0.15 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "carefultouch", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "philosopher", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "temporallyaware", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "knifeexpert", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "firestarter", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "practicedbutcher", - "type": "positive", - "attributes": { - "animalSeekingRange": -0.2, - "meleeWeaponsDamage": 0.15 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "inventiveinthekitchen", - "type": "positive", - "attributes": {} - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "animalfriend", - "type": "positive", - "attributes": { - "animalSeekingRange": -0.2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "refinedtaste", - "type": "negative", - "attributes": { - "hungerrate": 0.1 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "hungry", - "type": "negative", - "attributes": { - "hungerrate": 0.1 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "loud", - "type": "negative", - "attributes": { - "animalSeekingRange": 0.2 - } - } - }, - { - "file": "config/traits.json", - "op": "add", - "path": "/-", - "value": { - "code": "professor", - "type": "positive", - "attributes": {} - } - } -] \ No newline at end of file diff --git a/theworkingclasses/assets/theworkingclasses/config/characterclasses.json b/theworkingclasses/assets/theworkingclasses/config/characterclasses.json new file mode 100644 index 0000000..89f4423 --- /dev/null +++ b/theworkingclasses/assets/theworkingclasses/config/characterclasses.json @@ -0,0 +1,129 @@ +[ + { + "code": "miner", + "traits": ["miner", "prospector", "mason", "tough", "myopic", "heavyhanded"], + "gear": [ + { "type": "item", "code": "game:clothes-upperbody-miner" }, + { "type": "item", "code": "game:clothes-shoulder-clockmaker-apron" }, + { "type": "item", "code": "game:clothes-nadiya-lowerbody-miner-clean" }, + { "type": "item", "code": "game:clothes-nadiya-foot-miner" }, + { "type": "item", "code": "game:clothes-face-hunter-mask" }, + { "type": "item", "code": "game:clothes-nadiya-waist-miner" } + ] + }, + { + "code": "farmer", + "traits": ["farmer", "greenfingered", "animalfriend", "strongshoulders", "nervous", "claustrophobic"], + "gear": [ + { "type": "item", "code": "game:clothes-head-straw-hat" }, + { "type": "item", "code": "game:clothes-nadiya-face-grain" }, + { "type": "item", "code": "game:clothes-upperbody-clockmaker-shirt" }, + { "type": "item", "code": "game:clothes-shoulder-jord-robe" }, + { "type": "item", "code": "game:clothes-nadiya-lowerbody-shepherd" }, + { "type": "item", "code": "game:clothes-foot-forlorn-shoes" }, + { "type": "item", "code": "game:clothes-nadiya-hand-blacksmith" }, + { "type": "item", "code": "game:clothes-nadiya-waist-shepherd" } + ] + }, + { + "code": "lumberjack", + "traits": ["lumberjack", "forester", "burner", "woodsman", "kind", "heavyhanded"], + "gear": [ + { "type": "item", "code": "theworkingclasses:clothes-upperbody-lumberjack-shirt" }, + { "type": "item", "code": "theworkingclasses:clothes-lowerbody-lumberjack-pants-fancy" }, + { "type": "item", "code": "game:clothes-foot-metalcap-boots" }, + { "type": "item", "code": "game:clothes-neck-acorn-amulet" }, + { "type": "item", "code": "game:clothes-nadiya-arm-guard-bracers" }, + { "type": "item", "code": "game:clothes-waist-peasant-strap" } + ] + }, + { + "code": "blacksmith", + "traits": ["smith", "cokefurnacemaster", "mender", "strongarms", "nearsighted", "heavyhanded"], + "gear": [ + { "type": "item", "code": "game:clothes-shoulder-blacksmith-apron" }, + { "type": "item", "code": "game:clothes-upperbody-temptress-velvet-shirt" }, + { "type": "item", "code": "game:clothes-lowerbody-blackguard-leggings" }, + { "type": "item", "code": "game:clothes-nadiya-foot-blacksmith" }, + { "type": "item", "code": "theworkingclasses:clothes-face-welding-mask" }, + { "type": "item", "code": "game:clothes-hand-heavy-leather-gloves" } + ] + }, + { + "code": "cook", + "traits": ["knifeexpert", "firestarter", "practicedbutcher", "inventiveinthekitchen", "refinedtaste", "nearsighted"], + "gear": [ + { "type": "item", "code": "game:clothes-upperbody-linen-tunic" }, + { "type": "item", "code": "game:clothes-lowerbody-homespun-pants" }, + { "type": "item", "code": "game:clothes-foot-soldier-boots" }, + { "type": "item", "code": "game:clothes-hand-commoner-gloves" }, + { "type": "item", "code": "game:clothes-upperbodyover-surgeon" }, + { "type": "item", "code": "game:clothes-nadiya-waist-peasant1" } + ] + }, + { + "code": "alchemist", + "traits": ["forager", "carefultouch", "philosopher", "temporallyaware", "weak", "nearsighted"], + "gear": [ + { "type": "item", "code": "game:clothes-head-alchemist" }, + { "type": "item", "code": "game:clothes-face-tailor-mask" }, + { "type": "item", "code": "game:clothes-shoulder-alchemist" }, + { "type": "item", "code": "game:clothes-upperbody-azure-embroidered-shirt" }, + { "type": "item", "code": "game:clothes-hand-malefactor-gloves" }, + { "type": "item", "code": "game:clothes-nadiya-waist-alchemist" }, + { "type": "item", "code": "game:clothes-lowerbody-commoner-trousers" }, + { "type": "item", "code": "game:clothes-foot-blackguard-shoes" } + ] + }, + { + "code": "squire", + "traits": ["fleetfooted", "healthy", "forager", "versatile", "hungry", "claustrophobic"], + "gear": [ + { "type": "item", "code": "game:clothes-arm-leather-bracers" }, + { "type": "item", "code": "game:clothes-hand-forlorn-bracer" }, + { "type": "item", "code": "game:clothes-shoulder-squire-tunic" }, + { "type": "item", "code": "game:clothes-upperbody-marketeer" }, + { "type": "item", "code": "game:clothes-waist-squire-belt" }, + { "type": "item", "code": "game:clothes-lowerbody-aristocrat-leggings" }, + { "type": "item", "code": "game:clothes-foot-worn-leather-boots" } + ] + }, + { + "code": "potter", + "traits": ["potter", "digger", "artisan", "strongarms", "civil", "kind"], + "gear": [ + { "type": "item", "code": "game:clothes-shoulder-woolen-scarf" }, + { "type": "item", "code": "game:clothes-upperbody-hunters-green" }, + { "type": "item", "code": "game:clothes-nadiya-upperbodyover-coat-short" }, + { "type": "item", "code": "game:clothes-nadiya-waist-peasant1" }, + { "type": "item", "code": "game:clothes-lowerbody-pastoral-pants" }, + { "type": "item", "code": "game:clothes-nadiya-foot-peasantbrown" } + ] + }, + { + "code": "carpenter", + "traits": ["carpenter", "fitter", "millwright", "strongarms", "civil", "hungry"], + "gear": [ + { "type": "item", "code": "game:clothes-face-leather-reinforced-mask" }, + { "type": "item", "code": "game:clothes-hand-commoner-gloves" }, + { "type": "item", "code": "game:clothes-nadiya-upperbodyover-coat-short" }, + { "type": "item", "code": "game:clothes-upperbody-woolen-shirt" }, + { "type": "item", "code": "game:clothes-waist-sturdy-belt" }, + { "type": "item", "code": "game:clothes-lowerbody-pastoral-pants" }, + { "type": "item", "code": "game:clothes-foot-forlorn-shoes" } + ] + }, + { + "code": "healer", + "traits": ["healthy", "fleetfooted", "forager", "hedgewitch", "kind", "claustrophobic"], + "gear": [ + { "type": "item", "code": "game:clothes-face-hunter-mask" }, + { "type": "item", "code": "game:clothes-nadiya-arm-barber-pouch" }, + { "type": "item", "code": "game:clothes-shoulder-hooded-cape" }, + { "type": "item", "code": "game:clothes-nadiya-upperbody-beekeeper" }, + { "type": "item", "code": "game:clothes-waist-alchemist" }, + { "type": "item", "code": "game:clothes-lowerbody-marketeer" }, + { "type": "item", "code": "game:clothes-nadiya-foot-guard" } + ] + } +] diff --git a/theworkingclasses/assets/theworkingclasses/config/traits.json b/theworkingclasses/assets/theworkingclasses/config/traits.json new file mode 100644 index 0000000..d35312b --- /dev/null +++ b/theworkingclasses/assets/theworkingclasses/config/traits.json @@ -0,0 +1,248 @@ +[ + { + "code": "miner", + "type": "positive", + "attributes": { + "oreDropRate": 0.25, + "miningSpeedMul": 0.5 + } + }, + { + "code": "digger", + "type": "positive", + "attributes": { + "miningSpeedMul": 0.3 + } + }, + { + "code": "wallbuilder", + "type": "positive", + "attributes": {} + }, + { + "code": "stonecunning", + "type": "positive", + "attributes": {} + }, + { + "code": "prospector", + "type": "positive", + "attributes": {} + }, + { + "code": "tough", + "type": "positive", + "attributes": { + "maxhealthExtraPoints": 2, + "meleeWeaponsDamage": 0.15 + } + }, + { + "code": "myopic", + "type": "negative", + "attributes": { + "rangedWeaponsDamage": -0.2, + "rangedWeaponsAcc": -0.3, + "bowDrawingStrength": -0.2 + } + }, + { + "code": "farmer", + "type": "positive", + "attributes": { + "produceDropRate": 0.3 + } + }, + { + "code": "strongshoulders", + "type": "positive", + "attributes": { + "rangedWeaponsDamage": 0.2, + "bowDrawingStrength": 0.2 + } + }, + { + "code": "greenfingered", + "type": "positive", + "attributes": {} + }, + { + "code": "resilient", + "type": "positive", + "attributes": { + "maxhealthExtraPoints": 3 + } + }, + { + "code": "healthy", + "type": "positive", + "attributes": { + "maxhealthExtraPoints": 2 + } + }, + { + "code": "versatile", + "type": "positive", + "attributes": { + "meleeWeaponsDamage": 0.15, + "rangedWeaponsDamage": 0.2 + } + }, + { + "code": "hedgewitch", + "type": "positive", + "attributes": {} + }, + { + "code": "lumberjack", + "type": "positive", + "attributes": { + "woodDropRate": 0.1, + "stickDropRate": 0.3, + "meleeWeaponsDamage": 0.15 + } + }, + { + "code": "woodsman", + "type": "positive", + "attributes": {} + }, + { + "code": "forester", + "type": "positive", + "attributes": { + "fruittreeDropRate": 1, + "treeseedDropRate": 2 + } + }, + { + "code": "carpenter", + "type": "positive", + "attributes": {} + }, + { + "code": "fitter", + "type": "positive", + "attributes": {} + }, + { + "code": "millwright", + "type": "positive", + "attributes": {} + }, + { + "code": "sailwright", + "type": "positive", + "attributes": {} + }, + { + "code": "burner", + "type": "positive", + "attributes": { + "charcoalPileDropRate": 0.35 + } + }, + { + "code": "mason", + "type": "positive", + "attributes": {} + }, + { + "code": "potter", + "type": "positive", + "attributes": {} + }, + { + "code": "artisan", + "type": "positive", + "attributes": {} + }, + { + "code": "smith", + "type": "positive", + "attributes": {} + }, + { + "code": "cokefurnacemaster", + "type": "positive", + "attributes": {} + }, + { + "code": "strongarms", + "type": "positive", + "attributes": { + "meleeWeaponsDamage": 0.15 + } + }, + { + "code": "carefultouch", + "type": "positive", + "attributes": {} + }, + { + "code": "philosopher", + "type": "positive", + "attributes": {} + }, + { + "code": "temporallyaware", + "type": "positive", + "attributes": {} + }, + { + "code": "knifeexpert", + "type": "positive", + "attributes": {} + }, + { + "code": "firestarter", + "type": "positive", + "attributes": {} + }, + { + "code": "practicedbutcher", + "type": "positive", + "attributes": { + "animalSeekingRange": -0.2, + "meleeWeaponsDamage": 0.15 + } + }, + { + "code": "inventiveinthekitchen", + "type": "positive", + "attributes": {} + }, + { + "code": "animalfriend", + "type": "positive", + "attributes": { + "animalSeekingRange": -0.2 + } + }, + { + "code": "refinedtaste", + "type": "negative", + "attributes": { + "hungerrate": 0.1 + } + }, + { + "code": "hungry", + "type": "negative", + "attributes": { + "hungerrate": 0.1 + } + }, + { + "code": "loud", + "type": "negative", + "attributes": { + "animalSeekingRange": 0.2 + } + }, + { + "code": "professor", + "type": "positive", + "attributes": {} + } +] \ No newline at end of file diff --git a/theworkingclasses/assets/theworkingclasses/itemtypes/utility/wctraitmanual.json b/theworkingclasses/assets/theworkingclasses/itemtypes/utility/wctraitmanual.json index 0cfcdf7..ac64513 100644 --- a/theworkingclasses/assets/theworkingclasses/itemtypes/utility/wctraitmanual.json +++ b/theworkingclasses/assets/theworkingclasses/itemtypes/utility/wctraitmanual.json @@ -69,7 +69,7 @@ }, "*-carpenter": { "traitdata": { - "add": [ "carpenter", "millwright" ], + "add": [ "carpenter", "millwright", "fitter" ], "remove": [ "prospector", "mason", "greenfingered", "woodsman", "cokefurnacemaster", "smith", "firestarter", "inventiveinthekitchen", "philosopher", "temporallyaware", "carefultouch", "potter", "artisan", "hedgewitch", "bowyer", "clothier", "sailwright", "merciless", "tinkerer", "technical" ] } }, diff --git a/theworkingclasses/assets/theworkingclasses/lang/en.json b/theworkingclasses/assets/theworkingclasses/lang/en.json index ce3fce7..c781f81 100644 --- a/theworkingclasses/assets/theworkingclasses/lang/en.json +++ b/theworkingclasses/assets/theworkingclasses/lang/en.json @@ -373,7 +373,7 @@ "secondaryprofessions-text": "Secondary Professions

The working classes is designed around having one profession or two professions, a primary profession and a secondry profession. This mod relies on the 'Trait Aquirer' mod to make this possible.

How a Secondary Profession Works

With your primary profession, you get all the perks and penalties of the profession, both to physical attributes, and also any bonus recipes you may have access to.

That is not the case for your Secondary Profession. You will not gain any of the the physical attribute bonuses, nor any penalties that come from that class. You will only gain access to the class recipes.

E.g.
A Miner (Primary)/Blacksmith (Secondary) would get the bonuses from all four positive Miner traits (Miner/ Prospector/ Mason/ Tough) and both penalties (Myopic/ Heavy Handed) but only the recipe traits of a Blacksmith (Washery Grade Coke/ Smith)

A Blacksmith (Primary)/Miner (Secondary) on the other hand would get all the traits and penalties of the Blacksmith class, (Washery Grade Coke/ Mender/ Smith/ Strong Arms/ Nearsighted/ Heavy Handed) but only the recipe traits of the Miner (Prospector/ Mason).

This is deliberate and ensures you cannot stack physical bonuses or pick two classes to offset the penalties.

A Single Profession

If you only want people to have one profession on your server, than have them pick the class they want corresponding to their profession and you are all done.

A Second Profession

If on the other hand, you want people to have two professions, their second profession must be given to them by a server admin in the form of a book. There is a book corresponding to each class. Simply give them the book corresponding to their secondary class and you are done.

Learning Your Secondary Profession

If your server is using secondary classes, you will be given a book corresponding to your secondary profession by a server admin. (In single player, you can do this yourself.)

Once you have been given a book, place it on your hot bar, select it and right click for a couple of seconds (like eating food). You will use the book and learn your secondary profession.

Changing Primary Class

Simply give the player a '.charsel' usage as normal, and you are done.

Changing Secondary Profession

Simply give them the book for their new secondary profession. Using a Secondary Profession Book will remove the effects of the previous book.

Note: As the Squire profession is entirely based on physical traits, and it has not recipe unlocks, you can give someone the Squire book to reset their extra class traits.

This won't affect traits awarded not belonging to any of the classes if you are using ones not from this mod, but will remove any used by the classes, regardless of source.

Where to find Secondary Profession Books

You can find secondary profession manuals in the creative menu on the 'Profession Manuals' tab.

We recommend you only use these 'Professional's Guides', as the ones that come with Trait Aquirer by default do not remove traits learned by other books.", "thealchemist-text": "The Alchemist

The Alchemist searches for the answers to the mysteries of the universe, both scientific and arcane.

The alchemist is primarily concerned with first of all creating a Philosopher's Stone, and transmutation of mundane materials into precious ones using the principles of equivalent exchange.

There are however bonuses to flask recipes available to this class if you are using the Alchemy mod.

The Philosopher's Stone


To get started on Alchemy, you will need a Philosopher's Stone. You will need access to brass and black bronze to create this, and it is something you should be aiming for by the end of the early game.

Your Philosopher's Stone can be used to decorate your workshop, and is your primary tool for transmutation. It does have a durability, but no transmutations should use any. You should not have to replace it.

Transmutation

Once you have access to your Philosopher's Stone, you can begin transmutation. For every transmutation you do, you will need to provide the item you intend to transmute, and additional sacrificial catalysts to enable the transmutation to take place.

You can look up the Philosopher's Stone in the Handbook to see what Transmutations are possible.

Notable examples however include:Temporal Gears, Gold Nuggets, and Clear Quartz

The Alchemy Mod


This mod was built to be compatable with the Alchemy mod by Llama3013, but to avoid treading on any toes. With that in mind, this mod focuses on 'traditional folk lore' alchemy, and leaves potion brewing to the Alchemy mod.

To make this class a good fit for the Alchemy mod however, The Working Classes comes with a compatability patch making it slightly easier for Alchemist class players to make flasks from quartz, and allows alchemists to change quartz from regular quartz into either smoky or rose quartz.", "theblacksmith-text": "The Blacksmith

The Blacksmith is an expert at metalwork, and as such is able to keep their own armor in better condition in general passively - but they can also repair armor and use their knowledge of coal and coke furnaces to produce fuels which can make their supply of coal last longer

Better Armor Durability

This is a vanilla trait and originated with the Tailor Class. It should work passively for you.

Repair Kits


You can use tool kits with your armor in the crafting grid to create a new piece of the same armor, effectively repairing it.

Note: It may not carry over any enhancements, you are essentially recrafting the armor.

Washery Grade Coke


A significant part of the gameplay for this class is the production of Washery Grade Coke. Historically Steel Grade Coke was used for the production of steel, and Washery Grade Coke was used for other uses as it wasn't pure enough for steel production.

With this mod, after you produce coke, you can mix it with charcoal dust to produce washery grade coke, which can either be used as fuel directly (not recommended) or pulerised and then used as fuel.

At the end of the process, putting in:

16 Brown Coal should yield 32 bce (brown coal equivalent) in Washery Grade Coke.

Correspondingly;

16 Black Coal should produce 48 bce", - "thecarpenter-text": "The Carpenter

The Carpenter is skilled at producing finished items from wood, from making boards more efficiently to decorative floors. It is also the carpenter you will need to see if you want additional decorations for your buildings such as paper lanterns and wall papers.

Boards


Carpenters get significantly more boards than others when logs into boards.

Note: To get the extra boards, you have to use the carpenter specific recipe. If you use the default recipe, you will get the default number of boards.

Paper Lanterns


Carpenters can produce Paper Lanterns, an attractive and strong light source available early in the game. Whilst only a carpenter can make Paper Lanterns, anyone can craft 'on' versions into 'off' versions and vice versa.

Wallpaper


With access to paper, dyes and cloth, carpenters can produce wallpapers for use in decoration.

Decorative Plank Blocks


Carpenters can produce a number of decorative plank blocks to be used by themselves or others.

These blocks are available in all wood variations, not just the types shown on this guide page.", + "thecarpenter-text": "The Carpenter

The Carpenter is skilled at producing finished items from wood, from making boards more efficiently to decorative floors. It is also the carpenter you will need to see if you want additional decorations for your buildings such as paper lanterns and wall papers.

Boards


Carpenters get significantly more boards than others when logs into boards.

Note: To get the extra boards, you have to use the carpenter specific recipe. If you use the default recipe, you will get the default number of boards.

Paper Lanterns


Carpenters can produce Paper Lanterns, an attractive and strong light source available early in the game. Whilst only a carpenter can make Paper Lanterns, anyone can craft 'on' versions into 'off' versions and vice versa.

Wallpaper


With access to paper, dyes and cloth, carpenters can produce wallpapers for use in decoration.

Decorative Plank Blocks


Carpenters can produce a number of decorative plank blocks to be used by themselves or others.

These blocks are available in all wood variations, not just the types shown on this guide page.", "thecook-text": "The Cook

The Cook is an expert at preparing meals. Your physical perks are summarised in your traits, however your class based perks, whilst covered there are not so obvious.

Whetstones


You can craft whetstones and use them to keep sharp any metal knife you have, effectively meaning you shouldn't need to replace it.

Note: When you use a whetstone to sharpen a knife, you are recrafting it, so you may not retain any enhancements on the knife. For this reason, you should only sharpen your knife when it is nearly spent.

Rot Soaked Peat


You can craft improved cooking fuel using peat and kitchen waste (rot). It's no use for smelting, but it is excellent for cooking and burns for a very long time, so you shouldn't need to refuel as much.

Once you have crafted the rot soaked peat, you will need to dry it before you can burn it. Simply stack it up and leave it for a few in game days until it dries out into rot infused peat. You will see a difference in texture, it should look paler and more dried out. Once dry, your rot infused peat is ready to burn.

Improved Crocks


You can craft Improved Crocks, that hold up to 8 servings of food. To do this, you will need a number of crocks, some temporal gears, and a hammer.", "thefarmer-text": "The Farmer

Farmers work the land. As well as a life of toil giving them strong shoulders making them better users of the bows farmers have a number of advantages over others when growing food.

Seed Production


They are able to turn crops they have found or grown into seeds. This short term investment of produce will seem them fill their fields much faster.

Note:This should work for any crop/seed, not just the ones shown here.

Soil Boosters


Farmers can also craft soil boosters to improve the fertility of soil permanently, increasing the growth rates on their farms noticably.", "thehealer-text": "The Healer

Healers are welcome everywhere. Aside from their useful physical traits, healers are the most proficient out there when it comes to crafting healing items.

Healing Items


As a healer, you have access to recipes allowing you to produce poultices and clean bandages in bulk.

I do have more planned for healers, but that isn't quite ready yet.", diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-charcoalpile.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-charcoalpile.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-charcoalpile.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-charcoalpile.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-cloth-wallpaper.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-cloth-wallpaper.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-cloth-wallpaper.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-cloth-wallpaper.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-coalpile.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-coalpile.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-coalpile.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-coalpile.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-amaranth.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-amaranth.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-amaranth.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-amaranth.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-cabbage.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-cabbage.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-cabbage.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-cabbage.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-carrot.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-carrot.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-carrot.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-carrot.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-cassava.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-cassava.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-cassava.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-cassava.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-flax.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-flax.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-flax.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-flax.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-onion.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-onion.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-onion.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-onion.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-parsnip.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-parsnip.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-parsnip.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-parsnip.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-peanut.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-peanut.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-peanut.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-peanut.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-pineapple.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-pineapple.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-pineapple.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-pineapple.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-rice.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-rice.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-rice.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-rice.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-rye.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-rye.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-rye.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-rye.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-soybean.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-soybean.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-soybean.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-soybean.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-spelt.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-spelt.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-spelt.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-spelt.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-sunflower.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-sunflower.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-sunflower.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-sunflower.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-turnip.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-turnip.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-crop-turnip.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-crop-turnip.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-fruittreebranch.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-fruittreebranch.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-fruittreebranch.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-fruittreebranch.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-leaves-branchy.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-leaves-branchy.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-leaves-branchy.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-leaves-branchy.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-plant-leaves-normal.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-leaves-normal.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-plant-leaves-normal.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-plant-leaves-normal.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-wood-pitkiln.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-wood-pitkiln.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-wood-pitkiln.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-wood-pitkiln.json diff --git a/theworkingclasses/assets/game/patches/survival-blocktypes-wood-woodtyped-log.json b/theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-wood-woodtyped-log.json similarity index 100% rename from theworkingclasses/assets/game/patches/survival-blocktypes-wood-woodtyped-log.json rename to theworkingclasses/assets/theworkingclasses/patches/blocks/survival-blocktypes-wood-woodtyped-log.json diff --git a/theworkingclasses/assets/theworkingclasses/patches/compatibility/combatoverhaul/coclasses.json b/theworkingclasses/assets/theworkingclasses/patches/compatibility/combatoverhaul/coclasses.json index c441bfa..8a8a9ff 100644 --- a/theworkingclasses/assets/theworkingclasses/patches/compatibility/combatoverhaul/coclasses.json +++ b/theworkingclasses/assets/theworkingclasses/patches/compatibility/combatoverhaul/coclasses.json @@ -1,172 +1,172 @@ [ - { - "op": "replace", - "path": "/4/traits", - "value": [ "soldier", "hardy", "merciless", "ravenous", "nearsighted", "oneHandedSwordsProficiency", "twoHandedSwordsProficiency", "tremblingAim", "clumsyHands" ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/5/traits", - "value": [ "clothier", "mender", "sailwright", "civil", "weak", "tremblingAim" ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/6/traits", - "value": [ - "miner", - "prospector", - "mason", - "tough", - "myopic", - "heavyhanded", - "macesProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/7/traits", - "value": [ - "farmer", - "greenfingered", - "animalfriend", - "strongshoulders", - "nervous", - "claustrophobic", - "bowsProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/8/traits", - "value": [ - "lumberjack", - "forester", - "burner", - "woodsman", - "kind", - "heavyhanded", - "axesProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/9/traits", - "value": [ - "smith", - "cokefurnacemaster", - "mender", - "strongarms", - "nearsighted", - "heavyhanded", - "macesProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/10/traits", - "value": [ - "knifeexpert", - "firestarter", - "practicedbutcher", - "inventiveinthekitchen", - "refinedtaste", - "nearsighted", - "oneHandedSwordsProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/11/traits", - "value": [ - "forager", - "carefultouch", - "philosopher", - "temporallyaware", - "weak", - "nearsighted", - "quarterstaffProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/12/traits", - "value": [ - "fleetfooted", - "healthy", - "forager", - "versatile", - "hungry", - "claustrophobic", - "oneHandedSwordsProficiency", - "twoHandedSwordsProficiency", - "crossbowsProficiency", - "firearmsProficiency", - "spearsProficiency", - "halberdsProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/13/traits", - "value": [ - "potter", - "digger", - "artisan", - "strongarms", - "civil", - "kind", - "macesProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/14/traits", - "value": [ - "carpenter", - "fitter", - "millwright", - "strongarms", - "civil", - "hungry", - "axesProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - }, - { - "op": "replace", - "path": "/15/traits", - "value": [ - "healthy", - "fleetfooted", - "forager", - "hedgewitch", - "kind", - "claustrophobic", - "quarterstaffProficiency" - ], - "file": "game:config/characterclasses.json", - "dependsOn": [ { "modid": "combatoverhaul" } ] - } + { + "op": "replace", + "path": "/4/traits", + "value": [ "soldier", "hardy", "merciless", "ravenous", "nearsighted", "oneHandedSwordsProficiency", "twoHandedSwordsProficiency", "tremblingAim", "clumsyHands" ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/5/traits", + "value": [ "clothier", "mender", "sailwright", "civil", "weak", "tremblingAim" ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/6/traits", + "value": [ + "miner", + "prospector", + "mason", + "tough", + "myopic", + "heavyhanded", + "macesProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/7/traits", + "value": [ + "farmer", + "greenfingered", + "animalfriend", + "strongshoulders", + "nervous", + "claustrophobic", + "bowsProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/8/traits", + "value": [ + "lumberjack", + "forester", + "burner", + "woodsman", + "kind", + "heavyhanded", + "axesProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/9/traits", + "value": [ + "smith", + "cokefurnacemaster", + "mender", + "strongarms", + "nearsighted", + "heavyhanded", + "macesProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/10/traits", + "value": [ + "knifeexpert", + "firestarter", + "practicedbutcher", + "inventiveinthekitchen", + "refinedtaste", + "nearsighted", + "oneHandedSwordsProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/11/traits", + "value": [ + "forager", + "carefultouch", + "philosopher", + "temporallyaware", + "weak", + "nearsighted", + "quarterstaffProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/12/traits", + "value": [ + "fleetfooted", + "healthy", + "forager", + "versatile", + "hungry", + "claustrophobic", + "oneHandedSwordsProficiency", + "twoHandedSwordsProficiency", + "crossbowsProficiency", + "firearmsProficiency", + "spearsProficiency", + "halberdsProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/13/traits", + "value": [ + "potter", + "digger", + "artisan", + "strongarms", + "civil", + "kind", + "macesProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/14/traits", + "value": [ + "carpenter", + "fitter", + "millwright", + "strongarms", + "civil", + "hungry", + "axesProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + }, + { + "op": "replace", + "path": "/15/traits", + "value": [ + "healthy", + "fleetfooted", + "forager", + "hedgewitch", + "kind", + "claustrophobic", + "quarterstaffProficiency" + ], + "file": "combatoverhaul:config/characterclasses.json", + "dependsOn": [ { "modid": "combatoverhaul" } ] + } ] \ No newline at end of file diff --git a/theworkingclasses/assets/theworkingclasses/recipes/grid/artisan.json b/theworkingclasses/assets/theworkingclasses/recipes/grid/artisan.json index 5e00c1c..0465816 100644 --- a/theworkingclasses/assets/theworkingclasses/recipes/grid/artisan.json +++ b/theworkingclasses/assets/theworkingclasses/recipes/grid/artisan.json @@ -9,7 +9,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -56,7 +56,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -103,7 +103,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -154,7 +154,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -201,7 +201,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -248,7 +248,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -295,7 +295,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -350,7 +350,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -397,7 +397,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -444,7 +444,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -491,7 +491,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -538,7 +538,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -593,7 +593,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -640,7 +640,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -691,7 +691,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -742,7 +742,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -793,7 +793,7 @@ }, "V": { "type": "block", - "code": "game:storagevessel-raw" + "code": "game:storagevessel-*-raw" }, "G": { "type": "item", @@ -840,7 +840,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -891,7 +891,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -942,7 +942,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -989,7 +989,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1036,7 +1036,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1083,7 +1083,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1130,7 +1130,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1181,7 +1181,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1228,7 +1228,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1275,7 +1275,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1322,7 +1322,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1373,7 +1373,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1420,7 +1420,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1467,7 +1467,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1514,7 +1514,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1561,7 +1561,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1608,7 +1608,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1655,7 +1655,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1702,7 +1702,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1749,7 +1749,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", @@ -1796,7 +1796,7 @@ }, "V": { "type": "block", - "code": "game:clayplanter-raw" + "code": "game:clayplanter-*-raw" }, "G": { "type": "item", diff --git a/theworkingclasses/assets/theworkingclasses/recipes/grid/hedgewitch.json b/theworkingclasses/assets/theworkingclasses/recipes/grid/hedgewitch.json index 48b469a..ed54724 100644 --- a/theworkingclasses/assets/theworkingclasses/recipes/grid/hedgewitch.json +++ b/theworkingclasses/assets/theworkingclasses/recipes/grid/hedgewitch.json @@ -41,7 +41,7 @@ }, "B": { "type": "block", - "code": "game:bowl-fired" + "code": "game:bowl-*-fired" } }, "attributes": { @@ -126,7 +126,7 @@ }, "B": { "type": "block", - "code": "game:bowl-fired" + "code": "game:bowl-*-fired" } }, "attributes": { @@ -187,7 +187,7 @@ }, "B": { "type": "block", - "code": "game:bowl-fired" + "code": "game:bowl-*-fired" } }, "attributes": { diff --git a/theworkingclasses/assets/theworkingclasses/recipes/grid/miner.json b/theworkingclasses/assets/theworkingclasses/recipes/grid/miner.json index 99911be..589e0f1 100644 --- a/theworkingclasses/assets/theworkingclasses/recipes/grid/miner.json +++ b/theworkingclasses/assets/theworkingclasses/recipes/grid/miner.json @@ -49,7 +49,7 @@ }, "P": { "type": "block", - "code": "game:flowerpot-burnt", + "code": "game:flowerpot-*-fired", "quantity": 1 } }, diff --git a/theworkingclasses/modinfo.json b/theworkingclasses/modinfo.json index 366998b..5afb313 100644 --- a/theworkingclasses/modinfo.json +++ b/theworkingclasses/modinfo.json @@ -6,7 +6,7 @@ "Vivi_IX" ], "description": "Adds profession based classes to Vintage story. Pick a profession and work alongside your fellows, or take on the world alone in a new way", - "version": "1.0.3", + "version": "1.0.5", "dependencies": { "game": "", "traitacquirer": "0.9.6", diff --git a/theworkingclasses/theworkingclasses.csproj b/theworkingclasses/theworkingclasses.csproj index 170f16c..f651aad 100644 --- a/theworkingclasses/theworkingclasses.csproj +++ b/theworkingclasses/theworkingclasses.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 false bin\$(Configuration)\Mods\mod