Merge branch 'master' of gh:dfhack/scripts

DFHack · Apr 16, 2017 · 0e22223 · 0e22223
2 parents 614b138 + cc1b758
commit 0e22223
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/add-thought.lua b/add-thought.lua
@@ -31,13 +31,12 @@ function addEmotionToUnit(unit,thought,emotion,severity,strength,subthought)
         end
     end
     emotions:insert('#',{new=df.unit_personality.T_emotions,
-    type=emotion,
+    type=tonumber(emotion),
     unk2=1,
-    strength=strength,
-    thought=thought,
-    subthought=subthought,
-    severity=severity,
-    flags=0,
+    strength=tonumber(strength),
+    thought=tonumber(thought),
+    subthought=tonumber(subthought),
+    severity=tonumber(severity),
     unk7=0,
     year=df.global.cur_year,
     year_tick=df.global.cur_year_tick