New guns, calibres, and conversion kits, fixed PR. #64934
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
[JSON]
Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com>
…oomstick/Cataclysm-DDA into more_boomsticks_retooled
fixes merge errors.
…) to the classic zombies blacklist.
…oomstick/Cataclysm-DDA into more_boomsticks_retooled
github-actions
bot
added
the
BasicBuildPassed
|
In the future, being able to describe gun groups that are allowed for mods, or have variants spawn with mods to clean up some ID bloat would be nice, but no need to hold this up further. |
SurFlurer
added a commit
to SurFlurer/Cataclysm-DDA
that referenced
this pull request
May 26, 2023
commit d17ca98 Merge: a4a8dab 9c6f3d6 Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Fri May 26 00:33:59 2023 -0500 Merge pull request CleverRaven#65791 from CleverRaven/changelog-weekly-2023-05-22 Weekly Changelog 2023-05-15 to 2023-05-22 commit a4a8dab Author: SurFlurer <22912139+SurFlurer@users.noreply.github.com> Date: Thu May 25 15:45:48 2023 +0000 Gunsmith ammo convert json EOCify and cleanup (CleverRaven#65775) * Gunsmith EOCify and cleanup part 1 * update * Fix ammo_belt failure * Fix backward compatibility * Revert "Fix backward compatibility" This reverts commit 3e07162. * some cleanup * Further EOCify * Typo * for compatibility * make it shorter * Add var migration * Dot consistency * Add dummy parser for var_migration commit 2f73db6 Author: RetroStoat <74816566+Cataclysmanic@users.noreply.github.com> Date: Thu May 25 09:09:20 2023 -0500 Modified existing and added new snippets for Kaluptic Psychosis (Schizophrenia) (CleverRaven#62968) * Modifies and adds Snippets for Kaluptic Psychosis Added more snippets and edited previous ones to sound more human. New snippets add another layer to Psychosis aside from typical homicidal maniac. Notably adds several item voicelines. Adding casual dialogue, humor, and lines of worry or disdain Removed a couple corny lines, and also removed limb breakage line. * Update schizophrenia.json * Update schizophrenia.json * Fixed ellipsis and punctuation * Update data/json/snippets/schizophrenia.json * Apply suggestions from code review * Apply suggestions from code review * Update schizophrenia.json --------- Co-authored-by: Fris0uman <41293484+Fris0uman@users.noreply.github.com> Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> commit 7aab125 Merge: 81746f6 e300076 Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Thu May 25 00:19:43 2023 -0500 Merge pull request CleverRaven#65818 from anoobindisguise/patch-14 lower fur bodyarmor encumbrance a bit commit 9c6f3d6 Author: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Wed May 24 22:58:31 2023 -0500 Apply suggestions from code review Co-authored-by: David Seguin <davidseguin@live.ca> commit 81746f6 Author: Alexey <irwiss@users.noreply.github.com> Date: Wed May 24 22:45:19 2023 +0300 Vehicle part variants tidy (CleverRaven#65823) * Print variant in part name if debug_mode is on * Windshields copy-from * Doors copy-from * Seats copy-from * Remove slightly redundant values in seats * Remove flag with no effect * Remove redundant variant from forklift * Aisles copy-from * Pull loose doors to doors.json * Convert _rear wheels to symbols * Remove rarely/unused vpart variants * Add missing symbols commit 4dc67b5 Author: casswedson <58050969+casswedson@users.noreply.github.com> Date: Wed May 24 14:43:00 2023 -0500 fix: wizard's apprentice achievement (CleverRaven#65789) * fix: typos on new char screen for once I played a custom character to try out a mod and hey I found things to fix * fix: wizard's apprentice achievement entering a school of magic in magiclysm gives you a default spell so you end up triggering the "learn 3 spells" after actually just learning 2 spells from different schools change it to 5 to account for the default spells --------- Co-authored-by: casswedson <casswedson@users.noreply.github.com> commit 1d1b33b Author: David Seguin <davidseguin@live.ca> Date: Wed May 24 15:37:18 2023 -0400 Apply suggestions from code review Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> commit 231f46e Merge: 9e311b2 68bd190 Author: David Seguin <davidseguin@live.ca> Date: Wed May 24 15:30:13 2023 -0400 Merge pull request CleverRaven#65814 from jbytheway/clang-tidy_cert-err33-c Enable clang-tidy check cert-err33-c commit 9e311b2 Author: John Bytheway <52664+jbytheway@users.noreply.github.com> Date: Wed May 24 15:25:38 2023 -0400 Allow standard includes in clang-tidy tests (CleverRaven#65806) All the clang-tidy tests, because they use check_clang_tidy.py, have been unable to use any C++ STL headers. check_clang_tidy.py adds the -nostdinc++ to prevent this. Now that we are using our own copy of check_clang_tidy.py we can change this decision. This will allow us to drop a bunch of duplicate code and ensure that our mock implementations in the tests do not diverge too much from the reality. Do this, via a new option -allow-stdinc, where tests can opt in if they wish. Update all the tests that previously worked around this limitation to just use the regular includes instead. This allows us to simplify point.h, which had previously had special treatment to allow including it without access to the C++ headers. The main divergence I discovered that had already happened between the tests and main codebase was that the tests still used JsonIn in deserialize functions, which is no longer supported in the main code. Those tests updated accordingly. commit 68bd190 Author: John Bytheway <52664+jbytheway@users.noreply.github.com> Date: Tue May 23 20:20:41 2023 -0400 Fix type for Windows build On Windows, there's no sighandler_t typedef. commit ba794fe Author: John Bytheway <52664+jbytheway@users.noreply.github.com> Date: Tue May 23 06:59:11 2023 -0400 Enable clang-tidy check cert-err33-c This check looks for unused return values on a variety of C library functions. I resolved most of the warnings by printing out some kind of error message in the event that the function failed. Many of them are low-level things whose failure indicates some sort of serious problem, so the errors are simply printed to stderr, because our usual error reporting infrastructure might not be available. commit 09b378d Merge: afa5aca fd4546e Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Wed May 24 00:44:21 2023 -0500 Merge pull request CleverRaven#65816 from Nebnis/Adjustment-to-mess-kit-and-large-shelter-kit Misc fix to some random items commit afa5aca Author: Bence <44979050+LovamKicsiGazsii@users.noreply.github.com> Date: Wed May 24 05:31:33 2023 +0100 commit (CleverRaven#65807) commit 85d330b Author: Alexey <irwiss@users.noreply.github.com> Date: Wed May 24 07:30:09 2023 +0300 Fix divide by zero in driving offset (CleverRaven#65809) * Add inverse_lerp, linear_remap to cata_utility.h * Fix game::calc_driving_offset using a NaN commit fc24b0e Author: WhiteCloud0123 <112397151+WhiteCloud0123@users.noreply.github.com> Date: Wed May 24 12:27:25 2023 +0800 Prevent mounted animals from reacting to hallucinations. (CleverRaven#65813) * mounted horse ignores hallucination * add to check_mount_is_spooked * fix commit f8343f7 Author: Jeremy Rose <nornagon@nornagon.net> Date: Tue May 23 21:21:34 2023 -0700 makeshift electrolyzer shouldn't contain lye (CleverRaven#65820) commit 7ef3846 Author: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Date: Wed May 24 00:19:52 2023 -0400 [Magiclysm] Profession stoof (CleverRaven#65829) commit b00e875 Author: RenechCDDA <84619419+RenechCDDA@users.noreply.github.com> Date: Wed May 24 00:18:48 2023 -0400 Glassmaking audit (CleverRaven#65747) * rationalize glass production * Also rationalize innawoods glass * Linting is my bane recently 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> commit b365e7a Author: Alexey <irwiss@users.noreply.github.com> Date: Wed May 24 07:17:44 2023 +0300 Fix electric oil press (CleverRaven#65817) commit 66a8961 Author: Tim Pollard <timp@timp.com.au> Date: Wed May 24 14:16:45 2023 +1000 Xedra Evolved spell audit (CleverRaven#65793) * Auditing Xedra spells for class, energy cost, and increment settings. Some of the spells outside of classless_spells.json didn't have a class set, and there was a few that did have an energy cost, but no energy source set. In addition some of the _increment values where producing odd values, and would never actually hit the final_ or max_ values. * Changing the Xendra Evolved spell blur to use blurred_aura It was using the nearly-identical obfuscating_aura item from Magiclsym instead, but that meant the spell would only work if you had both Magiclsym and Xedra Evolved on your world. commit 3800362 Author: Dillon Matchett <dillon.matchett@gmail.com> Date: Wed May 24 01:15:59 2023 -0300 Global and character variable migrations (CleverRaven#65810) * Global and character variable migrations * Docs * Apply suggestions from code review * Update src/global_vars.h commit e300076 Author: anoobindisguise <56016372+anoobindisguise@users.noreply.github.com> Date: Tue May 23 10:26:11 2023 -0700 lower fur bodyarmor encumbrance a bit commit e565014 Author: DoctorBoomstick <102766473+DoctorBoomstick@users.noreply.github.com> Date: Tue May 23 16:23:35 2023 +0200 New guns, calibres, and conversion kits, fixed PR. (CleverRaven#64934) * adds the files in the items/ammo folder. * adds the files in the items/armour folder. * adds the files in the items/book folder. * adds the files in the items/container folder. * adds the files in the items/generic folder. * adds the files in the items/gun folder. * adds the files in the items/gunmod folder. * adds the files in the items/magazine folder. * adds asorted files in the items folder. * adds the conversions folder in the itemgroups/Weapons_Mods_Ammo folder. * adds files in the itemgroups/Weapons_Mods_Ammo/arsenal folder. * adds the files in the itemgroups/Weapons_Mods_Ammo folder. * adds files in the itemgroups folder. * adds files in the itemgroups/SUS folder. * adds files in the uncraft/ammo folder. * adds files in the requirements folder. * adds files in the recipes folder. * adds files in the json folder. * adds files in the mods/Generic_Guns folder. * last tweeks. * fixes a typo in the disc for the AI .308 10-round magazine. * general damage tweeks. * fixes merge errors. * fixes merge errors. * starts fixing bugs. * fixes bugs. * hooks up the ammo with the new barrel length system. still needs to add the barrel lengths to the guns themselves. * adds the barrel lengths to the .223 guns. * Update data/json/items/ammo/338lapua.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update data/json/items/ammo/450bushmaster.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update data/json/items/ammo/50_beowulf.json Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> * Update data/json/items/ammo/338lapua.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Adds a 20-inch conversion .223 kit for AR-15 rifles, representing those found on M16s. also adds in all the barrel-lengths for weapons in .300, .308, .30-06, and 12.3ln. * Commits suggested changes. * fixes the, "last," bug. I hope. please God. * Does a broad stroke to get gun migrations underway. Hope this doesn’t break… everything . * fixes pointed out bugges. * actualy fixes the shotgun bug. * lints, lints, lints, and lints some more. * Fixes the solitary erroneous file. * fixes more bugs. * retrigger checks * tweeks and bug fixes, makes the long version of the ar15 upper findable on guns and usable in crafts/ weapon mods. * Adds/ fixes gun entries in generic guns. * adds the last gun to generic guns. * look at that, more bug fixes. * adds more values for .223 barrel lengths and removes ranged damage entries from the conversions. they were causing errors, and the new barrel length system should make them unneeded anyhow. * Adds name plural forms for the conversion kits which need them. * Gives the prepped patriot a leg bag for storage. * adds no turret flags to all the guns which need it. * fixes a tiny bug. * the M231 wasn't lacking an ammo entry. No. I didn't forget that. this commit doesn't add that entry. * retrigger checks * retrigger checks * Update data/json/items/magazine/762.json Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> * Removes the redundant ranged damage entry. * fixes blacklist errors and adds the post-2000 guns (i.e. all the guns) to the classic zombies blacklist. --------- Co-authored-by: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheShadowFerret <99621099+TheShadowFerret@users.noreply.github.com> Co-authored-by: Dillon Matchett <dillon.matchett@gmail.com> commit fd4546e Author: Nebnis <104400556+Nebnis@users.noreply.github.com> Date: Tue May 23 11:20:11 2023 -0300 added suggestions commit 222be7c Author: Nebnis <104400556+Nebnis@users.noreply.github.com> Date: Tue May 23 10:54:51 2023 -0300 Update data/json/items/tool/cooking.json Co-authored-by: Karol1223 <68503002+Karol1223@users.noreply.github.com> commit 3d1627d Author: fairyarmadillo <94415528+fairyarmadillo@users.noreply.github.com> Date: Tue May 23 05:47:29 2023 -0700 Redo molting with crabs (CleverRaven#65459) Co-authored-by: fungamer2-2 <56766520+fungamer2-2@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Kevin Granade <kevin.granade@gmail.com> commit e053472 Author: Nebnis <animasana1@hotmail.com> Date: Tue May 23 08:49:13 2023 -0300 more small fixes commit b8c049e Merge: 559cba8 598ece3 Author: Angela Graves <rivet.the.zombie@gmail.com> Date: Tue May 23 00:11:48 2023 -0500 Merge pull request CleverRaven#65561 from stubkan/stubkan-wandering-in-the-open Wandering Hordes prefer to wander and recruit in open terrain commit 559cba8 Author: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Tue May 23 04:02:14 2023 +0200 [Xedra Evolved] Random fixes and changes (CleverRaven#65737) * initial commit * fixes * fixes 2 * Update data/mods/Xedra_Evolved/spells/dreamer_spells.json Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> * more changes * spell * last fixes * added 57 to blocky pistol * ...again * sane some inventor gunmods recipes * decrease the weight of blocky pistol to fit it in holster when its full * not that much decrease * small tweak of inventor gunmods * fix typo in research recipes * add barrel volume to repeater * fixes in inventor batteries recipes * make message of research end be much more visible * make wolf's mask not kill player's stamina * and also boost the effect, for the same reason --------- Co-authored-by: Maleclypse <54345792+Maleclypse@users.noreply.github.com> commit 6b2fc5e Author: Anton Simakov <67688115+GuardianDll@users.noreply.github.com> Date: Tue May 23 00:57:06 2023 +0200 Update military.json (CleverRaven#65803) commit cf2a710 Author: SurFlurer <22912139+SurFlurer@users.noreply.github.com> Date: Mon May 22 21:45:35 2023 +0000 Renaming duplicate group name (CleverRaven#65801) Co-authored-by: mqrause <38702195+mqrause@users.noreply.github.com> commit b054d60 Author: Nebnis <animasana1@hotmail.com> Date: Mon May 22 16:57:15 2023 -0300 oops commit 36557a2 Merge: 8e7b08a 55dcdcf Author: Nebnis <animasana1@hotmail.com> Date: Mon May 22 16:50:42 2023 -0300 misc changes commit 8e7b08a Author: Nebnis <animasana1@hotmail.com> Date: Mon May 22 16:47:51 2023 -0300 misc changes commit 1203304 Author: David Seguin <davidseguin@live.ca> Date: Mon May 22 01:11:13 2023 +0000 Weekly Changelog 2023-05-15 to 2023-05-22 commit 55dcdcf Author: Nebnis <104400556+Nebnis@users.noreply.github.com> Date: Thu May 11 12:36:36 2023 -0300 fix to missing items commit 598ece3 Author: stubkan <subnormalx@hotmail.com> Date: Tue May 9 23:31:18 2023 +0100 combined multiple if conditionals to single line to pass checks commit 4da904e Author: stubkan <subnormalx@hotmail.com> Date: Tue May 9 22:59:01 2023 +0100 Fixed recruitment terrain checks and made them less intensive on overhead commit 6dc1cc3 Author: stubkan <subnormalx@hotmail.com> Date: Tue May 9 22:00:26 2023 +0100 Added new wandering horde check for individual zombies being in the open Restricted wandering horde preference to move into open terrain
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Content "Migrates the changes from PR #64743. Adds 24 caliber conversion kits for various weapons, 13 new guns, 3 new calibres, and 3 professions, and migrates over the abandoned changes left behind in PR #63074."
Purpose of change
Following some rebase and merge errors, I had to close #64743, as it had become what could be generously described as a crap sandwich of errors and conflicts. This PR simply rescues and migrates over the files left behind in that PR. For the sake of ease of reference, the PR overview has been copied over.
Within the limits of real-world firearms’ use, caliber conversion kits for rifles (most notably the AR-15 platform) are rather prolific, with a number of such kits being in production and serving shooters within the remits of the roles they’re engineered for. This being said, such retool kits have been, for one reason or another, very thin on the ground within CDDA, with, at present, only a single .300 AAC Blackout kit existing in the whole game. This has led to guns like the abovementioned AR-15 rifles, as well as other arms like Glock pistols, not possessing the types of caliber swapping capabilities that their modular designs are prominently known for.
Personally, I believe that an effective implementation of such a mechanic could provide interesting tactical opportunities, as is the case with the Hub HWP. Apart from that, it could also assist in helping to elevate some firearms above their peers as far as individual utility goes and help them stand out from the current hordes of metal pue pue sticks that dump archaically named bullets into zombies.
Unrelated to caliber conversion kits, in PR #63074 I started to rework firearm damage modifiers in order to bring them up to speed with the currently established formula for determining such statistics. Due to various merge errors, rebase mistakes, and a large amount of IQ/coffee deprivation on my behalf, the entire PR got somewhat imploded following the release of 0.G, prompting me to shut it down.
Describe the solution
With respect to the caliber conversion kits, I have based their function on the current implementation of the HWP attachment system. Fundamentally, this involves having the base firearm itself simply be an empty frame, lacking any defined ammunition type, range value, damage amount, etc. Such values are only introduced with various removable and installable conversion kits that provide the weapons with their gun-related functionality.
As such, most of the AR-platform rifles, for example, have had their numbers tweaked to represent solitary lower receivers, with the differences made up by the installable conversion kits, which act as detachable upper receivers. All guns that possess this functionality are guaranteed to come with such a kit already installed by default, with these empty frames never spawning game-side. In addition, kits with differing barrel lengths have also been included, ranging from standard 16-inch assemblies to compact 7.5-inch CQB versions. These options allow players to indulge themselves in a very questionable game of dress-up with their guns by being able to retool their weapons according to their preferences and situations, like some form of metal Barbie doll.
A selection of screen shots in which this functionality is demonstrated is included here.
Describe alternatives you've considered
I considered extending this PR further and adding a number of pistol-caliber and handgun-related conversions to the complement already present. I decided against this as pistol-related conversions would likely demand a similar amount of work and content to that already presented here, and I wished to try and keep this PR manageable in its size.
I also wished to add the 338 Norma Magnum as a caliber but opted to leave it for another day for the same reasons outlined above.
Testing
I spawned into an active game and observed that no errors manifested themselves. Following this, I systematically spawned a number of convertible guns and spent some time attaching and detaching several conversion kits from them, firing different calibres through the weapons, and generally trying to see where any incongruities might arise.
Additional context
What follows is a list of internet resources and links that I consulted for information used in the creation of this PR:
Ruger® Hawkeye® Guide Gun Bolt-Action Rifle Model 47118
Ruger Precision® Rifle Bolt-Action Rifle Model 18081
Ruger Precision® Rifle .300 Win Mag / .300 PRC 5-Round Magazine (shopruger.com)
CZ BREN 2 Ms CARBINE 223 REM (czub.cz)
CZ BREN 2 Ms 7,62x39 11" (czub.cz)
Review: CZ Bren 2 Ms | An Official Journal Of The NRA (americanrifleman.org)
Barrett MRAD .338 Lapua Bolt Action Rifle | Flat Dark Earth | Palmetto State Armory
https://www.savagearms.com/content?p=firearms&a=product_summary&s=22448
https://www.mcmillanfirearms.com/sacitem.aspx?item=mcmtac338lapua
Accuracy International - AXMC Series Rifle – Sporting Services
https://www.czub.cz/en/firearms-and-products-product/cz-600-trail
https://www.ruger.com/products/americanRifleRanch/specSheets/16950.html
https://thegunzone.com/best-ar-15-calibers-conversion-kits/
https://www.pewpewtactical.com/best-ar-15-calibers-conversion-kits/#toc5
https://www.americanrifleman.org/content/first-look-cmmg-5-7x28-mm-ar-conversion/
https://www.57center.com/
https://www.bearcreekarsenal.com/300-blackout-16-parkerized-heavy-1-8-twist-pistol-15-hanguard-rear-forged-nrail.html
https://underwoodammo.com/12-7x42-designed-for-use-in-50-beowulf-firearms-420gr-xtreme-penetrator-solid-monolithic-hunting-self-defense-ammo/
12.7x42 AR-15 Heavy Barrel | High Accuracy (bearcreekarsenal.com)
https://www.bearcreekarsenal.com/12-7-x-42-16-parkerized-hb-1-20-twist-carbine.html
https://www.bearcreekarsenal.com/bca-ar-15-barrel-10-5-4150-black-nitrided-steel-heavy-barrel-12-7x42-pistol-length-gas-system-w-1-20-twist.html
https://www.bearcreekarsenal.com/5-56-nato-16-parkerized-m4-mid-length-1-7-twist-15-handguard-upper-nrail-spiral-flash.html
https://www.bearcreekarsenal.com/5-56-nato-10-5-parkerized-m4-1-7-twist-carbine-standard-handguard-upper.html
https://deserttech.com/conversion-kits.php
https://www.cheaperthandirt.com/ammunition/rifle-ammo/.450-bushmaster/
https://www.sellier-bellot.cz/en/products/rifle-ammunition/rifle-ammunition-target-match/detail/475/
https://www.nammo.com/product/our-products/ammunition/small-caliber-ammunition/8-6mm-series-338/8-6-mm-x-70-338-lapua-magnum-armor-piercing/
Tactical ammunition for MIL / LE | AP and API projectiles - Lapua
AXMC (accuracyinternational.com)
Search results for: '.450' (bearcreekarsenal.com)
https://www.primaryarms.com/radical-firearms-762x39mm-barreled-upper-16in-primary-arms-exclusive
https://www.righttobear.com/7-62-39-ar-magazines/