Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unarmed crafting organization #62564

Merged
merged 4 commits into from
Mar 5, 2023
Merged

Unarmed crafting organization #62564

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f400cf
New unarmed subcategory
Termineitor244 Dec 4, 2022
c6289f0
Unarmed weapons file
Termineitor244 Dec 4, 2022
baef322
Merge branch 'master' into Unarmed-organization
Termineitor244 Jan 29, 2023
8f887da
Revert "Unarmed weapons file"
Termineitor244 Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions data/json/recipes/armor/hands.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,39 +1063,6 @@
"time": "2 h 15 m",
"using": [ [ "armor_qt_chainmail_assembling", 2 ], [ "strap_small", 2 ] ]
},
{
"result": "gloves_studded",
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_HANDS",
"skill_used": "tailor",
"difficulty": 3,
"time": "30 m",
"autolearn": true,
"using": [ [ "sewing_standard", 4 ] ],
"proficiencies": [ { "proficiency": "prof_leatherworking_basic" }, { "proficiency": "prof_leatherworking" } ],
"qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
"components": [ [ [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "gloves_leather", 1 ] ], [ [ "scrap", 4 ] ] ]
},
{
"result": "xl_gloves_studded",
"type": "recipe",
"copy-from": "gloves_studded",
"time": "30 m",
"using": [ [ "sewing_standard", 4 ] ],
"qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
"components": [ [ [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "gloves_leather", 1 ] ], [ [ "scrap", 6 ] ] ]
},
{
"result": "xs_gloves_studded",
"type": "recipe",
"copy-from": "gloves_studded",
"time": "30 m",
"using": [ [ "sewing_standard", 4 ] ],
"qualities": [ { "id": "LEATHER_AWL", "level": 1 }, { "id": "WRENCH", "level": 1 } ],
"components": [ [ [ "gloves_light", 1 ], [ "gloves_liner", 1 ] ], [ [ "gloves_leather", 1 ] ], [ [ "scrap", 2 ] ] ]
},
{
"result": "lc_demi_gaunt",
"type": "recipe",
Expand Down
1 change: 1 addition & 0 deletions data/json/recipes/recipes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"CSC_WEAPON_BASHING",
"CSC_WEAPON_CUTTING",
"CSC_WEAPON_PIERCING",
"CSC_WEAPON_UNARMED",
"CSC_WEAPON_RANGED",
"CSC_WEAPON_EXPLOSIVE",
"CSC_WEAPON_MODS",
Expand Down
213 changes: 0 additions & 213 deletions data/json/recipes/weapon/bashing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,188 +286,6 @@
"proficiencies": [ { "proficiency": "prof_carpentry_basic", "fail_multiplier": 1 } ],
"components": [ [ [ "sword_wood", 1 ] ], [ [ "nail", 12 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "knuckle_steel",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"skills_required": [ "bashing", 1 ],
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
"difficulty": 2,
"time": "30 m",
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "cotton_patchwork", 4 ] ], [ [ "scrap", 4 ] ] ]
},
{
"result": "xl_knuckle_steel",
"type": "recipe",
"copy-from": "knuckle_steel",
"time": "30 m",
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "cotton_patchwork", 5 ] ], [ [ "scrap", 5 ] ] ]
},
{
"result": "xs_knuckle_steel",
"type": "recipe",
"copy-from": "knuckle_steel",
"time": "30 m",
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "cotton_patchwork", 3 ] ], [ [ "scrap", 3 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "knuckle_steel_forged",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"skills_required": [ "bashing", 1 ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_toolsmithing" }
],
"difficulty": 3,
"time": "1 h",
"autolearn": true,
"book_learn": [ [ "recipe_melee", 2 ] ],
"using": [ [ "blacksmithing_standard", 4 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "steel_chunk", 1 ], [ "scrap", 5 ] ] ]
},
{
"result": "xl_knuckle_steel_forged",
"type": "recipe",
"copy-from": "knuckle_steel_forged",
"time": "1 h",
"using": [ [ "blacksmithing_standard", 4 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "steel_chunk", 2 ], [ "scrap", 7 ] ] ]
},
{
"result": "xs_knuckle_steel_forged",
"type": "recipe",
"copy-from": "knuckle_steel_forged",
"time": "1 h",
"using": [ [ "blacksmithing_standard", 4 ] ],
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "steel_chunk", 1 ], [ "scrap", 3 ] ] ]
},
{
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"result": "knuckle_brass",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"skills_required": [ "bashing", 1 ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_toolsmithing" }
],
"difficulty": 3,
"time": "1 h",
"autolearn": false,
"book_learn": [ [ "recipe_melee", 2 ] ],
"using": [ [ "blacksmithing_standard", 4 ] ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "copper", 100 ] ], [ [ "chem_zinc_powder", 500 ] ] ]
},
{
"result": "xl_knuckle_brass",
"type": "recipe",
"copy-from": "knuckle_brass",
"time": "1 h",
"using": [ [ "blacksmithing_standard", 4 ] ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "copper", 150 ] ], [ [ "chem_zinc_powder", 600 ] ] ]
},
{
"result": "xs_knuckle_brass",
"type": "recipe",
"copy-from": "knuckle_brass",
"time": "1 h",
"using": [ [ "blacksmithing_standard", 4 ] ],
"tools": [ [ [ "drift", -1 ] ] ],
"components": [ [ [ "copper", 80 ] ], [ [ "chem_zinc_powder", 400 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "knuckle_nail",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"time": "10 m",
"reversible": true,
"autolearn": true,
"using": [ [ "cordage", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_carpentry_basic", "fail_multiplier": 1 },
{ "proficiency": "prof_carving", "fail_multiplier": 1 }
],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "nail", 16 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ] ]
},
{
"result": "xl_knuckle_nail",
"type": "recipe",
"copy-from": "knuckle_nail",
"time": "10 m",
"using": [ [ "cordage", 4 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "nail", 18 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ] ]
},
{
"result": "xs_knuckle_nail",
"type": "recipe",
"copy-from": "knuckle_nail",
"time": "10 m",
"using": [ [ "cordage", 4 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CUT", "level": 2 } ],
"components": [ [ [ "nail", 14 ] ], [ [ "stick", 1 ], [ "2x4", 1 ] ] ]
},
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "cestus",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"skills_required": [ "bashing", 1 ],
"difficulty": 2,
"time": "30 m",
"book_learn": [ [ "recipe_melee", 1 ], [ "textbook_weapeast", 7 ] ],
"using": [ [ "sewing_standard", 5 ] ],
"proficiencies": [ { "proficiency": "prof_leatherworking_basic", "fail_multiplier": 1.15 } ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "leather", 4 ] ], [ [ "scrap", 8 ] ] ]
},
{
"result": "xl_cestus",
"type": "recipe",
"copy-from": "cestus",
"time": "30 m",
"using": [ [ "sewing_standard", 5 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "leather", 6 ] ], [ [ "scrap", 10 ] ] ]
},
{
"result": "xs_cestus",
"type": "recipe",
"copy-from": "cestus",
"time": "30 m",
"using": [ [ "sewing_standard", 5 ] ],
"qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SAW_M", "level": 1 } ],
"components": [ [ [ "leather", 3 ] ], [ [ "scrap", 6 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down Expand Up @@ -843,36 +661,5 @@
"proficiencies": [ { "proficiency": "prof_metalworking" } ],
"components": [ [ [ "sheet_metal_small", 6 ] ], [ [ "nuts_bolts", 4 ] ], [ [ "bo", 1 ] ] ],
"qualities": [ { "id": "HAMMER", "level": 2 }, { "id": "SAW_M", "level": 2 }, { "id": "DRILL", "level": 2 } ]
},
{
"result": "knuckle_impact",
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"difficulty": 6,
"time": "4h",
"autolearn": true,
"using": [ [ "blacksmithing_standard", 5 ], [ "steel_standard", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_articulation" }
]
},
{
"result": "xl_knuckle_impact",
"type": "recipe",
"copy-from": "knuckle_impact",
"time": "4h",
"using": [ [ "blacksmithing_standard", 5 ], [ "steel_standard", 1 ] ]
},
{
"result": "xs_knuckle_impact",
"type": "recipe",
"copy-from": "knuckle_impact",
"time": "4h",
"using": [ [ "blacksmithing_standard", 5 ], [ "steel_standard", 1 ] ]
}
]
31 changes: 0 additions & 31 deletions data/json/recipes/weapon/piercing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1298,36 +1298,5 @@
"qualities": [ { "id": "GRIND", "level": 2 } ],
"tools": [ [ [ "hotcut", -1 ] ] ],
"components": [ [ [ "2x4", 1 ], [ "stick", 1 ] ], [ [ "fur", 2 ], [ "leather", 2 ] ] ]
},
{
"result": "knuckle_skewer",
"type": "recipe",
"activity_level": "BRISK_EXERCISE",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_PIERCING",
"skill_used": "fabrication",
"difficulty": 6,
"time": "4h",
"autolearn": true,
"using": [ [ "blacksmithing_standard", 5 ], [ "steel_standard", 1 ] ],
"proficiencies": [
{ "proficiency": "prof_metalworking" },
{ "proficiency": "prof_blacksmithing" },
{ "proficiency": "prof_articulation" }
]
},
{
"result": "xl_knuckle_skewer",
"type": "recipe",
"copy-from": "knuckle_skewer",
"time": "4h",
"using": [ [ "blacksmithing_standard", 6 ], [ "steel_standard", 1 ] ]
},
{
"result": "xs_knuckle_skewer",
"type": "recipe",
"copy-from": "knuckle_skewer",
"time": "4h",
"using": [ [ "blacksmithing_standard", 4 ], [ "steel_standard", 1 ] ]
}
]
Loading