Skip to content

Commit 63668f2

Browse files
committed
enemy hp, note missing
- enemies have been given individual HP stats - player notes no longer do their effects when missed
1 parent 4d8e55b commit 63668f2

4 files changed

Lines changed: 20 additions & 9 deletions

File tree

Globals/Scribe.cs

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public partial class Scribe : Node
2020
1,
2121
(director, note, timing) =>
2222
{
23-
director.Player.TakeDamage((3 - (int)timing) * note.GetBaseVal());
23+
director.Player.TakeDamage((3 - (int)timing) + note.GetBaseVal());
2424
}
2525
),
2626
new Note(
@@ -32,7 +32,8 @@ public partial class Scribe : Node
3232
1,
3333
(director, note, timing) =>
3434
{
35-
director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
35+
if (timing != Timing.Miss)
36+
director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
3637
}
3738
),
3839
new Note(
@@ -44,9 +45,8 @@ public partial class Scribe : Node
4445
1,
4546
(director, note, timing) =>
4647
{
47-
// can change later, but I want it like this instead of changing base
48-
// in case we have some relic that messes with timing
49-
director.Enemy.TakeDamage((2 * (int)timing) * note.GetBaseVal());
48+
if (timing != Timing.Miss)
49+
director.Enemy.TakeDamage((2 * (int)timing) + note.GetBaseVal());
5050
}
5151
),
5252
new Note(
@@ -58,7 +58,8 @@ public partial class Scribe : Node
5858
1,
5959
(director, note, timing) =>
6060
{
61-
director.Player.Heal((int)timing * note.GetBaseVal());
61+
if (timing != Timing.Miss)
62+
director.Player.Heal((int)timing + note.GetBaseVal());
6263
}
6364
),
6465
new Note(
@@ -70,8 +71,11 @@ public partial class Scribe : Node
7071
1,
7172
(director, note, timing) =>
7273
{
73-
director.Player.Heal((int)timing);
74-
director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
74+
if (timing != Timing.Miss)
75+
{
76+
director.Player.Heal((int)timing);
77+
director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
78+
}
7579
}
7680
),
7781
new Note(
@@ -83,7 +87,8 @@ public partial class Scribe : Node
8387
1,
8488
(director, note, timing) =>
8589
{
86-
director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
90+
if (timing != Timing.Miss)
91+
director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
8792
},
8893
0.25f
8994
),

scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ public partial class P_BossBlood : EnemyPuppet
77
{
88
public override void _Ready()
99
{
10+
_currentHealth = 100;
11+
_maxHealth = 100;
1012
base._Ready();
1113
var enemTween = CreateTween();
1214
enemTween.TweenProperty(Sprite, "position", Vector2.Down * 5, 1f).AsRelative();

scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ public partial class P_Parasifly : EnemyPuppet
55
{
66
public override void _Ready()
77
{
8+
_currentHealth = 50;
9+
_maxHealth = 50;
810
base._Ready();
911
var enemTween = CreateTween();
1012
enemTween.TweenProperty(Sprite, "position", Vector2.Down * 2, 2f).AsRelative();

scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ public partial class P_TheGWS : EnemyPuppet
55
{
66
public override void _Ready()
77
{
8+
_currentHealth = 75;
9+
_maxHealth = 75;
810
base._Ready();
911
var enemTween = CreateTween();
1012
enemTween.TweenProperty(Sprite, "position", Vector2.Down * 10, 3f).AsRelative();

0 commit comments

Comments
 (0)