Skip to content

/Cataclysm-DDA

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

[MWR] Gungrouping #5144

Merged
merged 12 commits into from Dec 23, 2013

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@KA101 @Rivet-the-Zombie @Zaweri
@KA101
Copy link
Contributor

commented Dec 20, 2013

OK, here's the initial rework of gun distribution. Basic ideas were that police typically will have fairly standard gear in their armories, civilian stashes probably won't have automatic/military weapons (or at least not top-of-the-line ones), and survivalists will bias toward weapons suitable for hunting rather than combat.

On the bright side, LMOE guns come loaded now and Rivtech gear should be a bit more common.

I've got it about where I want it, I think. Merge when ready, please.

KA101 added some commits Dec 20, 2013

@KA101
Gun-tightening, pass 1 
RM rifles, having burst capacity, are Assault weapons at best.  Same
with the Saiga.  Gave drug dealers the short-shotgun as it'd work quite
well in that capacity, IMO.  Still WIP.
05e0da0
@KA101
LMOE grouping 
Creates a specific group for guns a survivalist/gun-fan might have,
rather than the catchall "all_guns"; however, these guns come loaded.

Also cleans up a few descriptions in ranged.json and makes the Rivtech
civilian-market gear marginally more likely to show up in a
store-defense role (behind the counter).
f6a768f
@KA101
Instates the homegun-basements and PD armory 
This tightens and implements the new spawngroups.  Basically, civilians
go with rifles and shotguns rather than SMGs, and the police have far
less variety in the guns left around at base.

Cops can still have tonfas, grenade launchers, etc--just on their rezzed
person.  (And yes, some departments are procuring P90s IRL.)
c25002e
@KA101
comma fix
Loading status checks…
ff493a0
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Dec 20, 2013

This is looking pretty good.
@KA101
Mansion guns 
Puts the antiques and some imports in the Mansion's studies, galleries,
and (rarely) bedrooms.
Loading status checks…
71aed65
data/json/items/ranged.json Outdated
@@ -2143,7 +2143,7 @@
"symbol": "(",
"color": "magenta",
"name": "LACP laser pistol",
"description": "The LACP laser pistol was based on the v29 laser pistol designed in the mid-21st century, while little more then duct tape and electonics it uses the powerful fusion pack.",
"description": "The LACP laser pistol was based on the v29 laser pistol designed in the mid-21st century. While little more then duct tape and electronics, it runs on a standard UPS.",

This comment has been minimized.

Sign in to view
Copy link
@Rivet-the-Zombie

Rivet-the-Zombie Dec 21, 2013

Member

then =! than

This comment has been minimized.

Sign in to view
Copy link
@KA101

KA101 Dec 21, 2013

Author Contributor

Gagh. Thanks.

KA101 added some commits Dec 21, 2013

@KA101
fix typo
Loading status checks…
8900368
@KA101
Adds Tanto & wakizashi 
Since I'm in the Mansion anyway (potential self-merge-conflict) I
thought I might as well add the rest of the Japanese gear and
armor-stand in this PR.  If you mind, lemme know, OK?
c2fb42f
@KA101
Because I bought it in Japan 
We needed to have the samurai armor spawn somewhere and this seemed as
good a place as any.

(1980's Batman reference, in case anyone wonders about the commit
message.)

I'm a bit generous with the weaponry, because if you hit the 1/6 for
armor and then the 1/10 for Japanese, you may as well win something
nice.
Loading status checks…
13f4a26
@KA101
spawns and recipes 
This should do it for the Japanese Weapons segment.
9f1615b
@KA101
Survivalist upgrade 
Gives the residential bunker a small shot of LMOE and buffs the Weapons
Cache a bit.

However, this also knocks down the LMOE (ARs to SMGs) and takes a small
shot at the Mansion group.
Loading status checks…
65e28fd
@KA101
Mansion checks 
At this point, I think it's pretty good.
Loading status checks…
47f702a
@Zaweri

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Dec 22, 2013

Why would you remove ALL THE SPAWNS for the ARX-160 and not make any other spawns? facedesk
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Dec 22, 2013

I'm going to guess that was a simple mistake. It's easy to do when you're moving that many entries around at once.
@KA101

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Dec 22, 2013

OK. I didn't intend to totally despawn the ARX-160...though every time I pulled it was for cause. (So I don't have a place where it'd logically spawn.)

Ran a Wiki check and "widely used by military all around the world" = Albania, Egypt, Italy, Kazakhstan, Mexico, and Turkmenistan. Not to the same spec as (say) the MP5. There is a civilian semi-auto ARX-100 sold in the US, if you'd rather give the SKS some competition.
@KA101
spawn for ARX-160 
1 in lmoe_guns isn't bad (because basements with gun caches get a small
roll in lmoe).  But suspension/disbelief is still an issue here.
Loading status checks…
8be1017
@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Dec 22, 2013

It's also a Beretta, so you have to be independently wealthy in order to realistically afford one.

Rivet-the-Zombie added a commit that referenced this pull request Dec 23, 2013

@Rivet-the-Zombie
Merge pull request #5144 from KA101/gungrouping 
[MWR] Gungrouping
a46b22e

@Rivet-the-Zombie Rivet-the-Zombie merged commit a46b22e into CleverRaven:master Dec 23, 2013
1 check passed

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.

@KA101 KA101 deleted the KA101:gungrouping branch Dec 23, 2013

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.