Skip to content
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

Remove furniture/terrain legacy alias code and JSON #77523

Merged
merged 1 commit into from
Nov 3, 2024

Conversation

ShnitzelX2
Copy link
Contributor

Summary

Infrastructure "remove furniture/terrain legacy alias code and JSON"

Purpose of change

This is roughly half of #73211, which indeed turned out to have too many issues to rebase completely. From that PR, the rationale: "Removes remaining redundant aliases and alias code".

This work was done by @Procyonae, I just isolated the changes and cleaned them up.

Describe the solution

I mostly solved merge conflicts, and I made sure that any remaining "alias" fields don't exist in the "json" or "mods" directories.

I'm aware of #77459 and made sure to rebase over it; there weren't any serious conflicts.

Describe alternatives you've considered

Doing this from scratch would require a lot more work, I think.

Testing

  • clang-tidy, astyle, JSON formatted locally
  • Passed all tests locally
  • Made sure the game loads without JSON errors for all affected mods
  • Checked most of the particularly conflict-heavy mapgen, including: abandoned_shopping_plaza, DinoMod's zoo, GM_LODGE_PALETTE, NoHope's necropolis

Additional context

Additional thanks to @Procyonae for doing the original work

@github-actions github-actions bot added Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style [JSON] Changes (can be) made in JSON Mods Issues related to mods or modding Bionics CBM (Compact Bionic Modules) Map / Mapgen Overmap, Mapgen, Map extras, Map display [C++] Changes (can be) made in C++. Previously named `Code` Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Aftershock Anything to do with the Aftershock mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: No Hope Relating to the mod No Hope Mods: Defense Mode Anything to do with the Defense Mode mod Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Xedra Evolved Anything to do with Xedra Evolved Mods: Mind Over Matter labels Nov 2, 2024
@RedMisao
Copy link
Contributor

RedMisao commented Nov 2, 2024

Question: What was alias for ?

@github-actions github-actions bot added astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Nov 2, 2024
@PatrikLundell
Copy link
Contributor

@RedMisao:
In at least some cases aliases are used to specify orientation:

   "id": "t_chainfence",
    "alias": [ "t_chainfence_h", "t_chainfence_v" ],

however, I have no idea if it's actually used for anything, but suspect it was once used for display purposes but now replaced by logic to connect likes (this is a guess, not a fact in any way) to sort out how to display it.

@ShnitzelX2
Copy link
Contributor Author

That's the gist of it, yeah. From what I've read, aliases were made (about 8 years ago in #16368) to replace a table converting _h/_v variants of tiles into a parent tile during mapgen, and connect groups were also built to display aliased tiles correctly.

The bottom line is that _h/_v tiles are unnecessary legacy mapgen and have been for a long time -- they were called legacy in #14585! Connect groups further make aliases unnecessary, too.

@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Nov 3, 2024
@Maleclypse Maleclypse merged commit 9f98a02 into CleverRaven:master Nov 3, 2024
21 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Bionics CBM (Compact Bionic Modules) [C++] Changes (can be) made in C++. Previously named `Code` Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. [JSON] Changes (can be) made in JSON json-styled JSON lint passed, label assigned by github actions Map / Mapgen Overmap, Mapgen, Map extras, Map display Mods: Aftershock Anything to do with the Aftershock mod Mods: Defense Mode Anything to do with the Defense Mode mod Mods: Dinomod Anything to do with the Dinoclysm mod (DinoMod) Mods: Magiclysm Anything to do with the Magiclysm mod Mods: Mind Over Matter Mods: No Hope Relating to the mod No Hope Mods: TropiCataclysm 🌴 Having to do with the tropical region mod for DDA. Mods: Xedra Evolved Anything to do with Xedra Evolved Mods Issues related to mods or modding Monsters Monsters both friendly and unfriendly.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants