diff --git a/plugins/Dfusion/luafiles/common.lua b/plugins/Dfusion/luafiles/common.lua index 343877ef8..21e89fe20 100644 --- a/plugins/Dfusion/luafiles/common.lua +++ b/plugins/Dfusion/luafiles/common.lua @@ -11,15 +11,15 @@ function GetTextRegion() -- print(string.format("%d %s->%s",k,tostring(k2),tostring(v2))) --end --local num - --num=0 - --if(v["read"])then num=num+1 end - --if(v["write"])then num=num+10 end - --if(v["execute"]) then num=num+100 end + --flgs="" + --if(v["read"])then flgs=flgs..'r' end + --if(v["write"])then flgs=flgs..'w' end + --if(v["execute"]) then flgs=flgs..'e' end --if num>=100 then - --print(string.format("%d %x->%x %s %d",k,v["start"],v["end"],v.name or "",num)) + --print(string.format("%d %x->%x %s %s",k,v["start"],v["end"],v.name or "",flgs)) --end local pos=string.find(v.name,".text") or string.find(v.name,"libs/Dwarf_Fortress") - if(pos~=nil) then + if(pos~=nil) and v["execute"] then return v; end end diff --git a/plugins/Dfusion/luafiles/offsets.lua b/plugins/Dfusion/luafiles/offsets.lua index 4d5321534..774e85942 100644 --- a/plugins/Dfusion/luafiles/offsets.lua +++ b/plugins/Dfusion/luafiles/offsets.lua @@ -1,7 +1,12 @@ function f_dwarves() - pos=offsets.find(0,0x24,0x14,0x07,0,0,0,0xeb,0x08,0x8d) --search pattern + --pos_=offsets.findall(0,0x07,0,0,0) --search pattern + --for _,v in pairs(pos_) do + -- print(string.format("Possible hit:%x",v)) + --end + pos=offsets.find(0,0x07,0,0,0) --search pattern + print(string.format("Start dwarf position:%x",pos)) if pos~=0 then return pos+2-offsets.base(); else @@ -317,4 +322,4 @@ function f_materials() end return 0 end -offsets.new("Materials",f_materials) \ No newline at end of file +offsets.new("Materials",f_materials)