Properly obsolete burdock stalks (#68579)

* first pass

* burdock_cooked

* fried burdock

* Revert "fried burdock"

This reverts commit 360d140.

* Revert "burdock_cooked"

This reverts commit 4016757.

* Revert "first pass"

This reverts commit e87eb0d.

* second first pass

* words words words

* Revert "Revert "burdock_cooked""

This reverts commit 51f3ff9.

* Obsolete burdock_cooked again because why

* evil

* Revert "Revert "Revert "burdock_cooked"""

This reverts commit 5c15cf5.

* Revert "evil"

This reverts commit b533d26.

* Revert "Obsolete burdock_cooked again because why"

This reverts commit 54db50f.

* Revert "words words words"

This reverts commit 04d93bc.

* now???

data/json/items/comestibles/veggy_dishes.json

@@ -15,9 +15,9 @@
   {
     "type": "COMESTIBLE",
     "id": "cooked_burdock_stalk",
-    "name": { "str": "cooked burdock stalk" },
+    "name": { "str": "cooked plant stalk" },
     "copy-from": "cooked_cattail_stalk",
-    "description": "A cooked stalk from a burdock plant.  Its fibrous outer leaves have been stripped away, and now it is quite delicious."
+    "description": "A cooked stalk from a plant.  Its fibrous outer leaves have been stripped away, and now it is quite delicious."
   },
   {
     "type": "COMESTIBLE",
@@ -786,7 +786,7 @@
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "bell_pepper", "name": { "str_sp": "%s, bell pepper" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "broccoli", "name": { "str_sp": "%s, broccoli" } },
       { "type": "COMPONENT_ID", "condition": "burdock_cooked", "name": { "str_sp": "%s, cooked burdock greens" } },
-      { "type": "COMPONENT_ID", "condition": "burdock_stalk", "name": { "str_sp": "%s, burdock stalk" } },
+      { "type": "COMPONENT_ID", "condition": "plant_stalk", "name": { "str_sp": "%s, plant stalk" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "cabbage", "name": { "str_sp": "%s, cabbage" } },
       { "type": "COMPONENT_ID", "condition": "can_corn", "name": { "str_sp": "%s, corn kernels" } },
       { "type": "COMPONENT_ID", "condition": "carrot", "name": { "str_sp": "%s, carrot" } },
@@ -851,7 +851,7 @@
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "bell_pepper", "name": { "str_sp": "%s, bell pepper" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "broccoli", "name": { "str_sp": "%s, broccoli" } },
       { "type": "COMPONENT_ID", "condition": "burdock_cooked", "name": { "str_sp": "%s, cooked burdock greens" } },
-      { "type": "COMPONENT_ID", "condition": "burdock_stalk", "name": { "str_sp": "%s, burdock stalk" } },
+      { "type": "COMPONENT_ID", "condition": "plant_stalk", "name": { "str_sp": "%s, plant stalk" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "cabbage", "name": { "str_sp": "%s, cabbage" } },
       { "type": "COMPONENT_ID", "condition": "can_corn", "name": { "str_sp": "%s, corn kernels" } },
       { "type": "COMPONENT_ID", "condition": "carrot", "name": { "str_sp": "%s, carrot" } },
@@ -998,7 +998,7 @@
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "bell_pepper", "name": { "str_sp": "%s, bell pepper" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "broccoli", "name": { "str_sp": "%s, broccoli" } },
       { "type": "COMPONENT_ID", "condition": "burdock_cooked", "name": { "str_sp": "%s, cooked burdock greens" } },
-      { "type": "COMPONENT_ID", "condition": "burdock_stalk", "name": { "str_sp": "%s, burdock stalk" } },
+      { "type": "COMPONENT_ID", "condition": "plant_stalk", "name": { "str_sp": "%s, plant stalk" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "cabbage", "name": { "str_sp": "%s, cabbage" } },
       { "type": "COMPONENT_ID", "condition": "carrot", "name": { "str_sp": "%s, carrot" } },
       { "type": "COMPONENT_ID", "condition": "carrot_wild", "name": { "str_sp": "%s, wild root" } },
@@ -1079,7 +1079,7 @@
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "bell_pepper", "name": { "str_sp": "%s, bell pepper" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "broccoli", "name": { "str_sp": "%s, broccoli" } },
       { "type": "COMPONENT_ID", "condition": "burdock_cooked", "name": { "str_sp": "%s, cooked burdock greens" } },
-      { "type": "COMPONENT_ID", "condition": "burdock_stalk", "name": { "str_sp": "%s, burdock stalk" } },
+      { "type": "COMPONENT_ID", "condition": "plant_stalk", "name": { "str_sp": "%s, plant stalk" } },
       { "type": "COMPONENT_ID_SUBSTRING", "condition": "cabbage", "name": { "str_sp": "%s, cabbage" } },
       { "type": "COMPONENT_ID", "condition": "carrot", "name": { "str_sp": "%s, carrot" } },
       { "type": "COMPONENT_ID", "condition": "carrot_wild", "name": { "str_sp": "%s, wild root" } },

data/json/obsoletion/obsolete_items.json

@@ -1163,12 +1163,5 @@
     "dispersion": 50,
     "recoil": 350,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
-  },
-  {
-    "type": "COMESTIBLE",
-    "id": "burdock_stalk",
-    "name": { "str": "burdock stalk" },
-    "description": "A stiff, green stalk from a burdock plant.  It is starchy and fibrous, but it would be much better if you cooked it.",
-    "copy-from": "cattail_stalk"
   }
 ]

data/json/recipes/recipe_food.json

@@ -1848,7 +1848,7 @@
     "activity_level": "LIGHT_EXERCISE",
     "result": "cooked_burdock_stalk",
     "copy-from": "cooked_cattail_stalk",
-    "components": [ [ [ "burdock_stalk", 1 ] ] ]
+    "components": [ [ [ "plant_stalk", 1 ] ] ]
   },
   {
     "type": "recipe",

data/json/requirements/cooking_components.json

@@ -1126,7 +1126,7 @@
         [ "carrot", 2 ],
         [ "irradiated_carrot", 2 ],
         [ "cattail_stalk", 1 ],
-        [ "burdock_stalk", 1 ],
+        [ "plant_stalk", 1 ],
         [ "celery", 1 ],
         [ "irradiated_celery", 1 ],
         [ "corn_kernels", 1 ],