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

Addons to current civilian mobs #78318

Merged
merged 49 commits into from
Dec 16, 2024

Conversation

BioHazardSuit
Copy link
Contributor

@BioHazardSuit BioHazardSuit commented Dec 3, 2024

Summary

Content "Add/adjust some current civilian mobs; added two more types with a gun"

Purpose of change

There would be a good chunk of civilians with their sidearms ready despite the firearm and ammo shortage caused by the blob riots + I'd think it'd be more fitting for civilian fighters to arm themselves with random knives in the kitchen/bugout bag instead of a stick they found somewhere.

Describe the solution

-Gave the civilian fighter a feral knife monster weapon
-Made a officer civilian that uses an AR15
-Made a civilian fighter that uses a handgun instead
-Added them to last stand map extra

Describe alternatives you've considered

Testing

If I remember correctly, everything should work as intended, but

Additional context

I made this like a month, maybe a month+ ago and forgot to actually make a pull request. But I'm pretty sure I had fixed around the minor problems back then so it should be good now

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Monsters Monsters both friendly and unfriendly. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves labels Dec 3, 2024
BioHazardSuit and others added 3 commits December 3, 2024 20:33
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@Night-Pryanik
Copy link
Contributor

I'm not a US police weapons expert, but from I've seen on YT, most police officers assault rifles were variations of AR-15, not Steyr AUG.

@BioHazardSuit
Copy link
Contributor Author

I think I did this because the Aug rifle is unique to the police armory from what Ive seen in the loot table code. Should I change it to the AR-15?

@Night-Pryanik
Copy link
Contributor

Yes, I'd prefer that, but not necessarily specifically AR-15, any variant of it would suffice.

@BioHazardSuit
Copy link
Contributor Author

Alright then. I'll take a look into the police zombie loot table to see what types of AR15s they got first

@GuardianDll
Copy link
Member

For the idea of PR, ferals (and civilians) do not have ammo intentionally, for two reasons: they would use the rounds long before they met player, and secondly that single gun would would be nearly deadly experience (something we do not emulate now, but want to in the future). Shooting monsters is good, but enemies with guns should be limited to locations where they can have an effectively unlimited supply of such rounds, like bunkers

About PR itself, you have much more changes in this PR that you describe, so you either need to divide it, remove changes that are not related to feral changes, or at least explain what you are doing

@BioHazardSuit
Copy link
Contributor Author

Ok will do. I might have done something to feral guns but i cant tell if thats from my repository or.... Ill try to revert that.

For the civilians with guns, Im thinking theyre designed as scene pieces that die from zombies right? So I'm hoping players don't intentionally aggro on gun wielding civilians cause right, fighting shooting monsters are iffy right now and bullet rng hurts.

And hearing more gunshots at the start of an urban round is immaculate

@github-actions github-actions bot added json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Dec 4, 2024
Copy link
Contributor

github-actions bot commented Dec 4, 2024

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

Click to expand
  • firearmed fighter
  • firearmed fighters

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 BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 5, 2024
@github-actions github-actions bot removed the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 6, 2024
@BioHazardSuit
Copy link
Contributor Author

BioHazardSuit commented Dec 8, 2024

Ive updated and set my cdda copy again, and i see whats wrong in my code upon gamestart. I will attempt to fix this later-ish

@BioHazardSuit BioHazardSuit marked this pull request as draft December 10, 2024 10:12
@BioHazardSuit BioHazardSuit marked this pull request as ready for review December 13, 2024 12:58
@BioHazardSuit
Copy link
Contributor Author

BioHazardSuit commented Dec 13, 2024

I have to put them into a whitelists first hmmm

@github-actions github-actions bot added [Python] Code made in Python Code: Tooling Tooling that is not part of the main game but is part of the repo. labels Dec 14, 2024
Copy link
Contributor

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Auto-requesting reviews from non-collaborators: @jbytheway

@github-actions github-actions bot added the Mods: Generic Guns Anything to do with Generic Guns label Dec 14, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 15, 2024
@Night-Pryanik Night-Pryanik merged commit 472c200 into CleverRaven:master Dec 16, 2024
25 checks passed
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 Code: Tooling Tooling that is not part of the main game but is part of the repo. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [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 Mods: Generic Guns Anything to do with Generic Guns Monsters Monsters both friendly and unfriendly. [Python] Code made in Python
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants