Skip to content

Commit 37ea9b8

Browse files
LifeHckrcornerloan
LifeHckr
and
cornerloan
committed
Remove current implementation of block
This would be a good addition, just want to better incorporate it in eventually. Ideally with a proposed status effect system. Co-Authored-By: Connor Lowe <74088480+cornerloan@users.noreply.github.com>
1 parent 66412c1 commit 37ea9b8

File tree

8 files changed

+14
-134
lines changed

8 files changed

+14
-134
lines changed

‎Globals/Scribe.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public partial class Scribe : Node
9696
),
9797
new Note(
9898
6,
99-
"PlayerBlock",
99+
"Play-c-HoldBlock",
100100
"Gives player one charge of block.",
101101
GD.Load<Texture2D>("res://Classes/Notes/Assets/Note_PlayerBlock.png"),
102102
null,
@@ -105,7 +105,7 @@ public partial class Scribe : Node
105105
{
106106
if (timing == Timing.Miss)
107107
return;
108-
director.Player.GainShield(note.GetBaseVal()); //todo: should scale with timing????
108+
//director.Player.GainShield(note.GetBaseVal()); //todo: should scale with timing????
109109
}
110110
),
111111
};

‎Scenes/Puppets/Enemies/BossBlood/Boss1.tscn‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
[gd_scene load_steps=9 format=3 uid="uid://bi5iqbwpsd381"]
1+
[gd_scene load_steps=8 format=3 uid="uid://bi5iqbwpsd381"]
22

33
[ext_resource type="Script" uid="uid://bpyrrnhvisxgv" path="res://Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs" id="1_qj2oj"]
44
[ext_resource type="Texture2D" uid="uid://veedngaorx3l" path="res://Scenes/Puppets/Enemies/BossBlood/Assets/Boss1.png" id="2_mul30"]
55
[ext_resource type="Texture2D" uid="uid://b2iptr3o8rg4t" path="res://Scenes/Puppets/Enemies/BossBlood/Assets/Boss1EmissionShape.tres" id="3_yxnso"]
66
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="4_ffkxf"]
7-
[ext_resource type="Texture2D" uid="uid://bsg8b14xbddb6" path="res://SharedAssets/Shield.png" id="5_pa2dv"]
87

98
[sub_resource type="Gradient" id="Gradient_s7p55"]
109
offsets = PackedFloat32Array(0)
@@ -23,21 +22,11 @@ scale_min = 4.0
2322
scale_max = 4.0
2423
turbulence_noise_strength = 14.2
2524

26-
[sub_resource type="Gradient" id="Gradient_s7p55"]
27-
offsets = PackedFloat32Array(0)
28-
colors = PackedColorArray(0.641048, 0.0406094, 0.0473231, 1)
29-
30-
[sub_resource type="GradientTexture1D" id="GradientTexture1D_16sp0"]
31-
gradient = SubResource("Gradient_s7p55")
32-
width = 1
33-
34-
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "ShieldLogo", "ShieldText")]
25+
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite")]
3526
script = ExtResource("1_qj2oj")
3627
HealthBar = NodePath("ProgressBar")
3728
Sprite = NodePath("Sprite")
3829
InitScale = Vector2(2, 2)
39-
ShieldLogo = NodePath("Shield")
40-
ShieldText = NodePath("Shield/ShieldText")
4130

4231
[node name="Sprite" type="Sprite2D" parent="."]
4332
position = Vector2(0, -32)
@@ -57,15 +46,3 @@ offset_left = -75.0
5746
offset_top = 32.0
5847
offset_right = 75.0
5948
offset_bottom = 52.0
60-
61-
[node name="Shield" type="Sprite2D" parent="."]
62-
position = Vector2(56, 20)
63-
texture = ExtResource("5_pa2dv")
64-
65-
[node name="ShieldText" type="Label" parent="Shield"]
66-
offset_left = -13.0
67-
offset_top = -10.0
68-
offset_right = 13.0
69-
offset_bottom = 13.0
70-
text = "XX"
71-
horizontal_alignment = 1

‎Scenes/Puppets/Enemies/EnemyPuppet.tscn‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,15 @@
1-
[gd_scene load_steps=4 format=3 uid="uid://cwm0n2wu851nx"]
1+
[gd_scene load_steps=3 format=3 uid="uid://cwm0n2wu851nx"]
22

3-
[ext_resource type="Script" path="res://Scenes/Puppets/Scripts/PuppetTemplate.cs" id="1_kgmh0"]
3+
[ext_resource type="Script" uid="uid://bnfo57c070cll" path="res://Scenes/Puppets/Scripts/PuppetTemplate.cs" id="1_kgmh0"]
44
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="1_sxlrs"]
5-
[ext_resource type="Texture2D" uid="uid://bsg8b14xbddb6" path="res://SharedAssets/Shield.png" id="2_xx60o"]
65

7-
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "ShieldLogo", "ShieldText")]
6+
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite")]
87
script = ExtResource("1_kgmh0")
98
HealthBar = NodePath("ProgressBar")
109
Sprite = NodePath("Sprite")
11-
ShieldLogo = NodePath("Sprite/Shield")
12-
ShieldText = NodePath("Sprite/Shield/ShieldText")
1310

1411
[node name="Sprite" type="Sprite2D" parent="."]
1512

16-
[node name="Shield" type="Sprite2D" parent="Sprite"]
17-
position = Vector2(56, 20)
18-
texture = ExtResource("2_xx60o")
19-
20-
[node name="ShieldText" type="Label" parent="Sprite/Shield"]
21-
offset_left = -13.0
22-
offset_top = -10.0
23-
offset_right = 13.0
24-
offset_bottom = 13.0
25-
text = "XX"
26-
horizontal_alignment = 1
27-
2813
[node name="ProgressBar" parent="." instance=ExtResource("1_sxlrs")]
2914
offset_left = -75.0
3015
offset_top = 32.0

‎Scenes/Puppets/Enemies/Parasifly/Parasifly.tscn‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://uvlux4t6h5de"]
1+
[gd_scene load_steps=4 format=3 uid="uid://uvlux4t6h5de"]
22

33
[ext_resource type="Script" uid="uid://btaqgieybx0ep" path="res://Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs" id="1_ci2ca"]
44
[ext_resource type="Texture2D" uid="uid://pngu3pw1pu4o" path="res://Scenes/Puppets/Enemies/Parasifly/Assets/Parasifly.png" id="2_g4o48"]
55
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_f74ri"]
6-
[ext_resource type="Texture2D" uid="uid://bsg8b14xbddb6" path="res://SharedAssets/Shield.png" id="4_eemg7"]
76

8-
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "ShieldLogo", "ShieldText")]
7+
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite")]
98
script = ExtResource("1_ci2ca")
109
HealthBar = NodePath("ProgressBar")
1110
Sprite = NodePath("Sprite")
12-
StartPos = Vector2(500, 125)
13-
ShieldLogo = NodePath("Shield")
14-
ShieldText = NodePath("Shield/ShieldText")
1511

1612
[node name="Sprite" type="Sprite2D" parent="."]
1713
position = Vector2(0, -12)
@@ -22,15 +18,3 @@ offset_left = -75.0
2218
offset_top = 32.0
2319
offset_right = 75.0
2420
offset_bottom = 52.0
25-
26-
[node name="Shield" type="Sprite2D" parent="."]
27-
position = Vector2(56, 20)
28-
texture = ExtResource("4_eemg7")
29-
30-
[node name="ShieldText" type="Label" parent="Shield"]
31-
offset_left = -13.0
32-
offset_top = -10.0
33-
offset_right = 13.0
34-
offset_bottom = 13.0
35-
text = "XX"
36-
horizontal_alignment = 1

‎Scenes/Puppets/Enemies/TheGWS/GWS.tscn‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://d1puw6fvmkrb5"]
1+
[gd_scene load_steps=4 format=3 uid="uid://d1puw6fvmkrb5"]
22

33
[ext_resource type="Script" uid="uid://3axgcdtdevtx" path="res://Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs" id="1_dlike"]
44
[ext_resource type="Texture2D" uid="uid://ci0a2h2eatjht" path="res://Scenes/Puppets/Enemies/TheGWS/Assets/GhostWolfSnake.png" id="2_77v4w"]
55
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_mr0it"]
6-
[ext_resource type="Texture2D" uid="uid://bsg8b14xbddb6" path="res://SharedAssets/Shield.png" id="4_udalx"]
76

8-
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "ShieldLogo", "ShieldText")]
7+
[node name="EnemPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite")]
98
script = ExtResource("1_dlike")
109
HealthBar = NodePath("ProgressBar")
1110
Sprite = NodePath("Sprite")
12-
StartPos = Vector2(500, 125)
13-
ShieldLogo = NodePath("Shield")
14-
ShieldText = NodePath("Shield/ShieldText")
1511

1612
[node name="Sprite" type="Sprite2D" parent="."]
1713
position = Vector2(0, -54)
@@ -22,15 +18,3 @@ offset_left = -75.0
2218
offset_top = 32.0
2319
offset_right = 75.0
2420
offset_bottom = 52.0
25-
26-
[node name="Shield" type="Sprite2D" parent="."]
27-
position = Vector2(56, 20)
28-
texture = ExtResource("4_udalx")
29-
30-
[node name="ShieldText" type="Label" parent="Shield"]
31-
offset_left = -13.0
32-
offset_top = -10.0
33-
offset_right = 13.0
34-
offset_bottom = 13.0
35-
text = "XX"
36-
horizontal_alignment = 1

‎Scenes/Puppets/HealthBar.tscn‎

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

3-
[ext_resource type="Script" path="res://Scenes/Puppets/Scripts/HealthBar.cs" id="1_b1t4i"]
3+
[ext_resource type="Script" uid="uid://d24uqauywe5j5" path="res://Scenes/Puppets/Scripts/HealthBar.cs" id="1_b1t4i"]
44

55
[sub_resource type="Gradient" id="Gradient_ve5ki"]
66
colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)

‎Scenes/Puppets/PlayerPuppet.tscn‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
[gd_scene load_steps=5 format=3 uid="uid://eus17omen6yk"]
1+
[gd_scene load_steps=4 format=3 uid="uid://eus17omen6yk"]
22

33
[ext_resource type="Script" uid="uid://kkb4qp3s86n3" path="res://Scenes/Puppets/Scripts/PlayerPuppet.cs" id="1_f4rea"]
44
[ext_resource type="Texture2D" uid="uid://b6fkei0i83vte" path="res://SharedAssets/Character1.png" id="2_affso"]
55
[ext_resource type="PackedScene" uid="uid://bgomxovxs7sr8" path="res://Scenes/Puppets/HealthBar.tscn" id="3_rechw"]
6-
[ext_resource type="Texture2D" uid="uid://bsg8b14xbddb6" path="res://SharedAssets/Shield.png" id="4_5uc4u"]
76

8-
[node name="PlayerPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite", "ShieldLogo", "ShieldText")]
7+
[node name="PlayerPuppet" type="Node2D" node_paths=PackedStringArray("HealthBar", "Sprite")]
98
script = ExtResource("1_f4rea")
109
HealthBar = NodePath("ProgressBar")
1110
Sprite = NodePath("Sprite")
12-
StartPos = Vector2(158, 125)
13-
ShieldLogo = NodePath("Shield")
14-
ShieldText = NodePath("Shield/ShieldText")
1511

1612
[node name="Sprite" type="Sprite2D" parent="."]
1713
texture = ExtResource("2_affso")
@@ -21,15 +17,3 @@ offset_left = -75.0
2117
offset_top = 32.0
2218
offset_right = 75.0
2319
offset_bottom = 52.0
24-
25-
[node name="Shield" type="Sprite2D" parent="."]
26-
position = Vector2(56, 20)
27-
texture = ExtResource("4_5uc4u")
28-
29-
[node name="ShieldText" type="Label" parent="Shield"]
30-
offset_left = -13.0
31-
offset_top = -10.0
32-
offset_right = 13.0
33-
offset_bottom = 13.0
34-
text = "XX"
35-
horizontal_alignment = 1

‎Scenes/Puppets/Scripts/PuppetTemplate.cs‎

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ public partial class PuppetTemplate : Node2D
2727
protected int MaxHealth = 100;
2828
protected int CurrentHealth = 100;
2929

30-
//Stats would go here.
31-
protected int _numShield = 0; //todo: shield mechanic to block / dodge damage
32-
33-
[Export]
34-
public Sprite2D ShieldLogo;
35-
36-
[Export]
37-
public Label ShieldText;
38-
3930
protected string UniqName = ""; //Eventually make subclasses/scenes/real stuff
4031

4132
public override void _Ready()
@@ -45,9 +36,6 @@ public override void _Ready()
4536
Sprite.Scale = InitScale;
4637

4738
HealthBar.Visible = !HideHealth;
48-
49-
if (_numShield == 0)
50-
ShieldLogo.Visible = false;
5139
}
5240

5341
public override void _Process(double delta)
@@ -127,21 +115,6 @@ protected virtual void Kill()
127115

128116
public virtual void TakeDamage(int amount)
129117
{
130-
if (_numShield > 0 && amount > 0)
131-
{
132-
_numShield--;
133-
ShieldText.Text = $"{_numShield}";
134-
if (_numShield == 0)
135-
ShieldLogo.Visible = false;
136-
137-
TextParticle blockText = new TextParticle();
138-
blockText.Modulate = Colors.White; //white text for blocked damage
139-
Sprite.AddChild(blockText);
140-
blockText.Text = "-0"; //blocked damage is 0
141-
142-
return;
143-
}
144-
145118
amount = Math.Max(0, amount); //Should not be able to heal from damage.
146119
if (CurrentHealth <= 0 || amount == 0)
147120
return; //Only check if hp would change
@@ -175,11 +148,4 @@ public int GetCurrentHealth()
175148
{
176149
return CurrentHealth;
177150
}
178-
179-
public virtual void GainShield(int amount)
180-
{
181-
ShieldLogo.Visible = true;
182-
_numShield += amount;
183-
ShieldText.Text = $"{_numShield}";
184-
}
185151
}

0 commit comments

Comments
 (0)