Update upstream source from tag 'upstream/0.44.11'

Update to upstream version '0.44.11'
with Debian dir 5df2d8ad2d61456dd2e538720013802eca3c6ed2

32 files changed, 176 insertions, 14 deletions

diff --git a/amd64/data/help/main b/amd64/data/help/main
index f1c4597..ac2d630 100644
--- a/amd64/data/help/main
+++ b/amd64/data/help/main
diff --git a/amd64/data/help/text_viewer b/amd64/data/help/text_viewer
index ad5d603..217ba82 100644
--- a/amd64/data/help/text_viewer
+++ b/amd64/data/help/text_viewer
diff --git a/amd64/data/index b/amd64/data/index
index 90a47f3..801a57c 100644
--- a/amd64/data/index
+++ b/amd64/data/index
diff --git a/amd64/data/init/announcements.txt b/amd64/data/init/announcements.txt
index afed5bf..3ad5f46 100644
--- a/amd64/data/init/announcements.txt
+++ b/amd64/data/init/announcements.txt
@@ -328,4 +328,6 @@ UCR_A or UNIT_COMBAT_REPORT_ALL_ACTIVE: the announcement will be associated to a
 [CANNOT_CONSTRUCT:A_D:D_D]

 [RUMOR_SPREAD:A_D:D_D]

 [SERVICE_ORDER_RUMOR_RECEIVED:A_D:D_D]

-[RETURNING_RUMOR_RECEIVED:A_D:D_D]
\ No newline at end of file
+[RETURNING_RUMOR_RECEIVED:A_D:D_D]

+[NEW_HOLDING:A_D:D_D:BOX:P:R]

+[NEW_MARKET_LINK:A_D:D_D:BOX:P:R]
\ No newline at end of file
diff --git a/amd64/data/init/init.txt b/amd64/data/init/init.txt
index 1955a29..1a0adef 100644
--- a/amd64/data/init/init.txt
+++ b/amd64/data/init/init.txt
@@ -43,7 +43,7 @@ If this is set to YES, the tiles will not be stretched, but rather the game view
 

 [BLACK_SPACE:YES]

 

-Graphics info, most of it as above.  Set GRAPHICS to YES to turn it all on.  This will use the "raw/graphics" folder for tile information.  Currently this is limited to whatever creature graphics you have downloaded.  The game comes with a few pictures to demonstrate.  As of May 2018, the Dwarf Fortress Wiki has custom tilesets available at http://dwarffortresswiki.org/index.php/Tileset_repository and creature graphics at http://dwarffortresswiki.org/index.php/Graphics_set_repository.

+Graphics info, most of it as above.  Set GRAPHICS to YES to turn it all on.  This will use the "raw/graphics" folder for tile information.  Currently this is limited to whatever creature graphics you have downloaded.  The game comes with a few pictures to demonstrate.  As of June 2018, the Dwarf Fortress Wiki has custom tilesets available at http://dwarffortresswiki.org/index.php/Tileset_repository and creature graphics at http://dwarffortresswiki.org/index.php/Graphics_set_repository.

 

 [GRAPHICS:NO]

 [GRAPHICS_WINDOWEDX:0]

diff --git a/amd64/data/init/interface.txt b/amd64/data/init/interface.txt
index 6d01861..c2d0ab0 100644
--- a/amd64/data/init/interface.txt
+++ b/amd64/data/init/interface.txt
@@ -1327,6 +1327,10 @@
 [KEY:r]

 [BIND:CIV_CENTER_ON_FORT:REPEAT_NOT]

 [KEY:y]

+[BIND:CIV_HOLDINGS:REPEAT_NOT]

+[KEY:h]

+[BIND:CIV_MAP_LEGEND:REPEAT_NOT]

+[KEY:l]

 [BIND:CIV_REMOVE_MISSION:REPEAT_NOT]

 [KEY:x]

 [BIND:CIV_RESCUE:REPEAT_NOT]

@@ -1359,6 +1363,10 @@
 [KEY:t]

 [BIND:CIV_MISSION_TRIBUTE_ONGOING:REPEAT_NOT]

 [KEY:T]

+[BIND:CIV_MISSION_CONQUER:REPEAT_NOT]

+[KEY:q]

+[BIND:CIV_MISSION_DEMAND_SURRENDER:REPEAT_NOT]

+[KEY:Q]

 [BIND:CIV_NEWS:REPEAT_NOT]

 [KEY:n]

 [BIND:CIV_PEOPLE:REPEAT_NOT]

@@ -2417,6 +2425,8 @@
 [BIND:UNITVIEW_PRF_PROF:REPEAT_NOT]

 [KEY:l]

 [BIND:UNITVIEW_PRF_PET:REPEAT_NOT]

+[KEY:a]

+[BIND:UNITVIEW_PRF_EXPEL:REPEAT_NOT]

 [KEY:e]

 [BIND:UNITVIEW_PRF_NEW_SQUAD:REPEAT_NOT]

 [KEY:n]

diff --git a/amd64/file changes.txt b/amd64/file changes.txt
index b93cf2a..4b63f42 100644
--- a/amd64/file changes.txt
+++ b/amd64/file changes.txt
@@ -4,6 +4,32 @@ See command_line.txt for information on world generation from command lines.
 

 ******************************************************

 

+Auxiliary file changes for 0.44.11

+

+	announcements

+		[NEW_HOLDING:A_D:D_D:BOX:P:R]

+		[NEW_MARKET_LINK:A_D:D_D:BOX:P:R]

+

+	creatures

+		conger eel typo

+		whale shark typo

+		carp typo

+

+	new keys

+		CIV_HOLDINGS:h

+		CIV_MAP_LEGEND:l

+		CIV_MISSION_CONQUER:q

+		CIV_MISSION_DEMAND_SURRENDER:Q

+		UNITVIEW_PRF_EXPEL:e

+

+	changed keys

+		UNITVIEW_PRF_PET:a

+

+	graphics_example

+		MESSENGER added to list (new occupation-linked unit type)

+

+******************************************************

+

 Auxiliary file changes for 0.44.10:

 

 	Note:  Item inaccessible ANNOUNCE_ZOOM/2 will only be correct on new announcements (not 0.44.09 and before.)

diff --git a/amd64/g_src/keybindings.cpp b/amd64/g_src/keybindings.cpp
index 147f07c..e3a3fb6 100644
--- a/amd64/g_src/keybindings.cpp
+++ b/amd64/g_src/keybindings.cpp
@@ -185,6 +185,8 @@ void keybinding_init() {
 	bindingNames.insert(INTERFACEKEY_IMAGE_CREATOR_DONE, "IMAGE_CREATOR_DONE");

 	bindingNames.insert(INTERFACEKEY_CIV_RAID, "CIV_RAID");

 	bindingNames.insert(INTERFACEKEY_CIV_CENTER_ON_FORT, "CIV_CENTER_ON_FORT");

+	bindingNames.insert(INTERFACEKEY_CIV_HOLDINGS, "CIV_HOLDINGS");

+	bindingNames.insert(INTERFACEKEY_CIV_MAP_LEGEND, "CIV_MAP_LEGEND");

 	bindingNames.insert(INTERFACEKEY_CIV_REMOVE_MISSION, "CIV_REMOVE_MISSION");

 	bindingNames.insert(INTERFACEKEY_CIV_RESCUE, "CIV_RESCUE");

 	bindingNames.insert(INTERFACEKEY_CIV_RECOVER, "CIV_RECOVER");

@@ -201,6 +203,8 @@ void keybinding_init() {
 	bindingNames.insert(INTERFACEKEY_CIV_MISSION_RAZE, "CIV_MISSION_RAZE");

 	bindingNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONE_TIME, "CIV_MISSION_TRIBUTE_ONE_TIME");

 	bindingNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONGOING, "CIV_MISSION_TRIBUTE_ONGOING");

+	bindingNames.insert(INTERFACEKEY_CIV_MISSION_CONQUER, "CIV_MISSION_CONQUER");

+	bindingNames.insert(INTERFACEKEY_CIV_MISSION_DEMAND_SURRENDER, "CIV_MISSION_DEMAND_SURRENDER");

 	bindingNames.insert(INTERFACEKEY_CIV_NEWS, "CIV_NEWS");

 	bindingNames.insert(INTERFACEKEY_CIV_PEOPLE, "CIV_PEOPLE");

 	bindingNames.insert(INTERFACEKEY_CIV_ARTIFACTS, "CIV_ARTIFACTS");

@@ -1221,6 +1225,7 @@ void keybinding_init() {
 	bindingNames.insert(INTERFACEKEY_UNITVIEW_GEN_MISC, "UNITVIEW_GEN_MISC");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PROF, "UNITVIEW_PRF_PROF");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET, "UNITVIEW_PRF_PET");

+	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_EXPEL, "UNITVIEW_PRF_EXPEL");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_VIEW, "UNITVIEW_PRF_VIEW");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, "UNITVIEW_PRF_NEW_SQUAD");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, "UNITVIEW_PRF_REMOVE_FROM_SQUAD");

@@ -1771,6 +1776,8 @@ void keybinding_init() {
 	displayNames.insert(INTERFACEKEY_IMAGE_CREATOR_DONE, "Image Creator: Done");

 	displayNames.insert(INTERFACEKEY_CIV_RAID, "World: Raid");

 	displayNames.insert(INTERFACEKEY_CIV_CENTER_ON_FORT, "World: Center on Fort");

+	displayNames.insert(INTERFACEKEY_CIV_HOLDINGS, "World: Holdings");

+	displayNames.insert(INTERFACEKEY_CIV_MAP_LEGEND, "World: Map Legend");

 	displayNames.insert(INTERFACEKEY_CIV_REMOVE_MISSION, "World: Remove Mission");

 	displayNames.insert(INTERFACEKEY_CIV_RESCUE, "World: Rescue Person");

 	displayNames.insert(INTERFACEKEY_CIV_RECOVER, "World: Recover Artifact");

@@ -1787,6 +1794,8 @@ void keybinding_init() {
 	displayNames.insert(INTERFACEKEY_CIV_MISSION_RAZE, "World: Missions, Details, Raze");

 	displayNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONE_TIME, "World: Missions, Details, One-Time Tribute");

 	displayNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONGOING, "World: Missions, Details, Ongoing Tribute");

+	displayNames.insert(INTERFACEKEY_CIV_MISSION_CONQUER, "World: Missions, Details, Conquer");

+	displayNames.insert(INTERFACEKEY_CIV_MISSION_DEMAND_SURRENDER, "World: Missions, Details, Demand Surrender");

 	displayNames.insert(INTERFACEKEY_CIV_NEWS, "World: News and Rumors");

 	displayNames.insert(INTERFACEKEY_CIV_PEOPLE, "World: People");

 	displayNames.insert(INTERFACEKEY_CIV_ARTIFACTS, "World: Artifacts");

@@ -2807,6 +2816,7 @@ void keybinding_init() {
 	displayNames.insert(INTERFACEKEY_UNITVIEW_GEN_MISC, "Unitview, General, Misc");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PROF, "Unitview, Prefs, Labor");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET, "Unitview, Prefs, Pets");

+	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_EXPEL, "Unitview, Prefs, Expel");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_VIEW, "Unitview, Prefs, Profile");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, "Unitview, Prefs, New Squad");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, "Unitview, Prefs, Remove From Squad");

diff --git a/amd64/g_src/keybindings.h b/amd64/g_src/keybindings.h
index bf56899..e723bad 100644
--- a/amd64/g_src/keybindings.h
+++ b/amd64/g_src/keybindings.h
@@ -1255,6 +1255,7 @@ enum InterfaceKeyType
 	INTERFACEKEY_UNITVIEW_GEN_MISC,

 	INTERFACEKEY_UNITVIEW_PRF_PROF,

 	INTERFACEKEY_UNITVIEW_PRF_PET,

+	INTERFACEKEY_UNITVIEW_PRF_EXPEL,

 	INTERFACEKEY_UNITVIEW_PRF_VIEW,

 	INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD,

 	INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD,

@@ -1268,6 +1269,8 @@ enum InterfaceKeyType
 	INTERFACEKEY_IMAGE_CREATOR_DONE,

 	INTERFACEKEY_CIV_RAID,

 	INTERFACEKEY_CIV_CENTER_ON_FORT,

+	INTERFACEKEY_CIV_HOLDINGS,

+	INTERFACEKEY_CIV_MAP_LEGEND,

 	INTERFACEKEY_CIV_REMOVE_MISSION,

 	INTERFACEKEY_CIV_RESCUE,

 	INTERFACEKEY_CIV_RECOVER,

@@ -1284,6 +1287,8 @@ enum InterfaceKeyType
 	INTERFACEKEY_CIV_MISSION_RAZE,

 	INTERFACEKEY_CIV_MISSION_TRIBUTE_ONE_TIME,

 	INTERFACEKEY_CIV_MISSION_TRIBUTE_ONGOING,

+	INTERFACEKEY_CIV_MISSION_CONQUER,

+	INTERFACEKEY_CIV_MISSION_DEMAND_SURRENDER,

 	INTERFACEKEY_CIV_NEWS,

 	INTERFACEKEY_CIV_PEOPLE,

 	INTERFACEKEY_CIV_ARTIFACTS,

diff --git a/amd64/libs/Dwarf_Fortress b/amd64/libs/Dwarf_Fortress
index 4f6ae4a..93d8168 100755
--- a/amd64/libs/Dwarf_Fortress
+++ b/amd64/libs/Dwarf_Fortress
diff --git a/amd64/libs/libgraphics.so b/amd64/libs/libgraphics.so
index c70b6ae..eef0378 100755
--- a/amd64/libs/libgraphics.so
+++ b/amd64/libs/libgraphics.so
diff --git a/amd64/raw/graphics/graphics_example.txt b/amd64/raw/graphics/graphics_example.txt
index 42b662c..5b5396f 100644
--- a/amd64/raw/graphics/graphics_example.txt
+++ b/amd64/raw/graphics/graphics_example.txt
@@ -146,6 +146,7 @@ PEDDLER
 PROPHET

 PILGRIM

 MONK

+MESSENGER

 

 

 You can also use the entity/site link tokens in place of the profession tokens:

diff --git a/amd64/raw/objects/creature_large_ocean.txt b/amd64/raw/objects/creature_large_ocean.txt
index 6d8fdcd..fc21de6 100644
--- a/amd64/raw/objects/creature_large_ocean.txt
+++ b/amd64/raw/objects/creature_large_ocean.txt
@@ -537,8 +537,8 @@ creature_large_ocean
 

 [CREATURE:SHARK_WHALE]

 	[DESCRIPTION:A gigantic filter-feeding fish found in tropical oceans.]

-	[NAME:whale shark:whale sharks:shale shark]

-	[CASTE_NAME:whale shark:whale sharks:shale shark]

+	[NAME:whale shark:whale sharks:whale shark]

+	[CASTE_NAME:whale shark:whale sharks:whale shark]

 	[CHILD:1][GENERAL_CHILD_NAME:whale shark pup:whale shark pups]

 	[CREATURE_TILE:'W'][COLOR:6:0:0]

 	[LARGE_ROAMING]

@@ -1851,7 +1851,7 @@ creature_large_ocean
 				[TLCM_NOUN:eyes:PLURAL]

 

 [CREATURE:FISH_CONGER_EEL]

-	[DESCRIPTION:A medium-sized, brown, snake-like fish found in freshwater.]

+	[DESCRIPTION:A medium-sized, brown, snake-like fish found in ocean waters.]

 	[NAME:conger eel:conger eels:conger eel]

 	[CASTE_NAME:conger eel:conger eels:conger eel]

 	[CHILD:1][GENERAL_CHILD_NAME:conger eel fry:conger eel fry]

diff --git a/amd64/raw/objects/creature_large_riverlake.txt b/amd64/raw/objects/creature_large_riverlake.txt
index da7956d..9f4bc7e 100644
--- a/amd64/raw/objects/creature_large_riverlake.txt
+++ b/amd64/raw/objects/creature_large_riverlake.txt
@@ -234,7 +234,7 @@ creature_large_riverlake
 				[TLCM_NOUN:eyes:PLURAL]

 

 [CREATURE:FISH_CARP]

-	[DESCRIPTION:A medium-sized fish found in lakes and streams.  They are bottom-feeders and tend to gather groups.]

+	[DESCRIPTION:A medium-sized fish found in lakes and streams.  They are bottom-feeders and tend to gather in groups.]

 	[NAME:carp:carp:carp]

 	[CASTE_NAME:carp:carp:carp]

 	[CHILD:1][GENERAL_CHILD_NAME:carp fry:carp fry]

diff --git a/amd64/readme.txt b/amd64/readme.txt
index 46ea08c..3560835 100644
--- a/amd64/readme.txt
+++ b/amd64/readme.txt
@@ -13,7 +13,7 @@ This software is still in development, and this means that there are going to be
 

 For help with gameplay, press the help key (initially '?') after starting the game.  You might have to press ESC and use 2/8 to select keybindings on non-US keyboards in order to get the help key to work properly.

 

-As of May 2018, you can also get help at the fan-created dwarffortresswiki.org.  Please make use of and contribute to this valuable resource.

+As of June 2018, you can also get help at the fan-created dwarffortresswiki.org.  Please make use of and contribute to this valuable resource.

 

 Visit www.bay12games.com to report problems, discuss the game and read information on future development.  There are also other games there.

 All of the games there are free.  If you paid for this game, get the latest version for free at bay12games.com, and let me know who was charging you at tarn.adams@gmail.com.

diff --git a/amd64/release notes.txt b/amd64/release notes.txt
index 618c962..a25e26f 100644
--- a/amd64/release notes.txt
+++ b/amd64/release notes.txt
@@ -37,6 +37,33 @@ If you can get to the ESC keybindings menu (from the start screen, press ESC and
 

 ******************************************************

 

+Release notes for 0.44.11 (June 23, 2018):

+

+There are now peaceful and not-so-peaceful ways of expanding your influence in the world.  Once a site becomes linked to you (through prosperity or by conquest; you'll see a message), you can send a messenger there to request workers, or send dwarves from the fort out to such sites (from v-p).  This only works on historical figures, so you might find you don't have off-site workers available at first, though some sites do have them.  This release should also improve the issues dwarves were having with negative thoughts, and they can also now experience permanent changes in their personalities and intellectual values due to events in their lives.

+

+Note: Insurrections were such a problem in sites that I had to turn them off for your fortress's holdings; we'll get back to that later.  It wasn't even the insurrections, really; the dwarves were bailing on the occupation immediately because they were afraid of insurrections.

+

+New stuff

+	(*) Your civilization will send out groups to found sites near prosperous fortresses

+	(*) Existing sites near prosperous fortresses will associate themselves to those fortresses

+	(*) Added ability to take over sites and install administrators

+	(*) Can view your new holdings from the 'c' screen

+	(*) Can send workers off-site and send out messengers to request their return

+	(*) Mulling over long-term memories can lead to shifts in intellectual values and personality changes

+

+Major bug fixes

+	(*) Fixed hauling route crash

+	(*) Fixed problem causing county stage to be skipped in noble elevation

+	(*) Stopped all visiting barons from being elevated along with your baron

+	(*) Changed horror calculation from seeing a dead body

+	(*) Stopped similar memories close in time from taking all the memory space

+	(*) Stopped stuttering lag from repeated vegetation connectivity checks

+

+Other bug fixes/tweaks

+	(*) Camping refugees will be awake during the day now

+

+******************************************************

+

 Release notes for 0.44.10 (May 5, 2018):

 

 Here's our next effort, which should change the general situation regarding the (often inebriated) fortress dwarves and their lack of apparent stress.  Part of this involves a new system of memories, which we'll be improving as we go now.  You'll be able to see these in thought paragraphs as they are remembered, so don't worry if they aren't apparent at first.  There were also other problems with inebriation and overall stress balance; some of the latter will be ongoing, if we've overcorrected, as varied long-term forts are difficult to test, but we'll continue working with it.

diff --git a/i386/data/help/main b/i386/data/help/main
index f1c4597..ac2d630 100644
--- a/i386/data/help/main
+++ b/i386/data/help/main
diff --git a/i386/data/help/text_viewer b/i386/data/help/text_viewer
index ad5d603..217ba82 100644
--- a/i386/data/help/text_viewer
+++ b/i386/data/help/text_viewer
diff --git a/i386/data/index b/i386/data/index
index 90a47f3..801a57c 100644
--- a/i386/data/index
+++ b/i386/data/index
diff --git a/i386/data/init/announcements.txt b/i386/data/init/announcements.txt
index afed5bf..3ad5f46 100644
--- a/i386/data/init/announcements.txt
+++ b/i386/data/init/announcements.txt
@@ -328,4 +328,6 @@ UCR_A or UNIT_COMBAT_REPORT_ALL_ACTIVE: the announcement will be associated to a
 [CANNOT_CONSTRUCT:A_D:D_D]

 [RUMOR_SPREAD:A_D:D_D]

 [SERVICE_ORDER_RUMOR_RECEIVED:A_D:D_D]

-[RETURNING_RUMOR_RECEIVED:A_D:D_D]
\ No newline at end of file
+[RETURNING_RUMOR_RECEIVED:A_D:D_D]

+[NEW_HOLDING:A_D:D_D:BOX:P:R]

+[NEW_MARKET_LINK:A_D:D_D:BOX:P:R]
\ No newline at end of file
diff --git a/i386/data/init/init.txt b/i386/data/init/init.txt
index 1955a29..1a0adef 100644
--- a/i386/data/init/init.txt
+++ b/i386/data/init/init.txt
@@ -43,7 +43,7 @@ If this is set to YES, the tiles will not be stretched, but rather the game view
 

 [BLACK_SPACE:YES]

 

-Graphics info, most of it as above.  Set GRAPHICS to YES to turn it all on.  This will use the "raw/graphics" folder for tile information.  Currently this is limited to whatever creature graphics you have downloaded.  The game comes with a few pictures to demonstrate.  As of May 2018, the Dwarf Fortress Wiki has custom tilesets available at http://dwarffortresswiki.org/index.php/Tileset_repository and creature graphics at http://dwarffortresswiki.org/index.php/Graphics_set_repository.

+Graphics info, most of it as above.  Set GRAPHICS to YES to turn it all on.  This will use the "raw/graphics" folder for tile information.  Currently this is limited to whatever creature graphics you have downloaded.  The game comes with a few pictures to demonstrate.  As of June 2018, the Dwarf Fortress Wiki has custom tilesets available at http://dwarffortresswiki.org/index.php/Tileset_repository and creature graphics at http://dwarffortresswiki.org/index.php/Graphics_set_repository.

 

 [GRAPHICS:NO]

 [GRAPHICS_WINDOWEDX:0]

diff --git a/i386/data/init/interface.txt b/i386/data/init/interface.txt
index 6d01861..c2d0ab0 100644
--- a/i386/data/init/interface.txt
+++ b/i386/data/init/interface.txt
@@ -1327,6 +1327,10 @@
 [KEY:r]

 [BIND:CIV_CENTER_ON_FORT:REPEAT_NOT]

 [KEY:y]

+[BIND:CIV_HOLDINGS:REPEAT_NOT]

+[KEY:h]

+[BIND:CIV_MAP_LEGEND:REPEAT_NOT]

+[KEY:l]

 [BIND:CIV_REMOVE_MISSION:REPEAT_NOT]

 [KEY:x]

 [BIND:CIV_RESCUE:REPEAT_NOT]

@@ -1359,6 +1363,10 @@
 [KEY:t]

 [BIND:CIV_MISSION_TRIBUTE_ONGOING:REPEAT_NOT]

 [KEY:T]

+[BIND:CIV_MISSION_CONQUER:REPEAT_NOT]

+[KEY:q]

+[BIND:CIV_MISSION_DEMAND_SURRENDER:REPEAT_NOT]

+[KEY:Q]

 [BIND:CIV_NEWS:REPEAT_NOT]

 [KEY:n]

 [BIND:CIV_PEOPLE:REPEAT_NOT]

@@ -2417,6 +2425,8 @@
 [BIND:UNITVIEW_PRF_PROF:REPEAT_NOT]

 [KEY:l]

 [BIND:UNITVIEW_PRF_PET:REPEAT_NOT]

+[KEY:a]

+[BIND:UNITVIEW_PRF_EXPEL:REPEAT_NOT]

 [KEY:e]

 [BIND:UNITVIEW_PRF_NEW_SQUAD:REPEAT_NOT]

 [KEY:n]

diff --git a/i386/file changes.txt b/i386/file changes.txt
index b93cf2a..4b63f42 100644
--- a/i386/file changes.txt
+++ b/i386/file changes.txt
@@ -4,6 +4,32 @@ See command_line.txt for information on world generation from command lines.
 

 ******************************************************

 

+Auxiliary file changes for 0.44.11

+

+	announcements

+		[NEW_HOLDING:A_D:D_D:BOX:P:R]

+		[NEW_MARKET_LINK:A_D:D_D:BOX:P:R]

+

+	creatures

+		conger eel typo

+		whale shark typo

+		carp typo

+

+	new keys

+		CIV_HOLDINGS:h

+		CIV_MAP_LEGEND:l

+		CIV_MISSION_CONQUER:q

+		CIV_MISSION_DEMAND_SURRENDER:Q

+		UNITVIEW_PRF_EXPEL:e

+

+	changed keys

+		UNITVIEW_PRF_PET:a

+

+	graphics_example

+		MESSENGER added to list (new occupation-linked unit type)

+

+******************************************************

+

 Auxiliary file changes for 0.44.10:

 

 	Note:  Item inaccessible ANNOUNCE_ZOOM/2 will only be correct on new announcements (not 0.44.09 and before.)

diff --git a/i386/g_src/keybindings.cpp b/i386/g_src/keybindings.cpp
index 147f07c..e3a3fb6 100644
--- a/i386/g_src/keybindings.cpp
+++ b/i386/g_src/keybindings.cpp
@@ -185,6 +185,8 @@ void keybinding_init() {
 	bindingNames.insert(INTERFACEKEY_IMAGE_CREATOR_DONE, "IMAGE_CREATOR_DONE");

 	bindingNames.insert(INTERFACEKEY_CIV_RAID, "CIV_RAID");

 	bindingNames.insert(INTERFACEKEY_CIV_CENTER_ON_FORT, "CIV_CENTER_ON_FORT");

+	bindingNames.insert(INTERFACEKEY_CIV_HOLDINGS, "CIV_HOLDINGS");

+	bindingNames.insert(INTERFACEKEY_CIV_MAP_LEGEND, "CIV_MAP_LEGEND");

 	bindingNames.insert(INTERFACEKEY_CIV_REMOVE_MISSION, "CIV_REMOVE_MISSION");

 	bindingNames.insert(INTERFACEKEY_CIV_RESCUE, "CIV_RESCUE");

 	bindingNames.insert(INTERFACEKEY_CIV_RECOVER, "CIV_RECOVER");

@@ -201,6 +203,8 @@ void keybinding_init() {
 	bindingNames.insert(INTERFACEKEY_CIV_MISSION_RAZE, "CIV_MISSION_RAZE");

 	bindingNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONE_TIME, "CIV_MISSION_TRIBUTE_ONE_TIME");

 	bindingNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONGOING, "CIV_MISSION_TRIBUTE_ONGOING");

+	bindingNames.insert(INTERFACEKEY_CIV_MISSION_CONQUER, "CIV_MISSION_CONQUER");

+	bindingNames.insert(INTERFACEKEY_CIV_MISSION_DEMAND_SURRENDER, "CIV_MISSION_DEMAND_SURRENDER");

 	bindingNames.insert(INTERFACEKEY_CIV_NEWS, "CIV_NEWS");

 	bindingNames.insert(INTERFACEKEY_CIV_PEOPLE, "CIV_PEOPLE");

 	bindingNames.insert(INTERFACEKEY_CIV_ARTIFACTS, "CIV_ARTIFACTS");

@@ -1221,6 +1225,7 @@ void keybinding_init() {
 	bindingNames.insert(INTERFACEKEY_UNITVIEW_GEN_MISC, "UNITVIEW_GEN_MISC");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PROF, "UNITVIEW_PRF_PROF");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET, "UNITVIEW_PRF_PET");

+	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_EXPEL, "UNITVIEW_PRF_EXPEL");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_VIEW, "UNITVIEW_PRF_VIEW");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, "UNITVIEW_PRF_NEW_SQUAD");

 	bindingNames.insert(INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, "UNITVIEW_PRF_REMOVE_FROM_SQUAD");

@@ -1771,6 +1776,8 @@ void keybinding_init() {
 	displayNames.insert(INTERFACEKEY_IMAGE_CREATOR_DONE, "Image Creator: Done");

 	displayNames.insert(INTERFACEKEY_CIV_RAID, "World: Raid");

 	displayNames.insert(INTERFACEKEY_CIV_CENTER_ON_FORT, "World: Center on Fort");

+	displayNames.insert(INTERFACEKEY_CIV_HOLDINGS, "World: Holdings");

+	displayNames.insert(INTERFACEKEY_CIV_MAP_LEGEND, "World: Map Legend");

 	displayNames.insert(INTERFACEKEY_CIV_REMOVE_MISSION, "World: Remove Mission");

 	displayNames.insert(INTERFACEKEY_CIV_RESCUE, "World: Rescue Person");

 	displayNames.insert(INTERFACEKEY_CIV_RECOVER, "World: Recover Artifact");

@@ -1787,6 +1794,8 @@ void keybinding_init() {
 	displayNames.insert(INTERFACEKEY_CIV_MISSION_RAZE, "World: Missions, Details, Raze");

 	displayNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONE_TIME, "World: Missions, Details, One-Time Tribute");

 	displayNames.insert(INTERFACEKEY_CIV_MISSION_TRIBUTE_ONGOING, "World: Missions, Details, Ongoing Tribute");

+	displayNames.insert(INTERFACEKEY_CIV_MISSION_CONQUER, "World: Missions, Details, Conquer");

+	displayNames.insert(INTERFACEKEY_CIV_MISSION_DEMAND_SURRENDER, "World: Missions, Details, Demand Surrender");

 	displayNames.insert(INTERFACEKEY_CIV_NEWS, "World: News and Rumors");

 	displayNames.insert(INTERFACEKEY_CIV_PEOPLE, "World: People");

 	displayNames.insert(INTERFACEKEY_CIV_ARTIFACTS, "World: Artifacts");

@@ -2807,6 +2816,7 @@ void keybinding_init() {
 	displayNames.insert(INTERFACEKEY_UNITVIEW_GEN_MISC, "Unitview, General, Misc");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PROF, "Unitview, Prefs, Labor");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_PET, "Unitview, Prefs, Pets");

+	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_EXPEL, "Unitview, Prefs, Expel");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_VIEW, "Unitview, Prefs, Profile");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD, "Unitview, Prefs, New Squad");

 	displayNames.insert(INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD, "Unitview, Prefs, Remove From Squad");

diff --git a/i386/g_src/keybindings.h b/i386/g_src/keybindings.h
index bf56899..e723bad 100644
--- a/i386/g_src/keybindings.h
+++ b/i386/g_src/keybindings.h
@@ -1255,6 +1255,7 @@ enum InterfaceKeyType
 	INTERFACEKEY_UNITVIEW_GEN_MISC,

 	INTERFACEKEY_UNITVIEW_PRF_PROF,

 	INTERFACEKEY_UNITVIEW_PRF_PET,

+	INTERFACEKEY_UNITVIEW_PRF_EXPEL,

 	INTERFACEKEY_UNITVIEW_PRF_VIEW,

 	INTERFACEKEY_UNITVIEW_PRF_NEW_SQUAD,

 	INTERFACEKEY_UNITVIEW_PRF_REMOVE_FROM_SQUAD,

@@ -1268,6 +1269,8 @@ enum InterfaceKeyType
 	INTERFACEKEY_IMAGE_CREATOR_DONE,

 	INTERFACEKEY_CIV_RAID,

 	INTERFACEKEY_CIV_CENTER_ON_FORT,

+	INTERFACEKEY_CIV_HOLDINGS,

+	INTERFACEKEY_CIV_MAP_LEGEND,

 	INTERFACEKEY_CIV_REMOVE_MISSION,

 	INTERFACEKEY_CIV_RESCUE,

 	INTERFACEKEY_CIV_RECOVER,

@@ -1284,6 +1287,8 @@ enum InterfaceKeyType
 	INTERFACEKEY_CIV_MISSION_RAZE,

 	INTERFACEKEY_CIV_MISSION_TRIBUTE_ONE_TIME,

 	INTERFACEKEY_CIV_MISSION_TRIBUTE_ONGOING,

+	INTERFACEKEY_CIV_MISSION_CONQUER,

+	INTERFACEKEY_CIV_MISSION_DEMAND_SURRENDER,

 	INTERFACEKEY_CIV_NEWS,

 	INTERFACEKEY_CIV_PEOPLE,

 	INTERFACEKEY_CIV_ARTIFACTS,

diff --git a/i386/libs/Dwarf_Fortress b/i386/libs/Dwarf_Fortress
index f05b0f3..7b63392 100755
--- a/i386/libs/Dwarf_Fortress
+++ b/i386/libs/Dwarf_Fortress
diff --git a/i386/libs/libgraphics.so b/i386/libs/libgraphics.so
index 1ecb596..23fa185 100755
--- a/i386/libs/libgraphics.so
+++ b/i386/libs/libgraphics.so
diff --git a/i386/raw/graphics/graphics_example.txt b/i386/raw/graphics/graphics_example.txt
index 42b662c..5b5396f 100644
--- a/i386/raw/graphics/graphics_example.txt
+++ b/i386/raw/graphics/graphics_example.txt
@@ -146,6 +146,7 @@ PEDDLER
 PROPHET

 PILGRIM

 MONK

+MESSENGER

 

 

 You can also use the entity/site link tokens in place of the profession tokens:

diff --git a/i386/raw/objects/creature_large_ocean.txt b/i386/raw/objects/creature_large_ocean.txt
index 6d8fdcd..fc21de6 100644
--- a/i386/raw/objects/creature_large_ocean.txt
+++ b/i386/raw/objects/creature_large_ocean.txt
@@ -537,8 +537,8 @@ creature_large_ocean
 

 [CREATURE:SHARK_WHALE]

 	[DESCRIPTION:A gigantic filter-feeding fish found in tropical oceans.]

-	[NAME:whale shark:whale sharks:shale shark]

-	[CASTE_NAME:whale shark:whale sharks:shale shark]

+	[NAME:whale shark:whale sharks:whale shark]

+	[CASTE_NAME:whale shark:whale sharks:whale shark]

 	[CHILD:1][GENERAL_CHILD_NAME:whale shark pup:whale shark pups]

 	[CREATURE_TILE:'W'][COLOR:6:0:0]

 	[LARGE_ROAMING]

@@ -1851,7 +1851,7 @@ creature_large_ocean
 				[TLCM_NOUN:eyes:PLURAL]

 

 [CREATURE:FISH_CONGER_EEL]

-	[DESCRIPTION:A medium-sized, brown, snake-like fish found in freshwater.]

+	[DESCRIPTION:A medium-sized, brown, snake-like fish found in ocean waters.]

 	[NAME:conger eel:conger eels:conger eel]

 	[CASTE_NAME:conger eel:conger eels:conger eel]

 	[CHILD:1][GENERAL_CHILD_NAME:conger eel fry:conger eel fry]

diff --git a/i386/raw/objects/creature_large_riverlake.txt b/i386/raw/objects/creature_large_riverlake.txt
index da7956d..9f4bc7e 100644
--- a/i386/raw/objects/creature_large_riverlake.txt
+++ b/i386/raw/objects/creature_large_riverlake.txt
@@ -234,7 +234,7 @@ creature_large_riverlake
 				[TLCM_NOUN:eyes:PLURAL]

 

 [CREATURE:FISH_CARP]

-	[DESCRIPTION:A medium-sized fish found in lakes and streams.  They are bottom-feeders and tend to gather groups.]

+	[DESCRIPTION:A medium-sized fish found in lakes and streams.  They are bottom-feeders and tend to gather in groups.]

 	[NAME:carp:carp:carp]

 	[CASTE_NAME:carp:carp:carp]

 	[CHILD:1][GENERAL_CHILD_NAME:carp fry:carp fry]

diff --git a/i386/readme.txt b/i386/readme.txt
index 46ea08c..3560835 100644
--- a/i386/readme.txt
+++ b/i386/readme.txt
@@ -13,7 +13,7 @@ This software is still in development, and this means that there are going to be
 

 For help with gameplay, press the help key (initially '?') after starting the game.  You might have to press ESC and use 2/8 to select keybindings on non-US keyboards in order to get the help key to work properly.

 

-As of May 2018, you can also get help at the fan-created dwarffortresswiki.org.  Please make use of and contribute to this valuable resource.

+As of June 2018, you can also get help at the fan-created dwarffortresswiki.org.  Please make use of and contribute to this valuable resource.

 

 Visit www.bay12games.com to report problems, discuss the game and read information on future development.  There are also other games there.

 All of the games there are free.  If you paid for this game, get the latest version for free at bay12games.com, and let me know who was charging you at tarn.adams@gmail.com.

diff --git a/i386/release notes.txt b/i386/release notes.txt
index 618c962..a25e26f 100644
--- a/i386/release notes.txt
+++ b/i386/release notes.txt
@@ -37,6 +37,33 @@ If you can get to the ESC keybindings menu (from the start screen, press ESC and
 

 ******************************************************

 

+Release notes for 0.44.11 (June 23, 2018):

+

+There are now peaceful and not-so-peaceful ways of expanding your influence in the world.  Once a site becomes linked to you (through prosperity or by conquest; you'll see a message), you can send a messenger there to request workers, or send dwarves from the fort out to such sites (from v-p).  This only works on historical figures, so you might find you don't have off-site workers available at first, though some sites do have them.  This release should also improve the issues dwarves were having with negative thoughts, and they can also now experience permanent changes in their personalities and intellectual values due to events in their lives.

+

+Note: Insurrections were such a problem in sites that I had to turn them off for your fortress's holdings; we'll get back to that later.  It wasn't even the insurrections, really; the dwarves were bailing on the occupation immediately because they were afraid of insurrections.

+

+New stuff

+	(*) Your civilization will send out groups to found sites near prosperous fortresses

+	(*) Existing sites near prosperous fortresses will associate themselves to those fortresses

+	(*) Added ability to take over sites and install administrators

+	(*) Can view your new holdings from the 'c' screen

+	(*) Can send workers off-site and send out messengers to request their return

+	(*) Mulling over long-term memories can lead to shifts in intellectual values and personality changes

+

+Major bug fixes

+	(*) Fixed hauling route crash

+	(*) Fixed problem causing county stage to be skipped in noble elevation

+	(*) Stopped all visiting barons from being elevated along with your baron

+	(*) Changed horror calculation from seeing a dead body

+	(*) Stopped similar memories close in time from taking all the memory space

+	(*) Stopped stuttering lag from repeated vegetation connectivity checks

+

+Other bug fixes/tweaks

+	(*) Camping refugees will be awake during the day now

+

+******************************************************

+

 Release notes for 0.44.10 (May 5, 2018):

 

 Here's our next effort, which should change the general situation regarding the (often inebriated) fortress dwarves and their lack of apparent stress.  Part of this involves a new system of memories, which we'll be improving as we go now.  You'll be able to see these in thought paragraphs as they are remembered, so don't worry if they aren't apparent at first.  There were also other problems with inebriation and overall stress balance; some of the latter will be ongoing, if we've overcorrected, as varied long-term forts are difficult to test, but we'll continue working with it.