Ammo Providers & Hitscan Compability, Jumping Hitscans, Gun Overheating, MultiRaycast Hitscans. HV Revolvers. - #4335
Open
NazrinNya wants to merge 15 commits into
Open
Ammo Providers & Hitscan Compability, Jumping Hitscans, Gun Overheating, MultiRaycast Hitscans. HV Revolvers.#4335NazrinNya wants to merge 15 commits into
NazrinNya wants to merge 15 commits into
Conversation
monolith8319
changed the title
Contributor
kasature90
approved these changes
Jul 21, 2026
Contributor
|
There was another revolver pr made by fluffen. What happened to that? |
Contributor
Author
who knows |
Contributor
|
Revolver PR is currently working except for migrations being dumb or something, I can update it after this one tho |
Ilya246
requested changes
Jul 22, 2026
Contributor
There was a problem hiding this comment.
why do you empty extend it twice
Comment on lines
35
to
62
| @@ -42,6 +47,17 @@ private void OnCartridgeDamageExamine(EntityUid uid, CartridgeAmmoComponent comp | |||
| return p.Damage * Damageable.UniversalProjectileDamageModifier; | |||
| } | |||
| } | |||
| // mono | |||
| else if (entityProto.Components.TryGetValue(Factory.GetComponentName<HitscanBasicDamageComponent>(), out var hitscan)) | |||
| { | |||
| var h = (HitscanBasicDamageComponent) hitscan.Component; | |||
|
|
|||
| if (h.Damage.Empty) | |||
| return null; | |||
|
|
|||
| isHitscan = true; | |||
| return h.Damage; | |||
| } | |||
|
|
|||
| return null; | |||
Contributor
There was a problem hiding this comment.
actually this should probably use the shared system's methods for bullet protos which i wrote
| gun.ProjectileSpeedModified, | ||
| offset); // Mono - add offset | ||
|
|
||
| if (HasComp<FireControllableComponent>(gunUid)) { |
Contributor
There was a problem hiding this comment.
why is this not event-based actually
| /// <summary> | ||
| /// Entities that were already hit by hitscan (Or fired it) | ||
| /// </summary> | ||
| public HashSet<int> IgnoredEntities = []; |
Contributor
There was a problem hiding this comment.
why is this int (and not NetEntity/EntityUid)
why is this not DataField
Comment on lines
+14
to
+15
| [Dependency] private readonly EntityLookupSystem _lookup = default!; | ||
| [Dependency] private readonly SharedTransformSystem _transform = default!; |
Comment on lines
+2
to
+22
|
|
||
| [RegisterComponent] | ||
| public sealed partial class GunOverheatComponent : Component | ||
| { | ||
| [DataField] | ||
| public float FireRatePenalty = 2f; | ||
|
|
||
| [DataField] | ||
| public float SpreadPenalty = 2f; | ||
|
|
||
| [DataField] | ||
| public float HeatCapacity = 100f; | ||
|
|
||
| [DataField] | ||
| public float Heat = 0f; | ||
|
|
||
| [DataField] | ||
| public float HeatPerShot = 5f; | ||
|
|
||
| [DataField] | ||
| public float HeatDissipation = 10f; |
| private float _updateCooldown = 0.25f; | ||
| private float _updateTimer; | ||
|
|
||
| [Dependency] private readonly SharedGunSystem _gun = default!; |
| return; | ||
| } | ||
|
|
||
| var ents = EntityQueryEnumerator<GunOverheatComponent, GunComponent>(); |
Contributor
There was a problem hiding this comment.
don't need to query for guncomp
|
|
||
| private void OnGunShot(Entity<GunOverheatComponent> ent, ref GunShotEvent ev) | ||
| { | ||
| if (!TryComp<GunComponent>(ent, out var gun)) |
Contributor
There was a problem hiding this comment.
query since we're trying to optimize guns
|
|
||
| public float CalculatePenalty(float penalty, GunOverheatComponent overheat) | ||
| { | ||
| var i = Math.Pow(overheat.Heat / overheat.HeatCapacity, 0.25f); |
Contributor
There was a problem hiding this comment.
probably have the exponent be in the comp
Contributor
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
About the PR
This PR includes major changes to wizbase.
All ammo providers are now compatible with hitscans.
Added hitscan multiraycast
Added gun overheating, not implemented anywhere currently.
Added hitscans that jump between other mobs (ultrakill coins or some shit)
shit above doesn't matter to normal players so
.45 magnum FMJ -> .45 magnum HV. default .45 magnum now shoots hitscan projectile piercing 1 mob.
Why / Balance
revolvers were underperforming so this should make them somewhat unique now
Media
Requirements
How to test
Breaking changes
Changelog
🆑