Skip to content

Make MiniYaml inherits and removal more flexible#21462

Merged
PunkPun merged 2 commits into
OpenRA:bleedfrom
RoosterDragon:fix-yaml-removal
Jul 18, 2024
Merged

Make MiniYaml inherits and removal more flexible#21462
PunkPun merged 2 commits into
OpenRA:bleedfrom
RoosterDragon:fix-yaml-removal

Conversation

@RoosterDragon
Copy link
Copy Markdown
Member

@RoosterDragon RoosterDragon commented Jun 30, 2024

  • Previously the Inherits syntax was only resolved when used for top-level nodes. Now it is also resolved for nested nodes as well.
  • Previously the MiniYAML Merge feature supported the ability to remove nodes, but this only worked within the context of inherited nodes. Now, we allow node removal to work outside of the inheritance context.
  • Fix the sprite issues in d2k, as the old -Remap syntax is now considered invalid (before it was valid, but was a no-op and not working as intended)

Fixes #19580 Fixes #16278 Fixes #21444

@pchote
Copy link
Copy Markdown
Member

pchote commented Jun 30, 2024

Related: #21444.

@RoosterDragon RoosterDragon changed the title Fix YAML node removal to work outside of inheritance. Make MiniYaml inherits and removal more flexible Jul 14, 2024
@RoosterDragon
Copy link
Copy Markdown
Member Author

I've realised that as well as making removals more flexible, this also tackles an open request r.e. making Inherits more flexible. Have pushed an extra test case to cover that and updated the description.

Copy link
Copy Markdown
Member

@PunkPun PunkPun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise LGTM

Comment thread mods/d2k/sequences/infantry.yaml
- Previously the Inherits syntax was only resolved when used for top-level nodes. Now it is also resolved for nested nodes as well.
- Previously the MiniYAML Merge feature supported the ability to remove nodes, but this only worked within the context of inherited nodes. Now, we allow node removal to work outside of the inheritance context.
Follow-up from 34ff23d, the previous `-Remap:` line was not working and has since been removed. Without the remap being unapplied, there are rendering artefacts introduced as a result. Fix this by explicitly setting the remap to something else instead.
@PunkPun PunkPun merged commit 3716ffb into OpenRA:bleed Jul 18, 2024
@PunkPun
Copy link
Copy Markdown
Member

PunkPun commented Jul 18, 2024

changelog

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Visual glitches in D2k YAML Inherits works only at the actor level Yaml merging bug

3 participants