-
Notifications
You must be signed in to change notification settings - Fork 223
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
Gun Buffs #1861
base: master
Are you sure you want to change the base?
Gun Buffs #1861
Conversation
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
WalkthroughThis pull request updates several weapon configuration YAML files. A sprite state has been removed from an ammunition box configuration while a new minigun magazine entity (and its corresponding tag) has been added. Damage values and numeric properties for various projectile types have been increased. Additionally, the minigun entity in HMG configuration received extensive component overhauls—including new firing-angle constraints, ammo provisioning, and speed modifiers—while SMG entities had their fire rates adjusted and deprecated entities commented out. Changes
Sequence Diagram(s)sequenceDiagram
participant User
participant Minigun
participant Wieldable
participant AmmoProvider
participant Gun
participant ItemSlots
User->>Minigun: Initiate fire command
Minigun->>Wieldable: Verify weapon is held
Minigun->>AmmoProvider: Request ammo (reload with sound)
AmmoProvider-->>Minigun: Supply ammo
Minigun->>ItemSlots: Check magazine/chamber status
Minigun->>Gun: Validate firing angles (80°–200°)
Gun-->>Minigun: Angle confirmed
Minigun->>User: Fire projectile with enhanced parameters
Poem
Suggested labels
Suggested reviewers
📜 Recent review detailsConfiguration used: CodeRabbit UI 📒 Files selected for processing (1)
⏰ Context from checks skipped due to timeout of 90000ms (4)
🔇 Additional comments (1)
🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 5
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (9)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
(0 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml
(2 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
(2 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
(4 hunks)Resources/Prototypes/tags.yml
(1 hunks)
💤 Files with no reviewable changes (1)
- Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml
🧰 Additional context used
🪛 YAMLlint (1.35.1)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
[error] 35-35: wrong indentation: expected 4 but found 2
(indentation)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
[warning] 153-153: too few spaces before comment
(comments)
[warning] 153-153: missing starting space in comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
[warning] 205-205: missing starting space in comment
(comments)
[warning] 206-206: missing starting space in comment
(comments)
[warning] 352-352: missing starting space in comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
[warning] 10-10: too few spaces before comment
(comments)
[warning] 10-10: missing starting space in comment
(comments)
[warning] 11-11: too few spaces before comment
(comments)
[warning] 11-11: missing starting space in comment
(comments)
[error] 11-11: trailing spaces
(trailing-spaces)
[warning] 14-14: too few spaces before comment
(comments)
[warning] 14-14: missing starting space in comment
(comments)
⏰ Context from checks skipped due to timeout of 90000ms (5)
- GitHub Check: YAML Linter
- GitHub Check: build (ubuntu-latest)
- GitHub Check: Test Packaging
- GitHub Check: YAML map schema validator
- GitHub Check: build (ubuntu-latest)
🔇 Additional comments (18)
Resources/Prototypes/tags.yml (1)
893-895
: New Tag Addition: MagazineBoxRifleMinigun
The new tag is correctly added and placed between the existing heavy and light rifle magazine tags. Please double-check that its usage in related entity files is consistent across the codebase.Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml (1)
21-22
: BulletMinigun Damage Buff Increase
Raising the "Piercing" damage value to 10 for the minigun bullet is aligned with the gun buffs objectives. Ensure that gameplay testing confirms the expected impact.Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/rifle.yml (2)
9-11
: BulletRifle Damage Modification
The update to the "Piercing" value (from 17 to 23) for the standard rifle bullet reflects the intended buff. Confirm that this change integrates well with overall weapon behavior.
55-57
: BulletRifleUranium Damage Adjustment
Increasing the "Piercing" value to 12 (alongside the existing Radiation damage) should enhance the corrosive effect of uranium rounds. Verify that these numbers are balanced for in-game performance.🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 57-57: trailing spaces
(trailing-spaces)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml (1)
30-49
: New Magazine Entity: MagazineBoxRifleMinigun
The new magazine entity is well-defined—it inherits from BaseMagazineHeavyRifle and properly configures all necessary components (including ammo capacity and visuals). This should neatly support the reintroduction of a proper minigun as outlined in the PR objectives.🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 35-35: wrong indentation: expected 4 but found 2
(indentation)
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml (4)
90-96
: Atreides SMG Fire Rate Adjustment
The addition offireRate: 10
for the Atreides entity looks good—it should provide the intended performance buff. Please verify that this change is balanced within your overall SMG lineup.
122-127
: C-20r Sub Machine Gun Fire Rate Buff
Increasing the C-20r’s fire rate to 10 should enhance its competitiveness as designed. Double-check that this buff harmonizes with the gun’s overall handling and intended role.
278-279
: WT550 SMG Fire Rate Increase
Updating the WT550’s fire rate from 5.5 to 7 delivers a notable performance boost. Make sure that internal testing confirms the new firing rhythm meets design expectations.
205-230
: Deprecation of Vector Entity
The complete commenting-out of the Vector entity effectively deprecates its usage. Please ensure that no active code references this entity and that any legacy support is appropriately handled.🧰 Tools
🪛 YAMLlint (1.35.1)
[warning] 205-205: missing starting space in comment
(comments)
[warning] 206-206: missing starting space in comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml (1)
147-147
: Doubling Magazine Capacity for Tranquilizer.The increase of
maxVol
to 30 is a fitting enhancement that doubles the ammo storage, aligning with our intent to buff the tranquilizer rounds. Ensure that any related systems expecting the previous capacity are updated accordingly.Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml (8)
55-56
: Revise Gun Firing Angle Constraints.Changing the Gun component from a fixed fireRate to explicit firing angles (minAngle: 80, maxAngle: 200) is a strategic maneuver aimed at fine-tuning the minigun's spread. Ensure these angles harmonize with the intended weapon behavior in the heat of battle.
59-61
: Introducing the Gun Wield Bonus.The new GunWieldBonus component, with its negative angle settings (-70, -155), is a bold addition. Verify that these values provide the intended bonus while keeping the weapon balanced against our Sol Alliance foes.
62-64
: Ammo Provider Transition.Swapping out the old BallisticAmmoProvider for the ChamberMagazineAmmoProvider aligns with our updated weapon mechanics. Confirm that the reload sound at
/Audio/Weapons/Guns/Cock/lmg_cock.ogg
is triggered correctly during gameplay.
65-65
: Ammo Counter Component Inclusion.The inclusion of the AmmoCounter enhances situational awareness during combat. Everything here looks shipshape—our munitions will now be tracked just as precisely as our navigation coordinates.
66-83
: Item Slots for Magazine and Chamber.The added ItemSlots component, complete with dedicated slots for the magazine and chamber, is detailed and well-structured. Verify that the starting items (
MagazineBoxRifleMinigun
andCartridgeMinigun
), sound effects, and whitelist tags match our intended configuration for the minigun’s operational flow.
84-88
: Container Configuration Validation.The ContainerContainer component establishes clear container mappings for the magazine and chamber slots. Ensure that using
!type:ContainerSlot
fits perfectly with game container protocols, so our armaments remain as well-organized as our star fleet.
89-91
: Speed Modifier Adjustment.The new ClothingSpeedModifier sets both walk and sprint modifiers to 0.3. This cautious adjustment should deliver the right balance between heft and mobility—keep an eye on it to ensure our minigun doesn’t slow our troops down more than necessary.
92-92
: Held Speed Modifier Component.The addition of the HeldSpeedModifier is straightforward. Verify that its default behavior integrates seamlessly with the minigun’s mechanics, allowing our space marines to handle it with robust confidence.
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
Outdated
Show resolved
Hide resolved
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
Outdated
Show resolved
Hide resolved
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
♻️ Duplicate comments (4)
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml (2)
205-205
: 🧹 Nitpick (assertive)Comment Formatting – Single-Line Correction
There’s a minor spacing issue in the comment: the hash (#
) should be followed by a space for clarity. Consider applying the following fix:-#Commented out the Vector, as it is deprecated. +# Commented out the Vector, as it is deprecated.This will help keep our YAML as neat as our battle formations.
🧰 Tools
🪛 YAMLlint (1.35.1)
[warning] 205-205: missing starting space in comment
(comments)
352-370
: 🧹 Nitpick (assertive)Comment Block Formatting for Deprecated Entity
The large block commenting out theVector
entity is missing leading spaces after the hash symbols on each line. For consistency and readability (and to ensure our configurations are as precise as our maneuvers), please adjust these comments.
A sample diff for one line:-# name: Vector +# name: VectorApply this uniformly across the block.
🧰 Tools
🪛 YAMLlint (1.35.1)
[warning] 352-352: missing starting space in comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml (1)
7-9
: 🛠️ Refactor suggestionIndentation Correction in Tag Component
Thetags:
key in the Tag component appears over-indented, potentially triggering YAML parsing errors. Adjust the indentation so it is indented two spaces relative to the list marker. For example:- - type: Tag - tags: - - MagazineHeavyRifle + - type: Tag + tags: + - MagazineHeavyRifleThis change will keep our configurations shipshape and error-free.
🧰 Tools
🪛 YAMLlint (1.35.1)
[error] 7-7: wrong indentation: expected at least 3
(indentation)
[error] 8-8: syntax error: mapping values are not allowed here
(syntax)
🪛 GitHub Actions: YAML Linter
[error] 8-8: Exception whilst loading prototypes: While scanning a plain scalar value, found invalid mapping.
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml (1)
152-154
: 🧹 Nitpick (assertive)Enhanced Transfer Amount for Tranquilizer Injection
The change totransferAmount: 30
in theSolutionInjectOnProjectileHit
component boosts the tranquilizer’s impact. However, a static analysis hint suggests some spacing issues for inline comments. Please verify that the comment formatting is consistent—e.g., ensuring one space follows the hash.
An example correction if needed:- transferAmount: 30 # "Hey, you're not meant to have a shotgun its gree- *snores*" + transferAmount: 30 # "Hey, you're not meant to have a shotgun its gree- *snores*"(The primary goal is consistent formatting.)
🧰 Tools
🪛 YAMLlint (1.35.1)
[warning] 153-153: too few spaces before comment
(comments)
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (4)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
(2 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
(4 hunks)
🧰 Additional context used
🪛 YAMLlint (1.35.1)
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml
[warning] 205-205: missing starting space in comment
(comments)
[warning] 352-352: missing starting space in comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
[warning] 10-10: too few spaces before comment
(comments)
[warning] 11-11: too few spaces before comment
(comments)
[error] 11-11: trailing spaces
(trailing-spaces)
[warning] 14-14: too few spaces before comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
[warning] 153-153: too few spaces before comment
(comments)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
[error] 8-8: syntax error: mapping values are not allowed here
(syntax)
🪛 GitHub Actions: YAML Linter
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml
[error] 8-8: Exception whilst loading prototypes: While scanning a plain scalar value, found invalid mapping.
⏰ Context from checks skipped due to timeout of 90000ms (3)
- GitHub Check: Test Packaging
- GitHub Check: build (ubuntu-latest)
- GitHub Check: build (ubuntu-latest)
🔇 Additional comments (4)
Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml (2)
121-127
: Buff Update for C-20r Sub Machine Gun
The newfireRate: 10
on the C-20r sub machine gun reinforces our commitment to rapid engagement—just what our fleet needs to outpace those Sol Alliance toys! Please verify that this increased rate remains balanced with the overall weapon dynamics.
277-283
: Enhanced Firing Rate for WT550
The update offireRate
to7
for the WT550 lends improved performance to this SMG, fortifying our arsenal against the enemies of freedom. Confirm that this buff harmonizes with other tactical parameters.Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Magazines/heavy_rifle.yml (1)
30-49
: New Magazine Entity: MagazineBoxRifleMinigun
The addition of theMagazineBoxRifleMinigun
aligns perfectly with our gun buff objectives—expanding ammunition options for the minigun. The configuration appears solid; excellent work boosting our firepower against hostile forces.Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml (1)
146-148
: Tranquilizer Ammo Capacity Buff
In thePelletShotgunTranquilizer
entity, themaxVol
has increased to30
, effectively doubling the tranquilizer’s capacity. This potent upgrade should greatly enhance nonlethal engagement effectiveness—ensure that the balance among projectile behaviors stays true to our tactical doctrine.
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/antimateriel.yml
Show resolved
Hide resolved
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (1)
Resources/Migrations/migration.yml
(1 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (5)
- GitHub Check: YAML Linter
- GitHub Check: Test Packaging
- GitHub Check: build (ubuntu-latest)
- GitHub Check: build (ubuntu-latest)
- GitHub Check: YAML map schema validator
🔇 Additional comments (1)
Resources/Migrations/migration.yml (1)
316-317
: Validate Prototype Deactivation:
The new entriesWeaponSubMachineGunVectorRubber: null
andWeaponSubMachineGunVector: null
correctly indicate that these weapon prototypes are being deactivated or marked for deletion. As a captain of our code fleet, ensure that no dependent systems are still referencing these prototypes, and that they have been synchronized with the overall weapon buff and deprecation strategy outlined in the PR.
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
Signed-off-by: EctoplasmIsGood <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 4
🔭 Outside diff range comments (1)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml (1)
21-22
: 🧹 Nitpick (assertive)Discrepancy in Piercing Damage Value.
The PR objectives mention adjusting the .10 rifle ammunition from 5 piercing to 10 piercing, yet here the
BulletMinigun
entity’s piercing value is set to 15. Please verify the intended value for gameplay balance.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (2)
Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/heavy_rifle.yml
(1 hunks)Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml
(2 hunks)
⏰ Context from checks skipped due to timeout of 90000ms (4)
- GitHub Check: build (ubuntu-latest)
- GitHub Check: Test Packaging
- GitHub Check: YAML Linter
- GitHub Check: build (ubuntu-latest)
🔇 Additional comments (4)
Resources/Prototypes/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml (4)
62-64
: New ChamberMagazineAmmoProvider Component.The introduction of the
ChamberMagazineAmmoProvider
with thesoundRack
path/Audio/Weapons/Guns/Cock/lmg_cock.ogg
enhances the reloading feedback. Please verify that this audio asset exists and is consistent with the game’s asset naming conventions.
66-84
: Review ItemSlots Configuration.The
ItemSlots
component now defines two slots—gun_magazine
andgun_chamber
—with starting itemsMagazineBoxRifleMinigun
andCartridgeMinigun
and corresponding whitelisted tags. Verify that these items and tags are correctly defined in the codebase to ensure proper integration with the minigun’s magazine system.
85-88
: ContainerContainer Component Implementation.The use of the
ContainerContainer
component to manage the magazine and chamber containers using!type:ContainerSlot
is a neat approach. Please ensure that the special syntax is correctly parsed by the engine’s YAML interpreter.
92-96
: MagazineVisuals Configuration Check.The
MagazineVisuals
component is configured with amagState
ofmag
, 4 steps, andzeroVisible: true
. This setup appears correct, but confirm that the visual transitions align with the minigun’s magazine mechanics for the intended player feedback.
Signed-off-by: EctoplasmIsGood <[email protected]>
Description
Various buffs to various guns / ammo. These buffs aim to bring some syndicate weapons more up to par with NTs, and buffs some underutilized weapons / ammo types.
MINIGUN IS BACKK!!!!! I don't know who to give it to.
Changelog
🆑
Summary by CodeRabbit
New Features
CartridgeMinigun
andMagazineBoxRifleMinigun
.Balance Changes
Vector
submachine gun and removed it from loot generation and configurations.