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

Replace hard steel with tempered steel #55648

Merged
merged 25 commits into from
Mar 4, 2022

Conversation

Drew4484
Copy link
Contributor

Summary

Content "Removes hardsteel, uses tempered steel in place."

Purpose of change

Hardsteel is not clearly defined and only used for a few applications. Changing this to tempered steel removes an uncommon material and allows the player to create the vehicle plating items.

Describe the solution

Removes hardsteel material. Changes items using hardsteel to qt_steel.

Describe alternatives you've considered

Trying to pin down what hardsteel is supposed to represent IRL.

Testing

Loaded game, no errors. Installed heavy plating and ram.

Additional context

As far as I can tell, hard steel is supposed to be something like RHA, but it isn't used consistently. RHA is almost certainly out of survivor crafting, a replacement using a craftable steel makes sense to me.

@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Feb 24, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Feb 24, 2022
@Night-Pryanik
Copy link

You know, you ain't really removing this material yet. There's material definition in materials.json, there's several occurrences of it in the code etc which needs to be removed as well.

@Drew4484
Copy link
Contributor Author

You know, you ain't really removing this material yet. There's material definition in materials.json, there's several occurrences of it in the code etc which needs to be removed as well.

I hadn't deleted the material just yet because it breaks some mods and I need to check with the owners on those before I change their gear, but that's the end goal.

@github-actions github-actions bot removed astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions labels Feb 25, 2022
@Maleclypse Maleclypse added [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact Mods: Aftershock Anything to do with the Aftershock mod Mods: CRIT Anything to do with the CRIT mod labels Feb 25, 2022
@Night-Pryanik
Copy link

If you're actively working on the PR, consider converting it to draft.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Feb 25, 2022
@Drew4484 Drew4484 marked this pull request as draft February 25, 2022 18:10
@Drew4484
Copy link
Contributor Author

If you're actively working on the PR, consider converting it to draft.

Sorry about that, you were probably getting bombed with notifications. I was working on my phone and doing tiny edits, I've drafted this again and will keep it that way until I've squashed the errors.

@github-actions github-actions bot removed the astyled astyled PR, label is assigned by github actions label Feb 25, 2022
Copy link
Member

@dseguin dseguin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You'll also need to update the value on line 1292 of tests/iteminfo_test.cpp:

diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp
index e17f009ce0..027fe027d0 100644
--- a/tests/iteminfo_test.cpp
+++ b/tests/iteminfo_test.cpp
@@ -1289,7 +1289,7 @@ TEST_CASE( "armor protection", "[iteminfo][armor][protection]" )
         item super_tanktop( "test_complex_tanktop" );
         REQUIRE( super_tanktop.get_covered_body_parts().any() );
         // these values are averaged values but test that assumed armor portion is working at all
-        expected_armor_values( super_tanktop, 14, 18, 14.4f, 10.66667f );
+        expected_armor_values( super_tanktop, 14, 14, 14.4f, 10.66667f );
 
         // Protection info displayed on two lines
         CHECK( item_info_str( super_tanktop, more_protection ) ==

src/monattack.cpp Outdated Show resolved Hide resolved
src/monattack.cpp Outdated Show resolved Hide resolved
Drew4484 and others added 2 commits February 27, 2022 00:40
Co-authored-by: David Seguin <[email protected]>
Co-authored-by: David Seguin <[email protected]>
@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Feb 27, 2022
tests/iteminfo_test.cpp Outdated Show resolved Hide resolved
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Mar 1, 2022
@lgtm-com
Copy link

lgtm-com bot commented Mar 2, 2022

LGTM pull request analysis was skipped for b079dfa by Drew4484. Analysis of future commits will happen as normal.

@kevingranade kevingranade marked this pull request as ready for review March 4, 2022 06:55
@kevingranade kevingranade merged commit 2250560 into CleverRaven:master Mar 4, 2022
@Drew4484 Drew4484 deleted the Hard-steel-to-tempered branch March 4, 2022 09:06
chaosvolt added a commit to chaosvolt/cdda-arcana-mod that referenced this pull request Mar 4, 2022
Some critters inherited crappy vision from their base monsters.

Also sneak in an update to DDA version due to
CleverRaven/Cataclysm-DDA#55648
chaosvolt added a commit to chaosvolt/nocts_cata_mod that referenced this pull request Mar 4, 2022
Update to materials repairable by can forge due to
CleverRaven/Cataclysm-DDA#55648, also allows
repairing the other clutter steels.

Amusingly, they set it so the extended toolset item can repair this
fancy new tempered steel, but not any of the other useless material
clutter welders can repair.

Also lel, there's actually even more clutter steels in the form of
"chain" steels, which aren't repairable at all. Nevermind that I can
confirm via the generic steel chainmail items that anything that gets
materials solely via `covered_by_mat` can't actually be repaired at all.

It's always something with DDA...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Mods: Aftershock Anything to do with the Aftershock mod Mods: CRIT Anything to do with the CRIT mod
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants