Skip to content

Commit e061dee

Browse files
committed
Minor Bug Fixes
Loops effects no longer process after battle end Holograeme is immune to relic damage
1 parent 544341c commit e061dee

2 files changed

Lines changed: 3 additions & 11 deletions

File tree

Scenes/BattleDirector/Scripts/BattleDirector.cs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ public override void _Process(double delta)
184184
FocusedButton.GrabFocus();
185185
if (_countdownTween != null)
186186
_countdownLabel.Text = (_countdown + 1).ToString();
187+
if (IsBattleWon() || Player.GetCurrentHealth() <= 0)
188+
return;
187189
TimeKeeper.CurrentTime = Audio.GetPlaybackPosition();
188190
Beat realBeat = TimeKeeper.GetBeatFromTime(Audio.GetPlaybackPosition());
189191
UpdateBeat(realBeat);
@@ -409,15 +411,6 @@ public void DealDamage(Targetting targetting, int damage, PuppetTemplate source)
409411
}
410412
}
411413

412-
/*public void ReduceMeter(Note note, int amountLost, PuppetTemplate source)
413-
{
414-
PuppetTemplate[] targets = GetTargets(note.TargetType);
415-
foreach (PuppetTemplate target in targets)
416-
{
417-
target.
418-
}
419-
}*/
420-
421414
public void AddStatus(Targetting targetting, StatusEffect status, int amount = 1)
422415
{
423416
if (amount == 0)

Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,9 @@ public override void _Ready()
9090
if (
9191
e is not BattleDirector.Harbinger.OnDamageInstanceArgs dArgs
9292
|| dArgs.Dmg.Target != eff.Owner
93-
|| dArgs.Dmg.Source != dArgs.BD.Player
9493
)
9594
return;
96-
if (dArgs.Dmg.Damage < val)
95+
if (dArgs.Dmg.Source != e.BD.Player || dArgs.Dmg.Damage < val)
9796
{
9897
dArgs.Dmg.ModifyDamage(0, 0);
9998
}

0 commit comments

Comments
 (0)