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

Merge branch 'master' of git://github.com/peterix/dfhack

develop
Robert Heinrich 2012-03-29 18:27:40 +02:00
parent a4995d7681 b847a026e3
commit 2446fb7abf
27 changed files with 395 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
Unescape Escape View File

@ -58,7 +58,7 @@ set(DF_VERSION_MINOR "34")
set(DF_VERSION_PATCH "06")
set(DF_VERSION "${DF_VERSION_MAJOR}.${DF_VERSION_MINOR}.${DF_VERSION_PATCH}")
set(DFHACK_RELEASE "1")
set(DFHACK_RELEASE "2")
set(DFHACK_VERSION "${DF_VERSION_MAJOR}.${DF_VERSION_MINOR}.${DF_VERSION_PATCH}-r${DFHACK_RELEASE}")
add_definitions(-DDFHACK_VERSION="${DFHACK_VERSION}")

2
README.rst
Unescape Escape View File

@ -129,7 +129,7 @@ Examples:
``changelayer MARBLE all_biomes all_layers``
Convert all layers of all biomes which are not soil into marble.
.. Notes::
.. note::
* If you use changelayer and nothing happens, try to pause/unpause the game for a while and try to move the cursor to another tile. Then try again. If that doesn't help try temporarily changing some other layer, undo your changes and try again for the layer you want to change. Saving and reloading your map might also help.
* You should be fine if you only change single layers without the use of 'force'. Still it's advisable to save your game before messing with the map.

626
Readme.html
View File

File diff suppressed because it is too large Load Diff

2
library/xml

@ -1 +1 @@
Subproject commit 8bb7f923b1d124610db7e30aeb3be8f4cb9bd021
Subproject commit 3e1c728640d8f5a9501908064a2d5385a156058c

2
plugins/advtools.cpp
Unescape Escape View File

@ -55,8 +55,6 @@ DFHACK_PLUGIN("advtools");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
if (!ui_advmode)
return CR_OK;

2
plugins/changeitem.cpp
Unescape Escape View File

@ -316,7 +316,7 @@ command_result changeitem_execute(
out.printerr("change denied: subtype doesn't match. use 'force' to override.\n");
}
item->flags.bits.unk8 = 0; // recalc temperatures next time touched
item->flags.bits.temps_computed = 0; // recalc temperatures next time touched
item->flags.bits.weight_computed = 0; // recalc weight next time touched
}
return CR_OK;

1
plugins/devel/regrass.cpp
Unescape Escape View File

@ -56,7 +56,6 @@ DFHACK_PLUGIN("regrass");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector<PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("regrass", "Regrows all surface grass, restoring outdoor plant growth for pre-0.31.19 worlds.", df_regrass));
return CR_OK;
}

1
plugins/feature.cpp
Unescape Escape View File

@ -96,7 +96,6 @@ DFHACK_PLUGIN("feature");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand(
"feature", "List or manage map features.", feature, false,
" feature list\n"

1
plugins/mapexport/mapexport.cpp
Unescape Escape View File

@ -30,7 +30,6 @@ DFHACK_PLUGIN("mapexport");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
GOOGLE_PROTOBUF_VERIFY_VERSION;
commands.clear();
commands.push_back(PluginCommand("mapexport", "Exports the current map to a file.", mapexport, true));
return CR_OK;
}

1
plugins/mode.cpp
Unescape Escape View File

@ -18,7 +18,6 @@ DFHACK_PLUGIN("mode");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand(
"mode","View, change and track game mode.",
mode, true,

1
plugins/plants.cpp
Unescape Escape View File

@ -28,7 +28,6 @@ DFHACK_PLUGIN("plants");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("grow", "Grows saplings into trees (with active cursor, only the targetted one).", df_grow));
commands.push_back(PluginCommand("immolate", "Set plants on fire (under cursor, 'shrubs', 'trees' or 'all').", df_immolate));
commands.push_back(PluginCommand("extirpate", "Kill plants (same mechanics as immolate).", df_extirpate));

1
plugins/probe.cpp
Unescape Escape View File

@ -41,7 +41,6 @@ DFHACK_PLUGIN("probe");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("probe",
"A tile probe",
df_probe));

1
plugins/prospector.cpp
Unescape Escape View File

@ -195,7 +195,6 @@ DFHACK_PLUGIN("prospector");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand(
"prospect", "Show stats of available raw resources.",
prospector, false,

1
plugins/rename.cpp
Unescape Escape View File

@ -38,7 +38,6 @@ DFHACK_PLUGIN("rename");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
if (world && ui) {
commands.push_back(PluginCommand(
"rename", "Rename various things.", rename, false,

1
plugins/reveal.cpp
Unescape Escape View File

@ -76,7 +76,6 @@ DFHACK_PLUGIN("reveal");
DFhackCExport command_result plugin_init ( color_ostream &out, vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("reveal","Reveal the map. 'reveal hell' will also reveal hell. 'reveal demon' won't pause.",reveal));
commands.push_back(PluginCommand("unreveal","Revert the map to its previous state.",unreveal));
commands.push_back(PluginCommand("revtoggle","Reveal/unreveal depending on state.",revtoggle));

1
plugins/seedwatch.cpp
Unescape Escape View File

@ -243,7 +243,6 @@ DFHACK_PLUGIN("seedwatch");
DFhackCExport command_result plugin_init(color_ostream &out, vector<PluginCommand>& commands)
{
commands.clear();
commands.push_back(PluginCommand("seedwatch", "Switches cookery based on quantity of seeds, to keep reserves", df_seedwatch));
// fill in the abbreviations map, with abbreviations for the standard plants
abbreviations["bs"] = "SLIVER_BARB";

1
plugins/showmood.cpp
Unescape Escape View File

@ -272,7 +272,6 @@ DFHACK_PLUGIN("showmood");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector<PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("showmood", "Shows items needed for current strange mood.", df_showmood));
return CR_OK;
}

1
plugins/skeleton/skeleton.cpp
Unescape Escape View File

@ -29,7 +29,6 @@ DFHACK_PLUGIN("skeleton");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
// Fill the command list with your commands.
commands.clear();
commands.push_back(PluginCommand(
"skeleton", "Do nothing, look pretty.",
skeleton, false, /* true means that the command can't be used from non-interactive user interface */

1
plugins/stockpiles.cpp
Unescape Escape View File

@ -29,7 +29,6 @@ DFHACK_PLUGIN("stockpiles");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
if (world && ui) {
commands.push_back(
PluginCommand(

2
plugins/stonesense

@ -1 +1 @@
Subproject commit 07ddc8c13e0bb38cde77937803e9320e2b26f2d9
Subproject commit 906d6439d4cb694cf287d63badabb675a8b89329

1
plugins/tiletypes.cpp
Unescape Escape View File

@ -497,7 +497,6 @@ DFHACK_PLUGIN("tiletypes");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
tiletypes_hist.load("tiletypes.history");
commands.clear();
commands.push_back(PluginCommand("tiletypes", "Paint map tiles freely, similar to liquids.", df_tiletypes, true));
return CR_OK;
}

1
plugins/tubefill.cpp
Unescape Escape View File

@ -23,7 +23,6 @@ DFHACK_PLUGIN("tubefill");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("tubefill","Fill in all the adamantine tubes again.",tubefill));
return CR_OK;
}

1
plugins/tweak.cpp
Unescape Escape View File

@ -41,7 +41,6 @@ DFHACK_PLUGIN("tweak");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand(
"tweak", "Various tweaks for minor bugs.", tweak, false,
" tweak clear-missing\n"

1
plugins/vdig.cpp
Unescape Escape View File

@ -27,7 +27,6 @@ DFHACK_PLUGIN("vdig");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand(
"vdig","Dig a whole vein.",vdig,Gui::cursor_hotkey,
" Designates a whole vein under the cursor for digging.\n"

1
plugins/versionosd.cpp
Unescape Escape View File

@ -46,7 +46,6 @@ DFTileSurface* createTile(int x, int y)
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand("versionosd",
"Toggles displaying version in DF window",
df_versionosd));

1
plugins/weather.cpp
Unescape Escape View File

@ -19,7 +19,6 @@ DFHACK_PLUGIN("weather");
DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
commands.push_back(PluginCommand(
"weather", "Print the weather map or change weather.",
weather, false,

1
plugins/workflow.cpp
Unescape Escape View File

@ -59,7 +59,6 @@ DFHACK_PLUGIN("workflow");
DFhackCExport command_result plugin_init (color_ostream &out, std::vector <PluginCommand> &commands)
{
commands.clear();
if (!world || !ui)
return CR_FAILURE;