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

Flagpoles and hoisting flags #61551

Merged
merged 11 commits into from
Oct 11, 2022
Merged

Flagpoles and hoisting flags #61551

merged 11 commits into from
Oct 11, 2022

Conversation

mlange-42
Copy link
Contributor

@mlange-42 mlange-42 commented Oct 8, 2022

Summary

Content "Flagpoles and hoisting flags"

Purpose of change

Make it possible to hoist flags on flagpoles.

Describe the solution

  • Add flagpole furniture: inteded to drop a flag there, which is then displayed as hoisted through tileset's layering.json
    • Metal flagpole, not constructible
    • Wood flagpole, constructible
  • Allow for offset in layering variants
    • Saves a lot of work, as offset should be sufficient for hoisted flags in most tilesets
  • Allow for other variants (e.g. pride and state flags) in layering (pass them through)
  • Add flagpoles to certain "official" and a few other buildings

Other:

  • Make street lights and traffic lights not movable

Describe alternatives you've considered

Make hoisting a flag an explicit action.

Testing

Implemented on the tileset side for MSX (see screenshot and PR links).
Visited all modified locations.

Additional context

Made post sprites but no layering yet (needs merge of this):

Screenshot of hoisted flags in the MSX tileset:

grafik

@github-actions github-actions bot added <Documentation> Design documents, internal info, guides and help. [C++] Changes (can be) made in C++. Previously named `Code` [JSON] Changes (can be) made in JSON [Markdown] Markdown issues and PRs Crafting / Construction / Recipes Includes: Uncrafting / Disassembling Fields / Furniture / Terrain / Traps Objects that are part of the map or its features. Map / Mapgen Overmap, Mapgen, Map extras, Map display json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Oct 8, 2022
@github-actions github-actions bot added Mods Issues related to mods or modding Mods: No Hope Relating to the mod No Hope labels Oct 8, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Oct 8, 2022
data/json/construction.json Outdated Show resolved Hide resolved
data/json/furniture_and_terrain/furniture-terrains.json Outdated Show resolved Hide resolved
data/json/mapgen/house/house_detatched6.json Outdated Show resolved Hide resolved
@mlange-42 mlange-42 deleted the flagpoles branch October 13, 2022 10:07
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 [C++] Changes (can be) made in C++. Previously named `Code` Crafting / Construction / Recipes Includes: Uncrafting / Disassembling <Documentation> Design documents, internal info, guides and help. 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 [Markdown] Markdown issues and PRs Mods: No Hope Relating to the mod No Hope Mods Issues related to mods or modding
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants