Skip to content

Commit d877edc

Browse files
committed
Remove temp Event Assets
Leave as null for now
1 parent f9eada6 commit d877edc

6 files changed

Lines changed: 4 additions & 71 deletions

File tree

Classes/Events/Assets/Event1.png

-13.7 KB
Binary file not shown.

Classes/Events/Assets/Event1.png.import

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

Classes/Events/Assets/Event3.png

-13.7 KB
Binary file not shown.

Classes/Events/Assets/Event3.png.import

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

Classes/Events/EventDatabase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class EventDatabase
3535
StageProducer.PlayerStats.Money /= 2;
3636
},
3737
],
38-
GD.Load<Texture2D>("res://Classes/Events/Assets/Event1.png"),
38+
null,
3939
[
4040
() => StageProducer.PlayerStats.CurNotes.Length > 0,
4141
() => StageProducer.PlayerStats.CurRelics.Length > 0,
@@ -146,7 +146,7 @@ public class EventDatabase
146146
StageProducer.PlayerStats.AddNote(Scribe.NoteDictionary[3]);
147147
},
148148
],
149-
GD.Load<Texture2D>("res://Classes/Events/Assets/Event3.png"),
149+
null,
150150
[null, null, () => StageProducer.PlayerStats.Money >= 30]
151151
),
152152
};

Scenes/Puppets/Enemies/Holograeme/Holograeme.tscn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,13 @@ gradient = SubResource("Gradient_hguc7")
1919
width = 22
2020
height = 18
2121

22-
[node name="Holograeme" type="Node2D" node_paths=PackedStringArray("_whiteHand", "_redHand", "HealthBar", "Sprite")]
22+
[node name="Holograeme" type="Node2D" node_paths=PackedStringArray("_whiteHand", "_redHand", "HealthBar", "Sprite", "_statusContainer")]
2323
script = ExtResource("1_qkr3f")
2424
_whiteHand = NodePath("Hand2Center")
2525
_redHand = NodePath("Hand1Center")
2626
HealthBar = NodePath("ProgressBar")
2727
Sprite = NodePath("Sprite")
28+
_statusContainer = NodePath("StatusContainer")
2829

2930
[node name="Sprite" type="Sprite2D" parent="."]
3031
position = Vector2(0, -4)

0 commit comments

Comments
 (0)