Merge pull request #1015 from myk002/myk_personality

adjust to structures change
DFHack · Mar 3, 2024 · 7232ad5 · 7232ad5
2 parents f71292d + 472763e
commit 7232ad5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/add-thought.lua b/add-thought.lua
@@ -23,10 +23,10 @@ function addEmotionToUnit(unit,thought,emotion,severity,strength,subthought)
         end
     end
     emotions:insert('#', {
-      new=df.unit_personality.T_emotions,
+      new=df.personality_moodst,
       type=emotion,
-      unk2=1,
-      strength=tonumber(strength),
+      strength=1,
+      relative_strength=tonumber(strength),
       thought=properThought,
       subthought=properSubthought,
       severity=severity,

diff --git a/devel/export-dt-ini.lua b/devel/export-dt-ini.lua
@@ -1,11 +1,5 @@
 -- Exports an ini file for Dwarf Therapist.
---[====[
-devel/export-dt-ini
-===================
-Exports an ini file containing memory addresses for Dwarf Therapist.
-]====]
 
-local utils = require 'utils'
 local ms = require 'memscan'
 
 -- Utility functions
@@ -406,13 +400,13 @@ address('focus_level',df.unit_personality.T_needs,'focus_level')
 address('need_level',df.unit_personality.T_needs,'need_level')
 
 header('emotion_offsets')
-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')
-address('level',df.unit_personality.T_emotions,'severity')
-address('year',df.unit_personality.T_emotions,'year')
-address('year_tick',df.unit_personality.T_emotions,'year_tick')
+address('emotion_type',df.personality_moodst,'type')
+address('strength',df.personality_moodst,'relative_strength')
+address('thought_id',df.personality_moodst,'thought')
+address('sub_id',df.personality_moodst,'subthought')
+address('level',df.personality_moodst,'severity')
+address('year',df.personality_moodst,'year')
+address('year_tick',df.personality_moodst,'year_tick')
 
 header('job_details')
 address('id',df.job,'job_type')