Skip to content

Commit 6b7b984

Browse files
cornerloancornerloan
committed
Updated to include Michael's relic
Added 4 new relics: -Energy Drink: decreases max combo bar on pickup - Bandage: heals player after each combat - Medkit: heals player after each loop - Vinyl record: all loop effects trigger twice (excluding vinyl record)
1 parent 1b0aa23 commit 6b7b984

File tree

14 files changed

+248
-8
lines changed

14 files changed

+248
-8
lines changed

‎Classes/Relics/Assets/Relic_Bandage.png‎

775 Bytes
Loading

‎Classes/Relics/Assets/Relic_Bandage.png.import‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://dliqeijojucd2"
6+
path="res://.godot/imported/Relic_Bandage.png-7332ff4bcec166f3ea2b8ef3f740e5ec.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Classes/Relics/Assets/Relic_Bandage.png"
14+
dest_files=["res://.godot/imported/Relic_Bandage.png-7332ff4bcec166f3ea2b8ef3f740e5ec.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎Classes/Relics/Assets/Relic_EnergyDrink.png‎

911 Bytes
Loading

‎Classes/Relics/Assets/Relic_EnergyDrink.png.import‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bi678rx26dxdd"
6+
path="res://.godot/imported/Relic_EnergyDrink.png-31545a8db92a3c6cae482d1f8ecceff0.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Classes/Relics/Assets/Relic_EnergyDrink.png"
14+
dest_files=["res://.godot/imported/Relic_EnergyDrink.png-31545a8db92a3c6cae482d1f8ecceff0.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎Classes/Relics/Assets/Relic_Medkit.png‎

668 Bytes
Loading

‎Classes/Relics/Assets/Relic_Medkit.png.import‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://wtddl5ssgrm3"
6+
path="res://.godot/imported/Relic_Medkit.png-44673854c4fdf8be51048f39e6d245d1.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Classes/Relics/Assets/Relic_Medkit.png"
14+
dest_files=["res://.godot/imported/Relic_Medkit.png-44673854c4fdf8be51048f39e6d245d1.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎Classes/Relics/Assets/Relic_VinylRecord.png‎

868 Bytes
Loading

‎Classes/Relics/Assets/Relic_VinylRecord.png.import‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="CompressedTexture2D"
5+
uid="uid://bk7k5dk7g1mih"
6+
path="res://.godot/imported/Relic_VinylRecord.png-bd107871c395e71c5f912f3df2f1bdd4.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Classes/Relics/Assets/Relic_VinylRecord.png"
14+
dest_files=["res://.godot/imported/Relic_VinylRecord.png-bd107871c395e71c5f912f3df2f1bdd4.ctex"]
15+
16+
[params]
17+
18+
compress/mode=0
19+
compress/high_quality=false
20+
compress/lossy_quality=0.7
21+
compress/hdr_compression=1
22+
compress/normal_map=0
23+
compress/channel_pack=0
24+
mipmaps/generate=false
25+
mipmaps/limit=-1
26+
roughness/mode=0
27+
roughness/src_normal=""
28+
process/fix_alpha_border=true
29+
process/premult_alpha=false
30+
process/normal_map_invert_y=false
31+
process/hdr_as_srgb=false
32+
process/hdr_clamp_exposure=false
33+
process/size_limit=0
34+
detect_3d/compress_to=1

‎Globals/FunkEngineNameSpace.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ public enum BattleEffectTrigger
229229
SelfNoteHit,
230230
OnPickup,
231231
OnLoop,
232+
OnBattleStart,
233+
OnBattleEnd,
232234
}
233235

234236
public enum Stages

‎Globals/Scribe.cs‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,82 @@ public partial class Scribe : Node
223223
),
224224
}
225225
),
226+
new RelicTemplate(
227+
6,
228+
"Energy Drink",
229+
"Take a chance to cool down and sip an energy drink to increase your max energy bar.",
230+
Rarity.Common,
231+
GD.Load<Texture2D>("res://Classes/Relics/Assets/Relic_EnergyDrink.png"),
232+
new RelicEffect[]
233+
{
234+
new RelicEffect(
235+
BattleEffectTrigger.OnPickup,
236+
10,
237+
(e, self, val) =>
238+
{
239+
StageProducer.PlayerStats.MaxComboBar -= val;
240+
}
241+
),
242+
}
243+
),
244+
new RelicTemplate(
245+
7,
246+
"Bandage",
247+
"A clean strip of cloth. Use it after a fight to patch up and feel better.",
248+
Rarity.Common,
249+
GD.Load<Texture2D>("res://Classes/Relics/Assets/Relic_Bandage.png"),
250+
new RelicEffect[]
251+
{
252+
new RelicEffect(
253+
BattleEffectTrigger.OnBattleEnd,
254+
10,
255+
(e, self, val) =>
256+
{
257+
StageProducer.PlayerStats.CurrentHealth += val;
258+
}
259+
),
260+
}
261+
),
262+
new RelicTemplate(
263+
8,
264+
"Medkit",
265+
"A small kit with medical supplies. Heals you a bit after each loop.",
266+
Rarity.Common,
267+
GD.Load<Texture2D>("res://Classes/Relics/Assets/Relic_Medkit.png"),
268+
new RelicEffect[]
269+
{
270+
new RelicEffect(
271+
BattleEffectTrigger.OnLoop,
272+
5,
273+
(e, self, val) =>
274+
{
275+
e.BD.Player.Heal(val);
276+
}
277+
),
278+
}
279+
),
280+
new RelicTemplate(
281+
9,
282+
"Vinyl Record",
283+
"Right round, right round. All loop effects trigger twice.",
284+
Rarity.Legendary,
285+
GD.Load<Texture2D>("res://Classes/Relics/Assets/Relic_VinylRecord.png"),
286+
new RelicEffect[]
287+
{
288+
new RelicEffect(
289+
BattleEffectTrigger.OnLoop,
290+
0,
291+
(e, self, val) =>
292+
{
293+
if (
294+
(e is BattleDirector.Harbinger.LoopEventArgs eLoop)
295+
&& !eLoop.ArtificialLoop
296+
)
297+
BattleDirector.Harbinger.Instance.InvokeChartLoop(eLoop.Loop);
298+
}
299+
),
300+
}
301+
),
226302
};
227303

228304
public static readonly SongTemplate[] SongDictionary = new[]
@@ -285,6 +361,7 @@ public static RelicTemplate[] GetRandomRelics(RelicTemplate[] excludedRelics, in
285361
{
286362
availableRelics = availableRelics.Append(RelicDictionary[0].Clone()).ToArray();
287363
}
364+
288365
return availableRelics;
289366
}
290367

0 commit comments

Comments
 (0)