Make PA 40% less jank (#9278)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com> Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
This commit is contained in:
@@ -45,7 +45,8 @@ namespace Content.Client.ParticleAccelerator.UI
|
|||||||
{
|
{
|
||||||
base.Dispose(disposing);
|
base.Dispose(disposing);
|
||||||
|
|
||||||
_menu?.Close();
|
_menu?.Dispose();
|
||||||
|
_menu = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -334,11 +334,13 @@ namespace Content.Client.ParticleAccelerator.UI
|
|||||||
{
|
{
|
||||||
return new(this, resourceCache, name, state);
|
return new(this, resourceCache, name, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
UpdateUI(false, false, false, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool StrengthSpinBoxValid(int n)
|
private bool StrengthSpinBoxValid(int n)
|
||||||
{
|
{
|
||||||
return (n >= 0 && n <= 4 && !_blockSpinBox);
|
return (n >= 0 && n <= 3 && !_blockSpinBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PowerStateChanged(object? sender, ValueChangedEventArgs e)
|
private void PowerStateChanged(object? sender, ValueChangedEventArgs e)
|
||||||
@@ -358,13 +360,15 @@ namespace Content.Client.ParticleAccelerator.UI
|
|||||||
case 3:
|
case 3:
|
||||||
newState = ParticleAcceleratorPowerState.Level2;
|
newState = ParticleAcceleratorPowerState.Level2;
|
||||||
break;
|
break;
|
||||||
case 4:
|
// They can't reach this level anyway and I just want to fix the bugginess for now.
|
||||||
newState = ParticleAcceleratorPowerState.Level3;
|
//case 4:
|
||||||
break;
|
// newState = ParticleAcceleratorPowerState.Level3;
|
||||||
|
// break;
|
||||||
default:
|
default:
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_stateSpinBox.SetButtonDisabled(true);
|
||||||
Owner.SendPowerStateMessage(newState);
|
Owner.SendPowerStateMessage(newState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ namespace Content.Server.Singularity.Components
|
|||||||
// For the "emitter fired" sound
|
// For the "emitter fired" sound
|
||||||
public const float Variation = 0.25f;
|
public const float Variation = 0.25f;
|
||||||
public const float Volume = 0.5f;
|
public const float Volume = 0.5f;
|
||||||
public const float Distance = 3f;
|
public const float Distance = 6f;
|
||||||
|
|
||||||
[ViewVariables] public int FireShotCounter;
|
[ViewVariables] public int FireShotCounter;
|
||||||
|
|
||||||
|
|||||||
@@ -179,6 +179,7 @@
|
|||||||
- Impassable
|
- Impassable
|
||||||
- Opaque
|
- Opaque
|
||||||
- type: Projectile
|
- type: Projectile
|
||||||
|
# soundHit: Waiting on serv3
|
||||||
damage:
|
damage:
|
||||||
types:
|
types:
|
||||||
Heat: 14
|
Heat: 14
|
||||||
|
|||||||
Reference in New Issue
Block a user