Skip to content

Commit c13c3d9

Browse files
committed
Finished mk1 Holograeme fight
1 parent 4720da6 commit c13c3d9

3 files changed

Lines changed: 40 additions & 18 deletions

File tree

Audio/songMaps/HoloRepeat.tres

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
[gd_resource type="Resource" load_steps=27 format=3 uid="uid://dh7fdqbs6mwrq"]
1+
[gd_resource type="Resource" load_steps=27 format=3]
22

3-
[ext_resource type="Script" uid="uid://bhbpcmtr6e6pk" path="res://Classes/MidiMaestro/NoteInfo.cs" id="1_y4wy8"]
4-
[ext_resource type="Script" uid="uid://bnpnavb5lwobj" path="res://Classes/MidiMaestro/NoteChart.cs" id="2_1kkot"]
3+
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteInfo.cs" id="1_y4wy8"]
4+
[ext_resource type="Script" path="res://Classes/MidiMaestro/NoteChart.cs" id="2_1kkot"]
55

66
[sub_resource type="Resource" id="Resource_wxfu7"]
77
script = ExtResource("1_y4wy8")
@@ -125,10 +125,6 @@ Length = 0.0
125125

126126
[resource]
127127
script = ExtResource("2_1kkot")
128-
Bpm = 130
129-
NumLoops = 1
130-
SongSpeed = 200.0
131-
SongMapLocation = "Holo_ThereItIs.ogg"
132128
UpLaneData = [SubResource("Resource_rclq0"), SubResource("Resource_d15sy"), SubResource("Resource_xylpo"), SubResource("Resource_c4e5y"), SubResource("Resource_7lbis"), SubResource("Resource_8usgo")]
133129
DownLaneData = [SubResource("Resource_wxfu7"), SubResource("Resource_cjafy"), SubResource("Resource_jdotv"), SubResource("Resource_per1x"), SubResource("Resource_lw4uc"), SubResource("Resource_nxcmx")]
134130
LeftLaneData = [SubResource("Resource_x0uap"), SubResource("Resource_1m0i6"), SubResource("Resource_1mpgo"), SubResource("Resource_iuho0"), SubResource("Resource_uj1b6"), SubResource("Resource_fi760")]

Scenes/Puppets/Enemies/Holograeme/Holograeme.tscn

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
[gd_scene load_steps=9 format=3 uid="uid://dfke16a27sgop"]
1+
[gd_scene load_steps=11 format=3 uid="uid://dfke16a27sgop"]
22

33
[ext_resource type="Script" uid="uid://cbqev0wucp5gx" path="res://Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs" id="1_qkr3f"]
44
[ext_resource type="Texture2D" uid="uid://cjoky2yal24e3" path="res://Scenes/Puppets/Enemies/Holograeme/Holograeme.png" id="2_dj5fa"]
55
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_qkr3f"]
66
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="4_73js3"]
7+
[ext_resource type="Texture2D" uid="uid://bpi5ytgbhtkk1" path="res://Scenes/Puppets/Enemies/Holograeme/Holo_HP_Under.png" id="4_nx3as"]
8+
[ext_resource type="Texture2D" uid="uid://d1khaeq3p5d1w" path="res://Scenes/Puppets/Enemies/Holograeme/Holo_HP_Over.png" id="5_3wrsd"]
79
[ext_resource type="Texture2D" uid="uid://dwa70i6l80ic5" path="res://Scenes/Puppets/Enemies/Holograeme/HoloHand1.png" id="5_qkr3f"]
810
[ext_resource type="Texture2D" uid="uid://byr53yh51cxgo" path="res://Scenes/Puppets/Enemies/Holograeme/HoloHand2.png" id="6_73js3"]
911

@@ -14,7 +16,7 @@ colors = PackedColorArray(0, 1, 0.0999999, 1, 1, 1, 1, 1)
1416
[sub_resource type="GradientTexture2D" id="GradientTexture2D_545vi"]
1517
resource_local_to_scene = true
1618
gradient = SubResource("Gradient_hguc7")
17-
width = 100
19+
width = 22
1820
height = 18
1921

2022
[node name="Holograeme" type="Node2D" node_paths=PackedStringArray("_whiteHand", "_redHand", "HealthBar", "Sprite")]
@@ -29,10 +31,12 @@ position = Vector2(0, -4)
2931
texture = ExtResource("2_dj5fa")
3032

3133
[node name="ProgressBar" parent="." instance=ExtResource("3_qkr3f")]
32-
offset_left = -50.0
34+
offset_left = -12.0
3335
offset_top = 32.0
34-
offset_right = 52.0
36+
offset_right = 12.0
3537
offset_bottom = 52.0
38+
texture_under = ExtResource("4_nx3as")
39+
texture_over = ExtResource("5_3wrsd")
3640
texture_progress = SubResource("GradientTexture2D_545vi")
3741

3842
[node name="StatusContainer" parent="." instance=ExtResource("4_73js3")]

Scenes/Puppets/Enemies/Holograeme/P_Holograeme.cs

Lines changed: 29 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,13 @@ public override void _ExitTree()
1919
Scribe.NoteDictionary[0].Texture = null;
2020
BattleDirector.AutoPlay = false;
2121
BattleDirector.PlayerDisabled = false;
22+
Conductor.BeatSpawnOffsetModifier = 0;
2223
}
2324

2425
public override void _Ready()
2526
{
26-
MaxHealth = 150;
27+
Conductor.BeatSpawnOffsetModifier = 1;
28+
MaxHealth = 3;
2729
CurrentHealth = MaxHealth;
2830
BaseMoney = 20;
2931
base._Ready();
@@ -37,19 +39,18 @@ public override void _Ready()
3739
this,
3840
BattleEffectTrigger.OnBattleStart,
3941
-1,
40-
(e, eff, val) =>
42+
(e, _, _) =>
4143
{
4244
BattleDirector.AutoPlay = true;
4345
BattleDirector.PlayerDisabled = true;
4446
e.BD.AddStatus(Targetting.Player, StatusEffect.Disable);
45-
e.BD.AddStatus(Targetting.Player, StatusEffect.Block, 999);
4647
}
4748
),
4849
new EnemyEffect(
4950
this,
5051
BattleEffectTrigger.OnLoop,
5152
1,
52-
(e, eff, val) =>
53+
(e, _, _) =>
5354
{
5455
TweenLoop();
5556
if (e is not BattleDirector.Harbinger.LoopEventArgs lArgs)
@@ -72,14 +73,32 @@ public override void _Ready()
7273
this,
7374
BattleEffectTrigger.NoteHit,
7475
1,
75-
(e, eff, val) =>
76+
(e, _, _) =>
7677
{
7778
if (e is BattleDirector.Harbinger.NoteHitArgs nArgs)
7879
{
7980
TweenDir(nArgs.Type);
8081
}
8182
}
8283
),
84+
new EnemyEffect(
85+
this,
86+
BattleEffectTrigger.OnDamageInstance,
87+
3,
88+
(e, eff, val) =>
89+
{
90+
if (
91+
e is not BattleDirector.Harbinger.OnDamageInstanceArgs dArgs
92+
|| dArgs.Dmg.Target != eff.Owner
93+
|| dArgs.Dmg.Source != dArgs.BD.Player
94+
)
95+
return;
96+
if (dArgs.Dmg.Damage < val)
97+
{
98+
dArgs.Dmg.ModifyDamage(0, 0);
99+
}
100+
}
101+
),
83102
};
84103
}
85104

@@ -106,7 +125,7 @@ private void TweenLoop()
106125

107126
private Node2D[] _hands = new Node2D[2];
108127

109-
private int[] _dirToAngle = [270, 90, 180, 0]; //ArrowType to angle in deg
128+
private int[] _dirToAngle = [270, 450, 180, 360]; //ArrowType to angle in deg
110129

111130
private void TweenDir(ArrowType dir)
112131
{
@@ -125,7 +144,10 @@ private void TweenDir(ArrowType dir)
125144
_curTween.TweenCallback(
126145
Callable.From(() =>
127146
{
128-
_hands[handIdx].RotationDegrees = _dirToAngle[(int)dir];
147+
int offset = 0;
148+
if (_dirToAngle[(int)dir] >= 360)
149+
offset = 360;
150+
_hands[handIdx].RotationDegrees = _dirToAngle[(int)dir] - offset;
129151
})
130152
);
131153
}

0 commit comments

Comments
 (0)