maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-21 15:43:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfixes

Browse source
This commit is contained in:
MaddoScientisto 2025-03-22 17:47:24 +01:00
commit d927886380
6 changed files with 29 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Scenes/HUD/OptionsMenu.tscn
View file

@ -13,7 +13,7 @@ font_size = 20
outline_size = 4 outline_size = 4
outline_color = Color(0, 0, 0, 1) outline_color = Color(0, 0, 0, 1)
[node name="OptionsMenu" type="VBoxContainer" node_paths=PackedStringArray("ResolutionsList", "VSyncToggle")] [node name="OptionsMenu" type="VBoxContainer" node_paths=PackedStringArray("ResolutionsList", "VSyncToggle", "FullScreenToggle")]
anchors_preset = 15 anchors_preset = 15
anchor_right = 1.0 anchor_right = 1.0
anchor_bottom = 1.0 anchor_bottom = 1.0
@ -22,6 +22,7 @@ grow_vertical = 2
script = ExtResource("1_mpohc") script = ExtResource("1_mpohc")
ResolutionsList = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/Resolution/ResolutionsList") ResolutionsList = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/Resolution/ResolutionsList")
VSyncToggle = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/VsyncCheckbox") VSyncToggle = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/VsyncCheckbox")
FullScreenToggle = NodePath("ScrollContainer/HBoxContainer/HFlowContainer/FullScreenCheck")
[node name="HBoxContainer" type="HBoxContainer" parent="."] [node name="HBoxContainer" type="HBoxContainer" parent="."]
layout_mode = 2 layout_mode = 2
@ -76,7 +77,7 @@ layout_mode = 2
size_flags_vertical = 0 size_flags_vertical = 0
text = "VSync" text = "VSync"
[node name="CheckBox2" type="CheckBox" parent="ScrollContainer/HBoxContainer/HFlowContainer"] [node name="FullScreenCheck" type="CheckBox" parent="ScrollContainer/HBoxContainer/HFlowContainer"]
layout_mode = 2 layout_mode = 2
size_flags_vertical = 0 size_flags_vertical = 0
text = "Full Screen" text = "Full Screen"

2
Scenes/Interactable/Chest.tscn
View file

@ -117,6 +117,6 @@ shape = SubResource("CircleShape2D_7lp3q")
[node name="Health" type="Node2D" parent="DamageReceiver"] [node name="Health" type="Node2D" parent="DamageReceiver"]
script = ExtResource("3_s8kek") script = ExtResource("3_s8kek")
ResourceName = "Health" ResourceName = "Health"
MaxResource = 8.0 _maxResource = 8.0
[connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"] [connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"]

2
Scenes/test.tscn
View file

@ -1090,7 +1090,7 @@ position = Vector2(-1120, 80)
curve = SubResource("Curve2D_gd7x4") curve = SubResource("Curve2D_gd7x4")
[node name="Vertical Box" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("84_bwt6v")] [node name="Vertical Box" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("84_bwt6v")]
position = Vector2(-967, 182) position = Vector2(-969, 184)
[node name="HorizontalForceField2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("66_nxn3h")] [node name="HorizontalForceField2" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("66_nxn3h")]
position = Vector2(-432, 143) position = Vector2(-432, 143)

9
Scripts/Actors/Boss.cs
View file

@ -14,7 +14,7 @@ public partial class Boss : Enemy, IActivable, IScriptHost
//[Export] private Array<BossPhase> Phases; //[Export] private Array<BossPhase> Phases;
[Export] public BossScript BossScript { get; private set; } [Export] public BossScript BossScript { get; private set; }
//[Export] private PackedScene BossHudPrefab; //[Export] private PackedScene BossHudPrefab;
[Export] public Vector2 BossPhaseAnimationStartingPosition = new Vector2(180, 10); [Export] public Vector2 BossPhaseAnimationStartingPosition = new(180, 10);
private int currentPhaseIndex = 0; private int currentPhaseIndex = 0;
@ -108,6 +108,12 @@ public partial class Boss : Enemy, IActivable, IScriptHost
} }
} }
protected override void ActivateDefeatScript()
{
GameManager.Instance.ClearBullets();
base.ActivateDefeatScript();
}
protected override void Explode() protected override void Explode()
{ {
if (_bossHud is not null) if (_bossHud is not null)
@ -122,6 +128,7 @@ public partial class Boss : Enemy, IActivable, IScriptHost
private void StartPhase(BossPhase phase) private void StartPhase(BossPhase phase)
{ {
GameManager.Instance.ClearBullets();
if (phase.PlayAnimation) if (phase.PlayAnimation)
{ {
_waiting = true; _waiting = true;

2
Scripts/Enemy.cs
View file

@ -283,7 +283,7 @@ public partial class Enemy : CharacterBody2D
} }
} }
protected void ActivateDefeatScript() protected virtual void ActivateDefeatScript()
{ {
if (DefeatScript is not IActivable target) if (DefeatScript is not IActivable target)
{ {

15
Scripts/UI/OptionsMenu.cs
View file

@ -36,6 +36,21 @@ public partial class OptionsMenu : MenuBase
VSyncToggle.Toggled += VSyncToggleOnToggled; VSyncToggle.Toggled += VSyncToggleOnToggled;
FullScreenToggle.SetPressed(DisplayServer.WindowGetMode() is DisplayServer.WindowMode.Fullscreen); FullScreenToggle.SetPressed(DisplayServer.WindowGetMode() is DisplayServer.WindowMode.Fullscreen);
FullScreenToggle.Toggled += FullScreenToggleOnToggled;
}
private void FullScreenToggleOnToggled(bool toggledon)
{
switch (toggledon)
{
case true:
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Fullscreen);
break;
case false:
DisplayServer.WindowSetMode(DisplayServer.WindowMode.Windowed);
break;
}
} }
private void VSyncToggleOnToggled(bool toggledOn) private void VSyncToggleOnToggled(bool toggledOn)