minimata/MovementTests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main #9

Merged
minimata merged 8 commits from main into release/polylan-05-26 2026-05-17 11:01:58 +00:00
Conversation 0 Commits 8 Files Changed 489 +7 -3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7746a40542 - Show all commits

4
menus/scenes/components/SelectedAbility.cs
View File

@@ -41,8 +41,8 @@ public partial class SelectedAbility : Control
public void AbilityUpdated()
{
var icon = _icon ?? GetNode<TextureRect>("HBoxContainer/Icon");
var title = _title ?? GetNode<Label>("HBoxContainer/Title");
var icon = _icon ?? GetNode<TextureRect>("%Icon");
var title = _title ?? GetNode<Label>("%Title");
if (icon == null || title == null) return;
if (_ability == null)
{

6
scenes/player_controller/scripts/PlayerController.cs
View File

@@ -24,11 +24,14 @@ using GodotStateCharts;
using Movementtests.addons.godot_state_charts.csharp;
using Movementtests.forge.abilities;
using Movementtests.forge.attribute_sets;
using Movementtests.interfaces;
using Movementtests.systems;
using Movementtests.player_controller.Scripts;
using Movementtests.managers;
using Movementtests.scenes.components.knockback;
using Movementtests.scenes.enemies;
using Movementtests.scenes.player_controller.scripts;
using Movementtests.tools;
using Movementtests.tools.calculators;
using RustyOptions;
@@ -476,7 +479,8 @@ public partial class PlayerController : CharacterBody3D, IForgeEntity, ICueHandl
LoadSettings();
// General use stuff
Attributes = new EntityAttributes([.. ForgeUtils.CollectAttributeList(this)]);
// Attributes = new EntityAttributes([.. ForgeUtils.CollectAttributeList(this)]);
Attributes = new EntityAttributes([new CharacterAttributeSet(), new PlayerAttributeSet(), new MetaAttributeSet()]);
HealthAttribute = Attributes["CharacterAttributeSet.Health"];
ManaAttribute = Attributes["PlayerAttributeSet.Mana"];