diff options
| author | Warmist | 2012-03-25 01:31:58 +0200 |
|---|---|---|
| committer | Warmist | 2012-03-25 01:31:58 +0200 |
| commit | e36ed9ac07dbe3fdd7582e1b377b0d77f37ae3f7 (patch) | |
| tree | 28974ee018fd9a79af7583c2a614f10e82559263 /plugins/Dfusion | |
| parent | b8210a4cc717073d8f79442604f39c1453fa7f90 (diff) | |
| download | dfhack-e36ed9ac07dbe3fdd7582e1b377b0d77f37ae3f7.tar.gz dfhack-e36ed9ac07dbe3fdd7582e1b377b0d77f37ae3f7.tar.bz2 dfhack-e36ed9ac07dbe3fdd7582e1b377b0d77f37ae3f7.tar.xz | |
Fixed more plugins (embark/friendship/simple_embark)
Diffstat (limited to 'plugins/Dfusion')
| -rw-r--r-- | plugins/Dfusion/luafiles/common.lua | 4 | ||||
| -rw-r--r-- | plugins/Dfusion/luafiles/friendship/plugin.lua | 4 | ||||
| -rw-r--r-- | plugins/Dfusion/luafiles/init.lua | 4 | ||||
| -rw-r--r-- | plugins/Dfusion/luafiles/offsets.txt | 2 | ||||
| -rw-r--r-- | 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 04a0a9b9..43f95abd 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 fbc1c81a..695ddf05 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 f27f3ab8..27f0571f 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 75f4fd5f..e35f8437 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 1268a59f..ebaf6371 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 |
