From b8210a4cc717073d8f79442604f39c1453fa7f90 Mon Sep 17 00:00:00 2001 From: Warmist Date: Sun, 25 Mar 2012 01:16:41 +0200 Subject: [PATCH 1/2] Commented non working parts... Not very much left... --- plugins/Dfusion/CMakeLists.txt | 3 +-- plugins/Dfusion/luafiles/init.lua | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/plugins/Dfusion/CMakeLists.txt b/plugins/Dfusion/CMakeLists.txt index 85064b974..65587201b 100644 --- a/plugins/Dfusion/CMakeLists.txt +++ b/plugins/Dfusion/CMakeLists.txt @@ -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) # installs into DF root -install(DIRECTORY luafiles/ DESTINATION dfusion) -install(FILES ../../library/include/df/codegen.out.xml DESTINATION dfusion/patterns/) \ No newline at end of file +install(DIRECTORY luafiles/ DESTINATION dfusion) \ No newline at end of file diff --git a/plugins/Dfusion/luafiles/init.lua b/plugins/Dfusion/luafiles/init.lua index 10242c7e7..f27f3ab8c 100644 --- a/plugins/Dfusion/luafiles/init.lua +++ b/plugins/Dfusion/luafiles/init.lua @@ -47,7 +47,7 @@ function mainmenu(t1) end function RunSaved() print("Locating saves...") - local str=df.world.cur_savegame.save_dir + local str=df.global.world.cur_savegame.save_dir print("Current region:"..str) str="data/save/"..str.."/dfusion/init.lua" print("Trying to run:"..str) @@ -60,9 +60,9 @@ dofile("dfusion/editor.lua") --dofile("dfusion/xml_struct.lua") unlockDF() plugins={} -table.insert(plugins,{"simple_embark","A simple embark dwarf count editor"}) -table.insert(plugins,{"tools","some misc tools"}) -table.insert(plugins,{"embark","Multi race embark"}) +--table.insert(plugins,{"simple_embark","A simple embark dwarf count editor"}) +--table.insert(plugins,{"tools","some misc tools"}) +--table.insert(plugins,{"embark","Multi race embark"}) table.insert(plugins,{"friendship","Multi race fort enabler"}) --[=[table.insert(plugins,{"items","A collection of item hacking tools"}) table.insert(plugins,{"offsets","Find all offsets"}) @@ -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,{"migrants","multi race imigrations"}) --]=] -table.insert(plugins,{"onfunction","run lua on some df function"}) -table.insert(plugins,{"editor","edit internals of df",EditDF}) +--table.insert(plugins,{"onfunction","run lua on some df function"}) +--table.insert(plugins,{"editor","edit internals of df",EditDF}) table.insert(plugins,{"saves","run current worlds's init.lua",RunSaved}) loadall(plugins) dofile_silent("dfusion/initcustom.lua") From e36ed9ac07dbe3fdd7582e1b377b0d77f37ae3f7 Mon Sep 17 00:00:00 2001 From: Warmist Date: Sun, 25 Mar 2012 01:31:58 +0200 Subject: [PATCH 2/2] Fixed more plugins (embark/friendship/simple_embark) --- plugins/Dfusion/luafiles/common.lua | 4 ++-- plugins/Dfusion/luafiles/friendship/plugin.lua | 4 ++-- plugins/Dfusion/luafiles/init.lua | 4 ++-- plugins/Dfusion/luafiles/offsets.txt | 2 +- plugins/Dfusion/luafiles/tools/init.lua | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/Dfusion/luafiles/common.lua b/plugins/Dfusion/luafiles/common.lua index 04a0a9b91..43f95abd8 100644 --- a/plugins/Dfusion/luafiles/common.lua +++ b/plugins/Dfusion/luafiles/common.lua @@ -366,8 +366,8 @@ function findVectors() end function GetRaceToken(p) --actually gets token... - local vec=df.world.raws.creatures.all - return vec[p]:deref().creature_id + local vec=df.global.world.raws.creatures.all + return vec[p].creature_id end function BuildNameTable() local rtbl={} diff --git a/plugins/Dfusion/luafiles/friendship/plugin.lua b/plugins/Dfusion/luafiles/friendship/plugin.lua index fbc1c81ab..695ddf05e 100644 --- a/plugins/Dfusion/luafiles/friendship/plugin.lua +++ b/plugins/Dfusion/luafiles/friendship/plugin.lua @@ -2,8 +2,8 @@ if not(FILE) then --sanity test --print("race num:"..engine.peekw(offsets.getEx("CurrentRace"))) --print(string.format("%x vs %x",offsets.getEx("CurrentRace"),VersionInfo.getGroup("Creatures"):getAddress("current_race"))) - print("Race num:"..df.ui.race_id) - print("Your current race is:"..GetRaceToken(df.ui.race_id)) + print("Race num:"..df.global.ui.race_id) + print("Your current race is:"..GetRaceToken(df.global.ui.race_id)) print("If this is wrong please type 'q'") if(getline()=='q') then return diff --git a/plugins/Dfusion/luafiles/init.lua b/plugins/Dfusion/luafiles/init.lua index f27f3ab8c..27f0571fd 100644 --- a/plugins/Dfusion/luafiles/init.lua +++ b/plugins/Dfusion/luafiles/init.lua @@ -60,9 +60,9 @@ dofile("dfusion/editor.lua") --dofile("dfusion/xml_struct.lua") unlockDF() 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,{"embark","Multi race embark"}) +table.insert(plugins,{"embark","Multi race embark"}) table.insert(plugins,{"friendship","Multi race fort enabler"}) --[=[table.insert(plugins,{"items","A collection of item hacking tools"}) table.insert(plugins,{"offsets","Find all offsets"}) diff --git a/plugins/Dfusion/luafiles/offsets.txt b/plugins/Dfusion/luafiles/offsets.txt index 75f4fd5f2..e35f84373 100644 --- a/plugins/Dfusion/luafiles/offsets.txt +++ b/plugins/Dfusion/luafiles/offsets.txt @@ -13,4 +13,4 @@ WorldData : 0x1306148 Xpointer : 0x7347f0 vtableLegends : 0x6e7594 Buildings : 0x12C4DA8 -StartDwarfs : 0x5A5170 \ No newline at end of file +StartDwarfs : 0x5DA790 \ No newline at end of file diff --git a/plugins/Dfusion/luafiles/tools/init.lua b/plugins/Dfusion/luafiles/tools/init.lua index 1268a59f2..ebaf63719 100644 --- a/plugins/Dfusion/luafiles/tools/init.lua +++ b/plugins/Dfusion/luafiles/tools/init.lua @@ -275,9 +275,9 @@ function tools.empregnate(unit) local arr1=unit.appearance.unk_51c local arr2=unit.appearance.unk_51c local created=false - if unit.relations.pregnancy_ptr:tonumber()==0 then + if unit.relations.pregnancy_ptr == nil then 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 end local tarr1=unit.relations.pregnancy_ptr:deref().anon_1