Skip to content

Fix DamageScales settings not working properly with NSF #25

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.

Sign up for GitHub

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

Open
Nerd-eee wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix DamageScales settings not working properly with NSF #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13cd00
Fix DamageScales settings not working properly with NSF
Nerd-eee Mar 16, 2026
5f08e8d
actually have the LG and SG modifiers count, rather than just enforce…
Nerd-eee Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions Data/Scripts/CoreSystems/Session/SessionDamageMgr.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,22 +487,27 @@ private void DamageGrid(HitEntity hitEnt, ProInfo t)
aoeIsPool = aoeFalloff == Falloff.Pooled;
}
if (NerdShieldApiLoaded && NerdShieldAPI.IsReady)
if(currentGrid == null || !rootBlock.CubeGrid.IsInSameLogicalGroupAs(currentGrid))
{
if (currentGrid == null || !rootBlock.CubeGrid.IsInSameLogicalGroupAs(currentGrid))
{
currentGrid = rootBlock.CubeGrid;
HasNerdShields = NerdShieldAPI.GridHasShields(currentGrid);

switch (t.AmmoDef.DamageScales.Shields.Type)
if (!t.AmmoDef.NoGridOrArmorScaling)
{
case ShieldDef.ShieldType.Default:
nerdShieldModifier = t.AmmoDef.DamageScales.Shields.Modifier;
nerdShieldPassthroughModifier = t.AmmoDef.DamageScales.Shields.BypassModifier;
break;
case ShieldDef.ShieldType.Bypass:
nerdShieldPassthroughModifier = t.AmmoDef.DamageScales.Shields.Modifier;
break;
switch (t.AmmoDef.DamageScales.Shields.Type)
{
case ShieldDef.ShieldType.Default:
nerdShieldModifier = t.AmmoDef.DamageScales.Shields.Modifier * gridDamageModifier * gridSizeBuff
* (largeGrid ? t.AmmoDef.DamageScales.Grids.Large : t.AmmoDef.DamageScales.Grids.Small);
nerdShieldPassthroughModifier = t.AmmoDef.DamageScales.Shields.BypassModifier;
break;
case ShieldDef.ShieldType.Bypass:
nerdShieldPassthroughModifier = t.AmmoDef.DamageScales.Shields.Modifier;
break;
}
}
if (t.AmmoDef.DamageScales.Shields.Type == ShieldDef.ShieldType.Heal)
if (!t.AmmoDef.NoGridOrArmorScaling && t.AmmoDef.DamageScales.Shields.Type == ShieldDef.ShieldType.Heal)
NerdShieldAPI.ShieldDoDamage(currentGrid, currentGrid.GridIntegerToWorld(rootBlock.Position), t.AmmoDef.DamageScales.DamageType.Shield == DamageTypes.Damage.Kinetic ? KineticHash : EnergyHash,
-basePool, nerdShieldModifier, nerdShieldPassthroughModifier);
else
Expand All @@ -515,6 +520,7 @@ private void DamageGrid(HitEntity hitEnt, ProInfo t)
{
currentGrid = rootBlock.CubeGrid; // duplicated because doing it before would invalidate the nullcheck above
}
}

if (!detRequested)
{
Expand Down