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

Reworked rebar and rebar rail into rebar no.5 (First time contribution) #43166

Merged
merged 15 commits into from
Oct 8, 2020

Conversation

TheMasterGear
Copy link
Contributor

@TheMasterGear TheMasterGear commented Aug 23, 2020

Summary

SUMMARY: Balance "Corrected rebar and rail into steel, and normalized density and volume"

Purpose of change

Fixes #43156

Describe the solution

Corrected rebar and rail into steel, and normalized density and volume into the density of high carbon steel. 7.85 g/cm3 to match steel rebar type no.5

Also changed rebar spear not to have a reach attack, much like the pointed stick because they are both short for spears, 80 cms.

Describe alternatives you've considered

Could also be type no.4, no.6, or any other imperial bar size. But it's most common for no.5 rebar to be inside roadways, which is where you get rebar in CDDA.

Testing

Spawn rebar and looked at the crafting menu. Made sharpened rebar and rail rebar 1% and 5% lighter for being sharpened to points and one bar of rebar makes 5 rails.

Corrected rebar and rail into steel, and normalized density and volume into the density of high carbon steel. 7.85 g/cm3

https://www.harrissupplysolutions.com/5-rebar.html
Also changed rebar spear not to have a reach attack, much like the pointed stick because they are both short for spears, 80 cms.
@TheMasterGear TheMasterGear changed the title Reworked rebar and rebar rail into rebar #5 (First time contribution) Reworked rebar and rebar rail into rebar no.5 (First time contribution) #43156 Aug 23, 2020
@TheMasterGear TheMasterGear changed the title Reworked rebar and rebar rail into rebar no.5 (First time contribution) #43156 Reworked rebar and rebar rail into rebar no.5 (First time contribution) Aug 23, 2020
Revered copy-from back to rebar_rail
Fixed volume of the steel rail.
Redone recalculation of both rails weight and volume to be as close to 7.85 g/cm3 as possible.
Plus, I shaved off weight and volume to the steel rail to be thinner and lighter than rebar rail by 10%.
@TheMasterGear
Copy link
Contributor Author

Gosh, I totally butchered getting the file up here cleanly. Sorry! Is there a way to run the game without changing the files by compiling it?

@anothersimulacrum
Copy link
Member

I'm not sure what you're asking.

@anothersimulacrum anothersimulacrum added the [JSON] Changes (can be) made in JSON label Aug 24, 2020
@TheMasterGear
Copy link
Contributor Author

I'm not sure what you're asking.

I used Microsoft Visual Studio to compile the GitHub version of the game to test the patch, but it changes the files slightly so I had to use a different copy of the game to test which got confusing.
changes

@anothersimulacrum
Copy link
Member

Ah, that's weird. Well, for working on this you can just not add them (untick the checkmark there), but you should probably make an issue or seek help outside of this PR about that.

@TheMasterGear
Copy link
Contributor Author

Ah, that's weird. Well, for working on this you can just not add them (untick the checkmark there), but you should probably make an issue or seek help outside of this PR about that.

Yeah, it might be that my CMake has an error. It works also found that rail's in the JSON are ten of them when I did that calculation for only one rail so they're basic weightless now. This needs to be fixed.

@TheMasterGear
Copy link
Contributor Author

It's still failing. I'm not sure what's left to fix?

@anothersimulacrum
Copy link
Member

None of the CI failures are your fault.

@TheMasterGear
Copy link
Contributor Author

None of the CI failures are your fault.

Just out of curiosity, what when wrong then?

@anothersimulacrum
Copy link
Member

Something changed the DPS of a melee weapon.

@TheMasterGear
Copy link
Contributor Author

TheMasterGear commented Aug 24, 2020

None of the CI failures are your fault.

Just out of curiosity, what when wrong then?

Something changed the DPS of a melee weapon.

Will I need to update my branch once this is fixed?

@anothersimulacrum
Copy link
Member

Nope, CI failures that are not your fault won't cause problems for you.

@kevingranade
Copy link
Member

Actually the test failure is related, it increased the DPS of rebar
rebar out of range, expected: 7 got 8.40758

@anothersimulacrum
Copy link
Member

Whoops, missed that. I saw the header above it said club, so I thought it was that.

@kevingranade
Copy link
Member

kevingranade commented Sep 5, 2020 via email

@TheMasterGear
Copy link
Contributor Author

Did the weight change to rebar melee need to be changed back?

@anothersimulacrum
Copy link
Member

Probably the test needs to be changed.

@stale
Copy link

stale bot commented Oct 7, 2020

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. Please do not 'bump' or comment on this issue unless you are actively working on it. Stale issues, and stale issues that are closed are still considered.

@stale stale bot added the stale Closed for lack of activity, but still valid. label Oct 7, 2020
@kevingranade
Copy link
Member

Crap, I will fix this the test I promise.

@stale stale bot removed the stale Closed for lack of activity, but still valid. label Oct 7, 2020
@kevingranade kevingranade merged commit abfdc10 into CleverRaven:master Oct 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Steel rail ammo density is too high.
3 participants