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

Militia Community #73053

Merged
merged 10 commits into from
May 19, 2024
Merged

Conversation

RanikOrtega
Copy link
Contributor

@RanikOrtega RanikOrtega commented Apr 16, 2024

Summary

Content "Prepper Militia Community"

Purpose of change

To create a community to represent the surviving militia members / former emergency services.

Describe the solution

Created a WiP Prototype of the community. Currently a Merchant and several NPC guards. Merchant will also give quests in later updates.

Describe alternatives you've considered

Not making it.

Testing

Generated Location via both overmap editor and by finding it via natural spawning. Entered location spoke with NPC's and tried to steal items. Spoke with trader merchant etc etc.

Additional context

Lodge 1st
Lodge 2nd

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display labels Apr 16, 2024
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
  • Darby Sutton

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.

Hints for adding a new word to the dictionary
  • If the word is normally in all lowercase, such as the noun word or the verb does, add it in its lower-case form; if the word is a proper noun, such as the surname George, add it in its initial-caps form; if the word is an acronym or has special letter case, such as the acronym CDDA or the unit mW, add it by preserving the case of all the letters. A word in the dictionary will also match its initial-caps form (if the word is in all lowercase) and all-uppercase form, so a word should be added to the dictionary in its normal letter case even if used in a different letter case in a sentence.
  • For a word to be added to the dictionary, it should either be a real, properly-spelled modern American English word, a foreign loan word (including romanized foreign names), or a foreign or made-up word that is used consistently and commonly enough in the game. Intentional misspelling (including eye dialect) of a word should not be added unless it has become a common terminology in the game, because while someone may have a legitimate use for it, another person may spell it that way accidentally.

@github-actions github-actions bot added the astyled astyled PR, label is assigned by github actions label Apr 16, 2024
@Hyperseeker
Copy link
Contributor

What is the plan for the equipment the members of this faction wield or wear? A lot of gun enthusiasts like to kit out their guns with absolutely everything, as well as wear all sorts of military-style equipment. For example:

They may or may not serve as a solid basis for what the militia might carry. I'm curious if this is something you're considering: a bunch of gun & gear enthusiasts, some with military equipment but most not, wearing gear either for the drip (even if it doesn't jive well together) or for the clout (to show off how much money they'd spent on it), and kitting out their guns for show more than actual performance.

(I'm not saying all gearheads are like that, but it may be one aspect that's worth showcasing.)

@github-actions github-actions bot added the json-styled JSON lint passed, label assigned by github actions label Apr 16, 2024
@RanikOrtega
Copy link
Contributor Author

RanikOrtega commented Apr 17, 2024

What is the plan for the equipment the members of this faction wield or wear? A lot of gun enthusiasts like to kit out their guns with absolutely everything, as well as wear all sorts of military-style equipment. For example:

They may or may not serve as a solid basis for what the militia might carry. I'm curious if this is something you're considering: a bunch of gun & gear enthusiasts, some with military equipment but most not, wearing gear either for the drip (even if it doesn't jive well together) or for the clout (to show off how much money they'd spent on it), and kitting out their guns for show more than actual performance.

(I'm not saying all gearheads are like that, but it may be one aspect that's worth showcasing.)

I would place them as more practically equipped. Some attachments on their weaponry but mainly focusing on optics rather than side rail flashlights, lasers or angled iron sights. Part of their backstory setup is the few people who did make it were less prepared than they initially had planned for. For that matter, a qood quest prompt for them might be "Hey half our stuff was confiscated by a military checkpoint here. Help us find it and you can keep some of it."

@Hyperseeker
Copy link
Contributor

That also makes sense. If they're ex-military, they know how to equip well for a real firefight.

As an aside: angled iron sights are out of favor with the military. From what I've heard so far, it's easier to re-aim with a sight that's already on the same axis, than it would be to rotate the entire rifle (and offset your recoil location, making you hit outstanding tissue in the dominant arm while shooting).

Today, the US Army (and a few other branches) uses LPVOs: low-power variable optics, a scope that can change between 1x and 6x (usually) magnification. Essentially, it's your close-quarters and long-range fighting optic, all in one.

https://www.sigsauer.com/media/catalog/product/cache/2f7933e2ff16f0ec074a16ab6b6195f2/t/6/t6t-front-left.jpg

Before that, the favorable arrangement for the Army was an ACOG with an RMR mounted on top of it:

https://www.trijicon.com/uploads/product-uploads/TA01-D-100555_315-326-1565970773.jpg

We have hybrid_sight_4x: an ACOG with a sights slot atop. Add this and a red dot sight to the equipment, and you'll get a good approximation of the Army's sights layout. We do not have an LPVO in the game, and the closest to it would be the regular rifle scope. (It's possible to implement one, and I already have in my mods, though that's probably outside the scope of this PR.)

If you want to know what kinds of attachments could reasonably be expected on a military rifle, you can check out SOPMOD. It's the kit that was supplied to deployed US Army infantry for the longest time. Each rifle with SOPMOD would be equipped for a different purpose, so it wouldn't be unlikely to see a mix of different attachments/slots of a rifle.

@github-actions github-actions bot added the Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. label Apr 23, 2024
@RanikOrtega RanikOrtega marked this pull request as ready for review April 23, 2024 01:24
@RanikOrtega
Copy link
Contributor Author

RanikOrtega commented Apr 23, 2024

Marking this as ready for review. It's mostly ready for launch but I would appreciate some heavy review if possible.

@RanikOrtega RanikOrtega changed the title Militia Community Draft Militia Community Apr 23, 2024
Copy link
Contributor

@Procyonae Procyonae left a comment

Choose a reason for hiding this comment

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

Looks cool ^-^

data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
data/json/mapgen/militia/GM_LODGE.json Show resolved Hide resolved
@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions and removed json-styled JSON lint passed, label assigned by github actions labels May 19, 2024
@Maleclypse Maleclypse merged commit eddb236 into CleverRaven:master May 19, 2024
20 of 24 checks passed
RanikOrtega added a commit to RanikOrtega/Cataclysm-DDA that referenced this pull request Jul 2, 2024
Update to CleverRaven#73053 with pallete cleanup, item list cleanup and better map layout.
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 BasicBuildPassed This PR builds correctly, label assigned by github actions Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants