summaryrefslogtreecommitdiff
path: root/plugins/getplants.cpp
diff options
context:
space:
mode:
authorQuietust2012-01-07 23:31:23 -0600
committerQuietust2012-01-07 23:31:23 -0600
commitfd2563d0d5d4abd65fb62dd9ff8a7f608771faeb (patch)
treefd49f00eb2ac7db3637e62cdaf8443e2bc5c7e13 /plugins/getplants.cpp
parentc484d7ceaeb57cf950d1fa04edbfcb417c409a01 (diff)
downloaddfhack-fd2563d0d5d4abd65fb62dd9ff8a7f608771faeb.tar.gz
dfhack-fd2563d0d5d4abd65fb62dd9ff8a7f608771faeb.tar.bz2
dfhack-fd2563d0d5d4abd65fb62dd9ff8a7f608771faeb.tar.xz
Cleanup "getplants" plugin, minimize reliance on modules
Diffstat (limited to 'plugins/getplants.cpp')
-rw-r--r--plugins/getplants.cpp198
1 files changed, 78 insertions, 120 deletions
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 14fb8b90..e35c3d51 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -1,56 +1,34 @@
// Designate all matching plants for gathering/cutting
-#include <iostream>
-#include <vector>
-#include <map>
-#include <set>
-#include <stddef.h>
-#include <assert.h>
-#include <string.h>
-
#include "Core.h"
#include <Console.h>
#include <Export.h>
#include <PluginManager.h>
-#include <modules/Maps.h>
-#include <modules/Materials.h>
-#include <modules/Vegetation.h>
-#include <TileTypes.h>
-using namespace std;
-using namespace DFHack;
-
-DFhackCExport command_result df_getplants (Core * c, vector <string> & parameters);
+#include <DataDefs.h>
+#include <TileTypes.h>
+#include "df/world.h"
+#include "df/map_block.h"
+#include "df/tile_dig_designation.h"
+#include "df/plant_raw.h"
-DFhackCExport const char * plugin_name ( void )
-{
- return "getplants";
-}
+#include "modules/Vegetation.h"
+#include <set>
-DFhackCExport command_result plugin_init ( Core * c, vector <PluginCommand> &commands)
-{
- commands.clear();
- commands.push_back(PluginCommand("getplants", "Cut down all of the specified trees or gather all of the specified shrubs", df_getplants));
- return CR_OK;
-}
+using std::string;
+using std::vector;
+using std::set;
+using namespace DFHack;
-DFhackCExport command_result plugin_shutdown ( Core * c )
-{
- return CR_OK;
-}
+using df::global::world;
DFhackCExport command_result df_getplants (Core * c, vector <string> & parameters)
{
- uint32_t x_max,y_max,z_max;
- designations40d designations;
- tiletypes40d tiles;
- t_blockflags blockflags;
string plantMatStr = "";
set<int> plantIDs;
set<string> plantNames;
bool deselect = false, exclude = false, treesonly = false, shrubsonly = false;
- bool dirty = false;
int count = 0;
for (size_t i = 0; i < parameters.size(); i++)
{
@@ -77,16 +55,16 @@ DFhackCExport command_result df_getplants (Core * c, vector <string> & parameter
exclude = true;
else plantNames.insert(parameters[i]);
}
- c->Suspend();
- Materials *mats = c->getMaterials();
- for (vector<df_plant_type *>::const_iterator it = mats->df_organic->begin(); it != mats->df_organic->end(); it++)
+ CoreSuspender suspend(c);
+
+ for (int i = 0; i < world->raws.plants.all.size(); i++)
{
- df_plant_type &plant = **it;
- if (plantNames.find(plant.ID) != plantNames.end())
+ df::plant_raw *plant = world->raws.plants.all[i];
+ if (plantNames.find(plant->id) != plantNames.end())
{
- plantNames.erase(plant.ID);
- plantIDs.insert(it - mats->df_organic->begin());
+ plantNames.erase(plant->id);
+ plantIDs.insert(i);
}
}
if (plantNames.size() > 0)
@@ -95,103 +73,83 @@ DFhackCExport command_result df_getplants (Core * c, vector <string> & parameter
for (set<string>::const_iterator it = plantNames.begin(); it != plantNames.end(); it++)
c->con.printerr(" %s", it->c_str());
c->con.printerr("\n");
- c->Resume();
return CR_FAILURE;
}
if (plantIDs.size() == 0)
{
c->con.print("Valid plant IDs:\n");
- for (vector<df_plant_type *>::const_iterator it = mats->df_organic->begin(); it != mats->df_organic->end(); it++)
+ for (int i = 0; i < world->raws.plants.all.size(); i++)
{
- df_plant_type &plant = **it;
- if (plant.flags.is_set(PLANT_GRASS))
+ df::plant_raw *plant = world->raws.plants.all[i];
+ if (plant->flags.is_set(df::plant_raw_flags::GRASS))
continue;
- c->con.print("* (%s) %s - %s\n", plant.flags.is_set(PLANT_TREE) ? "tree" : "shrub", plant.ID.c_str(), plant.name.c_str());
+ c->con.print("* (%s) %s - %s\n", plant->flags.is_set(df::plant_raw_flags::TREE) ? "tree" : "shrub", plant->id.c_str(), plant->name.c_str());
}
- c->Resume();
return CR_OK;
}
- Maps *maps = c->getMaps();
-
- // init the map
- if (!maps->Start())
- {
- c->con.printerr("Can't init map.\n");
- c->Resume();
- return CR_FAILURE;
- }
-
- maps->getSize(x_max,y_max,z_max);
- // walk the map
- for (uint32_t x = 0; x < x_max; x++)
+ int count = 0;
+ for (int i = 0; i < world->map.map_blocks.size(); i++)
{
- for (uint32_t y = 0; y < y_max; y++)
+ df::map_block *cur = world->map.map_blocks[i];
+ bool dirty = false;
+ for (int j = 0; j < cur->plants.size(); j++)
{
- for (uint32_t z = 0; z < z_max; z++)
+ const df_plant *plant = (df_plant *)cur->plants[i];
+ int x = plant->x % 16;
+ int y = plant->y % 16;
+ if (plantIDs.find(plant->material) != plantIDs.end())
{
- if (maps->getBlock(x,y,z))
- {
- dirty = false;
- maps->ReadDesignations(x,y,z, &designations);
- maps->ReadTileTypes(x,y,z, &tiles);
- maps->ReadBlockFlags(x,y,z, blockflags);
-
- vector<df_plant *> *plants;
- if (maps->ReadVegetation(x, y, z, plants))
- {
- for (vector<df_plant *>::const_iterator it = plants->begin(); it != plants->end(); it++)
- {
- const df_plant &plant = **it;
- uint32_t tx = plant.x % 16;
- uint32_t ty = plant.y % 16;
- if (plantIDs.find(plant.material) != plantIDs.end())
- {
- if (exclude)
- continue;
- }
- else
- {
- if (!exclude)
- continue;
- }
-
- TileShape shape = tileShape(tiles[tx][ty]);
- if (plant.is_shrub && (treesonly || shape != SHRUB_OK))
- continue;
- if (!plant.is_shrub && (shrubsonly || (shape != TREE_OK && shape != TREE_DEAD)))
- continue;
- if (designations[tx][ty].bits.hidden)
- continue;
- if (deselect && designations[tx][ty].bits.dig != designation_no)
- {
- designations[tx][ty].bits.dig = designation_no;
- dirty = true;
- ++count;
- }
- if (!deselect && designations[tx][ty].bits.dig != designation_default)
- {
- designations[tx][ty].bits.dig = designation_default;
- dirty = true;
- ++count;
- }
- }
- }
- // If anything was changed, write it all.
- if (dirty)
- {
- blockflags.bits.designated = 1;
- maps->WriteDesignations(x,y,z, &designations);
- maps->WriteBlockFlags(x,y,z, blockflags);
- dirty = false;
- }
- }
+ if (exclude)
+ continue;
+ }
+ else
+ {
+ if (!exclude)
+ continue;
+ }
+ TileShape shape = tileShape(cur->tiletype[x][y]);
+ if (plant->is_shrub && (treesonly || shape != SHRUB_OK))
+ continue;
+ if (!plant->is_shrub && (shrubsonly || (shape != TREE_OK && shape != TREE_DEAD)))
+ continue;
+ if (cur->designation[x][y].bits.hidden)
+ continue;
+ if (deselect && cur->designation[x][y].bits.dig != df::tile_dig_designation::No)
+ {
+ cur->designation[x][y].bits.dig = df::tile_dig_designation::No;
+ dirty = true;
+ ++count;
+ }
+ if (!deselect && cur->designation[x][y].bits.dig != df::tile_dig_designation::Default)
+ {
+ cur->designation[x][y].bits.dig = df::tile_dig_designation::Default;
+ dirty = true;
+ ++count;
}
}
+ if (dirty)
+ cur->flags.set(df::block_flags::Designated);
}
- c->Resume();
if (count)
c->con.print("Updated %d plant designations.\n", count);
return CR_OK;
}
+
+DFhackCExport const char * plugin_name ( void )
+{
+ return "getplants";
+}
+
+DFhackCExport command_result plugin_init ( Core * c, vector <PluginCommand> &commands)
+{
+ commands.clear();
+ commands.push_back(PluginCommand("getplants", "Cut down all of the specified trees or gather all of the specified shrubs", df_getplants));
+ return CR_OK;
+}
+
+DFhackCExport command_result plugin_shutdown ( Core * c )
+{
+ return CR_OK;
+} \ No newline at end of file