Skip to content

Commit bc47366

Browse files
committed
Fix up Spider Enemy
Add note icon Fix wrong targeting for note effect
1 parent c291ca0 commit bc47366

6 files changed

Lines changed: 13 additions & 47 deletions

File tree

Globals/Scribe.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -208,12 +208,12 @@ public partial class Scribe : Node
208208
new Note(
209209
15,
210210
"Spider",
211-
GD.Load<Texture2D>("res://Classes/Notes/Assets/Note_Parasifly.png"),
211+
GD.Load<Texture2D>("res://Classes/Notes/Assets/Note_Spider.png"),
212212
1,
213213
(director, note, timing) =>
214214
{
215215
int amt = Math.Max((3 - (int)timing) * note.GetBaseVal(), 1);
216-
director.AddStatus(Targetting.First, StatusEffect.Poison, amt);
216+
director.AddStatus(Targetting.Player, StatusEffect.Poison, amt);
217217
}
218218
),
219219
};
@@ -667,13 +667,13 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
667667
new SongTemplate( //9
668668
new SongData
669669
{
670-
Bpm = 120,
670+
Bpm = 60,
671671
SongLength = -1,
672-
NumLoops = 5,
672+
NumLoops = 1,
673673
},
674674
"Holograeme",
675-
"Audio/Song1.ogg",
676-
"Audio/songMaps/Song1.tres",
675+
"Audio/Song2.ogg",
676+
"Audio/songMaps/Song2.tres",
677677
[P_Holograeme.LoadPath]
678678
),
679679
new SongTemplate( //10

Scenes/Puppets/Enemies/Spider/P_Spider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ public partial class P_Spider : EnemyPuppet
88

99
public override void _Ready()
1010
{
11-
MaxHealth = 50;
11+
MaxHealth = 100;
1212
CurrentHealth = MaxHealth;
13-
BaseMoney = 1;
14-
InitialNote = (15, 1);
13+
BaseMoney = 5;
14+
InitialNote = (15, 2);
1515
base._Ready();
1616

1717
BattleEvents = new EnemyEffect[]
-1.26 KB
Binary file not shown.

Scenes/Puppets/Enemies/Spider/Spider.tscn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[ext_resource type="Script" uid="uid://0o44m0e5yxiy" path="res://Scenes/Puppets/Enemies/Spider/P_Spider.cs" id="1_gyxko"]
44
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="2_xxbs3"]
5-
[ext_resource type="Texture2D" uid="uid://dvux16psycv0x" path="res://Scenes/Puppets/Enemies/Spider/spider.png" id="3_jf83a"]
5+
[ext_resource type="Texture2D" uid="uid://dvux16psycv0x" path="res://Scenes/Puppets/Enemies/Spider/Spider.png" id="3_jf83a"]
66
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="4_vp5wi"]
77

88
[sub_resource type="Gradient" id="Gradient_olxmf"]
@@ -29,12 +29,12 @@ offset_right = 41.0
2929
offset_bottom = 21.0
3030

3131
[node name="Sprite2D" type="Sprite2D" parent="."]
32-
position = Vector2(0, -25)
32+
position = Vector2(0, 6)
3333
texture = ExtResource("3_jf83a")
3434

3535
[node name="ProgressBar" parent="." instance=ExtResource("4_vp5wi")]
3636
offset_left = -47.0
37-
offset_top = 18.0
37+
offset_top = 31.0
3838
offset_right = 55.0
39-
offset_bottom = 38.0
39+
offset_bottom = 51.0
4040
texture_progress = SubResource("GradientTexture2D_r5ep7")
-1.26 KB
Binary file not shown.

Scenes/Puppets/Enemies/Spider/spider.png.import

Lines changed: 0 additions & 34 deletions
This file was deleted.

0 commit comments

Comments
 (0)