From ef61af4ede34b36c6c43561b76b52dc8f35a7c0e Mon Sep 17 00:00:00 2001 From: brodbowl <177868717+brodbowl@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:12:00 -0500 Subject: [PATCH 1/6] remove reference to plastic on wooden bats --- data/json/items/melee/bludgeons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index cf8b3750e1717..6b4abfe2ad1ec 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -73,7 +73,7 @@ "type": "GENERIC", "id": "bat", "name": { "str": "baseball bat" }, - "description": "A sturdy wooden bat with a plastic handle. Makes a great melee weapon.", + "description": "A sturdy wooden bat used to play the great american pastime. Makes for a great melee weapon too.", "weight": "1133 g", "longest_side": "90 cm", "to_hit": { "grip": "weapon", "length": "long", "surface": "any", "balance": "good" }, From c8cb0874e40395175ec4fec40acd1abce5375f89 Mon Sep 17 00:00:00 2001 From: brodbowl <177868717+brodbowl@users.noreply.github.com> Date: Wed, 14 Aug 2024 21:14:09 -0500 Subject: [PATCH 2/6] add the baseball bat recipe --- data/json/recipes/weapon/bashing.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index fc361c920d64b..7b07b2d7fb542 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -1,4 +1,19 @@ [ + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "bat", + "byproducts": [ [ "splinter", 10 ] ], + "category": "CC_WEAPON", + "subcategory": "CSC_WEAPON_BASHING", + "skill_used": "fabrication", + "difficulty": 4, + "time": "3 h", + "autolearn": true, + "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 } ], + "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 2 } ], + "components": [ [ [ "wooden_post", 1 ] ] ] + }, { "result": "hollow_cane", "type": "recipe", From abd7af39032c68fd907bb165950121af02e7c0ef Mon Sep 17 00:00:00 2001 From: brodbowl <177868717+brodbowl@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:16:28 -0500 Subject: [PATCH 3/6] remove space Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- data/json/recipes/weapon/bashing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index 7b07b2d7fb542..dd1ac9255818b 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -1,5 +1,5 @@ [ - { + { "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "bat", From 56b52ebde04adb6fb8388eb411bfadfdef3af56e Mon Sep 17 00:00:00 2001 From: brodbowl <177868717+brodbowl@users.noreply.github.com> Date: Wed, 14 Aug 2024 22:17:59 -0500 Subject: [PATCH 4/6] capitalize american --- data/json/items/melee/bludgeons.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 6b4abfe2ad1ec..a7a5048a17ab5 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -73,7 +73,7 @@ "type": "GENERIC", "id": "bat", "name": { "str": "baseball bat" }, - "description": "A sturdy wooden bat used to play the great american pastime. Makes for a great melee weapon too.", + "description": "A sturdy wooden bat used to play the great American pastime. Makes for a great melee weapon too.", "weight": "1133 g", "longest_side": "90 cm", "to_hit": { "grip": "weapon", "length": "long", "surface": "any", "balance": "good" }, From 305b88a55603c9e64c4efbfbbdd61cd75cce7534 Mon Sep 17 00:00:00 2001 From: brodbowl <177868717+brodbowl@users.noreply.github.com> Date: Thu, 15 Aug 2024 10:33:14 -0500 Subject: [PATCH 5/6] correct byproducts Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> --- data/json/recipes/weapon/bashing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index dd1ac9255818b..91de26f730252 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -3,7 +3,7 @@ "type": "recipe", "activity_level": "LIGHT_EXERCISE", "result": "bat", - "byproducts": [ [ "splinter", 10 ] ], + "byproducts": [ [ "splinter", 30 ] ], "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_BASHING", "skill_used": "fabrication", From 74621c71940221c5794a7347acd98dc18410fcab Mon Sep 17 00:00:00 2001 From: bloodbowel <177868717+bloodbowel@users.noreply.github.com> Date: Sun, 29 Sep 2024 12:49:44 -0500 Subject: [PATCH 6/6] add file to bat recipe --- data/json/recipes/weapon/bashing.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/weapon/bashing.json b/data/json/recipes/weapon/bashing.json index f658f37d8b2a7..f1d251d4d6b54 100644 --- a/data/json/recipes/weapon/bashing.json +++ b/data/json/recipes/weapon/bashing.json @@ -10,7 +10,7 @@ "difficulty": 4, "time": "3 h", "autolearn": true, - "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 } ], + "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 }, { "id": "FILE", "level": 1 } ], "proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 2 } ], "components": [ [ [ "wooden_post", 1 ] ] ] },