Skip to content

Commit 5245bb4

Browse files
committed
Add Mushroom note
Also rename LWS class to keep style standards
1 parent 2ada4fe commit 5245bb4

7 files changed

Lines changed: 65 additions & 6 deletions

File tree

874 Bytes
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://d1epchjdmxfxs"
6+
path="res://.godot/imported/Note_Mushroom.png-d7047f8deb762437256829b5c1281cb5.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Classes/Notes/Assets/Note_Mushroom.png"
14+
dest_files=["res://.godot/imported/Note_Mushroom.png-d7047f8deb762437256829b5c1281cb5.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: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,19 @@ public partial class Scribe : Node
231231
director.DealDamage(Targetting.Player, dmg, note.Owner);
232232
}
233233
),
234+
new Note(
235+
17,
236+
"Mushroom",
237+
GD.Load<Texture2D>("res://Classes/Notes/Assets/Note_Mushroom.png"),
238+
2,
239+
(director, note, timing) =>
240+
{
241+
if (timing == Timing.Perfect)
242+
return;
243+
int amt = Math.Max((3 - (int)timing) * note.GetBaseVal(), 1);
244+
director.AddStatus(Targetting.Player, StatusEffect.Poison, amt);
245+
}
246+
),
234247
};
235248

236249
public static readonly RelicTemplate[] RelicDictionary = new[]
@@ -761,7 +774,7 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
761774
name: "LWS",
762775
audioLocation: "Audio/FrostWaltz.ogg",
763776
songMapLocation: "Audio/songMaps/FrostWaltz.tres",
764-
enemyScenePath: [LWS.LoadPath]
777+
enemyScenePath: [P_LWS.LoadPath]
765778
),
766779
};
767780

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
using FunkEngine;
33
using Godot;
44

5-
public partial class LWS : EnemyPuppet
5+
public partial class P_LWS : EnemyPuppet
66
{
77
public static new readonly string LoadPath = "res://Scenes/Puppets/Enemies/LWS/P_LWS.tscn";
88

99
public override void _Ready()
1010
{
11-
MaxHealth = 150;
11+
MaxHealth = 80;
1212
CurrentHealth = MaxHealth;
13-
BaseMoney = 25;
13+
BaseMoney = 8;
1414
InitialNote = (16, 3);
1515
base._Ready();
1616
var enemyTween = CreateTween();

Scenes/Puppets/Enemies/LWS/P_LWS.tscn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[gd_scene load_steps=7 format=3 uid="uid://beww544cthrsj"]
22

3-
[ext_resource type="Script" uid="uid://baudb5v4ai8br" path="res://Scenes/Puppets/Enemies/LWS/LWS.cs" id="1_slsco"]
3+
[ext_resource type="Script" uid="uid://baudb5v4ai8br" path="res://Scenes/Puppets/Enemies/LWS/P_LWS.cs" id="1_slsco"]
44
[ext_resource type="Texture2D" uid="uid://b1k6m2uj4o76x" path="res://Scenes/Puppets/Enemies/LWS/Assets/LWS.png" id="2_iipdd"]
55
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_3fwan"]
66
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="4_dslq0"]

Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,19 @@ public override void _Ready()
1212
MaxHealth = 200;
1313
CurrentHealth = MaxHealth;
1414
BaseMoney = 10;
15-
InitialNote = (14, 3);
15+
InitialNote = (17, 1);
1616
base._Ready();
17+
BattleEvents = new EnemyEffect[]
18+
{
19+
new EnemyEffect(
20+
this,
21+
BattleEffectTrigger.OnBattleStart,
22+
1,
23+
(e, eff, _) =>
24+
{
25+
e.BD.RandApplyNote(eff.Owner, 17, 1);
26+
}
27+
),
28+
};
1729
}
1830
}

0 commit comments

Comments
 (0)