Skip to content

Commit 81720a6

Browse files
Rmojarro1LifeHckr
authored andcommitted
Basic Mushroom added
Added Mushroom elite, his notes are default; wanted to add an attack/note that can reduce the player's meter, help with that would be appreciated
1 parent c2b3f8c commit 81720a6

9 files changed

Lines changed: 98 additions & 21 deletions

File tree

Classes/MapAreas/MapLevels.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ private MapLevels(
125125
private static readonly MapLevels[] PresetLevels = new[]
126126
{
127127
new MapLevels(0, TutorialMapConfig, [4], [0], [5], [], 1),
128-
new MapLevels(1, FirstMapConfig, [1, 2, 11, 12], [3], [0], [], 2),
128+
new MapLevels(1, FirstMapConfig, [1, 2, 11, 12], [3, 13], [0], [], 2),
129129
new MapLevels(
130130
2,
131131
CityMapConfig,

Globals/Scribe.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
690690
"Audio/songMaps/Shapes.tres",
691691
[P_Shapes.LoadPath]
692692
),
693-
new SongTemplate( //10
693+
new SongTemplate( //11
694694
new SongData
695695
{
696696
Bpm = 130,
@@ -702,7 +702,7 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
702702
"Audio/songMaps/Spider.tres",
703703
[P_Spider.LoadPath, P_Spider.LoadPath]
704704
),
705-
new SongTemplate(
705+
new SongTemplate( //12
706706
new SongData
707707
{
708708
Bpm = 180,
@@ -714,6 +714,18 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
714714
"Audio/songMaps/SquirkelSong.tres",
715715
[P_Squirkel.LoadPath]
716716
),
717+
new SongTemplate( //13
718+
new SongData
719+
{
720+
Bpm = 100,
721+
SongLength = -1,
722+
NumLoops = 4,
723+
},
724+
"Mushroom",
725+
"Audio/Mushroom.ogg",
726+
"Audio/songMaps/Mushroom.tres",
727+
[P_Mushroom.LoadPath]
728+
),
717729
};
718730

719731
//Needs to be strictly maintained based on what the player has obtained.

Scenes/BattleDirector/Scripts/BattleDirector.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,15 @@ public void DealDamage(Targetting targetting, int damage, PuppetTemplate source)
374374
}
375375
}
376376

377+
/*public void ReduceMeter(Note note, int amountLost, PuppetTemplate source)
378+
{
379+
PuppetTemplate[] targets = GetTargets(note.TargetType);
380+
foreach (PuppetTemplate target in targets)
381+
{
382+
target.
383+
}
384+
}*/
385+
377386
public void AddStatus(Targetting targetting, StatusEffect status, int amount = 1)
378387
{
379388
if (amount == 0)

Scenes/Puppets/Enemies/Mushroom/Mushroom.tscn

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

33
[ext_resource type="Script" uid="uid://qoaceev66ieq" path="res://Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs" id="1_mtres"]
44
[ext_resource type="PackedScene" uid="uid://cdoguwlxehbpg" path="res://Scenes/Puppets/StatusContainer.tscn" id="2_ui84p"]
5-
[ext_resource type="Texture2D" uid="uid://dnjo4sim07auo" path="res://Scenes/Puppets/Enemies/Mushroom/EliteMushroom.png" id="3_mtres"]
5+
[ext_resource type="Texture2D" uid="uid://dnjo4sim07auo" path="res://Scenes/Puppets/Enemies/Mushroom/forest elite concept.png" id="3_mtres"]
66
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="4_af0yh"]
77

88
[sub_resource type="Gradient" id="Gradient_yw3bu"]
@@ -24,9 +24,9 @@ _statusContainer = NodePath("StatusContainer")
2424

2525
[node name="StatusContainer" parent="." instance=ExtResource("2_ui84p")]
2626
offset_left = -33.0
27-
offset_top = -118.0
27+
offset_top = 12.0
2828
offset_right = 43.0
29-
offset_bottom = -82.0
29+
offset_bottom = 48.0
3030

3131
[node name="Sprite2D" type="Sprite2D" parent="."]
3232
position = Vector2(4, -22)

Scenes/Puppets/Enemies/Mushroom/P_Mushroom.cs

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,10 @@ public partial class P_Mushroom : EnemyPuppet
99

1010
public override void _Ready()
1111
{
12-
MaxHealth = 150;
12+
MaxHealth = 200;
1313
CurrentHealth = MaxHealth;
14-
BaseMoney = 20;
15-
InitialNote = (17, 1);
14+
BaseMoney = 10;
15+
InitialNote = (14, 3);
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-
};
2917
}
3018
}
3.81 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://dnjo4sim07auo"
6+
path="res://.godot/imported/forest elite concept.png-c9565f9d800591e4f84b5262ff6bc487.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/Puppets/Enemies/Mushroom/forest elite concept.png"
14+
dest_files=["res://.godot/imported/forest elite concept.png-c9565f9d800591e4f84b5262ff6bc487.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
7.76 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://b8f6cj4fr0l10"
6+
path="res://.godot/imported/forest elite concept_HD.png-0f0d701363202a07526a149a262a8f75.ctex"
7+
metadata={
8+
"vram_texture": false
9+
}
10+
11+
[deps]
12+
13+
source_file="res://Scenes/Puppets/Enemies/Mushroom/forest elite concept_HD.png"
14+
dest_files=["res://.godot/imported/forest elite concept_HD.png-0f0d701363202a07526a149a262a8f75.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

0 commit comments

Comments
 (0)