Skip to content

Bring back zones in gui/blueprint (WIP) #5222

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

Merged
merged 14 commits into from
May 3, 2025

Conversation

realSquidCoder
Copy link
Contributor

@realSquidCoder realSquidCoder commented Jan 27, 2025

ref: #4994

@dhthwy
Copy link
Contributor

dhthwy commented Jan 30, 2025

looks like you might be missing some includes causing the builds to fail.

keep up the good work, maybe in some months you'll be cranking out like a c++ pro.

@realSquidCoder realSquidCoder marked this pull request as ready for review April 3, 2025 20:59
a.max_buckets == b.max_buckets &&
a.max_soap == b.max_soap;
}

static const char * get_zone_keys(const df::building_civzonest *zone) {
Copy link
Member

Choose a reason for hiding this comment

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

This function needs to be rewritten to support the blueprint format for zones and locations. The docs are here: https://docs.dfhack.org/en/latest/docs/guides/quickfort-user-guide.html#zone-mode and here: https://docs.dfhack.org/en/latest/docs/guides/quickfort-user-guide.html#zone-mode-reference

Copy link
Member

@myk002 myk002 left a comment

Choose a reason for hiding this comment

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

a good way to test this is to set up zones of each type next to each other, take a blueprint of them, and apply the blueprint with gui/quickfort. Do the quickfort-created zones look the same as the originals?

Also, create zones and add taverns/temples/guildhalls/hospitals. When you blueprint a zone with an attached location, do you successfully create a new location with the same configuration as the original?

Create two meeting zones and attach the same tavern hall to both of them. When you blueprint the pair, does quickfort correctly create two identical zones, with both attached to the same new tavern (which should have the same configuration as the original tavern)?

@myk002
Copy link
Member

myk002 commented May 3, 2025

This isn't quite correct, but I have a follow-up PR that will fill in the holes

@myk002 myk002 added this to 51.11-r2 May 3, 2025
@github-project-automation github-project-automation bot moved this to Todo in 51.11-r2 May 3, 2025
@myk002 myk002 merged commit 269eef8 into DFHack:develop May 3, 2025
14 checks passed
@github-project-automation github-project-automation bot moved this from Todo to Done in 51.11-r2 May 3, 2025
@realSquidCoder realSquidCoder deleted the squid-quickfort-zones branch May 3, 2025 22:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants