Merge pull request #75762 from bloodbowel/update-long-pole

Update the long pole

data/json/items/resources/wood.json

@@ -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" ],
@@ -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 }
   },
@@ -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",
@@ -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",

data/json/recipes/other/parts_construction.json

@@ -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 ],

data/mods/TEST_DATA/expected_dps_data/polearms_dps.json

@@ -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,

data/mods/TEST_DATA/legacy_to_hit.json

@@ -262,7 +262,6 @@
       "light_emergency_red",
       "livestock_scale",
       "log",
-      "long_pole",
       "lux_meter",
       "m107a1",
       "m110a1",