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

Merge https://github.com/warmist/dfhack

develop
Petr Mrázek 2012-03-25 03:27:26 +02:00
parent ee66731d63 e36ed9ac07
commit def7e51564
6 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/Dfusion/CMakeLists.txt
Unescape Escape View File

@ -11,5 +11,4 @@ SET_SOURCE_FILES_PROPERTIES( ${DFUSION_HS} PROPERTIES HEADER_FILE_ONLY TRUE )
DFHACK_PLUGIN(dfusion ${DFUSION_CPPS_ALL} ${DFUSION_HS} LINK_LIBRARIES lua dfhack-tinythread) DFHACK_PLUGIN(dfusion ${DFUSION_CPPS_ALL} ${DFUSION_HS} LINK_LIBRARIES lua dfhack-tinythread)
# installs into DF root # installs into DF root
install(DIRECTORY luafiles/ DESTINATION dfusion) install(DIRECTORY luafiles/ DESTINATION dfusion)
install(FILES ../../library/include/df/codegen.out.xml DESTINATION dfusion/patterns/)

4
plugins/Dfusion/luafiles/common.lua
Unescape Escape View File

@ -366,8 +366,8 @@ function findVectors()
end end
function GetRaceToken(p) --actually gets token... function GetRaceToken(p) --actually gets token...
local vec=df.world.raws.creatures.all local vec=df.global.world.raws.creatures.all
return vec[p]:deref().creature_id return vec[p].creature_id
end end
function BuildNameTable() function BuildNameTable()
local rtbl={} local rtbl={}

4
plugins/Dfusion/luafiles/friendship/plugin.lua
Unescape Escape View File

@ -2,8 +2,8 @@ if not(FILE) then
--sanity test --sanity test
--print("race num:"..engine.peekw(offsets.getEx("CurrentRace"))) --print("race num:"..engine.peekw(offsets.getEx("CurrentRace")))
--print(string.format("%x vs %x",offsets.getEx("CurrentRace"),VersionInfo.getGroup("Creatures"):getAddress("current_race"))) --print(string.format("%x vs %x",offsets.getEx("CurrentRace"),VersionInfo.getGroup("Creatures"):getAddress("current_race")))
print("Race num:"..df.ui.race_id) print("Race num:"..df.global.ui.race_id)
print("Your current race is:"..GetRaceToken(df.ui.race_id)) print("Your current race is:"..GetRaceToken(df.global.ui.race_id))
print("If this is wrong please type 'q'") print("If this is wrong please type 'q'")
if(getline()=='q') then if(getline()=='q') then
return return

8
plugins/Dfusion/luafiles/init.lua
Unescape Escape View File

@ -47,7 +47,7 @@ function mainmenu(t1)
end end
function RunSaved() function RunSaved()
print("Locating saves...") print("Locating saves...")
local str=df.world.cur_savegame.save_dir local str=df.global.world.cur_savegame.save_dir
print("Current region:"..str) print("Current region:"..str)
str="data/save/"..str.."/dfusion/init.lua" str="data/save/"..str.."/dfusion/init.lua"
print("Trying to run:"..str) print("Trying to run:"..str)
@ -61,7 +61,7 @@ dofile("dfusion/editor.lua")
unlockDF() unlockDF()
plugins={} plugins={}
table.insert(plugins,{"simple_embark","A simple embark dwarf count editor"}) table.insert(plugins,{"simple_embark","A simple embark dwarf count editor"})
table.insert(plugins,{"tools","some misc tools"}) --table.insert(plugins,{"tools","some misc tools"})
table.insert(plugins,{"embark","Multi race embark"}) table.insert(plugins,{"embark","Multi race embark"})
table.insert(plugins,{"friendship","Multi race fort enabler"}) table.insert(plugins,{"friendship","Multi race fort enabler"})
--[=[table.insert(plugins,{"items","A collection of item hacking tools"}) --[=[table.insert(plugins,{"items","A collection of item hacking tools"})
@ -73,8 +73,8 @@ table.insert(plugins,{"adv_tools","some tools for (mainly) advneturer hacking"})
table.insert(plugins,{"triggers","a function calling plug (discontinued...)"}) table.insert(plugins,{"triggers","a function calling plug (discontinued...)"})
table.insert(plugins,{"migrants","multi race imigrations"}) table.insert(plugins,{"migrants","multi race imigrations"})
--]=] --]=]
table.insert(plugins,{"onfunction","run lua on some df function"}) --table.insert(plugins,{"onfunction","run lua on some df function"})
table.insert(plugins,{"editor","edit internals of df",EditDF}) --table.insert(plugins,{"editor","edit internals of df",EditDF})
table.insert(plugins,{"saves","run current worlds's init.lua",RunSaved}) table.insert(plugins,{"saves","run current worlds's init.lua",RunSaved})
loadall(plugins) loadall(plugins)
dofile_silent("dfusion/initcustom.lua") dofile_silent("dfusion/initcustom.lua")

2
plugins/Dfusion/luafiles/offsets.txt
Unescape Escape View File

@ -13,4 +13,4 @@ WorldData : 0x1306148
Xpointer : 0x7347f0 Xpointer : 0x7347f0
vtableLegends : 0x6e7594 vtableLegends : 0x6e7594
Buildings : 0x12C4DA8 Buildings : 0x12C4DA8
StartDwarfs : 0x5A5170 StartDwarfs : 0x5DA790

4
plugins/Dfusion/luafiles/tools/init.lua
Unescape Escape View File

@ -275,9 +275,9 @@ function tools.empregnate(unit)
local arr1=unit.appearance.unk_51c local arr1=unit.appearance.unk_51c
local arr2=unit.appearance.unk_51c local arr2=unit.appearance.unk_51c
local created=false local created=false
if unit.relations.pregnancy_ptr:tonumber()==0 then if unit.relations.pregnancy_ptr == nil then
print("creating preg ptr.") print("creating preg ptr.")
unit.relations.pregnancy_ptr:newref() unit.relations.pregnancy_ptr=unit.relations:_field("pregnancy_ptr"):new()--=df.new(unit.relations.pregnancy_ptr._kind)
created=true created=true
end end
local tarr1=unit.relations.pregnancy_ptr:deref().anon_1 local tarr1=unit.relations.pregnancy_ptr:deref().anon_1