Merge branch 'DF2014' of https://github.com/splintermind/Dwarf-Therapist

into DF2014
splintermind · Dec 2, 2014 · fb7fa06 · fb7fa06
2 parents 9158529 + 875c8f4
commit fb7fa06
Show file tree

Hide file tree

Showing 2 changed files with 393 additions and 1 deletion.
diff --git a/scripts/export-dt-ini.lua b/scripts/export-dt-ini.lua
@@ -362,7 +362,7 @@ address('traits',df.unit_personality,'traits')
 address('stress_level',df.unit_personality,'stress_level')
 
 header('emotion_offsets')
-address('emotion_type',df.unit_personality.T_emotions,'emotion_type')
+address('emotion_type',df.unit_personality.T_emotions,'type')
 address('strength',df.unit_personality.T_emotions,'strength')
 address('thought_id',df.unit_personality.T_emotions,'thought')
 address('sub_id',df.unit_personality.T_emotions,'subthought')