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

Backport tiles from experimental to 0.H #76453

Merged
merged 5 commits into from
Sep 17, 2024

Conversation

harakka
Copy link
Member

@harakka harakka commented Sep 15, 2024

Summary

None

Purpose of change

Backport tileset changes from experimental to 0.H

Describe the solution

Pulled latest version of tileset repo, built the tilesets from it, updated the existing files. Unfortunately again this is a huge data backport that is extremely hard to comb over manually.

Describe alternatives you've considered

Testing

NOTE: I would super mega appreciate if you, the reader, helped testing this! If you care what your fave tileset looks like in 0.H, check this out.

NOTE 2: I'm looking for regressions from 0.H without this applied, not regressions compared to experimental. There's a fair bit of copy-from and id shuffling that's happened since 0.H came out and I don't want to track down all of those and port them. I already spent hours doing that actually and it was just way too much work.

Ran around with UltiCa, MSX+ and RetroDays enabled looking for obvious regressions, didn't find any. Checked the hairs since that's something we break regularly, at least the hairs that can spawn on NPCs look ok (screenshots included below).

Hair testing save (load the Scotty Guzman one, the other one is broken due to failed save editing and I CBA do the surgery to get it out): Hair-trimmed.tar.gz

Additional context

Screenshot_20240915_141710

Screenshot_20240915_141608

Screenshot_20240915_135340

Screenshot_20240915_135308

image

@github-actions github-actions bot added [JSON] Changes (can be) made in JSON Map / Mapgen Overmap, Mapgen, Map extras, Map display Vehicles Vehicles, parts, mechanics & interactions SDL: Tiles / Sound Tiles visual interface and sounds. Monsters Monsters both friendly and unfriendly. Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves Mechanics: Weather Rain, snow, portal storms and non-temperature environment <Bugfix> This is a fix for a bug (or closes open issue) <Enhancement / Feature> New features, or enhancements on existing Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Info / User Interface Game - player communication, menus, etc. astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Sep 15, 2024
@harakka harakka removed <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style labels Sep 15, 2024
@github-actions github-actions bot added <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style BasicBuildPassed This PR builds correctly, label assigned by github actions and removed BasicBuildPassed This PR builds correctly, label assigned by github actions labels Sep 15, 2024
@harakka harakka force-pushed the 0.H-tileset-update-take3 branch from f3bbd27 to c766409 Compare September 15, 2024 21:39
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Sep 16, 2024
@Fris0uman Fris0uman merged commit 293c761 into CleverRaven:0.H-branch Sep 17, 2024
18 of 22 checks passed
@Fris0uman
Copy link
Contributor

The useless files that got dropped from the repo in this backport should probably be removed in experimental too, if someone feels like doing it.

@harakka
Copy link
Member Author

harakka commented Sep 17, 2024

Just dropping the files is not a good long term solution, the fallbacks should be moved to tileset repo imo and then change the update procedure so that gfx is always replaced completely. Otherwise useless files will just start accumulating again. But yeah job for a different PR.

@harakka harakka deleted the 0.H-tileset-update-take3 branch October 18, 2024 13:25
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 <Bugfix> This is a fix for a bug (or closes open issue) Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style <Enhancement / Feature> New features, or enhancements on existing Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Info / User Interface Game - player communication, menus, etc. Items: Ammo / Guns Ammunition for all kinds of weapons and these weapons themselves [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 Mechanics: Weather Rain, snow, portal storms and non-temperature environment Monsters Monsters both friendly and unfriendly. SDL: Tiles / Sound Tiles visual interface and sounds. Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants