-
Notifications
You must be signed in to change notification settings - Fork 382
feat: added reasources states based on resource health #2684
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
pandinocoder
merged 55 commits into
AscensionGameDev:main
from
WeylonSantana:resource-state
Mar 30, 2025
Merged
Changes from all commits
Commits
Show all changes
55 commits
Select commit
Hold shift + click to select a range
70e59cc
starting replacing old resource state by the new one
WeylonSantana 483c1bd
update sprite on server
WeylonSantana ceba4ea
finished on editor, adding controls and render on map
WeylonSantana 32698cf
finished on client for now
WeylonSantana 5a595ea
fix editor chebox name being cropped
WeylonSantana bc2c657
finish animation on editor
WeylonSantana a589b8e
added animation part in client
WeylonSantana daeec45
rename Graphic to Texture
WeylonSantana 220f35b
renaming resource type enum and state property
WeylonSantana c5a24a0
renaming min/max hp from state
WeylonSantana 893ef01
renaming tile/map properties in client resource
WeylonSantana 70332a1
rename health to state
WeylonSantana df02af0
updating resource state type
WeylonSantana 69bb298
add name and id to resouce state
WeylonSantana bb694de
correct type for current state key
WeylonSantana 5547c9e
trying refactor resource
WeylonSantana 6d90722
select the fullest resource
WeylonSantana acad5a9
more editor refactor
WeylonSantana e8d181a
rename controls
WeylonSantana edd6367
show correct name in editor
WeylonSantana 8becfb8
sort states by health
WeylonSantana 2a3bf37
bring back original code and change only necessary
WeylonSantana cdae5a4
everything working for tileset and texture
WeylonSantana 031b8e3
undo map instance changes
WeylonSantana cf5c44b
fix hp bar not showing when has no graphic
WeylonSantana 8207c29
making animations working on client side
WeylonSantana 3101642
renaming state graphics => states
WeylonSantana 1c22193
rename death animation and sort some things on editor
WeylonSantana e2081df
cache maximum health for states
WeylonSantana 3abb611
dont update state if not necessary
WeylonSantana d4411f5
renaming current graphic state to current state
WeylonSantana 69bab12
cache animation descriptor
WeylonSantana ccdd892
cache texture
WeylonSantana 65f458f
cleanup on graphics
WeylonSantana 805cc7b
dont handle resource sprite logic on server
WeylonSantana 4ecf199
cleanup form resource
WeylonSantana ad72114
fix strings
WeylonSantana dd0fb5d
change items changed type
WeylonSantana f65f900
invert undo if
WeylonSantana 63a3905
sort when hp state changes
WeylonSantana 1b48080
renaming Texture => TextureName
WeylonSantana 276e6cf
fix lst state items on editor
WeylonSantana 70bae59
dispose animation when next state no longer uses
WeylonSantana 53a9c39
do not render the white pixel occupying the whole tile when changing …
WeylonSantana 830c6c4
fix rebasing
WeylonSantana 9c2ef67
regenerating migration
WeylonSantana 12b45f6
rename hpregen => HealthRegenPercent
WeylonSantana 891d7e4
sort fields
WeylonSantana 320dc8e
cleanup editor graphics
WeylonSantana db49e0a
cleanup resource on client
WeylonSantana f057779
fix small issues
WeylonSantana 21bb25a
update max health on load
WeylonSantana 80bc57b
using cached variables
WeylonSantana ef8bb4e
reusing position logic
WeylonSantana 4ef0ad5
dont checking is dead twice
WeylonSantana File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 12 additions & 5 deletions
17
Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceStateDescriptor.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
Framework/Intersect.Framework.Core/GameObjects/Resources/ResourceTextureSource.cs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| namespace Intersect.Framework.Core.GameObjects.Resources; | ||
|
|
||
| public enum ResourceTextureSource | ||
| { | ||
| Resource, | ||
| Tileset, | ||
| Animation, | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.