Skip to content

Commit 1939a2f

Browse files
committed
Added spiked shield
1 parent 5b8d045 commit 1939a2f

4 files changed

Lines changed: 67 additions & 0 deletions

File tree

1.11 KB
Loading
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://yukvjlpcbpt6"
6+
path="res://.godot/imported/Relic_SpikedShield.png-59642dbb734140b3422c00600f46526b.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Classes/Relics/Assets/Relic_SpikedShield.png"
14+
dest_files=["res://.godot/imported/Relic_SpikedShield.png-59642dbb734140b3422c00600f46526b.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/Scribe.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,31 @@ public partial class Scribe : Node
349349
),
350350
}
351351
),
352+
new RelicTemplate(
353+
11,
354+
"Spiked Shield",
355+
Rarity.Rare,
356+
GD.Load<Texture2D>("res://Classes/Relics/Assets/Relic_SpikedShield.png"),
357+
new RelicEffect[]
358+
{
359+
new RelicEffect(
360+
BattleEffectTrigger.OnDamageInstance,
361+
5,
362+
(e, self, val) =>
363+
{
364+
if (
365+
e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
366+
&& dmgArgs.Dmg.Target == e.BD.Player
367+
&& dmgArgs.Dmg.Damage > 0
368+
&& e.BD.Player.HasStatus(StatusEffect.Block.GetInstance())
369+
)
370+
{
371+
e.BD.DealDamage(Targetting.First, val, null);
372+
}
373+
}
374+
),
375+
}
376+
),
352377
};
353378

354379
public static readonly SongTemplate[] SongDictionary = new[] //Generalize and make pools for areas/room types

Scenes/Puppets/Scripts/PuppetTemplate.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,5 +192,13 @@ public void RemoveStatusEffect(StatusEffect effect)
192192
StatusEffects.Remove(effect);
193193
effect.QueueFree();
194194
}
195+
196+
public bool HasStatus(StatusEffect effect)
197+
{
198+
int index = StatusEffects.FindIndex(sEff => sEff.StatusName == effect.StatusName);
199+
if (index != -1)
200+
return true;
201+
return false;
202+
}
195203
#endregion
196204
}

0 commit comments

Comments
 (0)