Merge branch 'master' of gh:dfhack/scripts

lethosor · lethosor · commit 619d5b311606 · 2016-12-11T17:12:56.000-05:00
diff --git a/add-thought.lua b/add-thought.lua
@@ -15,7 +15,7 @@ local utils=require('utils')
 function addEmotionToUnit(unit,thought,emotion,severity,strength,subthought)
     local emotions=unit.status.current_soul.personality.emotions
     if not (tonumber(emotion)) then
-        emotion=df.emotion_type[tonumber(emotion)]
+        emotion=df.emotion_type[emotion]
     end
     local properThought=nil
     if not (tonumber(thought)) then
