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

Revolver Tweaks... more like additions, Gunslinger quirk, and more #2761

Merged
merged 21 commits into from
Mar 9, 2024

Conversation

rye-rice
Copy link
Member

@rye-rice rye-rice commented Feb 23, 2024

About The Pull Request

Oh god. What started as a simple project to fix a bug where ammo boxes acted like speedloaders and revolver safties turned into. A lot.
In short:

  • Single action revolvers now have the hammer as a saftey. Techinically they still have none, but decocking the hammer works as one.
  • Double actions get a proper safety. Yayy
  • Cleans up some behavior related to ammo boxes. I need to fucking clean up that whole file someday.
  • Revolvers... should feel better to use. They no longer fast load from everything now, and are slightly faster to load than magazines
  • You probably saw the number of changes in revolver.dm. Yes, along with being less janky, revolvers support gate loading revolvers. This is mostly for the shadow and ashhand. Other revolvers still drop everything on unload.
  • You have new actions to choose from when using revovlers. Alt click to access.
  • Adds support to remove energy gun cells like magazines. Leftover from the branch i poached gun huds from
  • OH YEAH, GUN HUDS! Stolen from skyrat Gun huds V2 [NOW WITH COMPONENTS!] Skyrat-SS13/Skyrat-tg#4333 but made much less shittier and with sprites made by azlan. This technically isn't used yet, maybe in the future. It was mostly modified to be used with revolvers, to see which chambers are loaded
  • The gunslinger quirk! See below. 0 points.
  • This "resprites" the shadow, but i'd just call it making it better proportioned compared to others. Also adds several more skins.
  • This fixes a fuckup with the flaming arrow as well.

To elaborate on gunslinger:

It gives you more recoil and spread when using SMGs, assault rifles, and LMGs, it increases accuracy with revolvers, shotguns, and lever actions, and no changes to anything else.

Also, lets you fan SINGLE ACTION revolvers (HP Shadow, HP Montague, and HP Ashhand) by one handing it with nothing else in your offhand. Slightly faster than pistols to boot.

Sound effect for moving the cyllinder is https://freesound.org/people/shelbyshark/sounds/501560/ by the way. Not from TGMC this time, suprisingly

Why It's Good For The Game

Should make friendly fire incidents involving revolvers less common, and make revolvers feel better to use.
Gunslinger should be funny and encourage cowboy blorbos to be more common.

image

image

Changelog

🆑
add: Gunslinger quirk! Lets you fling around a revolver like an old western! Good luck shooting anything newer, though.
add: 'New' HP Shadow sprites.
add: Double action revolvers have safeties now!
tweak: Many revolver tweaks
balance: Shadow and Ashhand are gate loaded now, and as such take longer to load.
fix: Non-speedloaders now load revolvers slowly again.
/:cl:

@rye-rice rye-rice requested a review from a team as a code owner February 23, 2024 07:22
@github-actions github-actions bot added DME Edit Sprites A bikeshed full of soulless bikes. Sound USSR Anthem 2.66 MB file. Code change Watch something violently break. labels Feb 23, 2024
@rye-rice
Copy link
Member Author

Updated the PR desc with:

"To elaborate on gunslinger:

It gives you more recoil and spread when using SMGs, assault rifles, and LMGs, it increases accuracy with revolvers, shotguns, and lever actions, and no changes to anything else.

Additionally, when using some gate loaded revolvers, you will see a ammo hud representing the chambers and what or if a cartridge is loaded. You can alt click to open up a action menu, which will allow you to rotate the cylinder or empty the current gate round.

Also, lets you fan SINGLE ACTION revolvers (HP Shadow and HP Ashhand) by one handing it with nothing else in your offhand. Slightly faster than pistols to boot."

@PrefabQuasar
Copy link
Contributor

a couple notes.
Double action revolvers feel Janky with this, for one, you can't load them from an ammo box At All, and have to take the bullets out of the box individually. It seems like double-actions are actually automatics playing pretend? pulling the trigger on an empty cylinder doesnt cycle the cylinders forward(it should, the trigger cocks the hammer when pulled, actuating the cylinder), and need the hammer to be "racked" by pressing space, which seems to act like an automatic slide(except for shell ejection, thankfully)
Additionally, single action revolvers seem to rotate the cylinder both on the hammer cocking and decocking, which is incorrect, they should only cycle forward on cocking

On a lesser note, I feel as though some of the abilities locked behind gunslinger should be available by default, being able to rotate the cylinder without using the hammer or trigger is Quite Basic Gun Use, and doesnt really make sense to be so restricted. The cylinder view should probably be visible to normal people on all revolvers BUT the gate-loaders, which could require the quirk. The only things that feel as though they genuinely Should come with the downsides gunslinger does are hammer fanning and the revolver tricks which are both actually advanced techniques.

@MarkSuckerberg
Copy link
Member

ugh. quirks.

First of all, yeah, definitely don't lock actual features like that behind a quirk, I feel like the accuracy changes are already pushing it but I won't outright reject that unless I see it being abused. As much as it's funny and quirky I believe that should be visible to all players or none. Honestly I'd rather people just RP things and just use certain guns more instead of outright getting buffs to it, again, I'll let it slide.

Second of all, minor note and more to prefab here, isn't that supposed to be the case with ammo boxes? I assumed we'd removed the ability to autoload with ammo boxes like that so that reloading was less trivial, but I could be wrong on that

@rye-rice
Copy link
Member Author

Updated gunslinger and made the ineractions available to everyone, and to answer mark and prefab, you have to unload the cylinder with your offhand first to load new bullets into it, instead of putting in a speedloader and it magically pushing out all the spent casings.

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Feb 26, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Feb 28, 2024
@rye-rice
Copy link
Member Author

Conflicts fixed

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Mar 4, 2024
Copy link
Contributor

github-actions bot commented Mar 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Mar 5, 2024
@rye-rice
Copy link
Member Author

rye-rice commented Mar 5, 2024

conflic fixed

@thgvr thgvr added this pull request to the merge queue Mar 9, 2024
Merged via the queue into shiptest-ss13:master with commit c3d369c Mar 9, 2024
14 checks passed
MysticalFaceLesS pushed a commit to CeladonSS13/Shiptest that referenced this pull request Mar 9, 2024
…hiptest-ss13#2761)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

Oh god. What started as a simple project to fix a bug where ammo boxes
acted like speedloaders and revolver safties turned into. A lot.
In short:
- Single action revolvers now have the hammer as a saftey. Techinically
they still have none, but decocking the hammer works as one.
- Double actions get a proper safety. Yayy
- Cleans up some behavior related to ammo boxes. I need to fucking clean
up that whole file someday.
- Revolvers... should feel better to use. They no longer fast load from
everything now, and are slightly faster to load than magazines
- You probably saw the number of changes in revolver.dm. Yes, along with
being less janky, revolvers support gate loading revolvers. This is
mostly for the shadow and ashhand. Other revolvers still drop everything
on unload.
- You have new actions to choose from when using revovlers. Alt click to
access.
- Adds support to remove energy gun cells like magazines. Leftover from
the branch i poached gun huds from
- OH YEAH, GUN HUDS! Stolen from skyrat
Skyrat-SS13/Skyrat-tg#4333 but made much less
shittier and with sprites made by azlan. This technically isn't used
yet, maybe in the future. It was mostly modified to be used with
revolvers, to see which chambers are loaded
- The gunslinger quirk! See below. 0 points.
- This "resprites" the shadow, but i'd just call it making it better
proportioned compared to others. Also adds several more skins.
- This fixes a fuckup with the flaming arrow as well.

To elaborate on gunslinger:

It gives you more recoil and spread when using SMGs, assault rifles, and
LMGs, it increases accuracy with revolvers, shotguns, and lever actions,
and no changes to anything else.

Also, lets you fan SINGLE ACTION revolvers (HP Shadow, HP Montague, and
HP Ashhand) by one handing it with nothing else in your offhand.
*Slightly* faster than pistols to boot.

Sound effect for moving the cyllinder is
https://freesound.org/people/shelbyshark/sounds/501560/ by the way. Not
from TGMC this time, suprisingly

Should make friendly fire incidents involving revolvers less common, and
make revolvers feel better to use.
Gunslinger should be funny and encourage cowboy blorbos to be more
common.

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/86657b45-4d70-4de4-98d7-ea2c6a3dfb3e)

![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/e98249f7-3245-42de-9ce0-221a51a14a51)

:cl:
add: Gunslinger quirk! Lets you fling around a revolver like an old
western! Good luck shooting anything newer, though.
add: 'New' HP Shadow sprites.
add: Double action revolvers have safeties now!
tweak: Many revolver tweaks
balance: Shadow and Ashhand are gate loaded now, and as such take longer
to load.
fix: Non-speedloaders now load revolvers slowly again.
/:cl:
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Sound USSR Anthem 2.66 MB file. Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants