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

fix renamed pregnancy_ptr/mystery to pregnancy_genes/caste

develop
jj 2013-08-10 01:57:11 +02:00
parent 090d7defc5
commit 308e7b6820
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/catsplosion.cpp
Unescape Escape View File

@ -120,14 +120,14 @@ command_result catsplosion (color_ostream &out, std::vector <std::string> & para
female->relations.pregnancy_timer = rand() % 100 + 1; female->relations.pregnancy_timer = rand() % 100 + 1;
totalchanged++; totalchanged++;
} }
else if(!female->relations.pregnancy_ptr) else if(!female->relations.pregnancy_genes)
{ {
df::unit_genes *preg = new df::unit_genes; df::unit_genes *preg = new df::unit_genes;
preg->appearance = female->appearance.genes.appearance; preg->appearance = female->appearance.genes.appearance;
preg->colors = female->appearance.genes.colors; preg->colors = female->appearance.genes.colors;
female->relations.pregnancy_ptr = preg; female->relations.pregnancy_genes = preg;
female->relations.pregnancy_timer = rand() % 100 + 1; female->relations.pregnancy_timer = rand() % 100 + 1;
female->relations.pregnancy_mystery = 1; // WTF is this? female->relations.pregnancy_caste = 1;
totalcreated ++; totalcreated ++;
} }
} }

10
plugins/lua/dfusion/tools.lua
Unescape Escape View File

@ -159,22 +159,22 @@ function empregnate(unit)
unit.curse.add_tags2.STERILE=false unit.curse.add_tags2.STERILE=false
end end
local genes = unit.appearance.genes local genes = unit.appearance.genes
if unit.relations.pregnancy_ptr == nil then if unit.relations.pregnancy_genes == nil then
print("creating preg ptr.") print("creating preg ptr.")
if false then if false then
print(string.format("%x %x",df.sizeof(unit.relations:_field("pregnancy_ptr")))) print(string.format("%x %x",df.sizeof(unit.relations:_field("pregnancy_genes"))))
return return
end end
unit.relations.pregnancy_ptr = { new = true, assign = genes } unit.relations.pregnancy_genes = { new = true, assign = genes }
end end
local ngenes = unit.relations.pregnancy_ptr local ngenes = unit.relations.pregnancy_genes
if #ngenes.appearance ~= #genes.appearance or #ngenes.colors ~= #genes.colors then if #ngenes.appearance ~= #genes.appearance or #ngenes.colors ~= #genes.colors then
print("Array sizes incorrect, fixing.") print("Array sizes incorrect, fixing.")
ngenes:assign(genes); ngenes:assign(genes);
end end
print("Setting preg timer.") print("Setting preg timer.")
unit.relations.pregnancy_timer=10 unit.relations.pregnancy_timer=10
unit.relations.pregnancy_mystery=1 unit.relations.pregnancy_caste=1
end end
menu:add("Empregnate",empregnate) menu:add("Empregnate",empregnate)
function healunit(unit) function healunit(unit)