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.

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

Finishing the spear shaft recipe #75640

Merged
merged 29 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
257942b
Update wood.json
bloodbowel Aug 13, 2024
a0894e5
Update parts_construction.json
bloodbowel Aug 13, 2024
d34caf5
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 13, 2024
9ebf638
Update data/json/items/resources/wood.json
bloodbowel Aug 13, 2024
14f4b57
Update data/json/items/resources/wood.json
bloodbowel Aug 13, 2024
a5f6eb8
Update wood.json
bloodbowel Aug 13, 2024
4c48793
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 14, 2024
67a7cd8
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 14, 2024
c41b2eb
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 15, 2024
d6f6999
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 17, 2024
ed29fb1
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 19, 2024
5792f11
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 21, 2024
63fbce8
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 22, 2024
56feb03
remove "being" from soaking spear shaft description
bloodbowel Aug 22, 2024
fb47622
add extra space after sentences for soaking spear shaft
bloodbowel Aug 22, 2024
11c4ada
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 24, 2024
5b82138
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 24, 2024
96f7af9
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 26, 2024
bb2bfa4
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 27, 2024
ad7de3b
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 28, 2024
1b11790
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Aug 29, 2024
915a29e
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Sep 4, 2024
ba9f3ba
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Oct 6, 2024
92cc485
add soaking spear shaft
bloodbowel Oct 6, 2024
dd4a8fc
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Oct 6, 2024
ad2097d
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Oct 16, 2024
a0e2d6a
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Oct 27, 2024
af87bb2
Update data/mods/TEST_DATA/expected_dps_data/staves_dps.json
Night-Pryanik Nov 13, 2024
b1859da
Merge branch 'CleverRaven:master' into finish-spear-shaft-recipe
bloodbowel Nov 29, 2024
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
29 changes: 29 additions & 0 deletions data/json/items/resources/wood.json
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,35 @@
"qualities": [ [ "HAMMER", 1 ] ],
"melee_damage": { "bash": 19 }
},
{
"type": "GENERIC",
"id": "soaking_spear_shaft",
"symbol": "/",
"color": "brown",
"name": { "str_sp": "soaking spear shaft" },
"looks_like": "q_staff",
"description": "A long stick carved and sanded into a smooth staff with a slight taper, for use in making spears. It's currently being soaked with oil and quite slippery. Once the oil penetrates the wood it can be wiped down and used for further projects. ",
"price": "40 USD",
"material": [ "wood" ],
"flags": [ "SHEATH_SPEAR", "ALWAYS_TWOHAND" ],
Night-Pryanik marked this conversation as resolved.
Show resolved Hide resolved
"weapon_category": [ "QUARTERSTAVES" ],
"weight": "1000 g",
"volume": "1250 ml",
"longest_side": "180 cm",
"category": "weapons",
"to_hit": { "grip": "none", "length": "long", "surface": "any", "balance": "neutral" },
bloodbowel marked this conversation as resolved.
Show resolved Hide resolved
"use_action": {
"target": "spear_shaft",
"msg": "You wipe down the spear shaft.",
"moves": 1000,
"type": "delayed_transform",
"transform_age": 15000,
"not_ready_msg": "The spear shaft is still soaking.",
"//": "4 hours"
},
"price_postapoc": "5 USD",
"melee_damage": { "bash": 8 }
},
{
"type": "GENERIC",
"id": "spear_shaft",
Expand Down
8 changes: 3 additions & 5 deletions data/json/recipes/other/parts_construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -357,17 +357,15 @@
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "spear_shaft",
"result": "soaking_spear_shaft",
"byproducts": [ [ "splinter", 12 ] ],
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"difficulty": 2,
"time": "5 h 40 m",
"//1": "TODO: adjust crafting time down by 4 hours when it's possible to separate the oiling time from the crafting time easily.",
"time": "1 h 40 m",
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.25, "max_experience": "100 m" } ],
"//2": "Max experience set because waiting for oil to soak in isn't really teaching you anything. Remove this when crafting time reduced to only carving time.",
"proficiencies": [ { "proficiency": "prof_carving", "time_multiplier": 1.25 } ],
"qualities": [
{ "id": "CUT", "level": 2 },
{ "id": "SAW_W", "level": 1 },
Expand Down
Loading