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

I just pulled the Draco out the Rari #75633

Merged
merged 11 commits into from
Aug 15, 2024

Conversation

Holli-Git
Copy link
Contributor

@Holli-Git Holli-Git commented Aug 12, 2024

Summary

Content "Draco pistol additions"

Purpose of change

I noticed that the mini draco we had in game seemed to be a mismash of all the dracos. I originally wanted to just fix this, but realized all the draco variants can fit in the game, so I did that.

Describe the solution

Adds in 3 new guns, adjusts 1.
Draco: Following the ID name, I changed it to the biggest draco.
Mini draco: A smaller version of the draco
Micro draco: An even smaller version
NAK9: Essentially a draco in 9mm

Describe alternatives you've considered

Just adjusting the draco

Testing

Spawning:
image
image
image

Additional context

image

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Spawn Creatures, items, vehicles, locations appearing on map Code: Tests Measurement, self-control, statistics, balancing. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mods: Generic Guns Anything to do with Generic Guns astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Aug 12, 2024
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Aug 13, 2024
Copy link
Contributor

@TheShadowFerret TheShadowFerret left a comment

Choose a reason for hiding this comment

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

Angry Glock noises

data/json/items/gun/9mm.json Outdated Show resolved Hide resolved
data/json/items/gun/9mm.json Outdated Show resolved Hide resolved
data/json/items/gun/762.json Outdated Show resolved Hide resolved
data/json/items/gun/762.json Outdated Show resolved Hide resolved
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
  • Dracos
  • Micro Dracos
  • Mini Dracos
  • NAK 9
  • NAK 9s
  • The Draco series of guns are guns imported by Century Arms. They're essentially semi-auto AKs, but with shorter barrels and no stock. While advertised as compact guns, they're more often than not range toys. This one is a Draco, the largest, with a 12.5" barrel.
  • The Draco series of guns are guns imported by Century Arms. They're essentially semi-auto AKs, but with shorter barrels and no stock. While advertised as compact guns, they're more often than not range toys. This one is a Micro Draco, the smallest, with a 6.25" barrel. It has a distinctive, oddly curvy handguard.
  • The Draco series of guns are guns imported by Century Arms. They're essentially semi-auto AKs, but with shorter barrels and no stock. While advertised as compact guns, they're more often than not range toys. This one is a Mini Draco, with a 7.75" barrel, short enough that the handguard had to be modified.
  • The NAK 9 is a Century Arms imported gun. It is essentially a shortened AK with no stock, chambered in 9mm and accepting Glock magazines, with an 11.14" barrel.

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.

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.

I'm ambivalent on splitting out the draco into different dracos. The nak-9 is a good addition.

data/json/items/gun/762.json Outdated Show resolved Hide resolved
@Holli-Git
Copy link
Contributor Author

I'm ambivalent on splitting out the draco into different dracos. The nak-9 is a good addition.

I did it as the damage difference between the Draco and mini/micro ones is quite steep, and the micro can fit in a large holster with a 30 rounder, while the others cannot fit in a holster regardless of magazine

@tenmillimaster tenmillimaster self-requested a review August 14, 2024 22:12
@Maleclypse Maleclypse merged commit 2fed395 into CleverRaven:master Aug 15, 2024
22 of 24 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: Tests Measurement, self-control, statistics, balancing. 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 Mods: Generic Guns Anything to do with Generic Guns Spawn Creatures, items, vehicles, locations appearing on map
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants