Merge branch '40.19' into DF2014

resources/default_gridviews.dtg

@@ -124,7 +124,7 @@ size=11
 2\sets\4\columns\3\labor_id=53
 2\sets\5\name=Ranger
 2\sets\5\bg_color=0xafc37eff
-2\sets\5\columns\size=4
+2\sets\5\columns\size=5
 2\sets\5\columns\1\name=Animal Training
 2\sets\5\columns\1\type=LABOR
 2\sets\5\columns\1\skill_id=5
@@ -141,6 +141,10 @@ size=11
 2\sets\5\columns\4\type=LABOR
 2\sets\5\columns\4\skill_id=8
 2\sets\5\columns\4\labor_id=26
+2\sets\5\columns\5\name=Geld
+2\sets\5\columns\5\type=LABOR
+2\sets\5\columns\5\skill_id=117
+2\sets\5\columns\5\labor_id=78
 2\sets\6\name=Healthcare
 2\sets\6\bg_color=0x8c7072ff
 2\sets\6\columns\size=5
@@ -451,7 +455,7 @@ size=11
 3\sets\4\columns\3\labor_id=53
 3\sets\5\name=Ranger
 3\sets\5\bg_color=0xafc37eff
-3\sets\5\columns\size=5
+3\sets\5\columns\size=6
 3\sets\5\columns\1\name=Animal Care
 3\sets\5\columns\1\type=LABOR
 3\sets\5\columns\1\skill_id=6
@@ -472,6 +476,10 @@ size=11
 3\sets\5\columns\5\type=LABOR
 3\sets\5\columns\5\skill_id=8
 3\sets\5\columns\5\labor_id=26
+3\sets\5\columns\6\name=Geld
+3\sets\5\columns\6\type=LABOR
+3\sets\5\columns\6\skill_id=117
+3\sets\5\columns\6\labor_id=78
 3\sets\6\name=Healthcare
 3\sets\6\bg_color=0x8c7072ff
 3\sets\6\columns\size=7
@@ -1221,7 +1229,7 @@ size=11
 7\sets\3\columns\3\role_id=Stone Crafter
 7\sets\4\name=Ranger
 7\sets\4\bg_color=0xafc37eff
-7\sets\4\columns\size=5
+7\sets\4\columns\size=6
 7\sets\4\columns\1\name=Animal Caretaker
 7\sets\4\columns\1\type=ROLE
 7\sets\4\columns\1\role_id=Animal Caretaker
@@ -1237,6 +1245,9 @@ size=11
 7\sets\4\columns\5\name=Small Animal Dissector
 7\sets\4\columns\5\type=ROLE
 7\sets\4\columns\5\role_id=Small Animal Dissector
+7\sets\4\columns\6\name=Gelder
+7\sets\4\columns\6\type=ROLE
+7\sets\4\columns\6\role_id=Gelder
 7\sets\5\name=Healthcare
 7\sets\5\bg_color=0x8c7072ff
 7\sets\5\columns\size=6

resources/game_data.ini

@@ -47,7 +47,7 @@ position/name_male_singluar/value = king
 
 [professions]
 # all professions assume can_assign_labors is true, and is_military is false
-size=111
+size=112
 1/name = Miner
 1/id = 0
 
@@ -417,6 +417,9 @@ size=111
 111/id = 110
 111/can_assign_labors = false
 
+112/name = Gelder
+112/id = 111
+
 
 [attributes]
 #Source: http://df.magmawiki.com/index.php/Attributes
@@ -651,7 +654,7 @@ size = 19
 19/levels/9/level_name = "An unbreakable will"
 
 [labors]
-size = 78
+size = 79
 
 1/name = Mining
 1/id = 0
@@ -993,6 +996,10 @@ size = 78
 78/skill = -1
 78/hauling = 1
 
+79/name = Geld
+79/id = 78
+79/skill = 117
+
 [skill_names]
 0	= Miner
 1	= Wood Cutter
@@ -1111,6 +1118,7 @@ size = 78
 114 = Bee Keeper
 115 = Wax Worker
 116 = Climbing
+117 = Gelder
 
 [goals]
 size = 12
@@ -3411,7 +3419,7 @@ size = 171
 171/divider = -8
 
 [dwarf_roles]
-size=96
+size=97
 2\name=Thresher
 2\attributes\size=4
 2\attributes\1\id=endurance
@@ -5766,6 +5774,28 @@ size=96
 49\preferences\2\name=-Creatures (Hateable)
 49\preferences\2\flags\size=1
 49\preferences\2\flags\1\flag=72
+97\name=Gelder
+97\attributes\size=4
+97\attributes\1\id=agility
+97\attributes\2\id=strength
+97\attributes\3\id=kinesthetic sense
+97\attributes\4\id=endurance
+97\skills\size=1
+97\skills\1\id=117
+97\preferences\size=2
+97\preferences\1\pref_category=9
+97\preferences\1\item_type=-1
+97\preferences\1\exact=false
+97\preferences\1\name=Outdoors
+97\preferences\1\flags\size=1
+97\preferences\1\flags\1\flag=999
+97\preferences\2\pref_category=1
+97\preferences\2\item_type=-1
+97\preferences\2\exact=false
+97\preferences\2\name=Creatures (Domestic)
+97\preferences\2\flags\size=1
+97\preferences\2\flags\1\flag=16
+
 
 #within the groups/categories, the descriptors should be in order of severity
 #with 0 being the most severe symptom or wound, or specify the severity to change the order

scripts/make-dt.pl

@@ -331,7 +331,7 @@ ($$$$)
     emit_addr 'active_syndrome_vector',%all,'unit','syndromes.active';
     emit_addr 'syn_sick_flag',%all,'unit_syndrome','flags.is_sick';
     emit_addr 'unit_health_info',%all,'unit','health';
-    emit_addr 'temp_mood',%all,'unit','counters.soldier_mood'
+    emit_addr 'temp_mood',%all,'unit','counters.soldier_mood';
     emit_addr 'counters1',%all,'unit','counters.winded';
     emit_addr 'counters2',%all,'unit','counters.pain';
     emit_addr 'counters3',%all,'unit','counters2.paralysis';