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

Reverted STOCKPILE_PLANT_GROWTH to LEAF_MAT

develop
PatrikLundell 2020-01-15 19:31:19 +01:00
parent 15e06640f6
commit 8c049389a4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/getplants.cpp
Unescape Escape View File

@ -94,7 +94,7 @@ selectability selectablePlant(const df::plant_raw *plant)
(growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) || (growth_mat.material->flags.is_set(material_flags::EDIBLE_COOKED) ||
growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) || growth_mat.material->flags.is_set(material_flags::EDIBLE_RAW))) ||
(plant->growths[i]->item_type == df::item_type::PLANT_GROWTH && (plant->growths[i]->item_type == df::item_type::PLANT_GROWTH &&
growth_mat.material->flags.is_set(material_flags::STOCKPILE_PLANT_GROWTH))) growth_mat.material->flags.is_set(material_flags::LEAF_MAT))) // Will change name to STOCKPILE_PLANT_GROWTH any day now...
{ {
if (*cur_year_tick >= plant->growths[i]->timing_1 && if (*cur_year_tick >= plant->growths[i]->timing_1 &&
(plant->growths[i]->timing_2 == -1 || (plant->growths[i]->timing_2 == -1 ||
@ -333,16 +333,17 @@ command_result df_getplants (color_ostream &out, vector <string> & parameters)
} }
} }
if (count) if (count)
{
if (verbose) if (verbose)
{ {
for (auto i = 0; i < plantSelections.size(); i++) for (auto i = 0; i < plantSelections.size(); i++)
{ {
if (collectionCount [i] > 0) if (collectionCount[i] > 0)
out.print("Updated %i %s designations.\n", collectionCount [i], world->raws.plants.all [i]->id.c_str()); out.print("Updated %i %s designations.\n", collectionCount[i], world->raws.plants.all[i]->id.c_str());
} }
out.print("\n"); out.print("\n");
} }
}
out.print("Updated %d plant designations.\n", count); out.print("Updated %d plant designations.\n", count);
return CR_OK; return CR_OK;