feat: Make fruit trees transplantable, take 2

data/json/itemgroups/Locations_MapExtras/locations.json

@@ -464,7 +464,8 @@
       [ "frame", 20 ],
       [ "hdframe", 20 ],
       [ "cu_pipe", 25 ],
-      [ "scrap_copper", 50 ]
+      [ "scrap_copper", 50 ],
+      [ "treespade", 5 ]
     ]
   },
   {
@@ -909,7 +910,8 @@
       [ "tourist_table", 10 ],
       [ "canister_empty", 45 ],
       [ "tongs", 10 ],
-      [ "pressure_cooker", 10 ]
+      [ "pressure_cooker", 10 ],
+      [ "treespade", 5 ]
     ]
   },
   {
@@ -1482,7 +1484,8 @@
       [ "one_year_old_newspaper", 2 ],
       { "group": "newspaper_recent", "prob": 15 },
       [ "foodperson_mask", 1 ],
-      [ "survnote", 1 ]
+      [ "survnote", 1 ],
+      [ "treespade", 5 ]
     ]
   },
   {

data/json/itemgroups/collections_trades.json

@@ -8,7 +8,8 @@
       { "group": "supplies_hardware", "prob": 50 },
       { "group": "hardware_clothing", "prob": 10 },
       [ "survnote", 1 ],
-      [ "atomic_butterchurn", 1 ]
+      [ "atomic_butterchurn", 1 ],
+      [ "treespade", 6 ]
     ]
   },
   {

data/json/itemgroups/supplies.json

@@ -110,7 +110,8 @@
       { "item": "nail", "prob": 60, "count": [ 5, 20 ] },
       { "item": "hinge", "prob": 60, "count": [ 5, 10 ] },
       { "item": "tempered_glass_sheet", "prob": 30, "count": [ 5, 20 ] },
-      { "item": "rigid_plastic_sheet", "prob": 30, "count": [ 5, 20 ] }
+      { "item": "rigid_plastic_sheet", "prob": 30, "count": [ 5, 20 ] },
+      { "item": "bag_canvas_replanting", "prob": 10 }
     ]
   },
   {
@@ -269,7 +270,8 @@
       [ "tempered_glass_sheet", 25 ],
       [ "rigid_plastic_sheet", 30 ],
       [ "trash_can_empty", 25 ],
-      [ "sandpaper", 15 ]
+      [ "sandpaper", 15 ],
+      [ "bag_canvas_replanting", 5 ]
     ]
   },
   {
@@ -347,7 +349,8 @@
       [ "fertilizer_commercial", 100 ],
       [ "fertilizer_liquid", 60 ],
       [ "material_quicklime", 80 ],
-      { "item": "chem_saltpetre", "prob": 15, "charges-min": 10, "charges-max": 50 }
+      { "item": "chem_saltpetre", "prob": 15, "charges-min": 10, "charges-max": 50 },
+      [ "bag_canvas_replanting", 15 ]
     ]
   },
   {

data/json/itemgroups/tools.json

@@ -573,7 +573,8 @@
       [ "saw", 100 ],
       [ "circsaw_off", 50 ],
       [ "circsaw_blade", 10 ],
-      [ "elec_chainsaw_off", 35 ]
+      [ "elec_chainsaw_off", 35 ],
+      [ "treespade", 15 ]
     ]
   },
   {

data/json/items/containers.json

@@ -1406,5 +1406,22 @@
     "color": "white",
     "contains": "2 L",
     "//": "Pseudo-container in order to make the hack work."
+  },
+  {
+    "id": "bag_canvas_replanting",
+    "type": "CONTAINER",
+    "category": "container",
+    "name": { "str": "arboreal canvas sack" },
+    "looks_like": "bag_plastic",
+    "description": "An enormous canvas sack, big enough to wrap around a tree's rootball and keep it hydrated.",
+    "weight": "2 kg",
+    "volume": "100 L",
+    "price": 0,
+    "price_postapoc": 10,
+    "to_hit": -5,
+    "material": [ "cotton" ],
+    "symbol": ")",
+    "color": "brown",
+    "contains": "500 L"
   }
 ]

data/json/items/fake.json

@@ -833,5 +833,13 @@
     "volume": "0 ml",
     "flags": [ "PSEUDO", "PERPETUAL" ],
     "fuel": { "energy": 1 }
+  },
+  {
+    "id": "fake_treespade",
+    "copy-from": "fake_item",
+    "type": "TOOL",
+    "name": { "str_sp": "tree spade" },
+    "flags": "TRADER_AVOID",
+    "qualities": [ [ "TREE_PULL", 1 ] ]
   }
 ]