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

Fix CI failures, blazemod errors, fix speedloaders #35804

Merged
merged 5 commits into from
Dec 2, 2019

Conversation

anothersimulacrum
Copy link
Member

@anothersimulacrum anothersimulacrum commented Dec 1, 2019

Summary

SUMMARY: None

Purpose of change

Fix CI failures.
Fix some issues from #34638

Describe the solution

Install time is commented out for all other gunmods, it doesn't appear to work.
One description was missing a space.
Add a default uncomfortable grip gunmod onto the remington 870 MCS. It is irremovable.

Testing

Ran tests/cata_test, noticed that it did not give me the errors it gave before I made these changes.

Additional Context

I want @tenmillimaster to give feedback before it is merged, so it's WIP.
image

The install time for all other gunmods is commented out, it doesn't
appear to work right now.

One description was missing a space.

Add an uncomfortable grip gunmod and have it installed by default on the
remington 870 MCS, instead of the handling modifier which does not work.
Done at the request of tenmillimaster
@anothersimulacrum anothersimulacrum force-pushed the fix-ci branch 2 times, most recently from 988e1be to ca984d5 Compare December 1, 2019 19:12
@tenmillimaster
Copy link
Member

Looks good.
Can't believe I missed a linting error.

@anothersimulacrum anothersimulacrum changed the title [WIP] Fix CI failures [WIP] Fix CI failures, blazemod errors, fix speedloaders Dec 1, 2019
@FuelType-Memes
Copy link
Contributor

FuelType-Memes commented Dec 2, 2019

Can you also fix the description for "shot_speedloader8"? It says 6-shot instead of 8. It's a really small copy-paste mistake, sad to create an individual PR for it

@ghost
Copy link

ghost commented Dec 2, 2019

Add a default uncomfortable grip gunmod onto the remington 870 MCS. It is irremovable.
irremovable

Why? 😢

@anothersimulacrum
Copy link
Member Author

Okay, all the tests pass, this is no longer WIP.

Not super happy with how I fixed the ranged balance tests, just felt like it was fudging with numbers. Not sure if there's a better way.

Can you also fix the description for "shot_speedloader8"? It says 6-shot instead of 8. It's a really small copy-paste mistake, sad to create an individual PR for it

I'm not super happy doing a lot of stuff in one PR, I'm only doing the speed-loader fix in this because 10millimaster asked me to. I will do that in a separate PR.

Add a default uncomfortable grip gunmod onto the remington 870 MCS. It is irremovable.
irremovable

Why? 😢

The intent originally appeared to be including a permanent -6 handling modifier on the gun, this has the same effect.

@anothersimulacrum anothersimulacrum changed the title [WIP] Fix CI failures, blazemod errors, fix speedloaders Fix CI failures, blazemod errors, fix speedloaders Dec 2, 2019
@ZhilkinSerg ZhilkinSerg added [JSON] Changes (can be) made in JSON Code: Build Issues regarding different builds and build environments Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons Code: Tests Measurement, self-control, statistics, balancing. labels Dec 2, 2019
@ZhilkinSerg ZhilkinSerg merged commit 689a417 into CleverRaven:master Dec 2, 2019
@anothersimulacrum anothersimulacrum deleted the fix-ci branch December 2, 2019 03:55
@ThomasLinkin
Copy link

"Uncomfortable Grip"? dude, why does that exists in the first place? and if it actually "enhance" the recoil, why would anyone use it ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code: Build Issues regarding different builds and build environments Code: Tests Measurement, self-control, statistics, balancing. Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants