GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SimRateTests: the fixture gun's round costs what the fixture reactor can pay at 0.01 s

Browse source
This commit is contained in:
soul 2026-10-23 00:27:47 +02:00
commit d038ee393a
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Assets/Scripts/ServerShared/Behaviors/InstantWeapon.cs
View file

@ -64,7 +64,6 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerCo
// The shooter asked for fire during this step (Activate): a weapon asked of for the whole step fires every round its
// cooldown allows inside it, rather than one per step. Cleared when the step ends.
private bool _pulled;
public string DiagBreak = ""; public int DiagRetriggers;
// The shortest cycle a countdown divides by: a cooldown of zero would otherwise fire without end in one step.
private const float ShortestCycle = .0005f;
@ -305,7 +304,6 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerCo
if (!refused && !_burstPaid && (!TrySpendActivationEnergy() || !UseAmmo(dt)))
{
_burstRemaining = 0;
DiagBreak = $"spend failed charge={_capacitor.Charge} cap={_capacitor.Capacity}";
return false;
}
if (!refused)
@ -342,11 +340,10 @@ public class InstantWeapon : Weapon, IProgressBehavior, IEventBehavior, IPowerCo
ended |= FinishCountdown(dt);
// The trigger is held and the weapon is ready: the next burst starts now, at the moment the cooldown ended (what it
// ran past zero is how long ago, at the step's end), or at the step's start when the weapon was already ready.
if (!Repeats || _burstRemaining > 0 || !CanFire || (retriggered && !_burstStarted)) { DiagBreak = $"cond Repeats={Repeats} rem={_burstRemaining} can={CanFire} re={retriggered} started={_burstStarted} cd={_cooldown} cooling={_coolingDown}"; break; }
if (!Repeats || _burstRemaining > 0 || !CanFire || (retriggered && !_burstStarted)) break;
retriggered = true;
DiagRetriggers++;
Trigger();
if (_burstRemaining == 0) { DiagBreak = "trigger refused"; break; }
if (_burstRemaining == 0) break;
if (ended)
{
_burstTimer = TakeOvershoot();