Skip to content

Commit

Permalink
Apply initial pre-commit config
Browse files Browse the repository at this point in the history
  • Loading branch information
lethosor committed Apr 6, 2022
1 parent ba182ce commit 76b935e
Show file tree
Hide file tree
Showing 12 changed files with 24 additions and 28 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ codegen/*
sbcl-runtime
cl-linux-debug
*.xml-old

4 changes: 2 additions & 2 deletions df.announcements.xml
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
<enum-item name='EMERGENCY_TACTICAL_CONTROL' since='v0.47.01'/>
<enum-item name='AGREEMENT_SATISFIED' since='v0.47.01'/>
<enum-item name='AGREEMENT_WARNING' since='v0.47.01'/>

<enum-item name='AGREEMENT_ABANDONED' since='v0.47.01'/>
<enum-item name='NEW_GUILD' since='v0.47.01'/>
<enum-item name='CRIME_WITNESS_HANDOFF' since='v0.47.01'/>
Expand All @@ -377,7 +377,7 @@
<enum-item name='CRIME_WITNESS_ITEM_MISSING' since='v0.47.01'/>
<enum-item name='MOUNT' since='v0.47.01'/>
<enum-item name='CANNOT_MOUNT' since='v0.47.01'/>

<enum-item name='FAILED_MOUNT' since='v0.47.01'/>
<enum-item name='DISMOUNT' since='v0.47.01'/>
<enum-item name='FAILED_DISMOUNT' since='v0.47.01'/>
Expand Down
2 changes: 1 addition & 1 deletion df.creature-raws.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<enum-item name='HAS_ANY_SLOW_LEARNER'/>
<enum-item name='HAS_ANY_NIGHT_CREATURE_NIGHTMARE'/>
<enum-item name='HAS_ANY_NIGHT_CREATURE_EXPERIMENTER'/>

</enum-type>

<enum-type type-name='caste_raw_flags'>
Expand Down
4 changes: 2 additions & 2 deletions df.d_init.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@
<static-array name='set_labor_lists' type-name='int16_t' count='2'/>

<int32_t name='graze_coefficient' since='v0.40.13'/>

<static-array name='temple_value_levels' type-name='int32_t' count='2' since='v0.47.01'/>
<static-array name='priesthood_unit_counts' type-name='int32_t' count='2' since='v0.47.01'/>
<static-array name='guildhall_value_levels' type-name='int32_t' count='2' since='v0.47.01'/>
<static-array name='guild_unit_counts' type-name='int32_t' count='2' since='v0.47.01'/>

<df-flagarray name='flags4' index-enum='d_init_flags4'/>
<enum name="post_prepare_embark_confirmation" type-name='d_init_embark_confirm'/>
<compound name='announcements' type-name='announcements'/>
Expand Down
2 changes: 1 addition & 1 deletion df.meeting.xml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@
<enum-item name='Read'/>
<enum-item name='Play'/>
</enum-type>

<struct-type type-name='activity_entry' instance-vector='$global.world.activities.all' key-field='id'>
<int32_t name='id'/>
<enum name='type' type-name='activity_entry_type'/>
Expand Down
4 changes: 2 additions & 2 deletions df.refs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@
<enum-type type-name='entity_entity_link_type' base-type='int16_t'>
<enum-item name='PARENT'/>
<enum-item name='CHILD'/>
<enum-item name='RELIGIOUS' comment='Seen between religion and merc company.' since='v0.47.01'/>
<enum-item name='RELIGIOUS' comment='Seen between religion and merc company.' since='v0.47.01'/>
</enum-type>

<struct-type type-name='entity_entity_link'>
Expand Down Expand Up @@ -654,7 +654,7 @@
MerchantCompany: All have status = 0 and the capital flag set. Some also have base_of_operations.
Guild: All have status = 0 and the capital flag set.
</enum-type>

<bitfield-type type-name='entity_site_link_flags' base-type='uint32_t'>
<flag-bit name='residence' comment='site is residence'/>
<flag-bit name='capital' comment='site is capital'/>
Expand Down
16 changes: 8 additions & 8 deletions df.viewscreen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2695,7 +2695,7 @@
<int16_t name='civilian_occupation' since='v0.47.01'/>
<static-array name='civilian_skill' type-name='int32_t' count='147' index-enum='job_skill' since='v0.47.01'/>

<int32_t name='deity_id' ref-target='historical_figure'/>
<int32_t name='deity_id' ref-target='historical_figure'/>

<!--<int32_t name='commander_id' init-value='-1' since='v0.40.01' refers-to='$(find-entity $(find-instance $world_site $$._parent.site_id).cur_owner_id).positions.assignments[$]' comment='-1 is peasant'/>-->
<int32_t name='site_id' ref-target='world_site' since='v0.40.01'/>
Expand Down Expand Up @@ -2819,18 +2819,18 @@
<enum-item name='Background'/>
<enum-item name='Equipment'/>
<enum-item name='MountsAndPets'/>
</enum>
</enum>
<int32_t name='unk_v47_110'/>
<int32_t name='unk_v47_111'/>
<int32_t name='unk_v47_112'/>
<enum base-type='int8_t' name='sel_trait_column'>
<enum-item name='SkillsColumn'/>
<enum-item name='AttributesColumn'/>
</enum>
<enum-item name='SkillsColumn'/>
<enum-item name='AttributesColumn'/>
</enum>
<int32_t name='attribute_idx'/>
<int32_t name='attribute_points_remaining'/>
<stl-vector name='skill_list'>
<enum base-type='int16_t' type-name='job_skill'/>
<enum base-type='int16_t' type-name='job_skill'/>
</stl-vector>
<int32_t name='unk_8f0'/>
<int32_t name='unk_8f4'/>
Expand Down Expand Up @@ -3284,8 +3284,8 @@
<stl-vector name="counteroffer" pointer-type='item'/>
<int8_t name="in_edit_count"/>
<stl-string name="edit_count"/>
<stl-vector pointer-type="stl-string"/>
<int32_t/>
<stl-vector pointer-type="stl-string"/>
<int32_t/>
</class-type>

<class-type type-name='viewscreen_tradelistst' inherits-from='viewscreen'>
Expand Down
12 changes: 6 additions & 6 deletions df.world-data.xml
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@
<int8_t name="dead_percentage" comment="% vegetation dead on embark. The number increases during world gen history, with the new ones always at 100%"/>
<bool name="unk_1e5" comment="Probably optionally set only on good and evil regions during world gen. Number set increases during world gen history and can affect neutral."/>
<bool name="unk_1e6" comment="Probably optionally set only on neutral regions"/>
<bool name="reanimating" comment="Indicates that region interaction is reanimating"/>
<int32_t name="unk_1e8" init-value='-1' since='v0.47.01' comment="Number set increases during world gen history"/>
<bool name="reanimating" comment="Indicates that region interaction is reanimating"/>
<int32_t name="unk_1e8" init-value='-1' since='v0.47.01' comment="Number set increases during world gen history"/>
<bool name='evil'/>
<bool name='good'/> -- At most one of 'evil' and 'good' is set at a time by DF.
<int16_t name='lake_surface' init-value='-30000'/>
Expand Down Expand Up @@ -398,15 +398,15 @@
edges to mountains, and both of them to anything else, no matter
what the original array value is. The actual biomes for tiles in
the frame are semi-randomly interpolated from this edge spec.

For some reason DF provides for all edges of all mid level tiles
in a world tile, but not for the corners on the south and east
edges: for these you have to go to the next world tile.
This has some effect on the corners on the south and east edges of
the world where there are no adjacent tiles to get the data from.
There the rules are static: the biomes of corners are taken from
the easternmost and southernmost of the two touching corners.

The rules for corner determination when the biome_corner field has
specified a biome that's specified to yield as per the above seems
to be to first take the NW corner (0), then the NE (1) one, and
Expand Down Expand Up @@ -942,7 +942,7 @@
exists during worldgen only, before it finishes
some sort of wandering groups (entity types NomadicGroup, PerformanceTroupe)
unk_10, unk_24 and unk_region_name are either all initialised or all empty/uninitialised
<stl-vector name="unk_274">
<stl-vector name="unk_274">
<pointer>
<stl-vector name="members" pointer-type="historical_figure"/>
<stl-vector name="unk_10">
Expand Down Expand Up @@ -1026,7 +1026,7 @@
<enum-item name='CreepingDust'/>
<enum-item name='FallingMaterial' comment="a.k.a. rain, both blood and syndrome, but not regular"/>
</enum-type>

<struct-type type-name='region_weather' key-field='id' instance-vector='$global.world.world_data.region_weather' comment="only evil weather, not the regular kind">
<int32_t name='id'/>
<enum name='type' type-name='region_weather_type' base-type='int32_t' comment="Creeping Gas/Vapor/Dust='cloud' below, FallingMaterial='rain'"/>
Expand Down
1 change: 0 additions & 1 deletion how-to-update.rst
Original file line number Diff line number Diff line change
Expand Up @@ -459,4 +459,3 @@ instructions see linux primitive globals.
5. announcements

Immediately follows d_init; starts 25 25 31 31 24 ...

2 changes: 0 additions & 2 deletions list.pl
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,3 @@
}

print $separator if $separator eq "\n";


2 changes: 1 addition & 1 deletion lower-2.xslt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--
<!--
Second pass of lowering:
- Detect incorrectly placed fields
- Fold container item fields into a single ld:item subelement.
Expand Down
2 changes: 1 addition & 1 deletion start-utils.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#-quicklisp
(asdf:load-system :cl-linux-debug.gui)

(defpackage :work
(defpackage :work
(:use :common-lisp
:alexandria :anaphora
:cl-linux-debug.code-info
Expand Down

0 comments on commit 76b935e

Please sign in to comment.