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

Identify world.status.announcement_alert fields #692

Merged
merged 7 commits into from
Dec 27, 2023
Merged

Identify world.status.announcement_alert fields #692

merged 7 commits into from
Dec 27, 2023

Conversation

Bumber64
Copy link
Contributor

@Bumber64 Bumber64 commented Dec 24, 2023

Identify announcement_alert fields based on use in make_announcement (FUN_1400574e0 v50.11 win64 Steam.) Naming the struct announcement_alertst based on convention.

Additionally defined the alert_button_announcement_id vector as int32_t, since it uses report.id.

df.announcements.xml Outdated Show resolved Hide resolved
df.announcements.xml Outdated Show resolved Hide resolved
<enum base-type='int32_t' type-name='announcement_alert_type' name='type'/>
<stl-vector name='report_id' type-name='int32_t'/>
<stl-vector name='unit_id' type-name='int32_t'/>
<stl-vector name='combat_type'>
Copy link
Member

Choose a reason for hiding this comment

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

bay12 name is report_unit_announcement_category (and the vector type is UnitAnnouncementCategory)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm using a pre-existing enum for the category. Doesn't look like original-name works with enum, so I've just put a comment on it in df.units.xml.

* Update df.announcements.xml

* Update df.units.xml
df.units.xml Outdated Show resolved Hide resolved
@myk002 myk002 merged commit 5bf43ce into DFHack:master Dec 27, 2023
17 checks passed
@Bumber64 Bumber64 deleted the patch-4 branch December 27, 2023 23:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants