MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bump version to v0.40.07 and update find-offsets to new pressure plate UI.

develop
Alexander Gavrilov 2014-08-11 14:14:42 +04:00
parent 0f99ea0ccb
commit 002bd5240b
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -58,7 +58,7 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
endif() endif()
# set up versioning. # 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_RELEASE "r0" CACHE STRING "Current release revision.")
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

2
library/xml

@ -1 +1 @@
Subproject commit fc3c5ce3329edcdca5dadb4c1f8b03b0c98f0472 Subproject commit 7c9ca91de4182e0f71dd617b4dbcea91f29fb886

2
plugins/manipulator.cpp
Unescape Escape View File

@ -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_FOOD, job_skill::NONE, "Fo"},
{11, 3, profession::NONE, unit_labor::HAUL_REFUSE, job_skill::NONE, "Re"}, {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_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"}, {11, 3, profession::NONE, unit_labor::HANDLE_VEHICLES, job_skill::NONE, "Ve"},
// Other Jobs // Other Jobs
{12, 4, profession::ARCHITECT, unit_labor::ARCHITECT, job_skill::DESIGNBUILDING, "Ar"}, {12, 4, profession::ARCHITECT, unit_labor::ARCHITECT, job_skill::DESIGNBUILDING, "Ar"},

15
scripts/devel/find-offsets.lua
Unescape Escape View File

@ -137,8 +137,8 @@ local function exec_finder(finder, names)
end end
local search = force_scan['all'] local search = force_scan['all']
for _,v in ipairs(names) do for _,v in ipairs(names) do
table.insert(finder_searches, v)
if force_scan[v] or not is_known(v) then if force_scan[v] or not is_known(v) then
table.insert(finder_searches, v)
search = true search = true
end end
end end
@ -704,9 +704,9 @@ Auto-searching for ui_build_selector. This requires mechanisms.]],
'BUILDING_TRIGGER_ENABLE_CREATURE' 'BUILDING_TRIGGER_ENABLE_CREATURE'
) )
else else
dwarfmode_feed_input('BUILDING_TRIGGER_MIN_SIZE_DOWN') dwarfmode_feed_input('BUILDING_TRIGGER_MIN_SIZE_UP')
end end
return true, 50000 - 1000*idx return true, 5000 + 1000*idx
end, end,
20 20
) )
@ -716,10 +716,9 @@ Auto-searching for ui_build_selector. This requires mechanisms.]],
addr = searcher:find_menu_cursor([[ addr = searcher:find_menu_cursor([[
Searching for ui_build_selector. Please start constructing Searching for ui_build_selector. Please start constructing
a pressure plate, and enable creatures. Then change the min a pressure plate, and enable creatures. Then change the min
weight as requested, remembering that the ui truncates the weight as requested, knowing that the ui shows 5000 as 5K:]],
number, so when it shows "Min (5000df", it means 50000:]],
'int32_t', 'int32_t',
{ 50000, 49000, 48000, 47000, 46000, 45000, 44000 } { 5000, 6000, 7000, 8000, 9000, 10000, 11000 }
) )
end end
@ -1546,7 +1545,9 @@ exec_finder(find_process_jobs, 'process_jobs')
exec_finder(find_process_dig, 'process_dig') exec_finder(find_process_dig, 'process_dig')
exec_finder(find_pause_state, 'pause_state') 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 for _, global in ipairs(finder_searches) do
local addr = dfhack.internal.getAddress(global) local addr = dfhack.internal.getAddress(global)