Migrate seasonal harvested underbrush to t_underbrush_harvested (#82420)

Procyonae · web-flow · commit 5aa86eca78e9 · 2025-08-13T15:09:00.000+02:00
* Migrate seasonal harvested underbrush to t_underbrush_harvested

* t_underbrush_harvested_winter is a SHRUB

* Somehow forgot to mark it harvested, good job sleepy me
diff --git a/data/json/furniture_and_terrain/terrain-flora.json b/data/json/furniture_and_terrain/terrain-flora.json
@@ -1541,6 +1541,7 @@
       "SMALL_HIDE"
     ],
     "examine_action": "shrub_wildveggies",
+    "transforms_into": "t_underbrush_harvested",
     "bash": {
       "str_min": 4,
       "str_max": 30,
@@ -1552,131 +1553,14 @@
   },
   {
     "type": "terrain",
-    "id": "t_underbrush_harvested_spring",
-    "name": "underbrush",
-    "looks_like": "t_underbrush",
-    "description": "Small plants and shrubs that decorate the forest.  It has been rummaged through and doesn't have anything useful left to forage from it.",
-    "symbol": "#",
-    "color": "green",
-    "move_cost": 6,
-    "coverage": 40,
-    "flags": [
-      "TRANSPARENT",
-      "DIGGABLE",
-      "CONTAINER",
-      "FLAMMABLE_ASH",
-      "THIN_OBSTACLE",
-      "PLACE_ITEM",
-      "SHRUB",
-      "SHORT",
-      "HARVESTED",
-      "SMALL_HIDE"
-    ],
-    "transforms_into": "t_underbrush",
-    "bash": {
-      "str_min": 4,
-      "str_max": 30,
-      "sound": "crunch.",
-      "sound_fail": "brush.",
-      "ter_set": "t_dirt",
-      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
-    }
-  },
-  {
-    "type": "terrain",
-    "id": "t_underbrush_harvested_summer",
-    "name": "underbrush",
-    "looks_like": "t_underbrush",
-    "description": "Small plants and shrubs that decorate the forest.  It has been rummaged through and doesn't have anything useful left to forage from it.",
-    "symbol": "#",
-    "color": "green",
-    "move_cost": 6,
-    "coverage": 40,
-    "flags": [
-      "TRANSPARENT",
-      "DIGGABLE",
-      "CONTAINER",
-      "FLAMMABLE_ASH",
-      "THIN_OBSTACLE",
-      "PLACE_ITEM",
-      "SHRUB",
-      "SHORT",
-      "HARVESTED",
-      "SMALL_HIDE"
-    ],
-    "transforms_into": "t_underbrush",
-    "bash": {
-      "str_min": 4,
-      "str_max": 30,
-      "sound": "crunch.",
-      "sound_fail": "brush.",
-      "ter_set": "t_dirt",
-      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
-    }
-  },
-  {
-    "type": "terrain",
-    "id": "t_underbrush_harvested_autumn",
-    "name": "underbrush",
-    "looks_like": "t_underbrush",
+    "id": "t_underbrush_harvested",
+    "copy-from": "t_underbrush",
+    "looks_like": "t_underbrush_harvested_spring",
     "description": "Small plants and shrubs that decorate the forest.  It has been rummaged through and doesn't have anything useful left to forage from it.",
-    "symbol": "#",
-    "color": "green",
-    "move_cost": 6,
-    "coverage": 40,
-    "flags": [
-      "TRANSPARENT",
-      "DIGGABLE",
-      "CONTAINER",
-      "FLAMMABLE_ASH",
-      "THIN_OBSTACLE",
-      "PLACE_ITEM",
-      "SHRUB",
-      "SHORT",
-      "HARVESTED",
-      "SMALL_HIDE"
-    ],
-    "transforms_into": "t_underbrush",
-    "bash": {
-      "str_min": 4,
-      "str_max": 30,
-      "sound": "crunch.",
-      "sound_fail": "brush.",
-      "ter_set": "t_dirt",
-      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
-    }
-  },
-  {
-    "type": "terrain",
-    "id": "t_underbrush_harvested_winter",
-    "name": "underbrush",
-    "looks_like": "t_underbrush",
-    "description": "Small plants and shrubs that decorate the forest.  It has been rummaged through and doesn't have anything useful left to forage from it.  Frost covers it.",
-    "symbol": "#",
     "color": "green",
-    "move_cost": 6,
-    "coverage": 40,
-    "flags": [
-      "TRANSPARENT",
-      "DIGGABLE",
-      "CONTAINER",
-      "FLAMMABLE_ASH",
-      "THIN_OBSTACLE",
-      "PLACE_ITEM",
-      "SHRUB",
-      "SHORT",
-      "HARVESTED",
-      "SMALL_HIDE"
-    ],
-    "transforms_into": "t_underbrush",
-    "bash": {
-      "str_min": 4,
-      "str_max": 30,
-      "sound": "crunch.",
-      "sound_fail": "brush.",
-      "ter_set": "t_dirt",
-      "items": [ { "item": "withered", "prob": 50, "count": [ 1, 2 ] } ]
-    }
+    "examine_action": "harvested_plant",
+    "extend": { "flags": [ "HARVESTED" ] },
+    "transforms_into": "t_underbrush"
   },
   {
     "type": "terrain",
diff --git a/data/json/monsters/singularities.json b/data/json/monsters/singularities.json
@@ -221,10 +221,7 @@
           "t_forestfloor",
           "t_moss",
           "t_underbrush",
-          "t_underbrush_harvested_spring",
-          "t_underbrush_harvested_summer",
-          "t_underbrush_harvested_autumn",
-          "t_underbrush_harvested_winter",
+          "t_underbrush_harvested",
           "t_fern",
           "t_fern_harvested",
           "t_tree_young"
diff --git a/data/json/obsoletion_and_migration_0.J/terrain.json b/data/json/obsoletion_and_migration_0.J/terrain.json
@@ -0,0 +1,22 @@
+[
+  {
+    "type": "ter_furn_migration",
+    "from_ter": "t_underbrush_harvested_spring",
+    "to_ter": "t_underbrush_harvested"
+  },
+  {
+    "type": "ter_furn_migration",
+    "from_ter": "t_underbrush_harvested_summer",
+    "to_ter": "t_underbrush_harvested"
+  },
+  {
+    "type": "ter_furn_migration",
+    "from_ter": "t_underbrush_harvested_autumn",
+    "to_ter": "t_underbrush_harvested"
+  },
+  {
+    "type": "ter_furn_migration",
+    "from_ter": "t_underbrush_harvested_winter",
+    "to_ter": "t_underbrush_harvested"
+  }
+]
diff --git a/data/mods/Magiclysm/effect_on_conditions/spellcasting/caster_level_boosts.json b/data/mods/Magiclysm/effect_on_conditions/spellcasting/caster_level_boosts.json
@@ -217,8 +217,7 @@
                 { "u_is_on_terrain": "t_grass_tall" },
                 { "u_is_on_terrain": "t_grass_long" },
                 { "u_is_on_terrain": "t_bamboo" },
-                { "u_is_on_terrain": "t_bamboo_harvested" },
-                { "u_is_on_terrain": "t_underbrush_harvested_winter" }
+                { "u_is_on_terrain": "t_bamboo_harvested" }
               ]
             },
             "effect": { "math": [ "u_level_boost = 2" ] }
diff --git a/data/mods/Magiclysm/mutations/mutation_paths/fantasy_species.json b/data/mods/Magiclysm/mutations/mutation_paths/fantasy_species.json
@@ -444,7 +444,6 @@
             { "u_is_on_terrain": "t_grass_long" },
             { "u_is_on_terrain": "t_bamboo" },
             { "u_is_on_terrain": "t_bamboo_harvested" },
-            { "u_is_on_terrain": "t_underbrush_harvested_winter" },
             { "u_is_on_terrain": "t_grass" },
             { "u_is_on_terrain": "t_grass_white" },
             { "u_is_on_terrain": "t_moss" },
diff --git a/data/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json b/data/mods/Magiclysm/ter_fur_transform/ter_fur_transform.json
@@ -366,10 +366,7 @@
           "t_forestfloor",
           "t_moss",
           "t_underbrush",
-          "t_underbrush_harvested_spring",
-          "t_underbrush_harvested_summer",
-          "t_underbrush_harvested_autumn",
-          "t_underbrush_harvested_winter",
+          "t_underbrush_harvested",
           "t_fern",
           "t_fern_harvested",
           "t_tree_young"
diff --git a/data/mods/Xedra_Evolved/effects/goblin_fruit_effects.json b/data/mods/Xedra_Evolved/effects/goblin_fruit_effects.json
@@ -441,7 +441,6 @@
             { "u_is_on_terrain": "t_grass_long" },
             { "u_is_on_terrain": "t_bamboo" },
             { "u_is_on_terrain": "t_bamboo_harvested" },
-            { "u_is_on_terrain": "t_underbrush_harvested_winter" },
             { "u_is_on_terrain": "t_grass" },
             { "u_is_on_terrain": "t_grass_white" },
             { "u_is_on_terrain": "t_moss" },
diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/arvore_mutations.json
@@ -132,7 +132,6 @@
             { "u_is_on_terrain": "t_grass_long" },
             { "u_is_on_terrain": "t_bamboo" },
             { "u_is_on_terrain": "t_bamboo_harvested" },
-            { "u_is_on_terrain": "t_underbrush_harvested_winter" },
             { "u_is_on_terrain": "t_grass" },
             { "u_is_on_terrain": "t_grass_white" },
             { "u_is_on_terrain": "t_moss" },
@@ -169,7 +168,6 @@
             { "u_is_on_terrain": "t_grass_long" },
             { "u_is_on_terrain": "t_bamboo" },
             { "u_is_on_terrain": "t_bamboo_harvested" },
-            { "u_is_on_terrain": "t_underbrush_harvested_winter" },
             { "u_is_on_terrain": "t_grass" },
             { "u_is_on_terrain": "t_grass_white" },
             { "u_is_on_terrain": "t_moss" },
diff --git a/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json b/data/mods/aftershock_exoplanet/maps/furniture_and_terrain/terrain_groundxeno.json
@@ -5,7 +5,7 @@
     "name": "lichen",
     "description": "Many colorful species of ice-lichen, thriving above an uncharacteristically fertile segment of ice.  Either endemic, or surviving genecraft from an aborted terraforming project.",
     "symbol": ".",
-    "looks_like": "t_underbrush_harvested_spring_season_autumn",
+    "looks_like": "t_underbrush_harvested",
     "color": "light_red",
     "move_cost": 2,
     "coverage": 40,
@@ -18,7 +18,7 @@
     "name": "lichen bed",
     "description": "Familiar, yet unfamiliar.  Lichens and moss cling to rocks and lifeless dirt here, providing a squishy but colorful grass.",
     "symbol": ",",
-    "looks_like": "t_underbrush_harvested_spring_season_autumn",
+    "looks_like": "t_underbrush_harvested",
     "color": "light_red",
     "move_cost": 3,
     "coverage": 40,
diff --git a/data/mods/aftershock_exoplanet/maps/mapgen/prepnet_orchard.json b/data/mods/aftershock_exoplanet/maps/mapgen/prepnet_orchard.json
@@ -31,7 +31,7 @@
         "FFFFFFFFFFFFFFFFFFFFFFFF"
       ],
       "terrain": {
-        "#": "t_underbrush_harvested_spring",
+        "#": "t_underbrush_harvested",
         "+": "t_door_c",
         " ": "t_region_groundcover_urban",
         "-": "t_fence",
@@ -125,7 +125,7 @@
         "p": "t_grass",
         "s": "t_shrub_blueberry",
         "t": "t_tree_apricot",
-        "u": "t_underbrush_harvested_spring",
+        "u": "t_underbrush_harvested",
         "w": "t_wall_log",
         "F": "t_fence_barbed"
       },
diff --git a/src/activity_actor.cpp b/src/activity_actor.cpp
@@ -283,10 +283,6 @@ static const ter_str_id ter_t_door_metal_c( "t_door_metal_c" );
 static const ter_str_id ter_t_door_metal_locked( "t_door_metal_locked" );
 static const ter_str_id ter_t_stump( "t_stump" );
 static const ter_str_id ter_t_trunk( "t_trunk" );
-static const ter_str_id ter_t_underbrush_harvested_autumn( "t_underbrush_harvested_autumn" );
-static const ter_str_id ter_t_underbrush_harvested_spring( "t_underbrush_harvested_spring" );
-static const ter_str_id ter_t_underbrush_harvested_summer( "t_underbrush_harvested_summer" );
-static const ter_str_id ter_t_underbrush_harvested_winter( "t_underbrush_harvested_winter" );
 
 static const trait_id trait_NUMB( "NUMB" );
 static const trait_id trait_PSYCHOPATH( "PSYCHOPATH" );
@@ -7548,31 +7544,26 @@ void forage_activity_actor::finish( player_activity &act, Character &who )
     bool found_something = false;
 
     item_group_id group_id;
-    ter_str_id next_ter;
 
     switch( season_of_year( calendar::turn ) ) {
         case SPRING:
             group_id = Item_spawn_data_forage_spring;
-            next_ter = ter_t_underbrush_harvested_spring;
             break;
         case SUMMER:
             group_id = Item_spawn_data_forage_summer;
-            next_ter = ter_t_underbrush_harvested_summer;
             break;
         case AUTUMN:
             group_id = Item_spawn_data_forage_autumn;
-            next_ter = ter_t_underbrush_harvested_autumn;
             break;
         case WINTER:
             group_id = Item_spawn_data_forage_winter;
-            next_ter = ter_t_underbrush_harvested_winter;
             break;
         default:
             debugmsg( "Invalid season" );
     }
 
     const tripoint_bub_ms bush_pos = here.get_bub( act.placement );
-    here.ter_set( bush_pos, next_ter );
+    here.ter_set( bush_pos, here.get_ter_transforms_into( bush_pos ) );
 
     // Survival gives a bigger boost, and Perception is leveled a bit.
     // Both survival and perception affect time to forage
diff --git a/src/sounds.cpp b/src/sounds.cpp
@@ -175,10 +175,7 @@ static const ter_str_id ter_t_slide( "t_slide" );
 static const ter_str_id ter_t_stump( "t_stump" );
 static const ter_str_id ter_t_trunk( "t_trunk" );
 static const ter_str_id ter_t_underbrush( "t_underbrush" );
-static const ter_str_id ter_t_underbrush_harvested_autumn( "t_underbrush_harvested_autumn" );
-static const ter_str_id ter_t_underbrush_harvested_spring( "t_underbrush_harvested_spring" );
-static const ter_str_id ter_t_underbrush_harvested_summer( "t_underbrush_harvested_summer" );
-static const ter_str_id ter_t_underbrush_harvested_winter( "t_underbrush_harvested_winter" );
+static const ter_str_id ter_t_underbrush_harvested( "t_underbrush_harvested" );
 
 static const trait_id trait_HEAVYSLEEPER( "HEAVYSLEEPER" );
 static const trait_id trait_HEAVYSLEEPER2( "HEAVYSLEEPER2" );
@@ -1768,10 +1765,7 @@ void sfx::do_footstep()
             ter_t_shrub_lilac,
             ter_t_shrub_lilac_harvested,
             ter_t_underbrush,
-            ter_t_underbrush_harvested_spring,
-            ter_t_underbrush_harvested_summer,
-            ter_t_underbrush_harvested_autumn,
-            ter_t_underbrush_harvested_winter,
+            ter_t_underbrush_harvested,
             ter_t_moss,
             ter_t_grass_white,
             ter_t_grass_long,
