Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7746a40542 | |||
| 33c0088ff8 | |||
| b2ab80c54c |
@@ -156,6 +156,11 @@ jobs:
|
||||
- name: Checkout with LFS
|
||||
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
|
||||
id: setup-godot
|
||||
uses: https://git.game-dev.space/minimata/setup-godot.git@main
|
||||
@@ -163,10 +168,6 @@ jobs:
|
||||
godot-version: ${GODOT_VERSION}
|
||||
dotnet-version: ${DOTNET_VERSION}
|
||||
|
||||
- name: Remove GDUnit addon
|
||||
run: |
|
||||
rm -rf ${{ gitea.workspace }}/addons/gdUnit4
|
||||
|
||||
- name: Build Windows
|
||||
run: |
|
||||
mkdir -v -p build/windows
|
||||
@@ -178,7 +179,7 @@ jobs:
|
||||
uses: actions/upload-artifact@v3-node20
|
||||
with:
|
||||
name: Windows build
|
||||
path: ${{ github.workspace }}/Windows.zip
|
||||
path: ${{ github.workspace }}/build/windows
|
||||
# - name: Setup Butler
|
||||
# shell: bash
|
||||
# env:
|
||||
|
||||
@@ -62,7 +62,6 @@ public partial class ForgeAttributeSet : Node
|
||||
string name = prop.Name;
|
||||
if (InitialAttributeValues.TryGetValue(name, out AttributeValues? value))
|
||||
{
|
||||
if (value is null) continue; //temp
|
||||
SetAttributeValue("SetAttributeBaseValue", instance, prop, value.Default);
|
||||
SetAttributeValue("SetAttributeMinValue", instance, prop, value.Min);
|
||||
SetAttributeValue("SetAttributeMaxValue", instance, prop, value.Max);
|
||||
|
||||
1
forge/abilities/ForgeUiAbilityBehaviour.cs.uid
Normal file
1
forge/abilities/ForgeUiAbilityBehaviour.cs.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://c411ne7juqsnv
|
||||
@@ -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"
|
||||
@@ -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"
|
||||
@@ -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"];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user