GKaszewski/przygody-pana-cegly
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new UID files and update scene configurations for dialogue components; refactor skill management and input handling

Browse Source
This commit is contained in:
Gabriel Kaszewski
2025-08-26 23:05:30 +02:00
parent 6e71c321f7
commit 6c733d3159
339 changed files with 18075 additions and 3491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scripts/UI/Marketplace.cs
View File

@@ -13,7 +13,7 @@ public partial class Marketplace : Control
[Export] public GridContainer ToUnlockGrid { get; set; }
[Export] public GridContainer UnlockedGrid { get; set; }
[Export] public Font Font { get; set; }
[Export] public SkillUnlockedComponent SkillUnlockedComponent { get; set; }
[Export] public SkillUnlockerComponent SkillUnlockerComponent { get; set; }
[Export] public Array<Node> ComponentsToDisable { get; set; } = [];
[Export] public PackedScene MarketplaceButtonScene { get; set; }
[Export] public PackedScene SkillButtonScene { get; set; }
@@ -35,12 +35,12 @@ public partial class Marketplace : Control
var unlockedSkills = _gameManager.GetUnlockedSkills();
foreach (var skill in unlockedSkills) CreateSkillButton(skill);
SkillUnlockedComponent.SkillUnlocked += OnSkillUnlocked;
SkillUnlockerComponent.SkillUnlocked += OnSkillUnlocker;
}
public override void _ExitTree()
{
SkillUnlockedComponent.SkillUnlocked -= OnSkillUnlocked;
SkillUnlockerComponent.SkillUnlocked -= OnSkillUnlocker;
}
public override void _Input(InputEvent @event)
@@ -64,7 +64,7 @@ public partial class Marketplace : Control
return $"{Tr(skill.Name)} {skill.Cost}";
}
private void OnSkillUnlocked(SkillData skill)
private void OnSkillUnlocker(SkillData skill)
{
if (_skillButtons.Count == 0) CreateSkillButton(skill);
@@ -109,17 +109,17 @@ public partial class Marketplace : Control
{
if (skill.Level < skill.MaxLevel)
{
SkillUnlockedComponent.TryUpgradeSkill(skill);
if (!skill.IsActive) SkillUnlockedComponent.SkillManager.ToggleSkillActivation(skill);
SkillUnlockerComponent.TryUpgradeSkill(skill);
if (!skill.IsActive) SkillUnlockerComponent.SkillManager.ToggleSkillActivation(skill);
}
else
{
SkillUnlockedComponent.SkillManager.ToggleSkillActivation(skill);
SkillUnlockerComponent.SkillManager.ToggleSkillActivation(skill);
}
}
else
{
SkillUnlockedComponent.TryUnlockSkill(skill);
SkillUnlockerComponent.TryUnlockSkill(skill);
}
}
@@ -137,6 +137,6 @@ public partial class Marketplace : Control
private void OnSkillButtonPressed(SkillButton button)
{
SkillUnlockedComponent.SkillManager.ToggleSkillActivation(button.Data);
SkillUnlockerComponent.SkillManager.ToggleSkillActivation(button.Data);
}
}

6
scripts/UI/MarketplaceButton.cs
View File

@@ -13,7 +13,7 @@ public partial class MarketplaceButton : Button
[Export] public Container SkillLevelContainer { get; set; }
private GameManager _gameManager;
private SkillUnlockedComponent _skillUnlockedComponent;
private SkillUnlockerComponent _skillUnlockerComponent;
public override void _Ready()
{
@@ -22,7 +22,7 @@ public partial class MarketplaceButton : Button
Setup();
var player = _gameManager.Player;
var skillUnlockerComponent = player?.GetNodeOrNull<SkillUnlockedComponent>("SkillUnlockerComponent");
var skillUnlockerComponent = player?.GetNodeOrNull<SkillUnlockerComponent>("SkillUnlockerComponent");
if (skillUnlockerComponent == null) return;
skillUnlockerComponent.SkillUnlocked += OnSkillUnlock;
@@ -30,7 +30,7 @@ public partial class MarketplaceButton : Button
public override void _ExitTree()
{
_skillUnlockedComponent.SkillUnlocked -= OnSkillUnlock;
_skillUnlockerComponent.SkillUnlocked -= OnSkillUnlock;
}
private void Setup()