Skip to content

Commit a7451e9

Browse files
committed
Enhance NPB
Better tie in NPB values to playerstats Added max combo multi NoteToComboIncrease made a stat Closes #109
1 parent dea0894 commit a7451e9

2 files changed

Lines changed: 9 additions & 3 deletions

File tree

Scenes/BattleDirector/Scripts/NotePlacementBar.cs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ private double CurrentBarValue
4343
private TextEdit _currentComboMultText;
4444

4545
private int _currentCombo;
46-
private int ComboMult => _currentCombo / _notesToIncreaseCombo + 1 + _bonusMult;
46+
private int MaxComboMult;
47+
private int ComboMult =>
48+
Math.Min(_currentCombo / _notesToIncreaseCombo + 1 + _bonusMult, MaxComboMult);
4749
private int _bonusMult;
4850
private int _notesToIncreaseCombo;
4951

@@ -56,7 +58,7 @@ private void UpdateComboMultText()
5658
#region Initialization
5759
public override void _Ready()
5860
{
59-
MaxValue = 80;
61+
MaxValue = 60;
6062
_notesToIncreaseCombo = 4;
6163

6264
_barInitPosition = _notePlacementBar.Position;
@@ -82,6 +84,8 @@ public void Setup(PlayerStats playerStats)
8284
ShuffleNoteQueue();
8385
ProgressQueue();
8486
MaxValue = playerStats.MaxComboBar;
87+
MaxComboMult = playerStats.MaxComboMult;
88+
_notesToIncreaseCombo = playerStats.NotesToIncreaseCombo;
8589
}
8690
#endregion
8791

Scenes/Puppets/Scripts/PlayerStats.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ public partial class PlayerStats : Resource
77
{
88
public int MaxHealth = 100;
99
public int CurrentHealth = 100;
10-
public int MaxComboBar = 80;
10+
public int MaxComboBar = 60;
11+
public int MaxComboMult = 25;
12+
public int NotesToIncreaseCombo = 4;
1113
public int RewardAmountModifier = 0;
1214
public int Rerolls = 0;
1315

0 commit comments

Comments
 (0)