Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust to structures change #1015

Merged
merged 1 commit into from
Mar 3, 2024
Merged

adjust to structures change #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions add-thought.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
20 changes: 7 additions & 13 deletions devel/export-dt-ini.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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')
Expand Down
Loading