diff --git a/df.advmode.xml b/df.advmode.xml index 2c2cce866..440d29224 100644 --- a/df.advmode.xml +++ b/df.advmode.xml @@ -42,7 +42,6 @@ 35 - ATTACKCREATURE_UNIT_CHOICE ATTACKCREATURE_CONFIRM ATTACKCREATURE_MOVE_CHOICE @@ -421,13 +420,6 @@ - - - - - - - @@ -473,9 +465,6 @@ - - - @@ -513,6 +502,7 @@ bay12: ADVENTURE_FLAG_* + bay12: adventure_rumor_infost @@ -616,38 +606,6 @@ - bay12: AIM_ATTACK_FLAG_* - - - - - - - - - - bay12: ChargeRestrictType - - - - - - - - - - - - - - - - - - - - - ? ? @@ -664,56 +622,6 @@ - not a compound - - - - - - - - - bay12: adventure_conversation_choice_infost - - - - - - - - - - - - bay12: talk_list_optionst - - - bay12: TalkCircumstanceType - - - - - - - - - - - - - - bay12: projectile_target_list_optionst - - - - - - - bay12: adventure_custom_combatst - - - - @@ -724,20 +632,29 @@ - + bay12: AdventureGameLoopType + + + + + + + + - - - not a compound - - - - - - + + + + + + + + + + + - - + not a compound @@ -761,18 +678,11 @@ - bay12: special_combatst - - - - - - - - bay12: reaction_moment_interfacest - + + + @@ -804,54 +714,6 @@ - bay12: attack_menust - - bay12: AttackMoveChoiceType - - - - - - - - - - - - - - - - bay12: performance_menust - bay12: PerformanceMenuModeType - - - - - - - - - - - - - - - - - - - - - - - - - - - - bay12: assume_identity_menust @@ -874,12 +736,27 @@ + - - + bay12: CombatAnimationSwishType + + + + + + - - + bay12: CombatAnimationSwishDirectionType + + + + + + + + + + bay12: PerformanceMenuChoiceType @@ -933,12 +810,50 @@ + bay12: AdventureOptionType + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + - + for "pick up vermin": @@ -954,7 +869,7 @@ argument 3 is set to true if a fire was started returns nullptr - + @@ -968,15 +883,162 @@ - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bay12: ADVENTURE_OPTION_INVENTORY_ITEM_OPTION_FLAG_* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1008,15 +1070,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1037,18 +1135,46 @@ - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1088,6 +1214,12 @@ + + + + + + @@ -1102,49 +1234,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/df.announcements.xml b/df.announcements.xml index 5fff807fd..a90b2326c 100644 --- a/df.announcements.xml +++ b/df.announcements.xml @@ -699,9 +699,7 @@ - - - + @@ -709,9 +707,7 @@ - - - + @@ -1093,6 +1089,10 @@ + + + + @@ -1210,6 +1210,11 @@ + + + + + diff --git a/df.buildings.xml b/df.buildings.xml index baa7292b3..516482e2c 100644 --- a/df.buildings.xml +++ b/df.buildings.xml @@ -461,6 +461,10 @@ -- 74 + + + + diff --git a/df.globals.xml b/df.globals.xml index ba0a9d1fa..aa808326e 100644 --- a/df.globals.xml +++ b/df.globals.xml @@ -416,10 +416,6 @@ - - - - diff --git a/df.graphics.xml b/df.graphics.xml index dd0a45e3d..23c8b3e6d 100644 --- a/df.graphics.xml +++ b/df.graphics.xml @@ -143,6 +143,7 @@ + @@ -152,6 +153,8 @@ + + @@ -161,6 +164,7 @@ + @@ -170,6 +174,8 @@ + + @@ -261,7 +267,8 @@ - + + @@ -292,17 +299,23 @@ - + - + - + - + + + + + + + @@ -397,7 +410,7 @@ - + @@ -425,12 +438,22 @@ + + + + + + + + + + @@ -479,7 +502,9 @@ + + diff --git a/df.items.xml b/df.items.xml index 3cfc1f269..962b88591 100644 --- a/df.items.xml +++ b/df.items.xml @@ -131,19 +131,19 @@ bay12: EngravingIntentType - + - - - - - + + + + + - + @@ -153,7 +153,7 @@ - + diff --git a/df.keybindings.xml b/df.keybindings.xml index d939f81dd..d902cdd06 100644 --- a/df.keybindings.xml +++ b/df.keybindings.xml @@ -4,6 +4,8 @@ + + @@ -25,6 +27,10 @@ + + + + @@ -67,12 +73,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -178,7 +229,201 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/df.pathfinding.xml b/df.pathfinding.xml index 067cbc29a..b88e2ec8e 100644 --- a/df.pathfinding.xml +++ b/df.pathfinding.xml @@ -215,6 +215,8 @@ + + bay12: StationType diff --git a/df.raws.xml b/df.raws.xml index 68924e335..46baf2d66 100644 --- a/df.raws.xml +++ b/df.raws.xml @@ -220,6 +220,7 @@ 0.50.01 0.50.01 0.50.08-beta + 0.51.01 -- Reaction RAWs diff --git a/df.ui-menus.xml b/df.ui-menus.xml index 92efd0699..c5f2c41ee 100644 --- a/df.ui-menus.xml +++ b/df.ui-menus.xml @@ -445,6 +445,12 @@ + + + + + + bay12: ImageCreatorContextType @@ -667,6 +673,8 @@ + + @@ -684,6 +692,11 @@ + + + + + bay12: HelpContextType @@ -752,6 +765,7 @@ + bay12: CreateCreatureModeType @@ -1175,6 +1189,94 @@ + bay12: AdventureInterfaceOptionListContextType + + + + + + + + + bay12: AdventureInterfaceInventoryContextType + + + + + + + + + + + + + + + bay12: AdventureInventoryOptionListType + + + + + + + + + + + + + bay12: AdventureInterfaceAttackModeType + + + + + + + + + + + + + + bay12: PerformanceMenuModeType + + + + + + + + + + + + + + + + + + + + bay12: AttackMoveChoiceType + + + + + + + + + + + + + + + + bay12: designation_interfacest @@ -1580,8 +1682,16 @@ - + + + + + + + + + bay12: image_creator_interfacest @@ -2289,8 +2399,11 @@ + + + @@ -2399,6 +2512,305 @@ + bay12: adventure_interfacest + bay12: adventure_interface_option_listst + + + + + + + + + + + + + + + + + + bay12: adventure_interface_inventoryst + + + + + + + + + + + + + bay12: adventure_interface_jumpst + + + + + bay12: adventure_interface_conversationst + + + + + + + + + + + + + + + + + + + + + + + + + bay12: adventure_interface_performst + + + + + + + + + + + + + + + + + + + + + + + bay12: adventure_interface_attackst + + + + + + + + + + + + bay12: special_combatst + + + + + + + + + + + + + + + + bay12: adventure_custom_combatst + + + bay12: AIM_ATTACK_FLAG_* + + + + + + + + + + bay12: ChargeRestrictType + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bay12: combat_listst + + + + + + + + + + + + + + + + + + + + + + + + + + bay12: adventure_interface_combat_prefst + + + + bay12: adventure_interface_aim_projectilest + + + + + + + + + + bay12: projectile_target_list_optionst + + + + + + + bay12: adventure_interface_companionsst + + + + + + + + + + + + bay12: adventure_interface_announcementsst + + + + + + + + bay12: adventure_interface_sleepst + + + + + + + bay12: adventure_interface_movement_optionsst + + + + + + + + + bay12: adventure_interface_travelst + + + + + + bay12: adventure_interface_barterst + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2464,6 +2876,11 @@ + + + + + @@ -4563,6 +4980,80 @@ + + New Adventure entries + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/df.units.xml b/df.units.xml index 7787a5bbb..da379b0cc 100644 --- a/df.units.xml +++ b/df.units.xml @@ -1351,6 +1351,12 @@ + bay12: DungeonControlState + + + + + protected: @@ -2433,15 +2439,16 @@ + bay12: DungeonWrestleType + + + + + bay12: wrestle_infost - bay12: DungeonWrestleType - - - - - + diff --git a/df.viewscreen.xml b/df.viewscreen.xml index fe08fafef..71a9e83a2 100644 --- a/df.viewscreen.xml +++ b/df.viewscreen.xml @@ -875,6 +875,12 @@ + + + + + + display site name next frame @@ -1576,6 +1582,23 @@ + bay12: SetupAdventureType + + + + + + + + + + + + + + + + @@ -1599,7 +1622,7 @@ - + @@ -1622,33 +1645,18 @@ - bay12: STARTUP_CHARACTERSHEET_FLAG_* - - - bay12: SetupAdventureType - - - - - - - - - - - - - - - + + + - + + + - @@ -1664,14 +1672,24 @@ - - - + + + + + + + + + + + + + @@ -1685,18 +1703,29 @@ - + - - - - + + + - + + + + + + + + + + + + + @@ -1752,6 +1781,63 @@ + + + + + bay12: SETUP_RACE_SELECTION_FLAG_* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + bay12: dungeon_mode_start_sheetst + + + + + @@ -1962,6 +2048,7 @@ + @@ -1973,6 +2060,9 @@ + + + diff --git a/df.world-site.xml b/df.world-site.xml index 0514f8a26..252addc1c 100644 --- a/df.world-site.xml +++ b/df.world-site.xml @@ -852,6 +852,159 @@ + bay12: SiteGraphicsTileType + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -874,7 +1027,17 @@ - 2601 = 51*51 = 17*3*17*3 + + + + + + + + + + + @@ -984,7 +1147,9 @@ - + + + @@ -995,7 +1160,17 @@ - 2704 = 52*52 + + + + + + + + + + + diff --git a/df.world.xml b/df.world.xml index b0386f9b6..088ce3e22 100644 --- a/df.world.xml +++ b/df.world.xml @@ -863,6 +863,7 @@ + @@ -1069,6 +1070,18 @@ + bay12: ANNOUNCEMENT_TEMP_FLAG_* + + + + + + + + + + +