Deprecate shop_general, adding its item into random_tool instead, so they are now a member of shop_random.

crafting/Tools/random_tool.trs

@@ -30,4 +30,9 @@ treasureone random_tool
   more
   arch fishing_pole2
     chance 3
+  list containers
+    chance 7
+  more
+  arch key
+    chance 3
   end

shop/Floors/shop_gener.arc

@@ -1,3 +1,4 @@
+# This is deprecated, and shop_random should be used instead.
 Object shop_general
 name general items tile
 is_floor 1

shop/Floors/shop_gener.trs

@@ -1,3 +1,4 @@
+# This is only used for the shop_general floor tile, which is deprecated.
 treasureone shop_general
   list containers
     chance 70

shop/Floors/shop_random.trs

@@ -0,0 +1,16 @@
+treasureone random_shop
+  list random_weapon
+    chance 10
+  more
+  list random_armour
+    chance 10
+  more
+  list random_food
+    chance 10
+  more
+  list random_special
+    chance 5
+  more
+  list random_tool
+    chance 5
+  end

treasures.trs

@@ -173,22 +173,6 @@ treasureone needle_diseases
   arch flaming_fart
     chance 20
   end
-treasureone random_shop
-  list random_weapon
-    chance 10
-  more
-  list random_armour
-    chance 10
-  more
-  list random_food
-    chance 10
-  more
-  list random_special
-    chance 5
-  more
-  list random_tool
-    chance 5
-  end
 treasureone random_weapon
   list missile_weapons
     chance 5