Simplify and polish D2k effects/palettes. - #21210
Merged
Merged
Conversation
pchote
force-pushed
the
d2k-effect-polish
branch
from
November 13, 2023 20:36
d836035 to
a1c4598
Compare
Member
|
Code changes look fine, but this needs to be scrutinized in game. 🧐 |
Contributor
Member
Member
pchote
force-pushed
the
d2k-effect-polish
branch
from
November 14, 2023 22:33
a1c4598 to
f613c5b
Compare
Member
Author
|
Updated to restore the previous fog visuals, and added a new commit to use the correct trike icon (4305 is a duplicate of 4277 in DATA.R8, but garbage in DATA.R16). |
Contributor
|
LGTM |
PunkPun
reviewed
Nov 15, 2023
PunkPun
left a comment
Member
There was a problem hiding this comment.
Actually shouldn't there be an update rule for the trait removal?
Member
Author
|
They are d2k-specific traits in the Mods.D2k.dll, so IMO no (and this would cause problems with visibility since |
Member
|
But in update we only deal in strings. We don't use actual classes that could have dependency issues unless it's basic structs such as CPos. And we do write update rules for Mods.Cnc.dll |
Member
Author
|
Added update rules. |
Member
|
needs a rebase |
pchote
force-pushed
the
d2k-effect-polish
branch
from
November 15, 2023 18:42
997dd4c to
ee069b8
Compare
Member
Author
|
Rebased. |
Member
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.




This PR does some initial housekeeping around D2k palettes in preparation for using the R16 sprites (aka D2kHDR 🌈).
I compared most of our effects against the "Dune 2000 Map and Mission Editor" tool which caught some discrepencies that I have now also fixed.
The cloak palette will be handled in its own PR.
The fog now looks slightly different, i'm hoping this won't be too controversial.