relative json inheritance might be wonky for survivor_machete_qt

[Regilith]

Describe the bug

Unsure if this is a bug or intended behavior, but I noticed a discrepancy between the damage of the tempered steel combat machete in-game, versus its listing on the item browser. 26 cut in-game, versus 28 cut 1 bash in the browser.

This is being caused by the survivor_machete_qt setting its relative damage on machete (21 cut), not the survivor_machete (23 cut).

This might be unintended, since survivor_machete_qt copy-from's the survivor_machete, which itself copy-from's and relative's the regular machete for its own damage.

Entries in JSON:

https://github.com/CleverRaven/Cataclysm-DDA/blob/cdda-experimental-2024-09-02-1123/data/json/items/melee/swords_and_blades.json#L819-L883

Attach save file

N/A

Steps to reproduce

Look at item browser, look at code for survivor_machete_qt, look at tempered steel combat machete in game.

Expected behavior

I would expect that tempering a machete would not cause it to lose bash damage compared to the non-tempered one.

I am not which values are 'correct' but the expected DPS of the qt combat machete is lower than inferior-steel alternatives in the expected dps file, as well as having worse expected DPS than bronze weapons like the khopesh and xiphos. I would expect a tempered steel short sword to perform better than a bronze short sword.

If this lower DPS is considered a bug, this issue might be the cause of it.

Expected DPS:

https://github.com/CleverRaven/Cataclysm-DDA/blob/cdda-experimental-2024-09-02-1123/data/mods/TEST_DATA/expected_dps_data/shortswords_dps.json

Screenshots

Versions and configuration

• OS: Linux
  • OS Version: LSB Version: n/a; Distributor ID: ManjaroLinux; Description: Manjaro Linux; Release: 24.0.2; Codename: Wynsdey;
• Game Version: cdda-experimental-2024-08-28-1527 0897544 [64-bit]
• Graphics Version: Tiles
• Game Language: System language []
• Mods loaded: [
  Dark Days Ahead [dda],
  Disable NPC Needs [no_npc_food],
  Portal Storms Ignore NPCs [personal_portal_storms],
  Slowdown Fungal Growth [no_fungal_growth]
  ]

Additional context

No response

[Regilith]

Additional context:

The PR introducing the tempered steel combat machete #59859 specifically calls out that its damage should be 28, not the current 26. Further evidence this is a bug.

The PR that introduced relative inheritance, nerfing the damage, was #66956. The PR did not mention that the nerfed damage was intended.

#68146 also removed the bash damage from the base machete, which affected both variants, despite the machete being a short sword, not a knife (possibly because it has "knife" in its description).