Speedloaders for Internal Magazine Weapons #29807

Cojoke-dot · 2024-07-07T22:34:16Z

About the PR

Adds speedloaders for shotguns and makes the SpeedLoaderLightRifle function like a speedloader.

Why / Balance

This was more made for a system that would let people quickly load internal mags the same way that revolvers do. Neither of the speedloaders mentioned are currently obtainable, but replacing the .30 rifle ammo box in the uplink with the light rifle speedloader would be nice. If people want I could add the shotgun speedloader to the secfab, but I don't think that would balance all that well with the existence of the bulldog. If I do it would be in another pr.

Technical details

Check if the object interacting with the gun has the SpeedLoaderComponent in the OnBallisticInteractUsing. Gets the empty slots in the shotgun, does a TakeAmmoEvent to clear them out of the speedloader, and then adds them to the weapon.

Media

2024-07-07.20-26-46.mp4

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

no cl, nothing players can obtain has been changed

github-actions · 2024-07-08T01:30:16Z

RSI Diff Bot; head commit abb9c24 merging into 9f55000
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Guns/Ammunition/SpeedLoaders/Shotgun/shotgun_speed_loader.rsi

State	Old	New	Status
base-1			Added
base-2			Added
base-3			Added
base-4			Added
base			Added

Edit: diff updated after abb9c24

IProduceWidgets · 2024-07-08T06:45:26Z

I had to look it up, but shotgun "speed loaders" are apparently a thing. Sort of. They're somewhere between a neat idea someone had to justify their 3d printer and a bad substitute for just practicing with a shotgun.
~~I could not however find any that load seven shells because they'd be long as hell. I'd just make it load 4 like the sprite implies and then it fits the kammerer where it's mildly more justifiable~~. am blind. I think it would make a decent science tech.

The stripper clip is good though, I like that.

IProduceWidgets · 2024-07-08T06:57:49Z

On further thought, it might be good to make the speedloaders require doafters.
Does the revolver require one? I can't recall.
Either way, while it does probably take the same amount of loading time at the moment, having these does represent a pretty big improvement to RoF of the best guns on the game (shotguns). To be clear, I'm not saying a long doafter, I'm thinking the same as what it takes to load one round.

IProduceWidgets · 2024-07-08T07:02:32Z

Also reminds me we could really use a visualizer that can layer these based on the contained ents so it can show the right shells. That's out of scope for now though imo.

Cojoke-dot · 2024-07-08T08:17:33Z

Does the revolver require one?

Nah, speed loaders are instant for revolvers

Also reminds me we could really use a visualizer that can layer these based on the contained ents so it can show the right shells. That's out of scope for now though IMO.

I would have to look into how revolvers do it, I just wanted a basic sprite so I did not ask for too much from the person who made the sprites.

I think it would make a decent science tech.

My biggest issue with the shotgun speed loader is how it devalues the advantage of the bulldog. The bulldog would still be better, it would just only be better due to 1 extra capacity and less space for ammo rather than the speed at which you load it. Sci tech would be fine if war ops was not a thing. Its really the only time it would be good and the only time it would be researched.

Plykiya · 2024-07-08T14:25:42Z

Does the revolver require one?

Nah, speed loaders are instant for revolvers

imo just give this one a do-after and add it to the lathes, bulldogs will still be superior because their ammo swap wouldn't require a do-after

IProduceWidgets · 2024-07-08T17:25:48Z

Also reminds me we could really use a visualizer that can layer these based on the contained ents so it can show the right shells. That's out of scope for now though IMO.

I would have to look into how revolvers do it, I just wanted a basic sprite so I did not ask for too much from the person who made the sprites.

They don't, that's why it reminded me.

metalgearsloth · 2024-08-08T09:42:15Z

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs

+
+                component.Entities.Add(ent.Value);
+                Containers.Insert(ent.Value, component.Container);
+
+                if (IsClientSide(ent.Value))
+                    Del(ent.Value);
+


Why is this inserting then deleting it?

This is what happens without the delete. OnBallisticAmmoFillDoAfter does the same thing

2024-08-08.21-51-03.mp4

metalgearsloth · 2024-08-08T09:43:16Z

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs

+
+        if (EntityManager.HasComponent<SpeedLoaderComponent>(args.Used))
+        {


Why is this doubling the existing speedloaders? It's not even using a whitelist or anything.

What do you mean by this? Doubling the existing speedloaders? It is also using a whitelist for anything inserted.

metalgearsloth · 2024-08-08T09:44:19Z

Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs

+                if (ev.Ammo.Count == 0)
+                    break;


The event one is just a ref to the local variable, is this even possible here? It's being iterated in the loop.

It seems to work, is there another way to do this that's preferred or is that fine?

2024-08-08.22-00-55.mp4

github-actions · 2024-08-12T04:02:01Z

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

github-actions · 2024-09-09T19:47:45Z

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

K-Dynamic · 2024-11-24T09:54:48Z

Are you still working on this

Also I'd consider removing the drum mags from sec techfabs since the only drum-fed shotguns are Syndicate weapons.

github-actions · 2024-11-25T12:55:29Z

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

TheShuEd · 2024-12-20T12:24:36Z

Seems derelict for me
If you wanna continue work, comment for reopen

Cojoke-dot added 2 commits July 7, 2024 17:16

Speedloaders for Internal Magazine Weapons

0305a75

unique sprite for shotgun speed loader

c2baecf

github-actions bot added the Changes: Sprites Changes: Might require knowledge of spriting or visual design. label Jul 8, 2024

Cojoke-dot marked this pull request as ready for review July 8, 2024 01:31

Cojoke-dot requested a review from metalgearsloth as a code owner July 8, 2024 01:31

github-actions bot added the S: Needs Review Status: Requires additional reviews before being fully accepted label Jul 8, 2024

metalgearsloth requested changes Aug 8, 2024

View reviewed changes

metalgearsloth added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Aug 8, 2024

github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 12, 2024

Merge branch 'master' into shotgunSpeedloader

abb9c24

github-actions bot removed the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Aug 12, 2024

github-actions bot added the S: Merge Conflict Status: Needs to resolve merge conflicts before it can be accepted label Sep 9, 2024

SlamBamActionman added the S: Untriaged Status: Indicates an item has not been triaged and doesn't have appropriate labels. label Nov 14, 2024

github-actions bot added the Merge Conflict label Nov 25, 2024

TheShuEd closed this Dec 20, 2024

TheShuEd added the S: Derelict Status: Abandoned, but may contain something that can be salvaged. label Dec 20, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Speedloaders for Internal Magazine Weapons #29807

Speedloaders for Internal Magazine Weapons #29807

Cojoke-dot commented Jul 7, 2024 •

edited

Loading

github-actions bot commented Jul 8, 2024 •

edited

Loading

IProduceWidgets commented Jul 8, 2024 •

edited

Loading

IProduceWidgets commented Jul 8, 2024

IProduceWidgets commented Jul 8, 2024

Cojoke-dot commented Jul 8, 2024

Plykiya commented Jul 8, 2024

IProduceWidgets commented Jul 8, 2024

metalgearsloth Aug 8, 2024

Cojoke-dot Aug 9, 2024

metalgearsloth Aug 8, 2024

Cojoke-dot Aug 9, 2024

metalgearsloth Aug 8, 2024

Cojoke-dot Aug 9, 2024

github-actions bot commented Aug 12, 2024

github-actions bot commented Sep 9, 2024

K-Dynamic commented Nov 24, 2024

github-actions bot commented Nov 25, 2024

TheShuEd commented Dec 20, 2024


		if (EntityManager.HasComponent<SpeedLoaderComponent>(args.Used))
		{

Speedloaders for Internal Magazine Weapons #29807

Speedloaders for Internal Magazine Weapons #29807

Conversation

Cojoke-dot commented Jul 7, 2024 • edited Loading

About the PR

Why / Balance

Technical details

Media

Breaking changes

github-actions bot commented Jul 8, 2024 • edited Loading

IProduceWidgets commented Jul 8, 2024 • edited Loading

IProduceWidgets commented Jul 8, 2024

IProduceWidgets commented Jul 8, 2024

Cojoke-dot commented Jul 8, 2024

Plykiya commented Jul 8, 2024

IProduceWidgets commented Jul 8, 2024

metalgearsloth Aug 8, 2024

Choose a reason for hiding this comment

Cojoke-dot Aug 9, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 8, 2024

Choose a reason for hiding this comment

Cojoke-dot Aug 9, 2024

Choose a reason for hiding this comment

metalgearsloth Aug 8, 2024

Choose a reason for hiding this comment

Cojoke-dot Aug 9, 2024

Choose a reason for hiding this comment

github-actions bot commented Aug 12, 2024

github-actions bot commented Sep 9, 2024

K-Dynamic commented Nov 24, 2024

github-actions bot commented Nov 25, 2024

TheShuEd commented Dec 20, 2024

Cojoke-dot commented Jul 7, 2024 •

edited

Loading

github-actions bot commented Jul 8, 2024 •

edited

Loading

IProduceWidgets commented Jul 8, 2024 •

edited

Loading