From 2e8c342b5790f2bb2e8fd6d84ffc61077792b5b3 Mon Sep 17 00:00:00 2001
From: DraugTheWhopper <nkipps@gmail.com>
Date: Wed, 3 Nov 2021 00:59:36 -0400
Subject: [PATCH] Deprecate shop_general, adding its item into random_tool
 instead, so they are now a member of shop_random.

---
 crafting/Tools/random_tool.trs |  5 +++++
 shop/Floors/shop_gener.arc     |  1 +
 shop/Floors/shop_gener.trs     |  1 +
 shop/Floors/shop_random.trs    | 16 ++++++++++++++++
 treasures.trs                  | 16 ----------------
 5 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 shop/Floors/shop_random.trs

diff --git a/crafting/Tools/random_tool.trs b/crafting/Tools/random_tool.trs
index 4940a17f2..93afd5918 100644
--- a/crafting/Tools/random_tool.trs
+++ b/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
diff --git a/shop/Floors/shop_gener.arc b/shop/Floors/shop_gener.arc
index a4c44dbce..970f3fb39 100644
--- a/shop/Floors/shop_gener.arc
+++ b/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
diff --git a/shop/Floors/shop_gener.trs b/shop/Floors/shop_gener.trs
index 67c7582a4..3bda5089e 100644
--- a/shop/Floors/shop_gener.trs
+++ b/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
diff --git a/shop/Floors/shop_random.trs b/shop/Floors/shop_random.trs
new file mode 100644
index 000000000..fff0a873a
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/treasures.trs b/treasures.trs
index c07dcab54..c21b57ae7 100644
--- a/treasures.trs
+++ b/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