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.

Sign up for GitHub

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
Merged

Identify music and sound raws; plotinfo.unk23c8_flags.caverns_opened #689

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
50e51f8
Update df.ui.xml
Bumber64 Dec 16, 2023
38033b5
Update df.raws.xml
Bumber64 Dec 16, 2023
71bd56f
Update df.raws.xml
Bumber64 Dec 16, 2023
3863411
Update plotinfost flags; rename raw handlers
Bumber64 Dec 17, 2023
ca1f880
Update df.raws.xml
Bumber64 Dec 17, 2023
15cfd20
Fix whitespace
Bumber64 Dec 17, 2023
b9a8ada
Comments
Bumber64 Dec 17, 2023
bb5fdec
Update df.raws.xml
Bumber64 Dec 17, 2023
5d17192
Update changelog.txt
Bumber64 Dec 19, 2023
9e80fb3
Update changelog.txt
Bumber64 Dec 20, 2023
c7f5eb4
Merge branch 'DFHack:master' into patch-1
Bumber64 Dec 27, 2023
35e8faf
Update df.announcements.xml
Bumber64 Dec 27, 2023
40369b9
Add missing changelog entries
Bumber64 Dec 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions df.raws.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@
</virtual-methods>
</class-type>

<class-type type-name='soundst'>
<stl-string name='token'/>
<int32_t name='index'/>
<stl-vector name='current_definition'>
<stl-string/>
quietust marked this conversation as resolved.
Show resolved Hide resolved
</stl-vector>
quietust marked this conversation as resolved.
Show resolved Hide resolved
<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 +211,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
View file
Open in desktop
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