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 music and sound raws; plotinfo.unk23c8_flags.caverns_opened #689

Merged
merged 13 commits into from
Dec 28, 2023
3 changes: 3 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ Template for new versions:
## Structures
- ``markup_text_boxst``: updated based on information from bay12
- ``markup_text_linkst``, ``markup_text_wordst``, ``script_environmentst``: defined
- ``plotinfost``: `unk23c8_flags` renamed to `flags`, updated based on information from bay12
- ``world_raws``: `unk_v50_1`, `unk_v50_2`, `unk_v50_3` renamed to `text_set`, `music`, `sound`
Bumber64 marked this conversation as resolved.
Show resolved Hide resolved
- ``soundst``: defined

# 50.11-r4

Expand Down
27 changes: 21 additions & 6 deletions df.raws.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,19 @@
</virtual-methods>
</class-type>

<class-type type-name='soundst'>
<stl-string name='token'/>
<int32_t name='index'/>
<stl-vector name='current_definition' pointer-type='stl-string'/>
<df-flagarray name='flag'/>
<int32_t name='source_hfid'/>
<int32_t name='source_enid'/>
<int32_t name='sound' comment='index of sound to be played'/>
<stl-vector name='announcement' comment='sound can be selected for these announcement types'>
<enum type-name='announcement_type'/>
</stl-vector>
</class-type>

<struct-type type-name='world_raws'>
!! in bay12 each of these is its own compound and some of them are classes with their own methods !!

Expand Down Expand Up @@ -197,19 +210,21 @@

<stl-vector name='interactions' since='v0.34.01' pointer-type='interaction'/>

-- Unknown new stuff
-- Text set

<compound name='unk_v50_1'>
<compound name='text_set'>
<stl-vector/>
<static-array count='63' type-name='int32_t'/>
</compound>

<compound name='unk_v50_2'>
<stl-vector/>
-- Audio

<compound name='music'>
<stl-vector name='music'/>
</compound>

<compound name='unk_v50_3'>
<stl-vector/>
<compound name='sound'>
<stl-vector name='sound' pointer-type='soundst'/>
</compound>

-- Material index
Expand Down
13 changes: 9 additions & 4 deletions df.ui.xml
Original file line number Diff line number Diff line change
Expand Up @@ -350,10 +350,15 @@
<stl-vector name='economic_stone' type-name='bool'
index-refers-to='(material-by-id 0 $)'/>

<bitfield name='unk23c8_flags'>
<flag-bit name='first_year'/>
<flag-bit name='recheck_aid_requests'/>
<flag-bit name='force_elections'/>
<bitfield name='flags'>
<flag-bit name='first_year' comment='(FIRSTYEAR)'/>
<flag-bit name='recheck_aid_requests' comment='(EVAL_REQUESTERCANCHECK)'/>
<flag-bit name='force_elections' comment='(RUN_SPECIAL_ELECTIONS)'/>
<flag-bit name='need_to_do_tutorial' comment='(NEED_TO_DO_TUTORIAL)'/>
<flag-bit name='minor_victory' comment='(MINOR_VICTORY)'/>
<flag-bit name='major_victory' comment='(MAJOR_VICTORY)'/>
<flag-bit name='did_first_caravan_announcement' comment='(DID_FIRST_CARAVAN_ANNOUNCEMENT)'/>
<flag-bit name='did_first_cavern_announcement' comment='(DID_FIRST_CAVERN_ANNOUNCEMENT) required for CAVERNS_OPENED music context'/>
</bitfield>
<int16_t name='mood_cooldown'/>

Expand Down
Loading