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

Update the long pole #75762

Merged
merged 32 commits into from
Dec 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
c1045bc
update long pole
bloodbowel Aug 17, 2024
e95b78a
add soaking longpole and update longpole
bloodbowel Aug 17, 2024
7d0cab6
remove spaces
bloodbowel Aug 17, 2024
f4a586a
remove "being" from description
bloodbowel Aug 17, 2024
4e650e2
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 17, 2024
2a0739a
add spaces after sentences in description
bloodbowel Aug 17, 2024
00a3625
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 19, 2024
ed14d84
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 21, 2024
0ced3e5
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 22, 2024
ed088db
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 24, 2024
858750e
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 24, 2024
4eed9ed
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 26, 2024
1ef38b1
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 27, 2024
564e769
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 28, 2024
6ad13d1
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Aug 29, 2024
a028ffa
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Sep 4, 2024
b731385
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Oct 6, 2024
cffc155
add soaking long pole to dps test
bloodbowel Oct 6, 2024
6efb8cf
remove long pole from legacy dps test
bloodbowel Oct 6, 2024
7849e34
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Oct 16, 2024
46f73af
increase soaking long pole dps
bloodbowel Oct 16, 2024
27995c7
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Oct 27, 2024
a0376d4
decrease soaking long pole dps
bloodbowel Oct 27, 2024
39e34e9
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Nov 29, 2024
e1d09b0
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Nov 29, 2024
c52424d
Update polearms_dps.json
bloodbowel Nov 29, 2024
ddfcce8
correct long pole and soaking long pole dps
bloodbowel Nov 29, 2024
c034d7f
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Dec 2, 2024
b1e812d
correct soaking long pole dps
bloodbowel Dec 2, 2024
a442036
correct soaking long pole dps
bloodbowel Dec 2, 2024
1c2ce4f
"str_sp" to "str"
bloodbowel Dec 2, 2024
eaefc3f
Merge branch 'CleverRaven:master' into update-long-pole
bloodbowel Dec 3, 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
36 changes: 33 additions & 3 deletions data/json/items/resources/wood.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,42 @@
"category": "spare_parts",
"melee_damage": { "bash": 18 }
},
{
"type": "GENERIC",
"id": "soaking_long_pole",
"name": { "str": "soaking long pole" },
"description": "A stout, ten-foot pole. Could be used similarly to a spear. It's currently soaked with oil and quite slippery. Once the oil penetrates the wood it can be wiped down and used for further projects.",
"//": "a long pole is a single piece of wood, and the heavy stick just isn't large enough.",
"color": "brown",
"symbol": "/",
"material": [ "wood" ],
"techniques": [ "WBLOCK_1" ],
"weight": "2250 g",
"volume": "3750 ml",
"longest_side": "305 cm",
"flags": [ "POLEARM", "SPEAR", "REACH_ATTACK", "REACH3", "NONCONDUCTIVE", "ALWAYS_TWOHAND" ],
"weapon_category": [ "POLEARMS" ],
"price": "40 USD",
"to_hit": { "grip": "bad", "length": "long", "surface": "point", "balance": "good" },
"use_action": {
"target": "long_pole",
"msg": "You wipe down the long pole.",
"moves": 1000,
"type": "delayed_transform",
"transform_age": 15000,
"not_ready_msg": "The long pole is still soaking.",
"//": "4 hours"
},
"price_postapoc": "50 cent",
"qualities": [ [ "HAMMER", 1 ] ],
"melee_damage": { "bash": 14 }
},
{
"type": "GENERIC",
"id": "long_pole",
"name": { "str": "long pole" },
"description": "A stout, ten-foot pole. Could be used similarly to a spear. The Cataclysm gives fresh meaning to walking softly and carrying a big stick.",
"//": "a long pole is a single piece of wood, and the heavy stick just isn't large enough.",
"to_hit": 1,
"color": "brown",
"symbol": "/",
"material": [ "wood" ],
Expand All @@ -90,6 +119,7 @@
"weapon_category": [ "POLEARMS" ],
"price": "40 USD",
"price_postapoc": "50 cent",
"to_hit": { "grip": "weapon", "length": "long", "surface": "point", "balance": "good" },
"qualities": [ [ "HAMMER", 1 ] ],
"melee_damage": { "bash": 19 }
},
Expand All @@ -98,7 +128,7 @@
"id": "soaking_spear_shaft",
"symbol": "/",
"color": "brown",
"name": { "str_sp": "soaking spear shaft" },
"name": { "str": "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 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",
Expand Down Expand Up @@ -127,7 +157,7 @@
"id": "spear_shaft",
"symbol": "/",
"color": "brown",
"name": { "str_sp": "spear shaft" },
"name": { "str": "spear shaft" },
"looks_like": "q_staff",
"description": "A long stick, sanded and treated with oil for integrity and carved into a smooth staff with a slight taper, for use in making spears. It can also be used as a makeshift quarterstaff as-is, but is too thin to be very effective for just hitting people.",
"price": "40 USD",
Expand Down
8 changes: 4 additions & 4 deletions data/json/recipes/other/parts_construction.json
Original file line number Diff line number Diff line change
Expand Up @@ -365,19 +365,19 @@
{
"type": "recipe",
"activity_level": "MODERATE_EXERCISE",
"result": "long_pole",
"byproducts": [ [ "splinter", 30 ] ],
"result": "soaking_long_pole",
"byproducts": [ [ "splinter", 60 ] ],
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_BASHING",
"skill_used": "fabrication",
"difficulty": 5,
"time": "5 h 40 m",
"time": "2 h 40 m",
"book_learn": [ [ "textbook_weapeast", 4 ] ],
"autolearn": true,
"qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 } ],
"//": "a long pole is a single piece of wood, and the stout branch just isn't large enough.",
"components": [
[ [ "wood_beam", 1 ] ],
[ [ "wooden_post_long", 1 ] ],
[
[ "any_tallow", 4, "LIST" ],
[ "cooking_oil", 32 ],
Expand Down
1 change: 1 addition & 0 deletions data/mods/TEST_DATA/expected_dps_data/polearms_dps.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"pike_pole": 12.51,
"halberd_fake": 12.77,
"long_pole": 13.0,
"soaking_long_pole": 6.51,
"pike_copper": 13.96,
"homemade_polehammer_makeshift": 14.31,
"spear_homemade_halfpike": 15.41,
Expand Down
1 change: 0 additions & 1 deletion data/mods/TEST_DATA/legacy_to_hit.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,6 @@
"light_emergency_red",
"livestock_scale",
"log",
"long_pole",
"lux_meter",
"m107a1",
"m110a1",
Expand Down
Loading