version 30.0

- 40.19 support - views, roles for gelding - fix script - fix domestic creature role preference
splintermind · Dec 2, 2014 · 3a2b821 · 3a2b821
1 parent fb7fa06
commit 3a2b821
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 7 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,12 @@
+### Version 30.0 Patch Notes
+
+***
+
+- 40.19 memory layouts
+- added new columns for gelding to default labor views
+- added new gelding role (based on shearer)
+- fixed domestic creature role preference
+
 ### Version 29.0 Patch Notes
 
 ***

diff --git a/inc/defines.h b/inc/defines.h
@@ -27,7 +27,7 @@ THE SOFTWARE.
 #define PRODUCT "Dwarf Therapist"
 
 #ifndef DT_VERSION_MAJOR
-    #define DT_VERSION_MAJOR 29
+    #define DT_VERSION_MAJOR 30
 #endif
 
 #ifndef DT_VERSION_MINOR

diff --git a/resources/default_gridviews.dtg b/resources/default_gridviews.dtg
@@ -141,7 +141,7 @@ 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\name=Gelding
 2\sets\5\columns\5\type=LABOR
 2\sets\5\columns\5\skill_id=117
 2\sets\5\columns\5\labor_id=78
@@ -476,7 +476,7 @@ 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\name=Gelding
 3\sets\5\columns\6\type=LABOR
 3\sets\5\columns\6\skill_id=117
 3\sets\5\columns\6\labor_id=78

diff --git a/resources/game_data.ini b/resources/game_data.ini
@@ -996,7 +996,7 @@ size = 79
 78/skill = -1
 78/hauling = 1
 
-79/name = Geld
+79/name = Gelding
 79/id = 78
 79/skill = 117
 

diff --git a/scripts/make-dt.pl b/scripts/make-dt.pl
@@ -384,7 +384,7 @@ ($$$$)
     emit_addr 'stress_level',%all,'unit_personality','stress_level';
 
     emit_header 'emotion_offsets';
-    emit_addr 'emotion_type',%all,'unit_personality::anon4','emotion_type';
+    emit_addr 'emotion_type',%all,'unit_personality::anon4','type';
     emit_addr 'strength',%all,'unit_personality::anon4','strength';
     emit_addr 'thought_id',%all,'unit_personality::anon4','thought';
     emit_addr 'sub_id',%all,'unit_personality::anon4','subthought';

diff --git a/src/preference.cpp b/src/preference.cpp
@@ -134,7 +134,7 @@ void Preference::set_pref_flags(Race *r){
         Caste *c = r->get_caste_by_id(0);
         if(c){
             QList<int> flags;
-            flags << TRAINABLE << SHEARABLE << FISHABLE << BUTCHERABLE << MILKABLE;
+            flags << TRAINABLE << SHEARABLE << FISHABLE << BUTCHERABLE << MILKABLE << DOMESTIC;
             set_flags(c->flags(),flags);
 
             if(set_flag(c->flags(),HAS_EXTRACTS)){

diff --git a/src/roledialog.cpp b/src/roledialog.cpp
@@ -869,7 +869,7 @@ void roleDialog::load_creatures(){
     flags << BUTCHERABLE;
     add_general_creature_node(tr("Butcherable"),flags,&m_butcher);
 
-    flags << 16;
+    flags << DOMESTIC;
     add_general_creature_node(tr("Domestic"),flags,&m_domestic);
 
     foreach(Race *r, m_df->get_races()){