From 21dc3afede209419a7c218b95a5f9146cd78a4d1 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Thu, 20 Jun 2013 17:20:04 +0400 Subject: [PATCH 1/2] Find cur_year_tick_advmode in devel/find-offsets.lua --- scripts/devel/find-offsets.lua | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/scripts/devel/find-offsets.lua b/scripts/devel/find-offsets.lua index 2f7f1287c..ea5450a58 100644 --- a/scripts/devel/find-offsets.lua +++ b/scripts/devel/find-offsets.lua @@ -1306,6 +1306,27 @@ local function find_cur_year_tick() ms.found_offset('cur_year_tick', addr) end +local function find_cur_year_tick_advmode() + stop_autosave() + + local feed = dwarfmode_to_top() + local addr = searcher:find_interactive( + 'Searching for cur_year_tick_advmode.', + 'int32_t', + function(idx) + if idx > 0 then + if not step_n_frames(1, feed) then + return false + end + end + return true, nil, 144 + end, + 20 + ) + + ms.found_offset('cur_year_tick_advmode', addr) +end + -- -- cur_season_tick -- @@ -1499,6 +1520,7 @@ print('\nUnpausing globals:\n') exec_finder(find_cur_year, 'cur_year') exec_finder(find_cur_year_tick, 'cur_year_tick') +exec_finder(find_cur_year_tick_advmode, 'cur_year_tick_advmode') exec_finder(find_cur_season_tick, 'cur_season_tick') exec_finder(find_cur_season, 'cur_season') exec_finder(find_process_jobs, 'process_jobs') From e15f5c451fa3105ed628f9f30f4078278bbd8d87 Mon Sep 17 00:00:00 2001 From: Alexander Gavrilov Date: Thu, 20 Jun 2013 18:18:02 +0400 Subject: [PATCH 2/2] Fix search for cur_season_tick and cur_season in devel/find-offsets. It seems the one-off error is a problem with the original save I used, and not the result of some general behavior. --- scripts/devel/find-offsets.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/devel/find-offsets.lua b/scripts/devel/find-offsets.lua index ea5450a58..1ce7a4425 100644 --- a/scripts/devel/find-offsets.lua +++ b/scripts/devel/find-offsets.lua @@ -1350,7 +1350,7 @@ menu, then do as instructed below:]], return false end end - return true, math.floor(((df.global.cur_year_tick+10)%100800)/10) + return true, math.floor((df.global.cur_year_tick%100800)/10) end ) ms.found_offset('cur_season_tick', addr) @@ -1382,7 +1382,7 @@ menu, then do as instructed below:]], return false end end - return true, math.floor((df.global.cur_year_tick+10)/100800)%4 + return true, math.floor(df.global.cur_year_tick/100800)%4 end ) ms.found_offset('cur_season', addr)