Skip to content

Fix shotguns not reading number of pellets from scripts. - #1910

Merged
Agiel merged 3 commits into
NeotokyoRebuild:masterfrom
Agiel:neo_weapon_parse
Apr 5, 2026
Merged

Fix shotguns not reading number of pellets from scripts.#1910
Agiel merged 3 commits into
NeotokyoRebuild:masterfrom
Agiel:neo_weapon_parse

Conversation

@Agiel

@AgielAgiel commented Mar 30, 2026•
edited
Loading

Copy link
Copy Markdown
Contributor

Description

Move all NT specific weapon info to a new CNEOWeaponInfo class, and add "Bullets" to the data being read. Then use that for the Supa7 and AA13 instead of hardcoding the value.

image

Toolchain

  • Linux GCC Distro Native - CachyOS - gcc version 15.2.1 20260209

Linked Issues

@Agiel
Agiel requested a review from a teamMarch 30, 2026 22:38
sunzenshen
sunzenshen reviewed Mar 31, 2026
View reviewed changes
Comment threadsrc/game/shared/hl2mp/hl2mp_weapon_parse.cpp
Comment threadsrc/game/shared/neo/weapons/neo_weapon_parse.cpp Outdated
@sunzenshen
sunzenshen requested a review from a teamMarch 31, 2026 05:07
@Agiel
Agiel requested a review from sunzenshenMarch 31, 2026 20:24
@DESTROYGIRLDESTROYGIRL added the Gunplay Gunplay elements in Neotokyo. Grenades, TTK, etc. label Mar 31, 2026
sunzenshen
sunzenshen previously approved these changes Apr 1, 2026
View reviewed changes
@sunzenshen
sunzenshen requested a review from a teamApril 1, 2026 04:03
@Agiel
Agiel requested a review from sunzenshenApril 4, 2026 22:18
@sunzenshen
sunzenshen requested a review from a teamApril 4, 2026 22:51
@Agiel
Agiel merged commit 5391c69 into NeotokyoRebuild:masterApr 5, 2026
7 checks passed
Mngdd pushed a commit to Mngdd/neo that referenced this pull request Apr 6, 2026
@AgielMinegoodd
Fix shotguns not reading number of pellets from scripts. (NeotokyoReb…
7f55985
…uild#1910)
Mngdd pushed a commit to Mngdd/neo that referenced this pull request Jul 5, 2026
@AgielMinegoodd
Fix shotguns not reading number of pellets from scripts. (NeotokyoReb…
9d15a4e
…uild#1910)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sunzenshensunzenshensunzenshen approved these changes
@nullsystemnullsystemnullsystem approved these changes

Assignees

No one assigned

Labels

GunplayGunplay elements in Neotokyo. Grenades, TTK, etc.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

The supa7 should be firing 8 pellets per standard shot

4 participants

@Agiel@sunzenshen@nullsystem@DESTROYGIRL