Skip to content

Commit

Permalink
Bump version to v0.40.07 and update find-offsets to new pressure plat…
Browse files Browse the repository at this point in the history
…e UI.
  • Loading branch information
angavrilov committed Aug 11, 2014
1 parent 0f99ea0 commit 002bd52
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
endif()

# set up versioning.
set(DF_VERSION "0.40.05")
set(DF_VERSION "0.40.07")
SET(DFHACK_RELEASE "r0" CACHE STRING "Current release revision.")

set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")
Expand Down
2 changes: 1 addition & 1 deletion library/xml
2 changes: 1 addition & 1 deletion plugins/manipulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ const SkillColumn columns[] = {
{11, 3, profession::NONE, unit_labor::HAUL_FOOD, job_skill::NONE, "Fo"},
{11, 3, profession::NONE, unit_labor::HAUL_REFUSE, job_skill::NONE, "Re"},
{11, 3, profession::NONE, unit_labor::HAUL_FURNITURE, job_skill::NONE, "Fu"},
{11, 3, profession::NONE, unit_labor::HAUL_ANIMAL, job_skill::NONE, "An"},
{11, 3, profession::NONE, unit_labor::HAUL_ANIMALS, job_skill::NONE, "An"},
{11, 3, profession::NONE, unit_labor::HANDLE_VEHICLES, job_skill::NONE, "Ve"},
// Other Jobs
{12, 4, profession::ARCHITECT, unit_labor::ARCHITECT, job_skill::DESIGNBUILDING, "Ar"},
Expand Down
15 changes: 8 additions & 7 deletions scripts/devel/find-offsets.lua
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ local function exec_finder(finder, names)
end
local search = force_scan['all']
for _,v in ipairs(names) do
table.insert(finder_searches, v)
if force_scan[v] or not is_known(v) then
table.insert(finder_searches, v)
search = true
end
end
Expand Down Expand Up @@ -704,9 +704,9 @@ Auto-searching for ui_build_selector. This requires mechanisms.]],
'BUILDING_TRIGGER_ENABLE_CREATURE'
)
else
dwarfmode_feed_input('BUILDING_TRIGGER_MIN_SIZE_DOWN')
dwarfmode_feed_input('BUILDING_TRIGGER_MIN_SIZE_UP')
end
return true, 50000 - 1000*idx
return true, 5000 + 1000*idx
end,
20
)
Expand All @@ -716,10 +716,9 @@ Auto-searching for ui_build_selector. This requires mechanisms.]],
addr = searcher:find_menu_cursor([[
Searching for ui_build_selector. Please start constructing
a pressure plate, and enable creatures. Then change the min
weight as requested, remembering that the ui truncates the
number, so when it shows "Min (5000df", it means 50000:]],
weight as requested, knowing that the ui shows 5000 as 5K:]],
'int32_t',
{ 50000, 49000, 48000, 47000, 46000, 45000, 44000 }
{ 5000, 6000, 7000, 8000, 9000, 10000, 11000 }
)
end

Expand Down Expand Up @@ -1546,7 +1545,9 @@ exec_finder(find_process_jobs, 'process_jobs')
exec_finder(find_process_dig, 'process_dig')
exec_finder(find_pause_state, 'pause_state')

print('\nDone. Now add newly-found globals to symbols.xml.\n')
print('\nDone. Now exit the game with the die command and add\n'..
'the newly-found globals to symbols.xml. You can find them\n'..
'in stdout.log or here:\n')

for _, global in ipairs(finder_searches) do
local addr = dfhack.internal.getAddress(global)
Expand Down

0 comments on commit 002bd52

Please sign in to comment.