From e691c516cd71a6c397b01278a93a61cd6310da68 Mon Sep 17 00:00:00 2001
From: Quietust <quietust@gmail.com>
Date: Wed, 27 Nov 2024 15:00:55 -0600
Subject: [PATCH] 51.01-beta26

---
 df.advmode.xml       | 397 ++++++++++++++++++++++---------------------
 df.announcements.xml |   4 +-
 df.creature-raws.xml |   9 +-
 df.d_init.xml        |   4 +-
 df.entities.xml      |  50 +++---
 df.entity-raws.xml   |   2 +-
 df.graphics.xml      |  28 ++-
 df.history.xml       |  49 +++---
 df.init.xml          |  11 +-
 df.interaction.xml   |  11 ++
 df.item-vectors.xml  |   2 +
 df.items.xml         |  31 +---
 df.materials.xml     |   6 +-
 df.meeting.xml       |   4 +
 df.raws.xml          |   1 +
 df.syndrome.xml      |   4 +-
 df.ui-menus.xml      |  81 ++++++++-
 df.units.xml         |  20 +++
 df.viewscreen.xml    | 239 ++++++++++++++++++++++++++
 df.world-site.xml    |   7 +
 df.world.xml         |   6 +
 21 files changed, 687 insertions(+), 279 deletions(-)

diff --git a/df.advmode.xml b/df.advmode.xml
index 331c94a3e..44f3d065d 100644
--- a/df.advmode.xml
+++ b/df.advmode.xml
@@ -55,257 +55,257 @@
         <enum-item name='Greet'/>
         <enum-item name='Nevermind'/>
         <enum-item name='Trade'/>
-        <enum-item name='AskJoin'/>
-        <enum-item name='AskSurroundings'/>
-        <enum-item name='SayGoodbye'/>
-        <enum-item name='AskStructure'/>
-        <enum-item name='AskFamily'/>
-        <enum-item name='AskProfession'/>
-        <enum-item name='AskPermissionSleep'/>
+        <enum-item name='Join'/>
+        <enum-item name='AskAboutSurroundings'/>
+        <enum-item name='Goodbye'/>
+        <enum-item name='Building'/>
+        <enum-item name='Family'/>
+        <enum-item name='Profession'/>
+        <enum-item name='SleepPermission'/>
         10
         <enum-item name='AccuseNightCreature'/>
-        <enum-item name='AskTroubles'/>
-        <enum-item name='BringUpEvent'/>
-        <enum-item name='SpreadRumor'/>
-        <enum-item name='ReplyGreeting'/>
-        <enum-item name='RefuseConversation'/>
-        <enum-item name='ReplyImpersonate'/>
+        <enum-item name='AskAboutProblems'/>
         <enum-item name='BringUpIncident'/>
-        <enum-item name='TellNothingChanged'/>
+        <enum-item name='SpreadRumor'/>
+        <enum-item name='GreetReply'/>
+        <enum-item name='GreetReplyAbort'/>
+        <enum-item name='GreetReplyImpersonateGod'/>
+        <enum-item name='BringUpSpecificIncident'/>
+        <enum-item name='StateGeneralSituation'/>
         <enum-item name='GoodbyeReply'/>
         20
-        <enum-item name='ReturnTopic'/>
-        <enum-item name='ChangeSubject'/>
-        <enum-item name='AskTargetAction'/>
-        <enum-item name='RequestSuggestAction'/>
-        <enum-item name='AskJoinInsurrection'/>
-        <enum-item name='AskJoinRescue'/>
+        <enum-item name='ReturnToCurrent'/>
+        <enum-item name='ReturnToMain'/>
+        <enum-item name='AskAudienceCourseOfAction'/>
+        <enum-item name='AskForMySuggestedCoureseOfAction'/>
+        <enum-item name='JoinForInsurrection'/>
+        <enum-item name='JoinForRescue'/>
         <enum-item name='StateOpinion'/>
-        <enum-item name='RespondJoinInsurrection'/>
+        <enum-item name='RespondJoinForInsurrection'/>
         <enum-item name='GeneralCompanionReaffirm'/>
-        <enum-item name='AllowPermissionSleep'/>
+        <enum-item name='SleepPermissionGrant'/>
         30
-        <enum-item name='DenyPermissionSleep'/>
+        <enum-item name='SleepPermissionDeny'/>
         <enum-item name='SleepInterrupt'/>
-        <enum-item name='AskJoinAdventure'/>
-        <enum-item name='AskGuideLocation'/>
+        <enum-item name='JoinAdventure'/>
+        <enum-item name='JoinGuide'/>
         <enum-item name='RespondJoinAdventure'/>
         <enum-item name='RespondJoinGuide'/>
         <enum-item name='OfferCondolences'/>
-        <enum-item name='StateNotAcquainted'/>
-        <enum-item name='SuggestTravel'/>
-        <enum-item name='SuggestTalk'/>
+        <enum-item name='StateDidNotKnowTopicHf'/>
+        <enum-item name='CouldTryTravelingToSite'/>
+        <enum-item name='CouldTryTalkingToHf'/>
         40
-        <enum-item name='RequestSelfRescue'/>
+        <enum-item name='AskToBeRescued'/>
         <enum-item name='AskWhatHappened'/>
-        <enum-item name='JoinBeRescued'/>
-        <enum-item name='SayNotRemember'/>
-        <enum-item name='RespondJoinRescue'/>
-        <enum-item name='SayNoFamily'/>
-        <enum-item name='StateUnitLocation'/>
-        <enum-item name='ReferToElder'/>
-        <enum-item name='AskComeCloser'/>
+        <enum-item name='JoinToBeRescued'/>
+        <enum-item name='DoNotRemember'/>
+        <enum-item name='RespondJoinToBeRescued'/>
+        <enum-item name='HaveNoFamily'/>
+        <enum-item name='StateHfLocation'/>
+        <enum-item name='HaveToTalkToSomebodyOlder'/>
+        <enum-item name='CanDoBusinessIfComeCloser'/>
         <enum-item name='DoBusiness'/>
         50
-        <enum-item name='AskComeStoreLater'/>
-        <enum-item name='AskComeMarketLater'/>
-        <enum-item name='TellTryShopkeeper'/>
-        <enum-item name='DescribeSurroundings'/>
-        <enum-item name='AskWaitUntilHome'/>
-        <enum-item name='DescribeFamily'/>
-        <enum-item name='StateAge'/>
-        <enum-item name='DescribeProfession'/>
-        <enum-item name='AnnounceNightCreature'/>
+        <enum-item name='ComeToStoreLater'/>
+        <enum-item name='ComeToMarketLater'/>
+        <enum-item name='TryAShopkeeper'/>
+        <enum-item name='SaySomethingAboutLocalArea'/>
+        <enum-item name='AskWhenIveReturnedHome'/>
+        <enum-item name='TalkAboutRandomFamilyMember'/>
+        <enum-item name='StateAgeEmphatically'/>
+        <enum-item name='StateRandomProfessionFact'/>
+        <enum-item name='AnnounceNightCreatureStatus'/>
         <enum-item name='StateIncredulity'/>
         60
         <enum-item name='BypassGreeting'/>
-        <enum-item name='AskCeaseHostilities'/>
+        <enum-item name='CeaseHostilitiesRequest'/>
         <enum-item name='DemandYield'/>
-        <enum-item name='HawkWares'/>
-        <enum-item name='YieldTerror'/>
+        <enum-item name='MarketBanter'/>
+        <enum-item name='YieldInTerror'/>
         <enum-item name='Yield'/>
-        <enum-item name='ExpressOverwhelmingEmotion'/>
-        <enum-item name='ExpressGreatEmotion'/>
-        <enum-item name='ExpressEmotion'/>
-        <enum-item name='ExpressMinorEmotion'/>
+        <enum-item name='EmotionalOutburstFail'/>
+        <enum-item name='EmotionalOutburstBreakingPoint'/>
+        <enum-item name='EmotionalOutburstMajor'/>
+        <enum-item name='EmotionalOutburstMinor'/>
         70
-        <enum-item name='ExpressLackEmotion'/>
-        <enum-item name='OutburstFleeConflict'/>
-        <enum-item name='StateFleeConflict'/>
-        <enum-item name='MentionJourney'/>
+        <enum-item name='EmotionalOutburstNegated'/>
+        <enum-item name='FleeConflictInTerror'/>
+        <enum-item name='FleeConflict'/>
+        <enum-item name='BringUpAgreement'/>
         <enum-item name='SummarizeTroubles'/>
-        <enum-item name='AskAboutIncident'/>
-        <enum-item name='AskDirectionsPerson'/>
-        <enum-item name='AskDirectionsPlace'/>
-        <enum-item name='AskWhereabouts'/>
-        <enum-item name='RequestGuideSite'/>
+        <enum-item name='AskAboutSpecificTrouble'/>
+        <enum-item name='AskForDirections'/>
+        <enum-item name='AskForDirectionsToSite'/>
+        <enum-item name='AskForDirectionsToHf'/>
+        <enum-item name='JoinGuideToSite'/>
         80
-        <enum-item name='RequestGuideHistfig'/>
-        <enum-item name='ProvideDirections'/>
-        <enum-item name='ProvideWhereabouts'/>
-        <enum-item name='TellTargetSelf'/>
-        <enum-item name='TellTargetDead'/>
+        <enum-item name='JoinGuideToHf'/>
+        <enum-item name='ProvideSpecificSiteLocation'/>
+        <enum-item name='ProvideSpecificHfLocation'/>
+        <enum-item name='YouFoundMe'/>
+        <enum-item name='HfIsDead'/>
         <enum-item name='RecommendGuide'/>
-        <enum-item name='ProfessIgnorance'/>
-        <enum-item name='TellAboutPlace'/>
-        <enum-item name='AskFavorMenu'/>
-        <enum-item name='AskWait'/>
+        <enum-item name='ProfessTotalIgnorance'/>
+        <enum-item name='ProvideInformationAboutStateBuilding'/>
+        <enum-item name='FavorRequestDemandOrder'/>
+        <enum-item name='AskToWait'/>
         90
-        <enum-item name='AskFollow'/>
-        <enum-item name='ApologizeBusy'/>
-        <enum-item name='ComplyOrder'/>
-        <enum-item name='AgreeFollow'/>
-        <enum-item name='ExchangeItems'/>
-        <enum-item name='BarterAskComeCloser'/>
-        <enum-item name='InitiateBarter'/>
-        <enum-item name='AgreeCeaseHostile'/>
-        <enum-item name='RefuseCeaseHostileArena'/>
-        <enum-item name='RefuseCeaseHostile'/>
+        <enum-item name='AskToFollow'/>
+        <enum-item name='SorryOtherwiseOccupied'/>
+        <enum-item name='ComplyWithOrder'/>
+        <enum-item name='AgreeToFollow'/>
+        <enum-item name='PersonalBarter'/>
+        <enum-item name='CanDoPersonalBarterIfComeCloser'/>
+        <enum-item name='DoPersonalBarter'/>
+        <enum-item name='CeaseHostilities'/>
+        <enum-item name='RefuseToCeaseHostilitiesArena'/>
+        <enum-item name='RefuseToCeaseHostilities'/>
         100
-        <enum-item name='RefuseYieldArena'/>
-        <enum-item name='RefuseYield'/>
-        <enum-item name='Brag'/>
-        <enum-item name='DescribeRelation'/>
-        <enum-item name='ClaimSite'/>
-        <enum-item name='AnnounceLairHunt'/>
-        <enum-item name='RequestDuty'/>
-        <enum-item name='AskJoinService'/>
-        <enum-item name='AcceptService'/>
-        <enum-item name='TellRemainVigilant'/>
+        <enum-item name='RefuseToYieldArena'/>
+        <enum-item name='RefuseToYield'/>
+        <enum-item name='BragAboutPastViolentActs'/>
+        <enum-item name='DiscussDiplomacyState'/>
+        <enum-item name='ClaimSiteForOwnEntity'/>
+        <enum-item name='LairHunter'/>
+        <enum-item name='AskForSquadTask'/>
+        <enum-item name='AskToJoinSquad'/>
+        <enum-item name='AcceptIntoSquad'/>
+        <enum-item name='EnjoySquadDowntime'/>
         110
-        <enum-item name='GiveServiceOrder'/>
-        <enum-item name='WelcomeSelfHome'/>
+        <enum-item name='GiveiDipstateSquadOrder'/>
+        <enum-item name='WelcomeSelfToNewHome'/>
         <enum-item name='RespondJoinForRescue'/>
-        <enum-item name='AskTravelReason'/>
-        <enum-item name='TellTravelReason'/>
-        <enum-item name='AskLocalRuler'/>
-        <enum-item name='ComplainAgreement'/>
+        <enum-item name='AskWhyListenerIsTraveling'/>
+        <enum-item name='ExplainCurrentJourney'/>
+        <enum-item name='AskAboutDominantEntity'/>
+        <enum-item name='ComplainAboutAgreement'/>
         <enum-item name='CancelAgreement'/>
-        <enum-item name='SummarizeConflict'/>
-        <enum-item name='SummarizeViews'/>
+        <enum-item name='DiscussConflict'/>
+        <enum-item name='SummarizeEntityViews'/>
         120
-        <enum-item name='AskClaimStrength'/>
-        <enum-item name='AskArmyPosition'/>
-        <enum-item name='AskOtherClaims'/>
-        <enum-item name='AskDeserters'/>
-        <enum-item name='AskSiteNeighbors'/>
-        <enum-item name='DescribeSiteNeighbors'/>
+        <enum-item name='AskAboutEntityHoldOverTheirLands'/>
+        <enum-item name='AskAboutPositionOfEnemyForces'/>
+        <enum-item name='AskAboutNonDominantSiteClaimants'/>
+        <enum-item name='AskAboutRefugees'/>
+        <enum-item name='AskAboutSiteTradePartners'/>
+        <enum-item name='SaySomethingAboutSiteTradePartners'/>
         <enum-item name='RaiseAlarm'/>
-        <enum-item name='DemandDropWeapon'/>
-        <enum-item name='AgreeComplyDemand'/>
-        <enum-item name='RefuseComplyDemand'/>
+        <enum-item name='DemandItemDrop'/>
+        <enum-item name='AgreeToComplyWithDemand'/>
+        <enum-item name='RefuseToComplyWithDemand'/>
         130
-        <enum-item name='AskLocationObject'/>
-        <enum-item name='DemandTribute'/>
-        <enum-item name='AgreeGiveTribute'/>
-        <enum-item name='RefuseGiveTribute'/>
-        <enum-item name='OfferGiveTribute'/>
-        <enum-item name='AgreeAcceptTribute'/>
-        <enum-item name='RefuseAcceptTribute'/>
-        <enum-item name='CancelTribute'/>
+        <enum-item name='WhereIsItem'/>
+        <enum-item name='DemandTributeForEntity'/>
+        <enum-item name='AgreeToGiveTributeToEntity'/>
+        <enum-item name='RefuseToGiveTributeToEntity'/>
+        <enum-item name='OfferTributeToEntity'/>
+        <enum-item name='AgreeToAcceptTributeFromEntity'/>
+        <enum-item name='RefuseToAcceptTributeFromEntity'/>
+        <enum-item name='CancelTributeToEntity'/>
         <enum-item name='OfferPeace'/>
-        <enum-item name='AgreePeace'/>
+        <enum-item name='AgreeToMakePeaceWithEntity'/>
         140
-        <enum-item name='RefusePeace'/>
-        <enum-item name='AskTradeDepotLater'/>
-        <enum-item name='ExpressAstonishment'/>
-        <enum-item name='CommentWeather'/>
-        <enum-item name='CommentNature'/>
-        <enum-item name='SummarizeTerritory'/>
-        <enum-item name='SummarizePatrols'/>
-        <enum-item name='SummarizeOpposition'/>
-        <enum-item name='DescribeRefugees'/>
-        <enum-item name='AccuseTroublemaker'/>
+        <enum-item name='RefuseToMakePeaceWithEntity'/>
+        <enum-item name='ComeToDepotLater'/>
+        <enum-item name='AstonishmentAtSeeingHf'/>
+        <enum-item name='CommentOnWeather'/>
+        <enum-item name='CommentOnNature'/>
+        <enum-item name='SummarizeEntityHoldOverTheirLands'/>
+        <enum-item name='SummarizeEntityLocalForceDisposition'/>
+        <enum-item name='SummarizeNonDominantSiteClaimants'/>
+        <enum-item name='SummarizeRefugeesOfCurrentOccupation'/>
+        <enum-item name='YouSoundLikeATroublemaker'/>
         150
-        <enum-item name='AskAdopt'/>
-        <enum-item name='AgreeAdopt'/>
-        <enum-item name='RefuseAdopt'/>
-        <enum-item name='RevokeService'/>
-        <enum-item name='InviteService'/>
-        <enum-item name='AcceptInviteService'/>
-        <enum-item name='RefuseShareInformation'/>
-        <enum-item name='RefuseInviteService'/>
-        <enum-item name='RefuseRequestService'/>
-        <enum-item name='OfferService'/>
+        <enum-item name='AskToTakeChildIn'/>
+        <enum-item name='AgreeToTakeChildIn'/>
+        <enum-item name='RefuseToTakeChildIn'/>
+        <enum-item name='KickOutOfSquad'/>
+        <enum-item name='InviteToJoinSquad'/>
+        <enum-item name='AcceptInvitationToJoinSquad'/>
+        <enum-item name='RefuseToSharePersonalInformation'/>
+        <enum-item name='RefuseInvitationToJoinSquad'/>
+        <enum-item name='RefuseEntryIntoSquad'/>
+        <enum-item name='OfferOwnPosition'/>
         160
-        <enum-item name='AcceptPositionService'/>
-        <enum-item name='RefusePositionService'/>
-        <enum-item name='InvokeNameBanish'/>
-        <enum-item name='InvokeNameService'/>
-        <enum-item name='GrovelMaster'/>
-        <enum-item name='DemandItem'/>
-        <enum-item name='GiveServiceReport'/>
+        <enum-item name='AgreeToAcceptPositionFromSpeaker'/>
+        <enum-item name='RefuseToAcceptPositionFromSpeaker'/>
+        <enum-item name='InvokeTrueNameToBanish'/>
+        <enum-item name='InvokeTrueNameToForceServitude'/>
+        <enum-item name='GrovelBeforeNewMaster'/>
+        <enum-item name='GoToDemandItemScreen'/>
+        <enum-item name='GiveSquadTaskReport'/>
         <enum-item name='OfferEncouragement'/>
-        <enum-item name='PraiseTaskCompleter'/>
-        <enum-item name='AskAboutPersonMenu'/>
+        <enum-item name='PraiseForCompletingSquadTask'/>
+        <enum-item name='AskAboutSomebody'/>
         170
-        <enum-item name='AskAboutPerson'/>
-        <enum-item name='TellAboutPerson'/>
-        <enum-item name='AskFeelings'/>
-        <enum-item name='TellThoughts'/>
-        <enum-item name='AskServices'/>
-        <enum-item name='TellServices'/>
-        <enum-item name='OrderDrink'/>
-        <enum-item name='RentRoom'/>
-        <enum-item name='ExtendRoomRental'/>
+        <enum-item name='AskAboutHf'/>
+        <enum-item name='ProvideOpinionOfHf'/>
+        <enum-item name='AskAboutCurrentState'/>
+        <enum-item name='StateRandomThought'/>
+        <enum-item name='RequestServicesOfAb'/>
+        <enum-item name='ListServicesOfStateAb'/>
+        <enum-item name='OrderDrinkOfStateServices'/>
+        <enum-item name='RoomRentalOfStateServices'/>
+        <enum-item name='ExtendRoomRentalOfStateServices'/>
         <enum-item name='ConfirmServiceOrder'/>
         180
-        <enum-item name='AskJoinEntertain'/>
+        <enum-item name='JoinEntertain'/>
         <enum-item name='RespondJoinEntertain'/>
-        <enum-item name='AskJoinTroupe'/>
+        <enum-item name='AskToJoinTroupe'/>
         <enum-item name='AcceptIntoTroupe'/>
-        <enum-item name='RefuseTroupeApplication'/>
-        <enum-item name='InviteJoinTroupe'/>
-        <enum-item name='AcceptTroupeInvitation'/>
-        <enum-item name='RefuseTroupeInvitation'/>
+        <enum-item name='RefuseEntryIntoTroupe'/>
+        <enum-item name='InviteToJoinTroupe'/>
+        <enum-item name='AcceptInvitationToJoinTroupe'/>
+        <enum-item name='RefuseInvitationToJoinTroupe'/>
         <enum-item name='KickOutOfTroupe'/>
         <enum-item name='CreateTroupe'/>
         190
         <enum-item name='LeaveTroupe'/>
-        <enum-item name='YellServiceOrder'/>
-        <enum-item name='TellBePatientForService'/>
-        <enum-item name='TellNoServices'/>
-        <enum-item name='AskWaitUntilThere'/>
-        <enum-item name='DenyWorkingHere'/>
-        <enum-item name='ExpressEmotionMenu'/>
-        <enum-item name='StateValueMenu'/>
+        <enum-item name='YellOutServiceOrder'/>
+        <enum-item name='PendingService'/>
+        <enum-item name='NoServicesAvailable'/>
+        <enum-item name='BothMustBeAtLocationToServe'/>
+        <enum-item name='DontWorkAtLocation'/>
+        <enum-item name='VolunteerCurrentState'/>
+        <enum-item name='VolunteerValue'/>
         <enum-item name='StateValue'/>
-        <enum-item name='SayNoOrderYet'/>
+        <enum-item name='MentionServices'/>
         200
-        <enum-item name='ProvideDirectionsBuilding'/>
-        <enum-item name='Argue'/>
+        <enum-item name='ProvideSpecificAbLocation'/>
+        <enum-item name='ArgueValue'/>
         <enum-item name='FlatterArgument'/>
         <enum-item name='DismissArgument'/>
-        <enum-item name='RespondPassively'/>
-        <enum-item name='Acquiesce'/>
+        <enum-item name='RespondPassivelyArgument'/>
+        <enum-item name='AcquiesceToValueArgument'/>
         <enum-item name='DerideFlattery'/>
-        <enum-item name='ExpressOutrageAtDismissal'/>
-        <enum-item name='PressArgument'/>
+        <enum-item name='ExpressOutrageOverDismissal'/>
+        <enum-item name='PressValueArgument'/>
         <enum-item name='DropArgument'/>
         210
-        <enum-item name='AskWork'/>
-        <enum-item name='AskWorkGroup'/>
-        <enum-item name='GrantWork'/>
-        <enum-item name='RefuseWork'/>
-        <enum-item name='GrantWorkGroup'/>
-        <enum-item name='RefuseWorkGroup'/>
+        <enum-item name='AskForPersonalEnidOccupation'/>
+        <enum-item name='AskForEntireEntityEnidOccupation'/>
+        <enum-item name='GrantPersonalOccupation'/>
+        <enum-item name='RefusePersonalOccupation'/>
+        <enum-item name='GrantEntireEntityOccupation'/>
+        <enum-item name='RefuseEntireEntityOccupation'/>
         <enum-item name='GiveSquadOrder'/>
-        <enum-item name='Artifact'/>
-        <enum-item name='PraiseReturn'/>
-        <enum-item name='ProvideLocation'/>
+        <enum-item name='DiscussMissingArtifact'/>
+        <enum-item name='PraiseForReturningItem'/>
+        <enum-item name='ProvideLocalBldLocation'/>
         220
-        <enum-item name='Prophesize'/>
-        <enum-item name='TalkAboutAncestor'/>
-        <enum-item name='SuggestTrade'/>
-        <enum-item name='AcceptNotTrade'/>
-        <enum-item name='DemandIdentity'/>
+        <enum-item name='ShoutBeliefStoryFrame'/>
+        <enum-item name='TalkAboutFamilyClan'/>
+        <enum-item name='SuggestItemTrade'/>
+        <enum-item name='AcceptItemTradeRefusal'/>
+        <enum-item name='InterrogateIdentityForSiteClearance'/>
         <enum-item name='Interrogate'/>
         <enum-item name='FishForMaster'/>
         <enum-item name='FishForPlots'/>
         <enum-item name='GiveUpRandomMaster'/>
         <enum-item name='GiveUpRandomPlot'/>
         230
-        <enum-item name='RefuseInterrogation'/>
+        <enum-item name='RefuseToAnswerInterrogation'/>
         <enum-item name='Flatter'/>
         <enum-item name='Pacify'/>
         <enum-item name='TellJoke'/>
@@ -326,6 +326,11 @@
         <enum-item name='GiftSpecificPet'/>
         <enum-item name='HorrifiedByPetGift'/>
         <enum-item name='ThankForPetGift'/>
+        250
+        <enum-item name='OfferService'/>
+        <enum-item name='LayQuestToRetrieveArtifact'/>
+        <enum-item name='GeneralChargeToServeSphere'/>
+        <enum-item name='ExhortToFinishCurrentQuest'/>
     </enum-type>
 
     <enum-type type-name='assume_identity_mode' base-type='int32_t'> bay12: AssumeIdentityMenuModeType
@@ -392,6 +397,7 @@
             <enum name="value_type" type-name='value_type'/>
             <enum name="squad_order_type" type-name='squad_order_type'/>
             <int32_t name='belief_system_id'/>
+            <int32_t name='retrieve_artifact_quest_art_id' ref-target='artifact_record'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable2'/>
@@ -412,6 +418,7 @@
             <int32_t name='squad_order_target_hfid' ref-target='historical_figure'/>
             <int32_t name='story_index'/>
             <int32_t name='question_identity_id'/>
+            <int32_t name='retrieve_artifact_quest_site_id' ref-target='world_site'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable3'/>
@@ -422,6 +429,7 @@
             <enum name="occupation_type" type-name='occupation_type'/>
             <int32_t name='squad_order_target_stid' ref-target='world_site'/>
             <int32_t name='story_frame_index'/>
+            <int32_t name='retrieve_artifact_quest_giver_entity_id' ref-target='historical_entity'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable4'/>
@@ -580,6 +588,14 @@
             <flag-bit name='always_prompt'/>
         </bitfield>
 
+        <bitfield name='chosen_flags' base-type='uint32_t'> bay12: ADVENTURE_CHOSEN_FLAG_*
+            <flag-bit name='did_deity_start_talk'/>
+        </bitfield>
+        <int32_t name='chosen_deity_hfid' ref-target='historical_figure'/>
+        <int32_t name='chosen_religion_enid' ref-target='historical_entity'/>
+        <int32_t name='chosen_temple_stid' ref-target='world_site'/>
+        <int32_t name='chosen_temple_abid' ref-target='abstract_building'/>
+
         <compound name='rumor_info'> bay12: adventure_rumor_infost
             <stl-vector name='base_data' pointer-type='adventure_rumor_datast' since='v0.44.10'/>
             <static-array name='data' count='34' index-enum='entity_event_type'>
@@ -740,9 +756,10 @@
             <stl-vector name='it_list' pointer-type='interaction_target_instance_listst'/>
 
             <stl-vector name='it_list_target_choice' pointer-type='general_ref' since='v0.47.01'/>
-            <pointer name='current_interaction_info_ptr' type-name='creature_interaction'/>
+            <pointer name='current_interaction_info_ptr' type-name='interaction_informationst'/>
             <int32_t name='selected_ability' init-value='-1' comment='natural ability'/>
             <int32_t name='selected_power' init-value='-1' comment='acquired power'/>
+            <pointer name='selected_item_power' type-name='item_powerst'/>
             <pointer name='current_it_list_itt' type-name='interaction_target'/>
             <int32_t name='max_target_number' init-value='-1'/>
             <int32_t name='target_range'/>
diff --git a/df.announcements.xml b/df.announcements.xml
index 797c162db..99c64c162 100644
--- a/df.announcements.xml
+++ b/df.announcements.xml
@@ -1096,7 +1096,7 @@
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
 
-        <enum-item name='UNUSED_46'>
+        <enum-item name='DEITY_PRONOUNCEMENT' since='v0.51.01'>
             <item-attr name='alert_type' value='GENERAL'/>
         </enum-item>
         <enum-item name='UNUSED_47'>
@@ -1222,6 +1222,7 @@
 
         <int16_t name='color' init-value='7'/>
         <bool name='bright' init-value='true'/>
+        <int32_t name='portrait_hfid' ref-target='historical_figure'/>
     </struct-type>
 
     <struct-type type-name='announcement_alertst'>
@@ -1250,6 +1251,7 @@
         <bitfield base-type='uint32_t' name='flags'> bay12: ANNOUNCEMENT_INFO_FLAG_*
             <flag-bit name='SPARRING_EVENT' comment='determined by unit_action_data_attack.flags.sparring_hit'/>
         </bitfield>
+        <int32_t name='portrait_hfid' ref-target='historical_figure'/>
     </struct-type>
 </data-definition>
 
diff --git a/df.creature-raws.xml b/df.creature-raws.xml
index 2bf9148d5..de7acacdc 100644
--- a/df.creature-raws.xml
+++ b/df.creature-raws.xml
@@ -710,7 +710,7 @@
         <flag-bit name='SELF_ONLY'/>
     </bitfield-type>
 
-    <struct-type type-name='creature_interaction' original-name='interaction_informationst'>
+    <struct-type type-name='interaction_informationst'>
         <stl-string name='token'/>
         <stl-vector pointer-type='stl-string' name='bp_required_type'/>
         <stl-vector pointer-type='stl-string' name='bp_required_name'/>
@@ -756,7 +756,7 @@
             <enum-item name='CAN_DO_INTERACTION'/>
             <enum-item name='ROOT_AROUND'/>
         </enum>
-        <compound name='interaction' type-name='creature_interaction'/>
+        <compound name='interaction' type-name='interaction_informationst'/>
     </struct-type>
 
     <struct-type type-name='caste_body_info' original-name='bodyst'>
@@ -1441,6 +1441,11 @@
 
         <static-array name='layer_unitless_texpos' count='135' index-enum='profession'><static-array count='3'><static-array count='2'><stl-vector type-name='int32_t'/></static-array></static-array></static-array>
         <static-array name='layer_unitless_sheet_icon_texpos' count='135' index-enum='profession'><stl-vector type-name='int32_t'/></static-array>
+
+        <int32_t name='texpos_glow'/>
+        <int32_t name='texpos_glow_left_gone'/>
+        <int32_t name='texpos_glow_right_gone'/>
+        <int32_t name='texpos_glow_child'/>
     </struct-type>
 
     <struct-type type-name='tissue_style_raw' key-field='id' original-name='tissue_style_unitst'>
diff --git a/df.d_init.xml b/df.d_init.xml
index 84c2a331b..d58218f1f 100644
--- a/df.d_init.xml
+++ b/df.d_init.xml
@@ -28,6 +28,8 @@
         <enum-item name='SHOW_IMP_QUALITY'/>
         <enum-item name='SHOW_FLOW_AMOUNTS'/>
         <enum-item name='SHOW_RAMP_ARROWS'/>
+        <enum-item name='FORT_SHOW_CLOTHING_DYES'/>
+        <enum-item name='ADV_SHOW_CLOTHING_DYES'/>
     </enum-type>
 
     <enum-type type-name='d_init_flags2'> bay12: InitAdventureFlagType
@@ -53,7 +55,7 @@
         <enum-item name='LOG_MAP_REJECTS'/>
         <enum-item name='PAUSE_ON_LOAD'/>
         <enum-item name='EMBARK_WARNING_ALWAYS'/>
-        <enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE'/>
+        <enum-item name='SHOW_ALL_HISTORY_IN_DWARF_MODE' comment='SHOW_ALL_HISTORY_IN_FORT_MODE'/>
 
         <enum-item name='TESTING_ARENA'/>
         <enum-item name='WALKING_SPREADS_SPATTER_DWF'/>
diff --git a/df.entities.xml b/df.entities.xml
index e62af911c..44867249f 100644
--- a/df.entities.xml
+++ b/df.entities.xml
@@ -382,18 +382,7 @@
         <int32_t name='claim_year_tick' init-value='-1' comment="usually init"/>
         <int32_t name='renounce_event' ref-target='history_event'/>
 
-        <!-- <compound name='temp_arl'> --> bay12: artifact_rumor_locationst
-        <pointer name='artifact' type-name='artifact_record'/>
-        <int32_t name='site' ref-target='world_site'/>
-        <int32_t name='structure_local' init-value='-1'/>
-        <int32_t name='holder_hf' ref-target='historical_figure' comment="might be owner_hf. all cases encountered have had both field the same when claimed by entity"/>
-        <int32_t name='subregion' ref-target='world_region'/>
-        <int32_t name='feature_layer_id' ref-target='world_underground_region'/>
-        <int32_t name='latest_year' init-value='-1'/>
-        <int32_t name='latest_season_tick' init-value='-1'/>
-        <uint32_t name='flags'/>
-        <pointer name='witness' type-name='witness_incidentst'/>
-        <!-- </compound> -->
+        <compound name='temp_arl' type-name='artifact_rumor_locationst'/>
 
         <pointer name='temp_site_ent' type-name='historical_entity' has-bad-pointers='true'/>
         <pointer name='temp_civ_ent' type-name='historical_entity' has-bad-pointers='true'/>
@@ -1486,22 +1475,24 @@
     </enum-type>
 
     <enum-type type-name='agreement_details_type' base-type='int32_t'> bay12: AgreementSubjectType
-        <enum-item name='JoinParty'/>
-        <enum-item name='DemonicBinding'/>
-        <enum-item name='Residency'/>
-        <enum-item name='Citizenship'/>
-        <enum-item name='Parley'/>
+        <enum-item name='JoinParty' comment='JOIN_AS_COMPANION'/>
+        <enum-item name='DemonicBinding' comment='ATTACH_TO_WORLD'/>
+        <enum-item name='Residency' comment='BECOME_RESIDENT'/>
+        <enum-item name='Citizenship' comment='BECOME_CITIZEN'/>
+        <enum-item name='Parley' comment='ARRANGE_PARLEY'/>
         <enum-item name='PositionCorruption' comment="Embezzlement and accepting bribes seen. For own gain and for 'sponsor'"/>
         <enum-item name='PlotStealArtifact'/>
         <enum-item name='PromisePosition'/>
         <enum-item name='PlotAssassination'/>
         <enum-item name='PlotAbduct'/>
         <enum-item name='PlotSabotage'/>
-        <enum-item name='PlotConviction'/>
-        <enum-item name='Location'/>
-        <enum-item name='PlotInfiltrationCoup'/>
-        <enum-item name='PlotFrameTreason'/>
-        <enum-item name='PlotInduceWar'/>
+        <enum-item name='PlotConviction' comment='FOILED_CONSPIRACY'/>
+        <enum-item name='Location' comment='BUILD_LOCATION'/>
+        <enum-item name='PlotInfiltrationCoup' comment='INFILTRATE_SOCIETY'/>
+        <enum-item name='PlotFrameTreason' comment='FRAME_FOR_CRIME'/>
+        <enum-item name='PlotInduceWar' comment='START_WAR_WITH_ENTITY'/>
+        <enum-item name='OfferService'/>
+        <enum-item name='RetrieveArtifact'/>
     </enum-type>
 
     <struct-type type-name='agreement_details' original-name='agreement_subjectst' key-field='id'>
@@ -1525,6 +1516,8 @@
             <pointer name='PlotInfiltrationCoup' type-name='agreement_details_data_plot_infiltration_coup'/>
             <pointer name='PlotFrameTreason' type-name='agreement_details_data_plot_frame_treason'/>
             <pointer name='PlotInduceWar' type-name='agreement_details_data_plot_induce_war'/>
+            <pointer name='OfferService' type-name='agreement_details_data_offer_service'/>
+            <pointer name='RetrieveArtifact' type-name='agreement_details_data_retrieve_artifact'/>
         </compound>
         <enum name='type' base-type='int32_t' type-name='agreement_details_type'/>
     </struct-type>
@@ -1664,6 +1657,19 @@
         <int32_t name='defender' ref-target='historical_entity'/>
     </struct-type>
 
+    <struct-type type-name='agreement_details_data_offer_service' original-name='agreement_subject_offer_servicest'>
+        <int32_t name='requesting_party' ref-target='agreement_party'/>
+        <int32_t name='serving_party' ref-target='agreement_party'/>
+        <int32_t name='served_entity' ref-target='historical_entity'/>
+    </struct-type>
+
+    <struct-type type-name='agreement_details_data_retrieve_artifact' original-name='agreement_subject_retrieve_artifactst'>
+        <int32_t name='retrieving_party' ref-target='agreement_party'/>
+        <int32_t name='requesting_party' ref-target='agreement_party'/>
+        <int32_t name='artifact' ref-target='artifact_record'/>
+        <int32_t name='artifact_site' ref-target='world_site'/>
+        <int32_t name='receiving_entity' ref-target='historical_entity'/>
+    </struct-type>
 </data-definition>
 
 <!--
diff --git a/df.entity-raws.xml b/df.entity-raws.xml
index 4c60499ae..fb5911147 100644
--- a/df.entity-raws.xml
+++ b/df.entity-raws.xml
@@ -48,7 +48,7 @@
         <enum-item name='AT_PEACE_WITH_WILDLIFE'/>
         <enum-item name='EQUIPMENT_IMPROVEMENTS'/>
         <enum-item name='ABUSE_BODIES'/>
-        <enum-item comment='unused'/>
+        <enum-item name='MYTHICAL'/>
         <enum-item name='GENERATED'/>
         <enum-item name='SKULKING'/>
         <enum-item name='HAS_LAND_HOLDER'/>
diff --git a/df.graphics.xml b/df.graphics.xml
index 3366c6955..348117728 100644
--- a/df.graphics.xml
+++ b/df.graphics.xml
@@ -299,25 +299,25 @@
         <static-array type-name='long' count='1' name='black_background_texpos'/>
         <static-array type-name='int32_t' count='120' name='texture_indices1'/>
         <stl-vector type-name='int32_t' name='texpos_custom_symbol'/>
-        <static-array type-name='int32_t' count='10871' name='texture_indices2'/>
+        <static-array type-name='int32_t' count='10967' name='texture_indices2'/>
 
         <compound type-name='interface_setst' name='graphical_interface'/>
         <compound type-name='interface_setst' name='classic_interface'/>
 
-        <static-array type-name='int32_t' count='13760' name='texture_indices3'/>
+        <static-array type-name='int32_t' count='13781' name='texture_indices3'/>
         <stl-vector type-name='int32_t' name='texpos_boulder'/>
-        <static-array type-name='int32_t' count='3472' name='texture_indices4'/>
+        <static-array type-name='int32_t' count='4436' name='texture_indices4'/>
         <static-array name='texpos_item_barrel_top' count='7'><stl-vector type-name='int32_t'/></static-array>
         <static-array type-name='int32_t' count='128' name='texture_indices5'/>
         <static-array name='texpos_item_bin_top' count='21'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='305' name='texture_indices6'/>
+        <static-array type-name='int32_t' count='306' name='texture_indices6'/>
         <stl-vector type-name='int32_t' name='texpos_item_statue_artifact'/>
         <static-array type-name='int32_t' count='7977' name='texture_indices7'/>
         <static-array name='texpos_site_map' count='81'><stl-vector type-name='int32_t'/></static-array>
         <static-array type-name='int32_t' count='101' name='texture_indices8'/>
         <static-array name='texpos_site_map_hillock' count='4'><stl-vector type-name='int32_t'/></static-array>
-        <static-array type-name='int32_t' count='270' name='texture_indices9'/>
-        <static-array name='texpos_map_drawn' count='70'><stl-vector type-name='int32_t'/></static-array>
+        <static-array type-name='int32_t' count='276' name='texture_indices9'/>
+        <static-array name='texpos_map_drawn' count='73'><stl-vector type-name='int32_t'/></static-array>
         <static-array type-name='int32_t' count='6845' name='texture_indices10'/>
     </struct-type>
 
@@ -413,7 +413,7 @@
         <static-array count='5' name='texpos_short_subsubtab'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='5' name='texpos_short_subsubtab_selected'><static-array type-name='int32_t' count='2'/></static-array>
         <int32_t name='texpos_interface_background'/>
-        <static-array count='698' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+        <static-array count='706' name='texpos_button_main'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
         <static-array count='13' name='texpos_button_small'><static-array count='2'><static-array type-name='int32_t' count='2'/></static-array></static-array>
         <static-array count='4' name='texpos_button_horizontal_option_left_ornament'><static-array type-name='int32_t' count='3'/></static-array>
         <static-array count='3' name='texpos_button_horizontal_option_active'><static-array type-name='int32_t' count='3'/></static-array>
@@ -536,6 +536,20 @@
         <static-array count='2' name='texpos_zoom_out_on'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='2' name='texpos_zoom_out_off'><static-array type-name='int32_t' count='2'/></static-array>
 
+        <static-array count='2' name='texpos_adv_liquid_numbers_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_liquid_numbers_off'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_ramp_arrows_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_ramp_arrows_off'><static-array type-name='int32_t' count='2'/></static-array>
+
+        <static-array count='2' name='texpos_adv_zoom_in_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_zoom_in_off'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_zoom_out_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_zoom_out_off'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_tracks_on'><static-array type-name='int32_t' count='2'/></static-array>
+        <static-array count='2' name='texpos_adv_tracks_off'><static-array type-name='int32_t' count='2'/></static-array>
+
+        <static-array count='76' name='texpos_adv_env'><static-array count='4'><static-array type-name='int32_t' count='3'/></static-array></static-array>
+
         <static-array count='3' name='texpos_legends_tab_page_left'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array count='3' name='texpos_legends_tab_page_right'><static-array type-name='int32_t' count='2'/></static-array>
         <static-array type-name='int32_t' count='2' name='texpos_legends_tab_close_inactive'/>
diff --git a/df.history.xml b/df.history.xml
index 1add0ad22..6edb435c0 100644
--- a/df.history.xml
+++ b/df.history.xml
@@ -223,6 +223,23 @@
         <enum-item name='ARMOR'/>
     </enum-type>
 
+    <struct-type type-name='creature_knowledgest'>
+        <int32_t name='combined_caste_id'/>
+        <bitfield name='flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_FLAG_*
+            <flag-bit name='heard_of'/>
+            <flag-bit name='old_local'/>
+            <flag-bit name='recent_encounter'/>
+        </bitfield>
+
+        <stl-vector name='site' type-name='int32_t' ref-target='world_site'/>
+        <stl-vector name='region' type-name='int32_t' ref-target='world_region'/>
+        <stl-vector name='layer' type-name='int32_t' ref-target='world_underground_region'/>
+
+        <bitfield name='scholar_flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_SCHOLAR_FLAG_*
+            <flag-bit name='foraging_behavior'/>
+        </bitfield>
+    </struct-type>
+
     <struct-type type-name='knowledge_profilest'>
         <stl-vector name='known_secrets' pointer-type='interaction' comment="bay12: interation_ptr; Interactions inflicted upon the figure through an I_SOURCE:SECRET means are recorded here; this appears to prevent the interaction from affecting the figure again on subsequent exposure (when rereading a necromancy slab, for example). For interactions with both I_SOURCE:SECRET and another source (I_SOURCE:INGESTION, for example), exposure to the interaction through the non-secret route does not result in the interaction being listed here."/>
         <int32_t name='next_intervention_resistance_year' init-value='-1' comment="All are gods with the DEATH sphere having created slabs, but the value isn't the id of the slab"/>
@@ -234,24 +251,7 @@
         <stl-vector name='heard_of_guide_hfid' type-name='int32_t'/>
         <stl-vector name='heard_of_stid' type-name='int32_t'/>
         <compound name='opinion_info' type-name='opinion_infost'/>
-        <stl-vector name='creature_knowledge'>
-            <pointer> bay12: creature_knowledgest
-                <int32_t name='combined_caste_id'/>
-                <bitfield name='flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_FLAG_*
-                    <flag-bit name='heard_of'/>
-                    <flag-bit name='old_local'/>
-                    <flag-bit name='recent_encounter'/>
-                </bitfield>
-
-                <stl-vector name='site' type-name='int32_t' ref-target='world_site'/>
-                <stl-vector name='region' type-name='int32_t' ref-target='world_region'/>
-                <stl-vector name='layer' type-name='int32_t' ref-target='world_underground_region'/>
-
-                <bitfield name='scholar_flags' base-type='uint32_t'> bay12: CREATURE_KNOWLEDGE_SCHOLAR_FLAG_*
-                    <flag-bit name='foraging_behavior'/>
-                </bitfield>
-            </pointer>
-        </stl-vector>
+        <stl-vector name='creature_knowledge' pointer-type='creature_knowledgest'/>
         <stl-vector name="known_poetic_forms" type-name='int32_t' ref-target='poetic_form' since='v0.42.01' comment='bay12: poetic_form_known_id'/>
         <stl-vector name="known_musical_forms" type-name='int32_t' ref-target='musical_form' since='v0.42.01' comment='bay12: musical_form_known_id'/>
         <stl-vector name="known_dance_forms" type-name='int32_t' ref-target='dance_form' since='v0.42.01' comment='bay12: dance_form_known_id'/>
@@ -300,11 +300,20 @@
     </struct-type>
 
     <struct-type type-name='historical_figure_info' original-name='hf_profilest'>
-        <pointer name="spheres"> bay12: metaphysical_profilest
+        <pointer name="metaphysical"> bay12: metaphysical_profilest
             <stl-vector name="spheres">
                 <enum base-type='int16_t' type-name='sphere_type'/>
             </stl-vector>
             <stl-vector name='associated_divination_set_id' type-name='int32_t' ref-target='divination_set' since='v0.47.01'/>
+            <pointer name='appearance_pform' type-name='unit_appearance'/>
+            <int32_t name='physical_form_strength'/>
+            <int32_t name='physical_form_recuperation'/>
+            <int32_t name='physical_form_age_days'/>
+            <int32_t name='physical_form_seed'/>
+            <int32_t name='related_civ_enid' ref-target='historical_entity'/>
+
+            <int32_t name='physical_form_portrait_texpos' comment='not saved'/>
+            <bool name='need_to_update_physical_form_portrait'/>
         </pointer>
 
         <pointer name="skills"> bay12: skill_profilest
@@ -432,6 +441,7 @@
             <bitfield name='flags' base-type='uint32_t' since='v0.44.06'> bay12: INVENTORY_PROFILE_FLAG_*
                 <flag-bit name='specific_items'/>
                 <flag-bit name='use_average_equipment_quality'/>
+                <flag-bit name='use_mythical_substances'/>
             </bitfield>
             <enum name='using_weapon_skill' type-name='job_skill' since='v0.44.06' comment='not saved'/>
             <pointer name='building_usage_profile' since='v0.47.01'> bay12: hf_building_usage_profilest
@@ -1662,6 +1672,7 @@
         <enum-item name='priest_cry'>
             <item-attr name='caption' value='to cry on a priest'/>
         </enum-item>
+        <enum-item name='success'/>
     </enum-type>
 
     <struct-type type-name='history_event_reason_info'> not an actual structure
diff --git a/df.init.xml b/df.init.xml
index 6b5dac14e..137e29ba0 100644
--- a/df.init.xml
+++ b/df.init.xml
@@ -55,10 +55,13 @@
     <struct-type type-name='init_media'>
         <df-flagarray name='flag' index-enum='init_media_flags'/>
         <int32_t name='volume_master'/>
-        <int32_t name='volume_music'/>
-        <int32_t name='volume_ambience'/>
-        <int32_t name='volume_sfx'/>
-        <int32_t name='time_between_songs'/>
+        <int32_t name='volume_music_fort'/>
+        <int32_t name='volume_ambience_fort'/>
+        <int32_t name='volume_sfx_fort'/>
+        <int32_t name='time_between_songs_fort'/>
+        <int32_t name='volume_music_adv'/>
+        <int32_t name='volume_ambience_adv'/>
+        <int32_t name='volume_sfx_adv'/>
     </struct-type>
 
     <enum-type type-name='init_input_flags'>
diff --git a/df.interaction.xml b/df.interaction.xml
index 30269a860..032d935b7 100644
--- a/df.interaction.xml
+++ b/df.interaction.xml
@@ -212,6 +212,8 @@
         <enum-item name='CREATURE_ACTION'/>
         <enum-item name='UNDERGROUND_SPECIAL'/>
         <enum-item name='EXPERIMENT'/>
+        <enum-item name='MYTHICAL'/>
+        <enum-item name='ITEM_POWER'/>
     </enum-type>
 
     <class-type type-name='interaction_source' original-name='interaction_sourcest' key-field='id'>
@@ -320,6 +322,15 @@
         <uint32_t name='spec_flags'/>
     </class-type>
 
+    <class-type type-name='interaction_source_mythicalst' inherits-from='interaction_source'>
+        <int32_t name='power_level'/>
+    </class-type>
+
+    <class-type type-name='interaction_source_item_powerst' inherits-from='interaction_source'>
+        <compound name='info' type-name='interaction_informationst'/>
+        <stl-string name='item_description'/>
+    </class-type>
+
     <enum-type type-name='interaction_target_type' base-type='int16_t'> bay12: InteractionTargetType
         <enum-item name='CORPSE'/>
         <enum-item name='CREATURE'/>
diff --git a/df.item-vectors.xml b/df.item-vectors.xml
index f9b5615a6..cc0d644e0 100644
--- a/df.item-vectors.xml
+++ b/df.item-vectors.xml
@@ -569,6 +569,7 @@
 
         -- 130
 
+        <enum-item name='MAGICAL'/>
         <enum-item name='ANY_RECENTLY_DROPPED'/>
         <enum-item name='ANY_MELT_DESIGNATED'/>
 
@@ -783,6 +784,7 @@
         <enum-item name='SHEET'/>
         <enum-item name='BRANCH'/>
         <enum-item name='BAG'/>
+        <enum-item name='MAGICAL'/>
     </enum-type>
 
     <df-other-vectors-type type-name='items_other' index-enum='items_other_id' item-type='item'>
diff --git a/df.items.xml b/df.items.xml
index 43fb7bf61..43f107cad 100644
--- a/df.items.xml
+++ b/df.items.xml
@@ -52,29 +52,14 @@
         <flag-bit name='might_contain_artifact'/>
     </bitfield-type>
 
-    <enum-type type-name='item_magicness_type'> bay12: ItemPowers, no base type
-        <enum-item name='Sparkle' comment='Speed'/>
-        <enum-item name='AirWarped' comment='Storage'/>
-        <enum-item name='Whistle' comment='Add Damage'/>
-        <enum-item name='OddlySquare' comment='Add DamBlock'/>
-        <enum-item name='SmallBumps' comment='Resist Pierce'/>
-        <enum-item name='EarthSmell' comment='Resist Bludgeon'/>
-        <enum-item name='Lightning' comment='Resist Slash'/>
-        <enum-item name='GrayHairs' comment='Resist Gore; with value of 10 or higher, creatures that look at the item cannot think negative thoughts'/>
-        <enum-item name='RustlingLeaves' comment='Thorn Burst'/>
-    </enum-type>
-
-    <struct-type type-name='item_magicness' original-name='item_powerst'>
-        <enum base-type='int16_t' name="type" type-name='item_magicness_type'/>
-        <int16_t name='value' comment='boosts item value by 50*this'/>
-        <int16_t name='gloss'/>
-        <bitfield name='flags' base-type='uint32_t'> bay12: MAGICALPOWERFLAG_
-            <flag-bit name='inactive'/>
-        </bitfield>
+    <struct-type type-name='item_powerst'>
+        <int32_t name='interaction_index' init-value='-1'/>
+        <int32_t name='interaction_source_index' init-value='-1'/>
+        <int32_t name='delay' init-value='0'/>
     </struct-type>
 
     <struct-type type-name='item_magicalst'>
-        <stl-vector name='power' pointer-type='item_magicness'/>
+        <stl-vector name='power' pointer-type='item_powerst'/>
     </struct-type>
 
     <struct-type type-name='temperaturest'> seems like a convenient name
@@ -441,12 +426,6 @@
 
             -- 110
 
-            <vmethod name='addpower'><enum name='ptype' type-name='item_magicness_type' base-type='int32_t'/><int16_t name='availpower'/><int16_t name='donorpower'/></vmethod>
-            <vmethod name='additempower'><pointer name='item' type-name='item'/><bool name='dwarfmake'/></vmethod>
-            <vmethod name='addimppower'><pointer name='imp' type-name='itemimprovement'/><bool name='dwarfmake'/></vmethod>
-            <vmethod name='addnamepower'><bool name='dwarfmake'/></vmethod>
-            <vmethod name='getavailpower'><static-array name='availpower' count='9' type-name='int16_t' index-enum='item_magicness_type'/><bool name='dwarfmake'/><bool name='subtract_current'/></vmethod>
-
             <vmethod name='setDisplayColor'><int16_t name='bg'/></vmethod>
             <vmethod ret-type='bool' name='isDamagedByHeat'/>
             <vmethod ret-type='bool' name='needTwoHandedWield'> <int32_t/> </vmethod>
diff --git a/df.materials.xml b/df.materials.xml
index 6b74673d7..2b22a794e 100644
--- a/df.materials.xml
+++ b/df.materials.xml
@@ -425,9 +425,9 @@
         <enum-item name='SOIL'/>
         <enum-item name='DEEP_SPECIAL'/>
         <enum-item name='DIVINE'/>
-        <enum-item/> these are all UNUSED
-        <enum-item/>
-        <enum-item/>
+        <enum-item name='MYTHICAL'/>
+        <enum-item name='MYTHICAL_REMNANT'/>
+        <enum-item name='MYTHICAL_SUBSTANCE'/>
         <enum-item/>
 
         <enum-item/>
diff --git a/df.meeting.xml b/df.meeting.xml
index 7511872db..4f9de097d 100644
--- a/df.meeting.xml
+++ b/df.meeting.xml
@@ -625,6 +625,7 @@
         <enum-item name='ToldJoke'/>
         <enum-item name='GiftPet'/>
         <enum-item name='GavePet'/>
+        <enum-item name='OfferedService'/>
     </enum-type>
 
     <enum-type type-name='conversation_trouble_type' base-type='int32_t'> bay12: ConversationTroubleType
@@ -697,6 +698,7 @@
             <enum name="value_type" type-name='value_type'/>
             <enum name="squad_order_type" type-name='squad_order_type'/>
             <int32_t name='belief_system_id'/>
+            <int32_t name='retrieve_artifact_quest_art_id' ref-target='artifact_record'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable2'/>
@@ -717,6 +719,7 @@
             <int32_t name='squad_order_target_hfid' ref-target='historical_figure'/>
             <int32_t name='story_index'/>
             <int32_t name='question_identity_id'/>
+            <int32_t name='retrieve_artifact_quest_site_id' ref-target='world_site'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable3'/>
@@ -727,6 +730,7 @@
             <enum name="occupation_type" type-name='occupation_type'/>
             <int32_t name='squad_order_target_stid' ref-target='world_site'/>
             <int32_t name='story_frame_index'/>
+            <int32_t name='retrieve_artifact_quest_giver_entity_id' ref-target='historical_entity'/>
         </compound>
         <compound is-union='true'>
             <int32_t name='variable4'/>
diff --git a/df.raws.xml b/df.raws.xml
index 46baf2d66..3e18675b9 100644
--- a/df.raws.xml
+++ b/df.raws.xml
@@ -179,6 +179,7 @@
             <stl-vector name='liquid_graphics_info'/> 0.50.01
             <stl-vector name='powder_graphics_info'/> 0.50.01
             <stl-vector name='pipe_section_graphics_info'/> 0.50.01
+            <stl-vector name='rock_graphics_info'/> 0.51.01
             <static-array name='statue_texpos_top' count='92' type-name='int32_t' /> 0.50.01
             <static-array name='statue_texpos_bottom' count='92' type-name='int32_t' /> 0.50.01
         </compound>
diff --git a/df.syndrome.xml b/df.syndrome.xml
index e09342ea1..3cf838741 100644
--- a/df.syndrome.xml
+++ b/df.syndrome.xml
@@ -192,7 +192,7 @@
             <vmethod name='parseLineCounter'><pointer name='tok1' type-name='stl-string'/><pointer name='tok2' type-name='stl-string'/><pointer name='tok3' type-name='stl-string'/><pointer name='tok4' type-name='stl-string'/></vmethod>
             <vmethod name='applyToHistfig'><pointer name='hf' type-name='historical_figure'/><bool name='worldgen'/></vmethod>
             <vmethod name='finalize'/>
-            <vmethod name='getCreatureInteraction'><ret-type><pointer type-name='creature_interaction'/></ret-type></vmethod>
+            <vmethod name='getCreatureInteraction'><ret-type><pointer type-name='interaction_informationst'/></ret-type></vmethod>
         </virtual-methods>
     </class-type>
 
@@ -411,7 +411,7 @@
 
     <class-type type-name='creature_interaction_effect_can_do_interactionst'
                 inherits-from='creature_interaction_effect'>
-        <compound name='interaction' type-name='creature_interaction'/>
+        <compound name='interaction' type-name='interaction_informationst'/>
     </class-type>
 
     <class-type type-name='creature_interaction_effect_sense_creature_classst'
diff --git a/df.ui-menus.xml b/df.ui-menus.xml
index afd4303f8..498e06679 100644
--- a/df.ui-menus.xml
+++ b/df.ui-menus.xml
@@ -2718,6 +2718,7 @@
                 <bool name='scrolling_aim_attack'/>
 
                 <stl-vector name='wrestle' pointer-type='unit_item_wrestle'/>
+                <stl-vector name='shared_it' pointer-type='item'/>
                 <int32_t name='scroll_position_wrestle'/>
                 <bool name='scrolling_wrestle'/>
 
@@ -2888,6 +2889,10 @@
                 <stl-vector name='interaction_cdi_use_flag' type-name='uint32_t'/>
                 <stl-vector name='interaction_cdi_mat_effect_index' type-name='int32_t' ref-target='interaction'/>
 
+                <stl-vector name='item' pointer-type='item'/>
+                <stl-vector name='item_power' pointer-type='item_powerst'/>
+                <stl-vector name='item_power_use_flag' type-name='uint32_t'/>
+
                 <bool name='scrolling'/>
                 <int32_t name='scroll_position'/>
             </compound>
@@ -2941,6 +2946,25 @@
                 <stl-string name='filter_str'/>
                 <bool name='entering_filter'/>
             </compound>
+
+            <compound name='journal_outliner'> bay12: adventure_interface_journal_outlinerst
+                <stl-vector name='agreement_entry' pointer-type='agreement_entryst'/>
+                <bitfield base-type='uint32_t' name='flag'> bay12: ADVENTURE_INTERFACE_JOURNAL_OUTLINER_FLAG_*
+                    <flag-bit name='hidden'/>
+                </bitfield>
+            </compound>
+
+            <bitfield base-type='uint64_t' name='must_renew_adv_env_hover_flag'> bay12: MUST_RENEW_ADV_ENV_HOVER_FLAG_*
+                <flag-bit name='odor'/>
+                <flag-bit name='fog'/>
+                <flag-bit name='precip'/>
+                <flag-bit name='cloud'/>
+                <flag-bit name='wind'/>
+                <flag-bit name='light'/>
+                <flag-bit name='moon'/>
+                <flag-bit name='temp'/>
+                <flag-bit name='freshest_track'/>
+            </bitfield>
         </compound>
 
         <stl-vector type-name='int32_t' name='viewunit_list'/>
@@ -2991,7 +3015,7 @@
         <int32_t name='current_hover_left_x'/>
         <int32_t name='current_hover_bot_y'/>
 
-        <static-array count='601' name='hover_instruction' type-name='curses_text_boxst' index-enum='main_hover_instruction'/>
+        <static-array count='619' name='hover_instruction' type-name='curses_text_boxst' index-enum='main_hover_instruction'/>
         <int32_t name='last_displayed_hover_inst'/>
         <int32_t name='last_displayed_hover_id1'/>
         <int32_t name='last_displayed_hover_id2'/>
@@ -5429,6 +5453,61 @@
             <item-attr name='caption' value=''/>
         </enum-item>
         600
+        <enum-item name='DYNAMIC_ADV_ENV_ODOR'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_FOG'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_PRECIP'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_CLOUD'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_WIND'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_LIGHT'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_MOON'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_TEMP'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='DYNAMIC_ADV_ENV_FRESHEST_TRACK'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='TRACK_TOGGLE'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        610
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_N'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_S'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_E'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_W'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_NW'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_NE'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_SW'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
+        <enum-item name='ADVENTURE_MOVE_DOWN_RAMP_SE'>
+            <item-attr name='caption' value=''/>
+        </enum-item>
         <enum-item name='Generic'>
             <item-attr name='caption' value=''/>
         </enum-item>
diff --git a/df.units.xml b/df.units.xml
index 61aa0c583..4d43470ed 100644
--- a/df.units.xml
+++ b/df.units.xml
@@ -152,6 +152,8 @@
         <flag-bit name='agitated_wilderness_creature'/>
         <flag-bit name='path_failed_recently'/>
         <flag-bit name='portrait_must_be_refreshed'/>
+        <flag-bit name='may_have_magical_inventory_item'/>
+        <flag-bit name='may_have_mythical_substance'/>
     </bitfield-type>
 
     <enum-type type-name='value_type' base-type='int32_t'> bay12: PersonalityValueType
@@ -1365,6 +1367,7 @@
             <vmethod ret-type='uint8_t' name='getCreatureTile'/>
             <vmethod ret-type='uint8_t' name='getCorpseTile'/>
             <vmethod ret-type='uint8_t' name='getGlowTile'/>
+            <vmethod ret-type='int32_t' name='getGlowTexture'/>
             <vmethod name='create_nemesis'>
                 <ret-type> <pointer type-name='nemesis_record'/> </ret-type>
                 <int8_t name='important'/>
@@ -1813,6 +1816,22 @@
         <enum-item name='NeedMillingDelayed' comment='auto-decrement'/>
         <enum-item name='BuildingDestroyerDelay' comment='auto-decrement'/>
         <enum-item name='HeistPaused' comment='auto-decrement'/>
+        <enum-item name='HaveIngestedMythicalSubstance'/>
+        <enum-item name='DidInteractionAnnouncementReducePain'/>
+        -- 70 --
+        <enum-item name='DidInteractionAnnouncementReduceSwelling'/>
+        <enum-item name='DidInteractionAnnouncementCureInfection'/>
+        <enum-item name='DidInteractionAnnouncementHealNerves'/>
+        <enum-item name='DidInteractionAnnouncementStopBleeding'/>
+        <enum-item name='DidInteractionAnnouncementCloseOpenWounds'/>
+        <enum-item name='DidInteractionAnnouncementHealTissues'/>
+        <enum-item name='DidInteractionAnnouncementRegrowParts'/>
+        <enum-item name='DidInteractionAnnouncementReduceParalysis'/>
+        <enum-item name='DidInteractionAnnouncementReduceFever'/>
+        <enum-item name='DidInteractionAnnouncementReduceNausea'/>
+        -- 80 --
+        <enum-item name='DidInteractionAnnouncementReduceDizzness'/>
+        <enum-item name='HaveCheckedFavorDodge'/>
     </enum-type>
 
     <struct-type type-name='unit_misc_trait' original-name='counterst'>
@@ -2449,6 +2468,7 @@
         <enum-item name='Grab'/>
         <enum-item name='WrestleGeneric'/>
         <enum-item name='GrabGeneric'/>
+        <enum-item name='StruggleForItem'/>
     </enum-type>
     <struct-type type-name='unit_action_data_attack' original-name='unit_move_attackst'>
         <int32_t name='target_unit_id' ref-target='unit'/>
diff --git a/df.viewscreen.xml b/df.viewscreen.xml
index 5bdb8edc7..f1ab07c69 100644
--- a/df.viewscreen.xml
+++ b/df.viewscreen.xml
@@ -702,6 +702,238 @@
         <int32_t name='progress' comment='0..35'/>
     </class-type>
 
+    <enum-type type-name='adventure_log_mode' base-type='int16_t'> bay12: AdventureLogModeType
+        <enum-item name="EVENTS"/>
+        <enum-item name="AGREEMENTS"/>
+        <enum-item name="PEOPLE"/>
+        <enum-item name="SITES"/>
+        <enum-item name="ENTITIES"/>
+        <enum-item name="SUBREGIONS"/>
+
+        <enum-item name="BESTIARY"/>
+        <enum-item name="ARTIFACTS"/>
+        <enum-item name="INTRIGUE"/>
+        <enum-item name="INTRIGUE_ACTORS"/>
+        <enum-item name="INTRIGUE_ORGANIZATIONS"/>
+        <enum-item name="INTRIGUE_PLOTS"/>
+        <enum-item name="BLANK_10"/>
+        <enum-item name="BLANK_11"/>
+        <enum-item name="BLANK_12"/>
+    </enum-type>
+
+    <class-type type-name='viewscreen_adventure_logst' inherits-from='viewscreen'>
+        <stl-vector name='base_actor_entry' pointer-type='actor_entryst'/>
+        <stl-vector name='base_organization_entry' pointer-type='organization_entryst'/>
+        <stl-vector name='base_plot_entry' pointer-type='plot_entryst'/>
+        <compound name='evidence_repository' type-name='evidence_repositoryst'/>
+
+        <compound name='map_display'> bay12: adventure_log_map_displayst
+            <int8_t name='map'/>
+            <int8_t name="midmap"/>
+            <int8_t name="localmap"/>
+            <int8_t name='hide_map'/>
+            <compound type-name='coord2d' name='cur_loc'/>
+            <compound type-name='coord2d' name='cur_mm_loc'/>
+            <compound type-name='coord2d' name='min'/>
+            <compound type-name='coord2d' name='max'/>
+            <compound type-name='coord2d' name='cursor'/>
+            <int16_t name="midmap_highlight_sx"/>
+            <int16_t name="midmap_highlight_ex"/>
+            <int16_t name="midmap_highlight_sy"/>
+            <int16_t name="midmap_highlight_ey"/>
+        </compound>
+
+        <int32_t name="selected"/>
+        <int8_t name="line_on"/>
+        <enum name='mode' type-name='adventure_log_mode'/>
+        <enum name='submode' type-name='adventure_log_mode'/>
+        <enum name='saved_submode_intrigue' type-name='adventure_log_mode'/>
+        <int32_t name='adventure_log_event_text_scroll'/>
+        <int32_t name='histfig_text_scroll'/>
+        <int32_t name='bestiary_text_scroll'/>
+        <int32_t name='entity_text_scroll'/>
+        <int32_t name='site_text_scroll'/>
+        <int32_t name='subregion_text_scroll'/>
+        <int32_t name='artifact_text_scroll'/>
+
+        <bool name='expand_text'/>
+        <pointer name='selected_oen' type-name='organization_entry_nodest'/>
+
+        <stl-string name='filter_str'/>
+        <bool name='entering_filter'/>
+        <bool name='initialized_intrigue_mode'/>
+
+        <int32_t name='scroll_position_events'/>
+        <int32_t name='scroll_position_agreements'/>
+        <int32_t name='scroll_position_people'/>
+        <int32_t name='scroll_position_sites'/>
+        <int32_t name='scroll_position_entities'/>
+        <int32_t name='scroll_position_subregions'/>
+        <int32_t name='scroll_position_bestiary'/>
+        <int32_t name='scroll_position_artifacts'/>
+        <int32_t name='scroll_position_intrigue_actors'/>
+        <int32_t name='scroll_position_intrigue_organizations'/>
+        <int32_t name='scroll_position_intrigue_plots'/>
+        <bool name='scrolling'/>
+
+        <stl-vector name='base_site_entry' pointer-type='site_entryst'/>
+        <stl-vector name='base_entity_entry' pointer-type='entity_entryst'/>
+        <stl-vector name='base_subregion_entry' pointer-type='subregion_entryst'/>
+        <stl-vector name='base_feature_layer' pointer-type='world_underground_region'/>
+        <stl-vector name='base_agreement_entry' pointer-type='agreement_entryst'/>
+        <stl-vector name='base_bestiary_entry' pointer-type='bestiary_entryst'/>
+        <stl-vector name='base_adventure_log_event' pointer-type='adventure_log_eventst'/>
+        <stl-vector name='base_histfig_entry' pointer-type='histfig_entryst'/>
+        <stl-vector name='base_artifact_entry' pointer-type='artifact_entryst'/>
+
+        <bool name='priority_sort_site'/>
+        <bool name='priority_sort_entity'/>
+        <bool name='priority_sort_histfig'/>
+        <int32_t name='event_sort_mode'/>
+        <bool name='set_priority_site'/>
+        <bool name='set_priority_entity'/>
+        <bool name='set_priority_histfig'/>
+        <bool name='set_priority_event'/>
+
+        <stl-vector name='value_site_entry' pointer-type='site_entryst'/>
+        <stl-vector name='value_entity_entry' pointer-type='entity_entryst'/>
+        <stl-vector name='value_subregion_entry' pointer-type='subregion_entryst'/>
+        <stl-vector name='value_feature_layer' pointer-type='world_underground_region'/>
+        <stl-vector name='value_agreement_entry' pointer-type='agreement_entryst'/>
+        <stl-vector name='value_bestiary_entry' pointer-type='bestiary_entryst'/>
+        <stl-vector name='value_adventure_log_event' pointer-type='adventure_log_eventst'/>
+        <stl-vector name='value_histfig_entry' pointer-type='histfig_entryst'/>
+        <stl-vector name='value_artifact_entry' pointer-type='artifact_entryst'/>
+        <stl-vector name='value_actor_entry' pointer-type='actor_entryst'/>
+        <stl-vector name='value_organization_entry' pointer-type='organization_entryst'/>
+        <stl-vector name='value_plot_entry' pointer-type='plot_entryst'/>
+
+        <stl-vector name='site_entry' pointer-type='site_entryst'/>
+        <stl-vector name='entity_entry' pointer-type='entity_entryst'/>
+        <stl-vector name='subregion_entry' pointer-type='subregion_entryst'/>
+        <stl-vector name='feature_layer' pointer-type='world_underground_region'/>
+        <stl-vector name='agreement_entry' pointer-type='agreement_entryst'/>
+        <stl-vector name='bestiary_entry' pointer-type='bestiary_entryst'/>
+        <stl-vector name='adventure_log_event' pointer-type='adventure_log_eventst'/>
+        <stl-vector name='histfig_entry' pointer-type='histfig_entryst'/>
+        <stl-vector name='artifact_entry' pointer-type='artifact_entryst'/>
+        <stl-vector name='actor_entry' pointer-type='actor_entryst'/>
+        <stl-vector name='organization_entry' pointer-type='organization_entryst'/>
+        <stl-vector name='plot_entry' pointer-type='plot_entryst'/>
+    </class-type>
+
+    <struct-type type-name='bestiary_entryst'>
+        <int32_t name='alpha_index'/>
+        <pointer name='ck' type-name='creature_knowledgest'/>
+        <stl-string name='list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+    </struct-type>
+
+    <struct-type type-name='agreement_entryst'>
+        <pointer name='ag' type-name='agreement'/>
+
+        <pointer name='sq' type-name='squad'/>
+        <pointer name='so' type-name='squad_order'/>
+        <bool name='squad_order_repeatable'/>
+
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+
+        <bool name='showing_commander'/>
+        <int32_t name='ax'/>
+        <int32_t name='ay'/>
+    </struct-type>
+
+    <struct-type type-name='histfig_entryst'>
+        <pointer name='hf' type-name='historical_figure'/>
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+
+        <pointer name='iden' type-name='identity'/>
+        <int32_t name='value'/>
+    </struct-type>
+
+    <struct-type type-name='site_entryst'>
+        <pointer name='st' type-name='world_site'/>
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+
+        <int32_t name='value'/>
+    </struct-type>
+
+    <struct-type type-name='entity_entryst'>
+        <pointer name='ent' type-name='historical_entity'/>
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+
+        <int32_t name='value'/>
+    </struct-type>
+
+    <struct-type type-name='subregion_entryst'>
+        <pointer name='sr' type-name='world_region'/>
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+    </struct-type>
+
+    <enum-type type-name='adventure_log_event_type' base-type='int32_t'> bay12: AdventureLogEventType
+        <enum-item name='INCIDENT'/>
+        <enum-item name='RUMOR'/>
+    </enum-type>
+
+    <struct-type type-name='adventure_log_eventst'>
+        <enum name='type' type-name='adventure_log_event_type'/>
+        <pointer name='rumor' type-name='entity_event'/>
+        <pointer name='incident' type-name='incident'/>
+        <pointer name='ard' type-name='adventure_rumor_datast'/>
+        <int32_t name='year'/>
+        <int32_t name='season_count'/>
+
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='summary'/>
+        <stl-vector name='key_word' pointer-type='stl-string'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+
+        <int32_t name='ax' init-value='-1'/>
+        <int32_t name='ay' init-value='-1'/>
+        <int32_t name='recenter_mode'/>
+        <static-array name='has_recenter_mode' type-name='bool' count='3'/>
+    </struct-type>
+
+    <struct-type type-name='artifact_entryst'>
+        <pointer name='art' type-name='artifact_record'/>
+        <stl-string name='list_name'/>
+        <stl-string name='simple_list_name'/>
+
+        <stl-string name='p_list_name'/>
+        <compound name='main_text_box' type-name='curses_text_boxst'/>
+
+        <compound name='arl' type-name='artifact_rumor_locationst'/>
+
+        <int32_t name='ax'/>
+        <int32_t name='ay'/>
+    </struct-type>
+
     <enum-type type-name='embark_finder_option' base-type='int16_t'> bay12: FindSiteParamType
         <enum-item name='DimensionX'/>
         <enum-item name='DimensionY'/>
@@ -1368,6 +1600,7 @@
         <int32_t name='cave_max_size'/>
         <int32_t name='mountain_cave_min'/>
         <int32_t name='non_mountain_cave_min'/>
+        <int32_t name='mythical_site_num'/>
         <int32_t name='total_civ_number'/>
         <int32_t name='rain_ranges_1'/>
         <int32_t name='rain_ranges_0'/>
@@ -1410,6 +1643,8 @@
         <int32_t name='evil_cloud_number'/>
         <int32_t name='evil_rain_number'/>
         <int8_t name='generate_divine_materials' since='v0.40.01'/>
+        <int8_t name='use_mythical_materials' since='v0.51.01'/>
+        <int8_t name='allow_mythical_healing' since='v0.51.01'/>
         <int8_t name='allow_divination' since='v0.47.01'/>
         <int8_t name='allow_demonic_experiments' since='v0.47.01'/>
         <int8_t name='allow_necromancer_experiments' since='v0.47.01'/>
@@ -1790,6 +2025,8 @@
         <int32_t name='tier_count'/>
         <bitfield name='flags' base-type='uint32_t'> bay12: SETUP_RACE_SELECTION_FLAG_*
             <flag-bit name='is_regionpop'/>
+            <flag-bit name='allows_chosen'/>
+            <flag-bit name='allows_hero'/>
         </bitfield>
     </struct-type>
 
@@ -1798,6 +2035,8 @@
         <stl-vector pointer-type='setup_race_selectionst' name='race_selection'/>
 
         <int32_t name='chosen_destiny'/>
+        <bool name='chosen_allowed'/>
+        <bool name='hero_allowed'/>
         <int32_t name='chosen_difficulty'/>
         <static-array name='destiny_desc' count='3' type-name='curses_text_boxst'/>
         <compound name='difficulty_desc' type-name='curses_text_boxst'/>
diff --git a/df.world-site.xml b/df.world-site.xml
index 29fdcff9c..ac6711234 100644
--- a/df.world-site.xml
+++ b/df.world-site.xml
@@ -312,6 +312,7 @@
         <enum-item name='NONE' value='-1'/>
         <enum-item name='TOMB'/>
         <enum-item name='VAULT'/>
+        <enum-item name='MYTHICAL'/>
     </enum-type>
 
     <enum-type type-name='lair_type' base-type='int16_t'> bay12: LairType
@@ -1015,6 +1016,9 @@
         <enum-item name='VAULT_02'/>
         <enum-item name='VAULT_12'/>
         <enum-item name='VAULT_22'/>
+        <enum-item name='MYTHICAL_PALACE'/>
+        <enum-item name='MYTHICAL_DUNGEON'/>
+        <enum-item name='MYTHICAL_LAIR'/>
     </enum-type>
 
     <struct-type type-name='world_site_realization' original-name='site_realizationst'>
@@ -1340,6 +1344,9 @@
         30
         <enum-item name='necromancer_tower'/>
         <enum-item name='barrow'/>
+        <enum-item name='mythical_palace'/>
+        <enum-item name='mythical_dungeon'/>
+        <enum-item name='mythical_lair'/>
 
     </enum-type>
 
diff --git a/df.world.xml b/df.world.xml
index 5601b4856..975f2ff8a 100644
--- a/df.world.xml
+++ b/df.world.xml
@@ -1028,6 +1028,7 @@
             <stl-vector name='announcements' pointer-type='report'/>
             <stl-vector name='popups' pointer-type='popup_message'/>
             <compound name='mega_text' type-name='markup_text_boxst'/>
+            <int32_t name='mega_portrait_hfid' ref-target='historical_figure'/>
 
             <int32_t name='next_report_id'/>
             <bitfield name='flags' base-type='uint32_t'> bay12: REPORT_FLAG_*
@@ -1313,6 +1314,7 @@
             <bool name='made_cave_pops'/>
             <bool name='made_cave_civs'/>
             <bool name='finished_prehistory'/>
+            <stl-vector name='mythical_site' pointer-type='world_site'/>
             <stl-vector name='caves' pointer-type='world_site'/>
             <stl-vector name='orig_cave' pointer-type='world_site'/>
             <int32_t name='current_bandit_num'/>
@@ -1341,6 +1343,8 @@
             <stl-vector name='o_final_cave_choice_y' type-name='int32_t'/>
             <int32_t name='mountain_cave_left'/>
             <int32_t name='non_mountain_cave_left'/>
+            <int32_t name='mythical_site_left'/>
+
             <stl-vector name='candidate_demon_c' type-name='int16_t' since='v0.40.01'/>
             <stl-vector name='candidate_demon_cc' type-name='int16_t' since='v0.40.01'/>
             <stl-vector name='libraries' pointer-type='abstract_building_libraryst' since='v0.42.01'/>
@@ -1366,6 +1370,8 @@
             <compound name='text_box' type-name='markup_text_boxst'/>
             <ulong name='last_chronicle_add_time'/>
             <int32_t name='last_event_id_added'/>
+
+            <stl-vector name='mythical_sphere' type-name='sphere_type'/>
         </compound>
 
         <compound name='orphaned_flow_pool' type-name='flow_reuse_pool'/>