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

Add FS2000(plus STANAG mag volume update) #36838

Merged
merged 2 commits into from May 4, 2020
Merged

Add FS2000(plus STANAG mag volume update) #36838

merged 2 commits into from May 4, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jan 9, 2020

Summary

SUMMARY: Content "Add FS2000 as rare rifle, give STANAG magazine real volume"

Purpose of change

Redo of #36436.

Describe the solution

Due to the handguard being removable but not on a rail, it is being added as "factory handguard" and fits in the underbarrel mount slot. Thus, you'd still have to add a mount to use anything other than the handguard(which then locks out using it if the rail mount is added since it's irremovable).

Volume: Use the owner's manual's overall length for scaling in ImageJ on this image from the manual, multiply by width. Do again after erasing handguards from image to get handguardless volume. Use difference as factory handguard mod's volume(568ml).

image
Additional image of trirail version for basis of trigger guard size on handguardless edit:
image

Results for surface area:
image

Weight: Take from manual for gun w/ handguard. To generize the handguard for any other guns that come with those by default, take average of Magpull's handguard selection.

Frequency: Tonkatsu's Gunbroker Method™ using guns_rifles_rare

Describe alternatives you've considered

Not adding it.

Testing

Started game for load errors, went to gun stores to see if spawning.

Additional context

The volume being comparatively huge to other rifles and holsters is a relic of bad scaling on the other rifles from the n*250ml era of modeling.
Tuna power!
image

@I-am-Erk I-am-Erk added 0.E Feature Freeze [JSON] Changes (can be) made in JSON Items / Item Actions / Item Qualities Items and how they work and interact labels Jan 9, 2020
@I-am-Erk
Copy link
Member

I-am-Erk commented Jan 9, 2020

I'm putting a feature freeze on this that can be removed once the generic guns update is merged so this can be made compliant with it.

@tenmillimaster
Copy link
Member

tenmillimaster commented Jan 9, 2020

You can shave a few more mL off by deleting the magazine from your picture.

Also this ejects tamely enough-maybe it can 'catch brass' by default?

Copy link
Member

@tenmillimaster tenmillimaster left a comment

Choose a reason for hiding this comment

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

Looks quite good.

data/json/items/gun/223.json Outdated Show resolved Hide resolved
data/json/items/gun/223.json Outdated Show resolved Hide resolved
data/json/items/gun/223.json Outdated Show resolved Hide resolved
data/json/items/gun/223.json Outdated Show resolved Hide resolved
@SirPendrak
Copy link
Contributor

Bullpup should not have stock mount slot

@ghost ghost changed the title Add FS2000 Add FS2000(plus STANAG mag volume update) Jan 9, 2020
@ghost
Copy link
Author

ghost commented Jan 11, 2020

GunBroker prevalance math:
image
Taking average of the hypothetical weights 1-20, with total number for M24/Remington 700.

Edit: Added semiauto G3s(count from 1&1semi->1&35 semis, used total of 36) per tenmillimaster's suggestion, weighting moved from 7 to 6.

@ghost ghost marked this pull request as ready for review January 11, 2020 23:10
@ghost ghost requested a review from tenmillimaster January 11, 2020 23:10
Copy link
Member

@tenmillimaster tenmillimaster left a comment

Choose a reason for hiding this comment

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

Some suggested changes. Also a mispelling.

data/json/items/gunmod/mount.json Outdated Show resolved Hide resolved
data/json/items/gun/223.json Outdated Show resolved Hide resolved
@ghost
Copy link
Author

ghost commented Jan 24, 2020

Ran Generic Guns test with FS2000 set to very high weighting so it would be the predominant drop, replaced with sporter carbine as expected. Handguard doesn't(nor is intended to) appear on the migrated rifle, so this should be good now.

Add factory handguard, adjust fs2000 weight


Linty boi + Add looks_like


Correct handguard volume


Apply suggestions from code review

Co-Authored-By: Tonkatsu <[email protected]>
Make Generic Guns work with FS2000 & handguard


Add FS2000 to guns_rifle_rare, Attempt 2


Rebase fixes


Add ranged damage modifier for 17.4in barrel


Remove duplicate handguard entry


Revert change to STANAG30 description
@kevingranade kevingranade merged commit 3928c8f into CleverRaven:master May 4, 2020
@ghost ghost deleted the FS2000 branch May 5, 2020 19:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Items / Item Actions / Item Qualities Items and how they work and interact [JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants