Merge remote-tracking branch 'rh73/master'

plugins/probe.cpp

@@ -330,6 +330,39 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
     out << "global feature idx: " << block.global_feature
         << endl;
     out << std::endl;
+
+    if(block.occupancy[tileX][tileY].bits.no_grow)
+        out << "no grow" << endl;
+
+    for(size_t e=0; e<block.block_events.size(); e++)
+    {            
+        df::block_square_event * blev = block.block_events[e];
+        df::block_square_event_type blevtype = blev->getType();
+        switch(blevtype)
+        {
+        case df::block_square_event_type::grass:
+            {
+                df::block_square_event_grassst * gr_ev = (df::block_square_event_grassst *)blev;
+                if(gr_ev->amount[tileX][tileY] > 0)
+                {
+                    out << "amount of grass: " << (int)gr_ev->amount[tileX][tileY] << endl;
+                }
+                break;
+            }
+        case df::block_square_event_type::world_construction:
+            {
+                df::block_square_event_world_constructionst * co_ev = (df::block_square_event_world_constructionst*)blev;
+                uint16_t bits = co_ev->tile_bitmask[tileY];
+                out << "construction bits: " << bits << endl;
+                break;
+            }
+        default:
+            //out << "unhandled block event type!" << endl;
+            break;
+        }
+    }
+
+
     return CR_OK;
 }
 
@@ -417,14 +450,10 @@ command_result df_bprobe (color_ostream &out, vector <string> & parameters)
             break;
         }
         if(building.origin->is_room)  //isRoom())
-            out << ", is room";
+            out << ", room";
-        else
-            out << ", not a room";
         if(building.origin->getBuildStage()!=building.origin->getMaxBuildStage())
             out << ", in construction";
         out.print("\n");
-
-
     }
     return CR_OK;
 }

plugins/regrass.cpp

@@ -83,7 +83,12 @@ command_result df_regrass (color_ostream &out, vector <string> & parameters)
             {
                 if (   tileShape(cur->tiletype[x][y]) != tiletype_shape::FLOOR
                     || cur->designation[x][y].bits.subterranean
-                    || cur->occupancy[x][y].bits.building)
+                    || cur->occupancy[x][y].bits.building
+                    || cur->occupancy[x][y].bits.no_grow)
+                    continue;
+
+                // don't touch furrowed tiles (dirt roads made on soil)
+                if(tileSpecial(cur->tiletype[x][y]) == tiletype_special::FURROWED)
                     continue;
 
                 int mat = tileMaterial(cur->tiletype[x][y]);
@@ -93,6 +98,7 @@ command_result df_regrass (color_ostream &out, vector <string> & parameters)
                     )
                     continue;
 
+
                 // max = set amounts of all grass events on that tile to 100
                 if(max)
                 {