Plant immolate/extirpate no longer work, but create/grow are still good

plugins/plants.cpp

@@ -24,6 +24,7 @@ const uint32_t sapling_to_tree_threshold = 120 * 28 * 12 * 3 - 1; // 3 years min
 
 DFHACK_PLUGIN("plants");
 
+/* Immolate/Extirpate no longer work in 0.40
 enum do_what
 {
     do_immolate,
@@ -59,12 +60,13 @@ static bool getoptions( vector <string> & parameters, bool & shrubs, bool & tree
     return true;
 }
 
-/**
+//
- * Book of Immolations, chapter 1, verse 35:
+// Book of Immolations, chapter 1, verse 35:
- * Armok emerged from the hellish depths and beheld the sunny realms for the first time.
+// Armok emerged from the hellish depths and beheld the sunny realms for the first time.
- * And he cursed the plants and trees for their bloodless wood, turning them into ash and smoldering ruin.
+// And he cursed the plants and trees for their bloodless wood, turning them into ash and smoldering ruin.
- * Armok was pleased and great temples were built by the dwarves, for they shared his hatred for trees and plants.
+// Armok was pleased and great temples were built by the dwarves, for they shared his hatred for trees and plants.
- */
+//
+
 static command_result immolations (color_ostream &out, do_what what, bool shrubs, bool trees)
 {
     CoreSuspender suspend;
@@ -90,7 +92,7 @@ static command_result immolations (color_ostream &out, do_what what, bool shrubs
                 destroyed ++;
             }
         }
-        out.print("Praise Armok!\n");
+        out.print("Praise Armok! %i plants destroyed.\n", destroyed);
     }
     else
     {
@@ -110,12 +112,10 @@ static command_result immolations (color_ostream &out, do_what what, bool shrubs
                     break;
                 }
             }
-            /*
+            if(didit)
-            if(!didit)
+                out.print("Praise Armok! Selected plant destroyed.\n");
-            {
+            else
-                cout << "----==== There's NOTHING there! ====----" << endl;
+               out.printerr("No plant found at specified location!\n");
-            }
-            */
         }
         else
         {
@@ -152,16 +152,16 @@ command_result df_immolate (color_ostream &out, vector <string> & parameters, do
 
     return CR_OK;
 }
-
+*/
 command_result df_grow (color_ostream &out, vector <string> & parameters)
 {
     for(size_t i = 0; i < parameters.size();i++)
     {
         if(parameters[i] == "help" || parameters[i] == "?")
         {
-            out << "Usage:\n"
+            out.print("Usage:\n"
                 "This command turns all living saplings on the map into full-grown trees.\n"
-                "With active cursor, work on the targetted one only.\n";
+                "With active cursor, work on the targetted one only.\n");
             return CR_OK;
         }
     }
@@ -175,6 +175,7 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
     }
     MapExtras::MapCache map;
     int32_t x,y,z;
+    int grown = 0;
     if(Gui::getCursorCoords(x,y,z))
     {
         for(size_t i = 0; i < world->plants.all.size(); i++)
@@ -186,6 +187,7 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
                     tileSpecial(map.tiletypeAt(DFCoord(x,y,z))) != tiletype_special::DEAD)
                 {
                     tree->grow_counter = sapling_to_tree_threshold;
+                    grown++;
                 }
                 break;
             }
@@ -193,7 +195,6 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
     }
     else
     {
-        int grown = 0;
         for(size_t i = 0 ; i < world->plants.all.size(); i++)
         {
             df::plant *p = world->plants.all[i];
@@ -201,9 +202,14 @@ command_result df_grow (color_ostream &out, vector <string> & parameters)
             if(!p->flags.bits.is_shrub && tileShape(ttype) == tiletype_shape::SAPLING && tileSpecial(ttype) != tiletype_special::DEAD)
             {
                 p->grow_counter = sapling_to_tree_threshold;
+                grown++;
             }
         }
     }
+    if (grown)
+        out.print("%i plants grown.\n", grown);
+    else
+        out.printerr("No plant(s) found!\n");
 
     return CR_OK;
 }
@@ -212,10 +218,10 @@ command_result df_createplant (color_ostream &out, vector <string> & parameters)
 {
     if ((parameters.size() != 1) || (parameters[0] == "help" || parameters[0] == "?"))
     {
-        out << "Usage:\n"
+        out.print("Usage:\n"
             "Create a new plant at the cursor.\n"
             "Specify the type of plant to create by its raw ID (e.g. TOWER_CAP or MUSHROOM_HELMET_PLUMP).\n"
-            "Only shrubs and saplings can be placed, and they must be located on a dirt or grass floor.\n";
+            "Only shrubs and saplings can be placed, and they must be located on a dirt or grass floor.\n");
         return CR_OK;
     }
 
@@ -313,6 +319,7 @@ command_result df_plant (color_ostream &out, vector <string> & parameters)
             parameters.erase(parameters.begin());
             return df_grow(out, parameters);
         } else
+/*
         if (parameters[0] == "immolate") {
             parameters.erase(parameters.begin());
             return df_immolate(out, parameters, do_immolate);
@@ -321,6 +328,7 @@ command_result df_plant (color_ostream &out, vector <string> & parameters)
             parameters.erase(parameters.begin());
             return df_immolate(out, parameters, do_extirpate);
         } else
+*/
         if (parameters[0] == "create") {
             parameters.erase(parameters.begin());
             return df_createplant(out, parameters);
@@ -334,8 +342,8 @@ DFhackCExport command_result plugin_init ( color_ostream &out, std::vector <Plug
     commands.push_back(PluginCommand("plant", "Plant creation and removal.", df_plant, false,
         "Command to create, grow or remove plants on the map. For more details, check the subcommand help :\n"
         "plant grow help      - Grows saplings into trees.\n"
-        "plant immolate help  - Set plants on fire.\n"
+//        "plant immolate help  - Set plants on fire.\n"
-        "plant extirpate help - Kill plants.\n"
+//        "plant extirpate help - Kill plants.\n"
         "plant create help    - Create a new plant.\n"));
 
     return CR_OK;