Compare commits

..

4 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
b2ab80c54c trying to remove rider plugin before CI build
All checks were successful
Create tag and build when new code gets to main / BumpTag (push) Successful in 29s
Create tag and build when new code gets to main / Export (push) Successful in 7m46s
2026-05-17 11:08:41 +02:00
06ef5d892b test
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 7m18s
2026-05-17 02:32:06 +02:00
5 changed files with 12 additions and 20 deletions

View File

@@ -156,6 +156,11 @@ jobs:
- name: Checkout with LFS - name: Checkout with LFS
uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main uses: https://git.game-dev.space/minimata/checkout-with-lfs.git@main
- name: Remove problematic addons
run: |
rm -rf ${{ gitea.workspace }}/addons/gdUnit4
rm -rf ${{ gitea.workspace }}/addons/rider-plugin
- name: Setup Godot - name: Setup Godot
id: setup-godot id: setup-godot
uses: https://git.game-dev.space/minimata/setup-godot.git@main uses: https://git.game-dev.space/minimata/setup-godot.git@main
@@ -163,10 +168,6 @@ jobs:
godot-version: ${GODOT_VERSION} godot-version: ${GODOT_VERSION}
dotnet-version: ${DOTNET_VERSION} dotnet-version: ${DOTNET_VERSION}
- name: Remove GDUnit addon
run: |
rm -rf ${{ gitea.workspace }}/addons/gdUnit4
- name: Build Windows - name: Build Windows
run: | run: |
mkdir -v -p build/windows mkdir -v -p build/windows
@@ -178,7 +179,7 @@ jobs:
uses: actions/upload-artifact@v3-node20 uses: actions/upload-artifact@v3-node20
with: with:
name: Windows build name: Windows build
path: ${{ github.workspace }}/Windows.zip path: ${{ github.workspace }}/build/windows
# - name: Setup Butler # - name: Setup Butler
# shell: bash # shell: bash
# env: # env:

View File

@@ -0,0 +1 @@
uid://c411ne7juqsnv

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.addons.godot_state_charts.csharp;
using Movementtests.forge.abilities; using Movementtests.forge.abilities;
using Movementtests.forge.attribute_sets;
using Movementtests.interfaces; using Movementtests.interfaces;
using Movementtests.systems; using Movementtests.systems;
using Movementtests.player_controller.Scripts; using Movementtests.player_controller.Scripts;
using Movementtests.managers; using Movementtests.managers;
using Movementtests.scenes.components.knockback; using Movementtests.scenes.components.knockback;
using Movementtests.scenes.enemies;
using Movementtests.scenes.player_controller.scripts;
using Movementtests.tools; using Movementtests.tools;
using Movementtests.tools.calculators; using Movementtests.tools.calculators;
using RustyOptions; using RustyOptions;
@@ -476,7 +479,8 @@ public partial class PlayerController : CharacterBody3D, IForgeEntity, ICueHandl
LoadSettings(); LoadSettings();
// General use stuff // 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"]; HealthAttribute = Attributes["CharacterAttributeSet.Health"];
ManaAttribute = Attributes["PlayerAttributeSet.Mana"]; ManaAttribute = Attributes["PlayerAttributeSet.Mana"];