Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

develop
lethosor 2016-02-28 11:15:46 -05:00
commit 95e7553a99
1 changed files with 3 additions and 1 deletions

@ -179,6 +179,7 @@ address('shearable_tissues_vector',df.caste_raw,'shearable_tissue_layer')
address('extracts',df.caste_raw,'extracts','extract_matidx') address('extracts',df.caste_raw,'extracts','extract_matidx')
header('hist_entity_offsets') header('hist_entity_offsets')
address('histfigs',df.historical_entity,'histfig_ids')
address('beliefs',df.historical_entity,'resources','values') address('beliefs',df.historical_entity,'resources','values')
address('squads',df.historical_entity,'squads') address('squads',df.historical_entity,'squads')
address('positions',df.historical_entity,'positions','own') address('positions',df.historical_entity,'positions','own')
@ -300,6 +301,7 @@ address('race',df.unit,'race')
address('flags1',df.unit,'flags1') address('flags1',df.unit,'flags1')
address('flags2',df.unit,'flags2') address('flags2',df.unit,'flags2')
address('flags3',df.unit,'flags3') address('flags3',df.unit,'flags3')
address('meeting',df.unit,'meeting')
address('caste',df.unit,'caste') address('caste',df.unit,'caste')
address('sex',df.unit,'sex') address('sex',df.unit,'sex')
address('id',df.unit,'id') address('id',df.unit,'id')
@ -432,7 +434,7 @@ address('uniform_item_filter',df.squad_uniform_spec,'item_filter')
address('uniform_indiv_choice',df.squad_uniform_spec,'indiv_choice') address('uniform_indiv_choice',df.squad_uniform_spec,'indiv_choice')
header('activity_offsets') header('activity_offsets')
address('activity_type',df.activity_entry,'id') address('activity_type',df.activity_entry,'type')
address('events',df.activity_entry,'events') address('events',df.activity_entry,'events')
address('participants',df.activity_event_combat_trainingst,'participants') address('participants',df.activity_event_combat_trainingst,'participants')
address('sq_lead',df.activity_event_skill_demonstrationst,'hist_figure_id') address('sq_lead',df.activity_event_skill_demonstrationst,'hist_figure_id')