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

Fix for -ah adding wrong labors.

develop
Raoul XQ 2011-04-12 13:47:11 +02:00
parent f2c60a3cfb
commit bb80b246d1
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/playground/skillmodify.cpp
Unescape Escape View File

@ -670,17 +670,24 @@ int main (int argc, const char* argv[])
if (remove_labors) { if (remove_labors) {
cout << "Removing labors..." << endl; cout << "Removing labors..." << endl;
for(unsigned int lab = 0; lab < NUM_CREATURE_LABORS; lab++) { for(unsigned int lab = 0; lab < NUM_CREATURE_LABORS; lab++) {
if (creature.labors[lab])
{
cout << "Removing labor " << int(hauler_labors[lab]) << "..." << endl;
creature.labors[lab] = 0; creature.labors[lab] = 0;
} }
} }
}
if (remove_hauler) { if (remove_hauler) {
cout << "Removing hauler labors..." << endl;
for (int labs=0; for (int labs=0;
labs < sizeof(hauler_labors)/sizeof(hauler_labors[0]); labs < sizeof(hauler_labors)/sizeof(hauler_labors[0]);
labs++) labs++)
{ {
creature.labors[labs] = 0; if (creature.labors[hauler_labors[labs]])
{
cout << "Removing labor " << int(hauler_labors[labs]) << "..." << endl;
creature.labors[hauler_labors[labs]] = 0;
}
} }
} }
@ -690,7 +697,11 @@ int main (int argc, const char* argv[])
labs < sizeof(hauler_labors)/sizeof(hauler_labors[0]); labs < sizeof(hauler_labors)/sizeof(hauler_labors[0]);
labs++) labs++)
{ {
creature.labors[labs] = 1; if (creature.labors[hauler_labors[labs]] == 0)
{
cout << "Adding labor " << int(hauler_labors[labs]) << "..." << endl;
creature.labors[hauler_labors[labs]] = 1;
}
} }
} }
if (Creatures->WriteLabors(creature_idx, creature.labors) == true) { if (Creatures->WriteLabors(creature_idx, creature.labors) == true) {