Compare commits

...

2 Commits

Author SHA1 Message Date
7746a40542 trying manual attributeset attribution
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 25s
Create tag and build when new code gets to main / Export (push) Successful in 7m49s
2026-05-17 11:28:26 +02:00
33c0088ff8 removing old resources 2026-05-17 11:11:52 +02:00
4 changed files with 7 additions and 17 deletions

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)
{

View File

@@ -1,7 +0,0 @@
[gd_resource type="Resource" script_class="RHealth" format=3 uid="uid://bjyd801wvverk"]
[ext_resource type="Script" uid="uid://baiapod3csndf" path="res://scenes/components/health/RHealth.cs" id="1_tv6ah"]
[resource]
script = ExtResource("1_tv6ah")
metadata/_custom_type_script = "uid://baiapod3csndf"

View File

@@ -1,7 +0,0 @@
[gd_resource type="Resource" script_class="RDamageModifier" format=3 uid="uid://dyru7mxo121w6"]
[ext_resource type="Script" uid="uid://b6y3ugfydvch0" path="res://scenes/components/damage/RDamageModifier.cs" id="1_7i47t"]
[resource]
script = ExtResource("1_7i47t")
metadata/_custom_type_script = "uid://b6y3ugfydvch0"

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"];