diff --git a/cave/caveitems.php b/cave/caveitems.php
deleted file mode 100644
index 6cebcdf..0000000
--- a/cave/caveitems.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-if($user['room'] == 621) {
-  $caveitems[1] = array(array('id' => 1126, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 50, 'podzem' => 1));
-  $caveitems[2] = array(array('id' => 1125, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 40, 'podzem' => 1));
-  $caveitems[3] = array(array('id' => 1127, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 15, 'podzem' => 1));
-  $caveitems[4] = array(array('id' => 1128, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 5, 'podzem' => 1));
-  $caveitems[5] = array(array('id' => 1126, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 60, 'podzem' => 1));
-  $caveitems[6] = array(array('id' => 1130, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 7), 'podzem' => 1);
-  $caveitems[7] = array(array('id' => 1129, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 10, 'podzem' => 1));
-  $caveitems[8] = array(array('id' => 1131, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 5, 'podzem' => 1));
-}
diff --git a/classes/cave/CaveBots.php b/classes/cave/CaveBots.php
new file mode 100644
index 0000000..86d6360
--- /dev/null
+++ b/classes/cave/CaveBots.php
@@ -0,0 +1,24 @@
+<?php
+
+trait CaveBots
+{
+    public static $bots = [
+        1 => 10025,
+        2 => 10026,
+        3 => 10027,
+        4 => 10028,
+        5 => 10031,
+        6 => 10032,
+        7 => 10033,
+        8 => 10034];
+    public static $botnames = [
+        1 => "Паук",
+        2 => "Тарантул",
+        3 => "Гигантская крыса",
+        4 => "Покровитель нечести",
+        5 => "Нечто",
+        6 => "Обезумевший крыс",
+        7 => "Призрак короля крыс ",
+        8 => "Обезумевший палач"];
+}
+
diff --git a/classes/cave/CaveItems.php b/classes/cave/CaveItems.php
new file mode 100644
index 0000000..3eb5a54
--- /dev/null
+++ b/classes/cave/CaveItems.php
@@ -0,0 +1,18 @@
+<?php
+
+trait CaveItems
+{
+    static function getCaveItems($room)
+    {
+        if ($room == 621) {
+            $caveitems[1] = [['id' => 1126, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 50, 'podzem' => 1]];
+            $caveitems[2] = [['id' => 1125, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 40, 'podzem' => 1]];
+            $caveitems[3] = [['id' => 1127, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 15, 'podzem' => 1]];
+            $caveitems[4] = [['id' => 1128, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 5, 'podzem' => 1]];
+            $caveitems[5] = [['id' => 1126, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 60, 'podzem' => 1]];
+            $caveitems[6] = [['id' => 1130, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 7], 'podzem' => 1];
+            $caveitems[7] = [['id' => 1129, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 10, 'podzem' => 1]];
+            $caveitems[8] = [['id' => 1131, 'from' => 'shop', 'foronetrip' => 0, 'chance' => 5, 'podzem' => 1]];
+        }
+    }
+}
\ No newline at end of file
diff --git a/classes/cave/cave_bots.php b/classes/cave/cave_bots.php
deleted file mode 100644
index ee38d70..0000000
--- a/classes/cave/cave_bots.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?
-$bots = array(1 => 10025, 2 => 10026, 3 => 10027, 4 => 10028, 5 => 10031, 6 => 10032, 7 => 10033, 8 => 10034);
-$botnames = array(1 => "Паук", 2 => "Тарантул", 3 => "Гигантская крыса", 4 => "Покровитель нечести", 5 => "Нечто", 6 => "Обезумевший крыс", 7 => "Призрак короля крыс ", 8 => "Обезумевший палач");  
-