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

Adding weapon lights, laser aim modules and appropriate spawns for each + change to police belts #71825

Closed
wants to merge 48 commits into from

Conversation

ANickelN
Copy link
Contributor

@ANickelN ANickelN commented Feb 18, 2024

Summary

Content "Adds weapon lights, laser aim modules and appropriate spawns for each"

Purpose of change

Weapon lights are a common accessory on police and SWAT firearms, LAM are common on military rifles. This PR adds both to the game and gives them appropriate spawns. There is also work being done to create new groups for the police and SWAT teams that reflect appropriate weaponry with appropriate attachments.

While attempting to clean up item groups to aid in those spawns, I noticed the police belt didn't seem to accurately reflect it's namesake so I changed some pockets.

Describe the solution

Add the items and give them spawns.

Describe alternatives you've considered

The way that the weapon light works is as a container currently. The "mount mod" is attached to the weapon, which creates a small pocket that only fits items with the "GUNLIGHT" flag. That flag is used as putting a regular flashlight on a firearm is likely to break it within a few shots.

Testing

Still being done, but so far military and SWAT spawns are partially completed.

Additional context

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons Spawn Creatures, items, vehicles, locations appearing on map Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Feb 18, 2024
@Hyperseeker
Copy link
Contributor

I'm curious about the inclusion of the PEQ-15. Is it significantly-different from the existing rail laser sight? The combat-related stats are the same, which I assume is the result of you copying the JSON? I would never argue against an abundance of different models of gunmods, but here, it doesn't make much sense.

As general notes not directly related to this PR:

Laser sights should see some sort of an audit. Both of the existing ones (and, by extension, the PEQ-15) list integral_volume at 0 ml, which is plain wrong. They don't disappear inside the lower receiver once installed; in fact, they would quite proudly rest on the outside of (most often) the handguard. They really should add volume when installed, and probably exactly as much as their natural volume.

Aside from that... PEQ-15's visible laser diverges at 0.5 mrad, or roughly 1.72 MOA, which should put its dispersion (at the existing ratio of 1 MOA = 100 dispersion) at 172. The existing lasers are as abstract as a gunmod can be, but the few lasers I've modelled for Loadout vary wildly in their divergence. Holosun LS117, one of the higher-end lasers on the market, also has 0.5 mrad of divergence, so it's safe to presume that an average red-laser sight would probably be above that.

(I haven't tested the lasers' performance with these stats yet. I'm simply going off what the docs are telling me.)

@ANickelN
Copy link
Contributor Author

ANickelN commented Feb 18, 2024

I (incorrectly) assumed "integral volume" to mean "How much of the item is inside of the weapon, thereby not increasing volume" That's a simple fix.

I appreciate the quick reviews, but please keep in mind I'm still in draft and not all my changes are in yet.
I want the PEQ in as a separate item because it isn't just a visible laser, and though IR lasers aren't implemented yet in the future they may have some use.
The other laser will have it's stats adjusted to more clearly reflect a civilian laser compared to the big block that is a PEQ.

@Hyperseeker
Copy link
Contributor

I appreciate the quick reviews, but please keep in mind I'm still in draft and not all my changes are in yet.

Ah, understood. I jumped the gun. Will reserve notes until the PR is out of review.

Glad to see a big-boy laser finally in the game. :)

@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Feb 18, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Feb 18, 2024
ANickelN and others added 2 commits February 24, 2024 08:50
Copy link
Contributor

Spell checker encountered unrecognized words in the in-game text added in this pull request. See below for details.

Click to expand
  • A flashlight designed to endure rough conditions. You could attach it to a firearm with a mount. This one is shorter than a regular weaponlight.
  • A small mount for firearms that allows for the attachment of weaponlights.
  • The weaponlight's batteries are dead.
  • You shouldn't see this message.
  • You turn the weaponlight off.
  • compact weaponlight (off)
  • compact weaponlight (on)
  • compact weaponlights (off)
  • compact weaponlights (on)
  • underbarrel weaponlight mount
  • underbarrel weaponlight mounts
  • weaponlight (off)
  • weaponlight (on) (high)
  • weaponlight (on) (low)
  • weaponlight mount
  • weaponlight mounts
  • weaponlights (off)
  • weaponlights (on) (high)
  • weaponlights (on) (low)

This alert is automatically generated. You can simply disregard if this is inaccurate, or (optionally) you can also add the new words to tools/spell_checker/dictionary.txt so they will not trigger an alert next time.

@github-actions github-actions bot added Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. json-styled JSON lint passed, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels Feb 29, 2024
If 1 shot creates 1 level of dirt, there's no way average Joe cop would have discharged his pistol 5000+ times
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Feb 29, 2024
@github-actions github-actions bot removed the json-styled JSON lint passed, label assigned by github actions label Mar 1, 2024
@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Mar 1, 2024
@TheShadowFerret
Copy link
Contributor

TheShadowFerret commented Mar 3, 2024

Shouldn't the police/SWAT professions be updated to start with some of these 👀

Copy link
Contributor

github-actions bot commented Apr 2, 2024

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.

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 Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Items: Armor / Clothing Armor and clothing Items: Gunmod / Toolmod Weapon and tool attachments, and add-ons [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Spawn Creatures, items, vehicles, locations appearing on map stale Closed for lack of activity, but still valid.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants