feat: added reasources states based on resource health #2684

WeylonSantana · 2025-03-21T02:02:10Z

This feature aims to add custom states to resources based on their life.
works like in videos, and also supports animated resources

The only detail to pay attention to is that it will be considered a "dead state" when the maxhp of the state is 0%
if there is no state that fits the min-max hp percentages, nothing will be rendered
The current resources that already exist in the old model are migrated correctly (as far as testing) and already serve as a model for everyone who already has resources to understand how the system works.

resource rendering can be based on the resource's maximum lifetime or the resource object's maximum lifetime, which can provide a more dynamic mapping, but that is not the intent of this feature.

1742488880_Intersect_Editor.mp4

1742494850_Intersect_Client.mp4

1742521716_Intersect_Client.mp4

pandinocoder

MySQL migration is needed
States should be sorted by their min/max health

pandinocoder · 2025-03-22T16:32:10Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceStateDescriptor.cs

 public partial class ResourceStateDescriptor
 {
-    public string Graphic { get; set; } = null;
+    public string Graphic { get; set; } = default;


TextureName

pandinocoder · 2025-03-22T16:32:55Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceGraphicType.cs

@@ -0,0 +1,8 @@
+namespace Intersect.Framework.Core.GameObjects.Resources;
+
+public enum ResourceGraphicType


ResourceTextureSource

pandinocoder · 2025-03-22T16:33:07Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceGraphicType.cs

+
+public enum ResourceGraphicType
+{
+    Graphic,


pandinocoder · 2025-03-22T16:33:19Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceStateDescriptor.cs

-    public string Graphic { get; set; } = null;
+    public string Graphic { get; set; } = default;
+
+    public ResourceGraphicType GraphicType { get; set; } = ResourceGraphicType.Graphic;


TextureType

pandinocoder · 2025-03-22T16:33:38Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceStateDescriptor.cs

    public bool RenderBelowEntities { get; set; }

-    public bool GraphicFromTileset { get; set; }
+    public Guid AnimationId { get; set; } = Guid.Empty;


= Guid.Empty; isn't necessary

pandinocoder · 2025-03-22T17:04:59Z

Intersect.Editor/Localization/Strings.cs

+        public static LocalizedString HealthStateNameError = @"Health Graphic State Name must be unique and greater than 0 characters.";

-        public static LocalizedString initialgraphic = @"Initial Graphic:";
+        public static LocalizedString HealthStateNameExists = @"Health Graphic State Name already exists.";


This isn't needed with the Guid change

pandinocoder · 2025-03-22T17:06:24Z

Intersect.Editor/Localization/Strings.cs

-        public static LocalizedString initialgraphic = @"Initial Graphic:";
+        public static LocalizedString HealthStateNameExists = @"Health Graphic State Name already exists.";
+
+        public static LocalizedString hpregen = @"HP (%);";


This isn't needed, there's a label both above and to the right of the textbox, we only need the one to the right (but you can move it if you want, and we can reword it)

pandinocoder · 2025-03-22T17:07:31Z

Intersect.Server.Core/Migrations/Sqlite/Game/20250320180433_ResourceHealthGraphics.cs

+                SET HealthGraphics = json_object(
+                    'Exhauted', json_object(
+                        'Graphic', Exhausted_Graphic,
+                        'GraphicType', Exhausted_GraphicFromTileset,
+                        'RenderBelowEntities', Exhausted_RenderBelowEntities,
+                        'Height', Exhausted_Height,
+                        'Width', Exhausted_Width,
+                        'X', Exhausted_X,
+                        'Y', Exhausted_Y,
+                        'MinHp', 0,
+                        'MaxHp', 0
+                    ),
+                    'Initial', json_object(
+                        'Graphic', Initial_Graphic,
+                        'GraphicType', Initial_GraphicFromTileset,
+                        'RenderBelowEntities', Initial_RenderBelowEntities,
+                        'Height', Initial_Height,
+                        'Width', Initial_Width,
+                        'X', Initial_X,
+                        'Y', Initial_Y,
+                        'MinHp', 100,
+                        'MaxHp', 100
+                    )


Will need to be updated to reflect name changes I mentioned

pandinocoder · 2025-03-22T17:08:20Z

Intersect.Server.Core/Migrations/Sqlite/Game/20250320180433_ResourceHealthGraphics.cs

This will need to be regenerated after the renames

pandinocoder · 2025-03-22T17:08:33Z

Intersect.Server.Core/Migrations/Sqlite/Game/20250320180433_ResourceHealthGraphics.cs

+            migrationBuilder.Sql(@"
+                UPDATE Resources
+                SET HealthGraphics = json_object(
+                    'Exhauted', json_object(


Exhausted with an s

pandinocoder · 2025-03-23T11:36:09Z

Intersect.Server.Core/Migrations/Sqlite/Game/20250322192625_ResourcesStates.cs

+                    '{exhaustedId}', json_object(
+                        'Id', '{exhaustedId}',
+                        'Name', 'Exhausted',
+                        'Texture', Exhausted_Graphic,
+                        'TextureType', Exhausted_GraphicFromTileset,
+                        'RenderBelowEntities', Exhausted_RenderBelowEntities,
+                        'Height', Exhausted_Height,
+                        'Width', Exhausted_Width,
+                        'X', Exhausted_X,
+                        'Y', Exhausted_Y,
+                        'MinimumHealth', 0,
+                        'MaximumHealth', 0
+                    ),
+                    '{initalId}', json_object(
+                        'Id', '{initalId}',


All of the exhausted and initial states would have the same ID across resources.

While I think this won't cause an immediate issue, if we ever have to separate it into another table it will cause an issue (and we'd have to remember that this issue exists).

On Discord we discussed using invalid placeholder UUIDs for initial/exhausted and then re-assigning invalid IDs in InitDatabase().

pandinocoder · 2025-03-23T11:40:43Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs

        Name = "New Resource";
-        Initial = new ResourceStateDescriptor();
-        Exhausted = new ResourceStateDescriptor();
+        StatesGraphics = [];


Do an inline = []; on States, don't use a constructor initializer

pandinocoder · 2025-03-23T11:40:45Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs

        Name = "New Resource";
-        Initial = new ResourceStateDescriptor();
-        Exhausted = new ResourceStateDescriptor();
+        StatesGraphics = [];


Do an inline = []; on States, don't use a constructor initializer

pandinocoder · 2025-03-23T11:40:56Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs


-    public ResourceStateDescriptor Exhausted { get; set; }
+    [NotMapped, JsonIgnore]
+    public Dictionary<Guid, ResourceStateDescriptor> StatesGraphics { get; set; }


The = []; goes here

pandinocoder · 2025-03-23T11:41:05Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs


-    public ResourceStateDescriptor Exhausted { get; set; }
+    [NotMapped, JsonIgnore]
+    public Dictionary<Guid, ResourceStateDescriptor> StatesGraphics { get; set; }


Also should be called States

pandinocoder · 2025-03-23T11:41:11Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs

+    [NotMapped, JsonIgnore]
+    public Dictionary<Guid, ResourceStateDescriptor> StatesGraphics { get; set; }
+
+    [Column("StatesGraphics")]


nameof(States)

pandinocoder · 2025-03-23T11:41:26Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceDescriptor.cs

+        set => StatesGraphics = JsonConvert.DeserializeObject<Dictionary<Guid, ResourceStateDescriptor>>(value);
+    }

    [Column("Animation")]


nameof(Animation)

pandinocoder · 2025-03-23T11:44:54Z

Intersect.Client.Core/Entities/Resource.cs

+        if (Texture == default)
        {
-            Texture = Globals.ContentManager.GetTexture(Framework.Content.TextureType.Resource, _sprite);
+            Texture = Graphics.Renderer.WhitePixel;


Why are we setting it to a white pixel when we were not doing this before?

when is a animation, Texture is null, if texture is null no hp bar is rendered because current code use player texture to render the hpbar, so assign a white pixel if any case above fail (not graphic on range, or animation), make sure to render hp bar when texture not exists when player hits

pandinocoder · 2025-03-23T11:46:09Z

Intersect.Client.Core/Entities/Resource.cs

+                    return;
+                }
+
+                if (!AnimationDescriptor.TryGet(_currentState.AnimationId, out var animationDescriptor))


The animation descriptor should be cached when the resource descriptor is changed (_descriptor)

Intersect.Client.Core/Entities/Resource.cs

pandinocoder · 2025-03-23T11:49:30Z

Intersect.Client.Core/Entities/Resource.cs

+        var currentState = graphicStates.FirstOrDefault(
+            s => currentHealthPercentage >= s.Value.MinimumHealth && currentHealthPercentage <= s.Value.MaximumHealth
+        );


Multiple problems here

You are still not using .Values before the FirstOrDefault()

You can check _currentState before doing this -- if _currentState is null or if the current health is outside of the range of _currentState then you go and change the state, you don't need to change the state if the current state is still valid.

pandinocoder · 2025-03-23T11:50:08Z

Intersect.Client.Core/Entities/Resource.cs

+        var maxHealth = Descriptor.UseExplicitMaxHealthForResourceStates
+            ? Descriptor.MaxHp
+            : MaxVital[(int)Enums.Vital.Health];


This can be cached when the descriptor is set, cache it in _maximumHealthForStates

pandinocoder · 2025-03-23T11:51:21Z

Intersect.Client.Core/Entities/Resource.cs

+    public void UpdateCurrentState()
    {
-        if (descriptor == null)
+        if (Descriptor == default)


This risks a null due to race condition below, the descriptor was passed into this method for a reason, the other valid alteration is if (_descriptor is not { } descriptor), but you can't switch to Descriptor

pandinocoder · 2025-03-23T11:52:36Z

Intersect.Client.Core/Entities/Resource.cs

+    /// <inheritdoc />
+    public override bool CanBeAttacked => !IsDead;
+
+    public ResourceStateDescriptor? CurrentGraphicState => _currentState;


CurrentState

pandinocoder · 2025-03-23T11:53:36Z

Intersect.Client.Core/Entities/Resource.cs

+
+    private readonly int _tileWidth = Options.Instance.Map.TileWidth;
+    private readonly int _tileHeight = Options.Instance.Map.TileHeight;
+    private readonly int _tapHeight = Options.Instance.Map.MapHeight;


_mapHeight not _tapHeight

pandinocoder · 2025-03-23T11:54:23Z

Intersect.Client.Core/Entities/Resource.cs

+                _renderBoundsSrc.Width = Texture.Width;
+                _renderBoundsSrc.Height = Texture.Height;


you need null protection for Texture

pandinocoder · 2025-03-23T12:13:14Z

Intersect.Client.Core/Networking/PacketHandler.cs

+            if (entity.Type == EntityType.Resource)
+            {
+                ((Resource)entity).UpdateCurrentState();


this should be entity is Resource resourceEntity and then use resourceEntity instead of casting

pandinocoder

This isn't a complete review, after addressing the comments I added you should check the part of the code I didn't review this time around and see if any of the things I mentioned elsewhere apply to code I hadn't commented on yet

I'll re-review (and hopefully do a more thorough review) after the current comments are addressed

pandinocoder · 2025-03-23T12:41:21Z

Intersect.Editor/Core/Graphics.cs

+                                float xpos = x * Options.Instance.Map.TileWidth + xoffset + Options.Instance.Map.TileWidth / 2;
+                                float ypos = y * Options.Instance.Map.TileHeight + yoffset + Options.Instance.Map.TileHeight / 2;


pandinocoder · 2025-03-23T12:42:00Z

Intersect.Editor/Core/Graphics.cs

+                                var animationInstance = tmpMap.GetAttributeAnimation(tmpMap.Attributes[x, y], animation.Id);
+
+                                //Update if the animation isn't right!
+                                if (animationInstance == null || animationInstance.Descriptor != animation)


Doesn't animationInstance?.Descriptor != animation work?

pandinocoder · 2025-03-23T12:42:21Z

Intersect.Editor/Core/Graphics.cs

+                                if (animationInstance == null || animationInstance.Descriptor != animation)
+                                {
+                                    tmpMap.SetAttributeAnimation(
+                                        tmpMap.Attributes[x, y], new Animation(animation, true)


newline between the arguments of SetAttributeAnimation

pandinocoder · 2025-03-25T17:37:47Z

Intersect.Server.Core/Migrations/Sqlite/Game/20250323183440_ResourceStates.cs

+            var initalId = Guid.NewGuid();
+            var exhaustedId = Guid.NewGuid();


This still isn't matching what we discussed

pandinocoder · 2025-03-25T17:39:13Z

Intersect.Server.Core/Database/DbInterface.cs


+    private static void ValidateResourceStates()
+    {
+        var checkedIds = new List<Guid>();


This isn't what we had discussed

pandinocoder · 2025-03-25T17:59:52Z

Intersect.Editor/Forms/Editors/frmResource.cs

+            item.States = item.States
+                .OrderBy(s => s.Value.MinimumHealth)
+                .ThenBy(s => s.Value.MaximumHealth)
+                .ToDictionary(p => p.Key, p => p.Value);


It should already be sorted before a user clicks save, it needs to get sorted when values are changed and the displayed list order needs to match the sorted order

pandinocoder · 2025-03-25T18:00:52Z

Intersect.Editor/Forms/Editors/frmResource.cs

-
-    //General Editting Variables
-    bool mTMouseDown;
+    private readonly List<ResourceDescriptor> _changed = [];


This should be a Dictionary<Guid, ResourceDescriptor>

pandinocoder · 2025-03-25T18:02:46Z

Intersect.Editor/Forms/Editors/frmResource.cs

+        if (_editorItem != null && lstGameObjects.Focused)
+        {
+            if (DarkMessageBox.ShowWarning(
+                    Strings.ResourceEditor.deleteprompt, Strings.ResourceEditor.deletetitle, DarkDialogButton.YesNo,


1 parameter per line

pandinocoder · 2025-03-25T18:03:06Z

Intersect.Editor/Forms/Editors/frmResource.cs

+        if (_editorItem != null && lstGameObjects.Focused)
+        {
+            if (DarkMessageBox.ShowWarning(


Invert the if statements to denest the logic

pandinocoder · 2025-03-25T18:03:55Z

Intersect.Editor/Forms/Editors/frmResource.cs

+        toolStripItemCopy.Enabled = _editorItem != null && lstGameObjects.Focused;
+        toolStripItemPaste.Enabled = _editorItem != null && _copiedItem != null && lstGameObjects.Focused;
+        toolStripItemDelete.Enabled = _editorItem != null && lstGameObjects.Focused;
+        toolStripItemUndo.Enabled = _editorItem != null && lstGameObjects.Focused;


I see _editorItem != null && lstGameObjects.Focused repeated 4 times

…from static to animation

pandinocoder · 2025-03-27T11:11:31Z

Intersect.Editor/Localization/Strings.cs

+        public static LocalizedString StateNameError = @"State Name must be greater than 0 characters.";

-        public static LocalizedString initialgraphic = @"Initial Graphic:";
+        public static LocalizedString hpregen = @"HP Regen (%):";


HealthRegenPercent

pandinocoder · 2025-03-27T11:12:21Z

Intersect.Editor/Forms/Editors/frmResource.cs

+    private readonly List<string> _knownFolders = [];
+    private readonly BindingList<NotifiableDrop> _dropList = [];
+    private readonly BindingList<ResourceStateDescriptor> _stateList = [];


Can you reorder this so all of the readonlys are together at the top with one empty line between them and the mutable fields?

pandinocoder · 2025-03-27T11:13:43Z

Intersect.Editor/Core/Graphics.cs

+                                float xpos = x * Options.Instance.Map.TileWidth + xoffset;
+                                float ypos = y * Options.Instance.Map.TileHeight + yoffset;


This "base" calculation is common between all 3 cases, please extract the common code

pandinocoder · 2025-03-27T11:13:50Z

Intersect.Editor/Core/Graphics.cs

+                        case ResourceTextureSource.Resource:
+                            {
+                                var texture = GameContentManager.GetTexture(
+                                    GameContentManager.TextureType.Resource, resourceGraphic.TextureName


1 arg per line

pandinocoder · 2025-03-27T11:14:00Z

Intersect.Editor/Core/Graphics.cs

+                        case ResourceTextureSource.Tileset:
+                            {
+                                var texture = GameContentManager.GetTexture(
+                                    GameContentManager.TextureType.Tileset, resourceGraphic.TextureName


1 arg per line

pandinocoder · 2025-03-27T11:21:33Z

Intersect.Client.Core/Entities/Resource.cs

+        }
+
+        _currentState = currentState;
+        _sprite = _currentState?.TextureName ?? string.Empty;


I would prefer we set _sprite to null if at all possible, rather than Empty

then this would have to be left for another refactoring, since _sprite is defined as not null in entity, and this affects the Sprite property which is also not null, which would require adding several other checks in loadtextures, sprite set, and so on

pandinocoder · 2025-03-27T11:23:01Z

Intersect.Client.Core/Entities/Resource.cs

+            Descriptor = descriptor;
+            UpdateCurrentState();


Can we make the setter for Descriptor call UpdateCurrentState() instead of calling it separately?

pandinocoder · 2025-03-27T11:24:06Z

Intersect.Client.Core/Entities/Resource.cs

-            (IsDead && !Descriptor.Exhausted.RenderBelowEntities) ||
-            (!IsDead && !Descriptor.Initial.RenderBelowEntities)
-        )
+        if (Descriptor == default || CurrentState is not { } graphicState || !graphicState.RenderBelowEntities)


We aren't using Descriptor at all in this if statement, I think it should be removed from the check here

pandinocoder · 2025-03-27T11:27:06Z

Intersect.Client.Core/Entities/Resource.cs

+                if (IsDead)
+                {
+                    if (graphicState is { MaximumHealth: 0 } deadGraphic)
+                    {
+                        _renderBoundsSrc = new(
+                            deadGraphic.X * _tileWidth,
+                            deadGraphic.Y * _tileHeight,
+                            (deadGraphic.Width + 1) * _tileWidth,
+                            (deadGraphic.Height + 1) * _tileHeight
+                        );
+                    }
+                    else
+                    {
+                        _renderBoundsSrc = new();
+                    }
+                }
+                else if (graphicState is { MinimumHealth: > 0 } aliveGraphic)
+                {
+                    _renderBoundsSrc = new(
+                        aliveGraphic.X * _tileWidth,
+                        aliveGraphic.Y * _tileHeight,
+                        (aliveGraphic.Width + 1) * _tileWidth,
+                        (aliveGraphic.Height + 1) * _tileHeight
+                    );
+                }


The logic here is almost the same and I'd prefer it not get duplicated, and it seems suspicious that we don't have the "else" case for alive but we do for dead -- store deadGraphic/aliveGraphic in a local variable, and if the variable is null set the src to empty (use default instead of new()), and if it isn't use the local variable to calculate the positions

pandinocoder · 2025-03-27T11:27:49Z

Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceStateDescriptor.cs

+
+    public string Name { get; set; }
+
+    public string TextureName { get; set; } = default;


string? must be nullable

pandinocoder · 2025-03-28T11:49:27Z

Intersect.Client.Core/Entities/Resource.cs

+            if (value == _descriptor)
+            {
+                return;
+            }
+
+            _descriptor = value;


This stuff needs to be before anything else in the setter, it shouldn't be after the new value is being used

pandinocoder · 2025-03-28T11:50:53Z

Intersect.Client.Core/Entities/Resource.cs

+                if (IsDead && graphicState is { MaximumHealth: 0 } deadGraphic)
                {
-                    if (graphicState is { MaximumHealth: 0 } deadGraphic)
-                    {
-                        _renderBoundsSrc = new(
-                            deadGraphic.X * _tileWidth,
-                            deadGraphic.Y * _tileHeight,
-                            (deadGraphic.Width + 1) * _tileWidth,
-                            (deadGraphic.Height + 1) * _tileHeight
-                        );
-                    }
-                    else
-                    {
-                        _renderBoundsSrc = new();
-                    }
+                    selectedGraphic = deadGraphic;
                }
-                else if (graphicState is { MinimumHealth: > 0 } aliveGraphic)
+                else if (!IsDead && graphicState is { MinimumHealth: > 0 } aliveGraphic)


IsDead shouldn't be getting checked twice.

pandinocoder · 2025-03-28T11:52:02Z

Intersect.Editor/Core/Graphics.cs

-                                    (resourceGraphic.Width + 1) * Options.Instance.Map.TileWidth,
-                                    (resourceGraphic.Height + 1) * Options.Instance.Map.TileHeight, renderTarget
+                                    (resourceGraphic.Width + 1) * tileWidth,
+                                    (resourceGraphic.Height + 1) * Options.Instance.Map.TileHeight,


Options.Instance.Map.TileHeight

pandinocoder · 2025-03-28T11:52:06Z

Intersect.Editor/Core/Graphics.cs

+                                    xpos,
+                                    ypos,
+                                    resourceGraphic.X * tileWidth,
                                    resourceGraphic.Y * Options.Instance.Map.TileHeight,


Options.Instance.Map.TileHeight

pandinocoder · 2025-03-28T11:52:10Z

Intersect.Editor/Core/Graphics.cs

-                                float xpos = x * Options.Instance.Map.TileWidth + xoffset + Options.Instance.Map.TileWidth / 2f;
-                                float ypos = y * Options.Instance.Map.TileHeight + yoffset + Options.Instance.Map.TileHeight / 2f;
+                                xpos += tileWidth / 2f;
+                                ypos += Options.Instance.Map.TileHeight / 2f;


Options.Instance.Map.TileHeight

pandinocoder · 2025-03-28T11:52:40Z

Intersect.Editor/Core/Graphics.cs

                    }

+                    float xpos = x * tileWidth + xoffset;
+                    float ypos = y * Options.Instance.Map.TileHeight + yoffset;


Options.Instance.Map.TileHeight

pandinocoder · 2025-03-28T11:52:51Z

Intersect.Editor/Core/Graphics.cs

+        var tileWidth = Options.Instance.Map.TileWidth;
+        var tileHeight = Options.Instance.Map.TileHeight;
+        var xoffset = CurrentView.Left + gridX * tileWidth * Options.Instance.Map.MapWidth;
        var yoffset = CurrentView.Top + gridY * Options.Instance.Map.TileHeight * Options.Instance.Map.MapHeight;


Options.Instance.Map.TileHeight and Options.Instance.Map.MapHeight

pandinocoder · 2025-03-28T11:53:04Z

Intersect.Editor/Core/Graphics.cs

-        var xoffset = CurrentView.Left + gridX * Options.Instance.Map.TileWidth * Options.Instance.Map.MapWidth;
+        var tileWidth = Options.Instance.Map.TileWidth;
+        var tileHeight = Options.Instance.Map.TileHeight;
+        var xoffset = CurrentView.Left + gridX * tileWidth * Options.Instance.Map.MapWidth;


Options.Instance.Map.MapWidth

pandinocoder · 2025-03-28T11:53:22Z

Intersect.Editor/Core/Graphics.cs

        }

        var x1 = 0;
        var x2 = Options.Instance.Map.MapWidth;


Options.Instance.Map.MapWidth should be cached and reused in the instances after this

pandinocoder · 2025-03-28T11:55:29Z

Intersect.Editor/Core/Graphics.cs

+                        float xpos = x * tileWidth + xoffset + tileWidth / 2;
                        float ypos = y * Options.Instance.Map.TileHeight + yoffset + Options.Instance.Map.TileHeight / 2;


By the way both of these lines can be written as (base + 0.5f) * multiplier + offset

WeylonSantana force-pushed the resource-state branch from fbd1b73 to 491b0fe Compare March 21, 2025 02:06

pandinocoder requested changes Mar 22, 2025

View reviewed changes

WeylonSantana force-pushed the resource-state branch from 491b0fe to fc18426 Compare March 23, 2025 01:47

pandinocoder requested changes Mar 23, 2025

View reviewed changes

WeylonSantana force-pushed the resource-state branch from fc18426 to 4830a21 Compare March 23, 2025 19:53

pandinocoder requested changes Mar 25, 2025

View reviewed changes

WeylonSantana force-pushed the resource-state branch from 4830a21 to 784b1a5 Compare March 27, 2025 02:14

WeylonSantana added 21 commits March 26, 2025 23:19

starting replacing old resource state by the new one

70e59cc

update sprite on server

483c1bd

finished on editor, adding controls and render on map

ceba4ea

finished on client for now

32698cf

fix editor chebox name being cropped

5a595ea

finish animation on editor

bc2c657

added animation part in client

a589b8e

rename Graphic to Texture

daeec45

renaming resource type enum and state property

220f35b

renaming min/max hp from state

c5a24a0

renaming tile/map properties in client resource

893ef01

rename health to state

70332a1

updating resource state type

df02af0

add name and id to resouce state

69bb298

correct type for current state key

bb694de

trying refactor resource

5547c9e

select the fullest resource

6d90722

more editor refactor

acad5a9

rename controls

e8d181a

show correct name in editor

edd6367

sort states by health

8becfb8

WeylonSantana added 15 commits March 26, 2025 23:20

cache animation descriptor

69bab12

cache texture

ccdd892

cleanup on graphics

65f458f

dont handle resource sprite logic on server

805cc7b

cleanup form resource

4ecf199

fix strings

ad72114

change items changed type

dd0fb5d

invert undo if

f65f900

sort when hp state changes

63a3905

renaming Texture => TextureName

1b48080

fix lst state items on editor

276e6cf

dispose animation when next state no longer uses

70bae59

do not render the white pixel occupying the whole tile when changing …

53a9c39

…from static to animation

fix rebasing

830c6c4

regenerating migration

9c2ef67

WeylonSantana force-pushed the resource-state branch from 784b1a5 to 9c2ef67 Compare March 27, 2025 02:28

pandinocoder requested changes Mar 27, 2025

View reviewed changes

WeylonSantana added 5 commits March 27, 2025 11:02

rename hpregen => HealthRegenPercent

12b45f6

sort fields

891d7e4

cleanup editor graphics

320dc8e

cleanup resource on client

db49e0a

fix small issues

f057779

pandinocoder requested changes Mar 28, 2025

View reviewed changes

WeylonSantana added 4 commits March 28, 2025 10:24

update max health on load

21bb25a

using cached variables

80bc57b

reusing position logic

ef8bb4e

dont checking is dead twice

4ef0ad5

pandinocoder approved these changes Mar 30, 2025

View reviewed changes

pandinocoder merged commit da1ae0d into AscensionGameDev:main Mar 30, 2025
1 check passed

pandinocoder deleted the resource-state branch March 30, 2025 18:40

		@@ -0,0 +1,8 @@
		namespace Intersect.Framework.Core.GameObjects.Resources;

		public enum ResourceGraphicType

		_renderBoundsSrc.Width = Texture.Width;
		_renderBoundsSrc.Height = Texture.Height;

		float xpos = x * Options.Instance.Map.TileWidth + xoffset + Options.Instance.Map.TileWidth / 2;
		float ypos = y * Options.Instance.Map.TileHeight + yoffset + Options.Instance.Map.TileHeight / 2;

		var initalId = Guid.NewGuid();
		var exhaustedId = Guid.NewGuid();


		public string Name { get; set; }

		public string TextureName { get; set; } = default;

		float xpos = x * tileWidth + xoffset + tileWidth / 2;
		float ypos = y * Options.Instance.Map.TileHeight + yoffset + Options.Instance.Map.TileHeight / 2;

feat: added reasources states based on resource health #2684

feat: added reasources states based on resource health #2684

Uh oh!

Conversation

WeylonSantana commented Mar 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pandinocoder left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pandinocoder left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

WeylonSantana commented Mar 21, 2025 •

edited

Loading