Pruning the old to-hit syntax - Part 9

[Karol1223]

Summary

None

Purpose of change

Continuation from #76281

Describe the solution

Worth to point out that I also removed damage values from a bunch of stuff that didn't have a defined to_hit anyway, as a bunch of apparel was doing damage where it should not have in any reasonable situation done so

Affected files:

• armor\cardboard.json
• armor\exotic.json
• armor\eyewear.json
• armor\head_attachments.json
• armor\helmets.json
• armor\hoods.json
• armor\integrated.json
• armor\jewelry.json
• armor\legs_armor.json
• armor\masks.json
• armor\pets_dog_armor.json
• armor\storage.json

Describe alternatives you've considered

Testing

Additional context

The next PR should finish off the armor folder

[akrieger]

Legit looking failures.

(~[slow] ~[.],starting_items)=>   CHECK( calc_expected_dps( weap.first ) == weap.second )
(~[slow] ~[.],starting_items)=> with expansion:
Error: (~[slow] ~[.],starting_items)=>   Approx( 5.3147823341 ) == 8.42
(~[slow] ~[.],starting_items)=> with message:
(~[slow] ~[.],starting_items)=>   integrated_chitin3_claws's dps changed, if it's intended replace the value in
(~[slow] ~[.],starting_items)=>   the respective file in data/mods/TEST_DATA/expected_dps_data.
(~[slow] ~[.],starting_items)=> 
(~[slow] ~[.],starting_items)=> ../tests/effective_dps_test.cpp:294: FAILED:
(~[slow] ~[.],starting_items)=>   CHECK( calc_expected_dps( weap.first ) == weap.second )
(~[slow] ~[.],starting_items)=> with expansion:
Error: (~[slow] ~[.],starting_items)=>   Approx( 7.4637222144 ) == 11.31
(~[slow] ~[.],starting_items)=> with message:
(~[slow] ~[.],starting_items)=>   integrated_giant_pincer's dps changed, if it's intended replace the value in
(~[slow] ~[.],starting_items)=>   the respective file in data/mods/TEST_DATA/expected_dps_data.

[Karol1223]

Legit looking failures.

(~[slow] ~[.],starting_items)=>   CHECK( calc_expected_dps( weap.first ) == weap.second )
(~[slow] ~[.],starting_items)=> with expansion:
Error: (~[slow] ~[.],starting_items)=>   Approx( 5.3147823341 ) == 8.42
(~[slow] ~[.],starting_items)=> with message:
(~[slow] ~[.],starting_items)=>   integrated_chitin3_claws's dps changed, if it's intended replace the value in
(~[slow] ~[.],starting_items)=>   the respective file in data/mods/TEST_DATA/expected_dps_data.
(~[slow] ~[.],starting_items)=> 
(~[slow] ~[.],starting_items)=> ../tests/effective_dps_test.cpp:294: FAILED:
(~[slow] ~[.],starting_items)=>   CHECK( calc_expected_dps( weap.first ) == weap.second )
(~[slow] ~[.],starting_items)=> with expansion:
Error: (~[slow] ~[.],starting_items)=>   Approx( 7.4637222144 ) == 11.31
(~[slow] ~[.],starting_items)=> with message:
(~[slow] ~[.],starting_items)=>   integrated_giant_pincer's dps changed, if it's intended replace the value in
(~[slow] ~[.],starting_items)=>   the respective file in data/mods/TEST_DATA/expected_dps_data.

They look legit, and they're the reason I'm not doing anything with this PR, but I don't know whether they actually are legit.

From my understanding, unarmed weapons do not use to-hit at all when worn. The ones here are integrated, so should only ever be worn. For the weapons the tests cry about, to-hit is the only aspect I changed.

What this means is either unarmed weapons do use to-hit, or the DPS calculation (and by extent DPS display in item description) lies to the player because it calculates the DPS with to-hit in mind when in reality it doesn't use it. I am assuming it is the latter, and that the tests don't make an exception for integrated armor either, and the test character just wields it anyway (which isn't possible in standard gameplay to my understanding)

As such, there's a problem of... it looks like unarmed weapons have two separate DPS values at once - one when wielded, and one when worn. This is bad.

[Maleclypse]

@anothersimulacrum I think you might be the best person to answer the above question.

[anothersimulacrum]

To-hit is not applied when using worn weapons. I think this should be considered a bug.

Hit is determined:

Cataclysm-DDA/src/melee.cpp

Line 613 in 11886ea

int hit_spread = t.deal_melee_attack( this, hit_roll() );

Worn weapons enter the equation:

Cataclysm-DDA/src/melee.cpp

Lines 775 to 786 in 11886ea

	if( contact_area != sub_body_part_sub_limb_debug ) {
	// todo: simplify this by using item_location everywhere
	// so only cur_weapon = worn.current_unarmed_weapon remains
	// Check if our vector allows armor-derived damage
	if( vector_id->armor_bonus ) {
	item *worn_weap = worn.current_unarmed_weapon( contact_area );
	cur_weapon = worn_weap ? item_location( *this, worn_weap ) : item_location();
	cur_weap = cur_weapon ? *cur_weapon : null_item_reference();
	add_msg_debug( debugmode::DF_MELEE, "Vector allows armor damage calculation, chosen weapon %s",
	cur_weap.display_name() );
	}
	}