DFHack works on Windows XP, Vista, 7 or any modern Linux distribution. OSX is not supported due to lack of developers with a Mac.
-Currently, only version 0.34.05 is supported. If you need DFHack +
Currently, only versions 0.34.06 and 0.34.07 are supported. If you need DFHack for older versions, look for older releases.
On Windows, you have to use the SDL version of DF.
It is possible to use the Windows DFHack under wine/OSX.
diff --git a/library/xml b/library/xml index 31e91326e..6acc7f142 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 31e91326eb01e002f525cb48bba1cda0dab68977 +Subproject commit 6acc7f14274343319a61d6118afdc669ee2ff485 diff --git a/plugins/Dfusion/luafiles/adv_tools/init.lua b/plugins/Dfusion/luafiles/adv_tools/init.lua index d8317f7ab..3810f0364 100644 --- a/plugins/Dfusion/luafiles/adv_tools/init.lua +++ b/plugins/Dfusion/luafiles/adv_tools/init.lua @@ -1,11 +1,7 @@ adv_tools=adv_tools or {} adv_tools.menu=adv_tools.menu or MakeMenu() function adv_tools.ressurect() - myoff=offsets.getEx("AdvCreatureVec") - vector=engine.peek(myoff,ptr_vector) - indx=GetCreatureAtPos(getxyz()) - if indx<0 then indx=0 end - --print(string.format("%x",vector:getval(indx))) + v2=engine.peek(vector:getval(indx),ptr_Creature.hurt1) for i=0,v2:size()-1 do v2:setval(i,0) diff --git a/plugins/Dfusion/luafiles/embark/init.lua b/plugins/Dfusion/luafiles/embark/init.lua index 35d27e544..529c2d1e5 100644 --- a/plugins/Dfusion/luafiles/embark/init.lua +++ b/plugins/Dfusion/luafiles/embark/init.lua @@ -33,7 +33,7 @@ end function embark(names) RaceTable=RaceTable or BuildNameTable() mypos=engine.getmod('Embark') - stoff=offsets.getEx('StartDwarfs') + stoff=VersionInfo.getAddress('start_dwarf_count') if mypos then --if mod already loaded print("Mod already loaded @:"..mypos.." just updating") modpos=mypos diff --git a/plugins/Dfusion/luafiles/migrants/init.lua b/plugins/Dfusion/luafiles/migrants/init.lua index b2472b08c..6fb315923 100644 --- a/plugins/Dfusion/luafiles/migrants/init.lua +++ b/plugins/Dfusion/luafiles/migrants/init.lua @@ -45,7 +45,8 @@ else --patch part --pos=62873C+DF -- pattern: A1,DWORD_,"CURRENTRACE",56,89,ANYBYTE,ANYBYTE,34,e8 - pos=offsets.find(offsets.base(),0xa1,DWORD_,offsets.getEx("CurrentRace"),0x56,0x89,ANYBYTE,ANYBYTE,0x34,0xe8) + _,raceoff=df.sizeof(df.global.ui:_field('race_id')) + pos=offsets.find(offsets.base(),0xa1,DWORD_,raceoff,0x56,0x89,ANYBYTE,ANYBYTE,0x34,0xe8) function pokeCall(off) engine.pokeb(off,0xe8) engine.poked(off+1,modpos-off-5) diff --git a/plugins/Dfusion/luafiles/offsets.lua b/plugins/Dfusion/luafiles/offsets.lua deleted file mode 100644 index 8349f73e3..000000000 --- a/plugins/Dfusion/luafiles/offsets.lua +++ /dev/null @@ -1,327 +0,0 @@ - - -function f_dwarves() - --mov DWORD PTR [ESP+14],7 - --jmp +0x08 - pos_=offsets.findall(0,0x24,0x14,0x07,0,0,0) --search pattern - for _,v in pairs(pos_) do - print(string.format("Possible hit:%x",v)) - end - pos=offsets.find(0,0x24,0x14,0x07,0,0,0,0xeb,0x08,0x8d) --search pattern - print(string.format("Start dwarf position:%x",pos)) - if pos~=0 then - return pos+2-offsets.base(); - else - return 0; - end -end -offsets.new("StartDwarfs",f_dwarves) -- finds the starting dwarf count -function f_creatures() - --01C48034-base=0x1258034 - local val=0 - --print("Enter creature count:"); - --local r=io.stdin:read() - for k,v in pairs(offsets.getvectors()) do - if (v>60) and (v<100) then --used count changed some time ago... two hits second one is the right one. Maybe some smarter way could be better? - --new version first one is right?? needs more testing thou... - val= k-offsets.base() - print(string.format("%x",val)) - break; - end - --vec=engine.peek(k,ptr_vector); - - --[[if(vec:size()==tonumber(r)) then - val=k-offsets.base() - print(string.format("off:%x",k)) - end--]] - end - offsets.new("AdvCreatureVec",val) - return val -end -offsets.new("CreatureVec",f_creatures) -function f_words() - local val=0 - for k,v in pairs(offsets.getvectors()) do - local toff=engine.peekd(engine.peekd(k)) - if(engine.peekstr(toff)=="ABBEY") then - val=k-offsets.base() - end - end - return val -end -offsets.newlazy("WordVec",f_words) -function f_creatureptr() --a creature number under the pointer - pos=offsets.find(0,0xa1,ANYDWORD,0x83,0xf8,0xff,0x75) - print("Offset="..pos) - if pos~=0 then - pos=engine.peekd(pos+1) - return pos-offsets.base() - else - return 0 - end -end -offsets.new("CreaturePtr",f_creatureptr) - -function f_creaturegloss() --creature race vector - for k,v in pairs(offsets.getvectors()) do - local reg - reg=GetRegionIn(k) - if reg ~=nil then - print(string.format("looking into %x wich is in %s",k,reg.name or "")) - else - print(string.format("looking into %x in nil region",k)) - end - if ValidOffset(k) then - print("Looking into:"..string.format("%x",k).." used:"..v) - - local vec=engine.peek(k,ptr_vector) - if vec:size()>0 and vec:size()<100000 and vec:getval(0)~=0 then - local toff=vec:getval(0) - if ValidOffset(toff) then - print("\tval:"..string.format("%x",vec:getval(0))) - local token=engine.peek(toff,ptt_dfstring) - --print("\t\tval:".. token:getval()) - if token:getval()=="TOAD" then -- more offsets could be found this way - return k-offsets.base() - end - end - end - end - end - return 0 -end -offsets.new("CreatureGloss",f_creaturegloss) ---reaction vec: search for TAN_A_HIDE -function f_racevec() --current race - --find all movsx anyreg,address - local den={} - local pos=offsets.findall(0,0x0f,0xbf,ANYBYTE,ADDRESS) - for k,v in pairs(pos) do - local add - if v~=0 then - add=engine.peekd(v+3) - if den[add]~=nil then - den[add]= den[add]+1 - else - den[add]=1 - end - end - - end - - for k,v in pairs(den) do - if v <60 then - den[k]=nil - end - - end - for k,v in pairs(den) do - print("Looking into:"..string.format("%x",k).." used:"..v.." Race:"..engine.peekw(k)) - if engine.peekw(k) >0 and engine.peekw(k)<1000 then - - return k-offsets.base() - end - end - - - return 0 -end -offsets.new("CurrentRace",f_racevec) -function f_pointer() --adventure (not only?) pointer x,y,z - print("\n") - local den={} - local pos=0 - repeat - pos=offsets.find(pos+3,0x0f,0xb7,ANYBYTE,ADDRESS) - local add=engine.peekd(pos+3) - local add2=engine.peekd(pos+13) - local add3=engine.peekd(pos+23) - if( math.abs(add-add2)==4 or math.abs(add-add3)==4) then - - if den[add]~=nil then - den[add]= den[add]+1 - else - den[add]=1 - end - end - until pos==0 - for k,v in pairs(den) do - print("Looking into:"..string.format("%x",k).." used:"..v) - return k-offsets.base()-4 - end - return 0 -end -offsets.new("Xpointer",f_pointer) -function f_adventure() - RaceTable=RaceTable or BuildNameTable() -- this gets all the races' numbers - --[[print("input chars race:") - repeat - r=io.stdin:read() - if RaceTable[r]==nil then print("Incorrect race...") end - until RaceTable[r]~=nil -- query till correct race is inputed - rnum=RaceTable[r] --get its num - print("Race:"..rnum)]]-- - myoff=0 - print("input player's creature's name (lowercaps):") - r=io.stdin:read() - - for k,v in pairs(offsets.getvectors()) do -- now lets look through all vector offsets - off=engine.peekd(k) --get vector start - off=engine.peekd(off) --get 0 element (or first) in adventurer mode its our hero - name=engine.peekstr(off) - if(name==r) then - --if engine.peek(off+140)==rnum then -- creature start+140 is the place where race is kept - print(string.format("%x race:%x",k,engine.peekw(off+140))) - myoff=k -- ok found it - break - end - end - if myoff~=0 then - crvec=engine.peek(myoff,ptr_vector) - print(string.format("player offset:%x",crvec:getval(0))) - local legidVec=engine.peek(crvec:getval(0),ptr_Creature.legends) - print(string.format("legends offset:%x",legidVec:getval(0))) - local vtable=engine.peekd(legidVec:getval(0)) - print(string.format("vtable offset:%x",vtable)) - offsets.new("vtableLegends",vtable-offsets.base()) - return myoff-offsets.base() --save the offset for laters - else - return 0 --indicate failure - end -end -offsets.newlazy("AdvCreatureVec",f_adventure) -- register a way to find this offset ---7127F0 -function f_legends() - pos=1 - T={} - repeat - pos=offsets.find(pos+1,0x50,0xb8,ANYDWORD,0xe8,ANYDWORD,0x8b,0xf0) - off=engine.peekd(pos+2) - vec=engine.peek(off,ptr_vector) - if vec:size()~=0 then - if T[off]~=nil then - T[off].c=T[off].c+1 - else - T[off]={c=1,vsize=vec:size()} - end - - end - - until pos==0 - for k,v in pairs(T) do - vec=engine.peek(k,ptr_vector) - print(string.format("off:%x used:%i size:%d",k,v.c,v.vsize)) - print(string.format("fith elements id:%d",engine.peekd(vec:getval(5)))) - if engine.peekd(vec:getval(5))==5 then - --if v.c==2 and v.vsize>1000 then - return k-offsets.base() - end - end - return 0 -end -offsets.newlazy("Legends",f_legends) -function f_playerlegendid() - local off=offsets.getEx("Legends") - local pos=1 - repeat - pos=offsets.find(pos+1,0xa1,DWORD_,off+4,0x2b,0x05,DWORD_,off) - val=engine.peekd(pos+16) - if engine.peekd(val)~=0 then - --if val >offsets.base() then - return val-offsets.base() - end - --print(string.format("%x",val)) - until pos==0 - return 0 -end -offsets.newlazy("PlayerLegend",f_playerlegendid) - -function f_world() - local pos=offsets.base() - T={} - while pos~=0 do - --pos=offsets.find(pos+6,0xa1,DWORD_,mapoffset,0x8b,0x4c,0x88,0xFC) - pos=offsets.find(pos+6,0x8b,0x35,ANYDWORD,0x85,0xf6)--,0x8b,0x4c,0x88,0xFC) - --pos2=offsets.find(pos,0x8b,0x34,0x88) - - if pos~=0 then - add=engine.peekd(pos+2); - --if pos2 ~=0 and pos2-pos<25 then - -- print(string.format("Address:%x dist:%d Map:%x",pos2,pos2-pos,add)) - -- - --end - if add~=0 then - if T[add]~=nil then - T[add]=T[add]+1 - else - T[add]=1 - end - end - end - - end - local kk,vv - vv=0 - for k,v in pairs(T) do - if v>vv then - vv=v - kk=k - end - --print(string.format("Address:%x, times used:%d",k,v)) - end - return kk-offsets.base() -end -offsets.new("WorldData",f_world) - -function f_sites() - local pos=offsets.base() - T={} - while pos~=0 do - - pos=offsets.find(pos+17,0xA1,ANYDWORD, --mov eax, ptr to some biger thing - 0x8B,0x90,0x24,0x01,0x00,0x00, --mov edx [eax+0x124] - 0x2b,0x90,0x20,0x01,0x00,0x00, --sub edx [eax+0x120] - EOL) - if pos~=0 then - add=engine.peekd(pos+1) - return add-offsets.base() - - end - - end - return 0 -end -offsets.newlazy("SiteData",f_sites) --actually has a lot more data... -function f_items() - local pos=offsets.base() - while pos~= 0 do - pos=offsets.find(pos+17,0x8b,0x0d,ANYDWORD, --mov eax, ptr to some biger thing - 0x8B,0x54,0x24,0x34) - if pos~=0 then - --print(string.format("%x",engine.peekd(pos+2))) - local ret=engine.peekd(pos+2)-offsets.base() - return ret - end - end - return 0 -end -offsets.new("Items",f_items) -function f_materials() - for k,v in pairs(offsets.getvectors()) do - --print("Looking into:"..string.format("%x",k).." used:"..v) - local vec=engine.peek(k,ptr_vector) - if vec:getval(0)~=0 then - --print("\tval:"..string.format("%x",vec:getval(0))) - local token=engine.peek(vec:getval(0),ptt_dfstring) - if token:getval()~=""then - --print("\t\tval:".. token:getval()) - if token:getval()=="IRON" then - --print("Found:"..string.format("%x",k).." used:"..v) - return k-offsets.base() - end - end - end - end - return 0 -end -offsets.new("Materials",f_materials) diff --git a/plugins/Dfusion/luafiles/offsets.txt b/plugins/Dfusion/luafiles/offsets.txt deleted file mode 100644 index e35f84373..000000000 --- a/plugins/Dfusion/luafiles/offsets.txt +++ /dev/null @@ -1,16 +0,0 @@ -AdvCreatureVec : 0x12c44ac -CreatureGloss : 0x1308040 -CreaturePtr : 0xaf2430 -CreatureVec : 0x12c44ac -CurrentRace : 0x10f0c28 -Items : 0x12c4550 -Legends : 0x12c451c -Materials : 0x1307f50 -PlayerLegend : 0x145bfec -SiteData : 0x1307778 -WordVec : 0x1308254 -WorldData : 0x1306148 -Xpointer : 0x7347f0 -vtableLegends : 0x6e7594 -Buildings : 0x12C4DA8 -StartDwarfs : 0x5DA790 \ No newline at end of file diff --git a/plugins/Dfusion/luafiles/offsets_misc.lua b/plugins/Dfusion/luafiles/offsets_misc.lua index 01460dc48..5a35abd71 100644 --- a/plugins/Dfusion/luafiles/offsets_misc.lua +++ b/plugins/Dfusion/luafiles/offsets_misc.lua @@ -1,63 +1,4 @@ offsets=offsets or {} -offsets._toff={} -offsets._foff={} -offsets.get = function (name) - if offsets._toff[name] == nil then - offsets.searchoffset(name,true) - end - return offsets._toff[name] -end -offsets.getEx = function (name) - --return offsets._toff[name]+Process.getBase() - return offsets.get(name)+Process.getBase() -end -offsets.load = function () - local f=io.open("dfusion/offsets.txt") - local line=f:read() - while line~=nil do - --print(line) - local sppliter=string.find(line,":") - offsets._toff[string.sub(line,1,sppliter-2)]=tonumber(string.sub(line,sppliter+2)) - line=f:read() - end -end -offsets.save = function () - local f=io.open("dfusion/offsets.txt","w") - for k,v in pairs(offsets._toff) do - - f:write(string.format("%s : 0x%x\n",k,v)) - end - f:close() -end -function offsets.new(name, func) - if type(func)=="function" then - table.insert(offsets._foff,{name,func,false}) - else - offsets._toff[name]=func - end - --offsets._foff[name]={func,false} -end -function offsets.newlazy(name, func) - table.insert(offsets._foff,{name,func,true}) - --offsets._foff[name]={func,true} -end -function offsets.searchoffset(num,forcelazy) - v=offsets._foff[num] - print("Finding offset:"..v[1]) - if (v[3] and focelazy) or not v[3] then - local pos=v[2]() - if pos== 0 then - error("Offset not found for:"..v[1]) - else - offsets._toff[v[1]]=pos - end - end -end -function offsets.searchoffsets(forcelazy) - for k,v in pairs(offsets._foff) do - offsets.searchoffset(k,forcelazy) - end -end function offsets.find(startoffset,...) local endadr=GetTextRegion()["end"]; --[=[if startoffset== 0 then @@ -103,6 +44,4 @@ end function offsets.getvectors() return findVectors() end -offsets.load() -ADDRESS=ANYDWORD -dofile("dfusion/offsets.lua") \ No newline at end of file +ADDRESS=ANYDWORD \ No newline at end of file diff --git a/plugins/Dfusion/luafiles/simple_embark/plugin.lua b/plugins/Dfusion/luafiles/simple_embark/plugin.lua index 133cffb51..c64aa7e68 100644 --- a/plugins/Dfusion/luafiles/simple_embark/plugin.lua +++ b/plugins/Dfusion/luafiles/simple_embark/plugin.lua @@ -1,5 +1,5 @@ function simple_embark(num) -stoff=offsets.getEx('StartDwarfs') +stoff=VersionInfo.getAddress('start_dwarf_count') print("Starting dwarves found:"..engine.peekd(stoff)) engine.poked(stoff,num) end diff --git a/plugins/stonesense b/plugins/stonesense index 906d6439d..8365e4a89 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 906d6439d4cb694cf287d63badabb675a8b89329 +Subproject commit 8365e4a89cf4c21fc402dd6042c9743f71654ac9