Merge branch 'master' into toams/serverdata-omatt/serverdata-Training_roomtoams/serverdata-omatt/serverdata-Training_room

2 files changed, 43 insertions, 38 deletions

diff --git a/db/map_index.txt b/db/map_index.txt
index 9885b94d..a0edf6c9 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -53,41 +53,42 @@
 001-2-9 53
 001-3-0 54
 001-3-1 55
-008-1-1 56
-008-1 57
-008-2-0 58
-008-2-1 59
-008-2-10 60
-008-2-11 61
-008-2-12 62
-008-2-13 63
-008-2-14 64
-008-2-15 65
-008-2-16 66
-008-2-17 67
-008-2-18 68
-008-2-19 69
-008-2-2 70
-008-2-20 71
-008-2-21 72
-008-2-22 73
-008-2-23 74
-008-2-24 75
-008-2-25 76
-008-2-26 77
-008-2-27 78
-008-2-28 79
-008-2-29 80
-008-2-3 81
-008-2-30 82
-008-2-4 83
-008-2-5 84
-008-2-6 85
-008-2-7 86
-008-2-8 87
-008-2-9 88
-008-3-0 89
-008-3-1 90
-008-4-1 91
-test 92
-testbg 93
+001-3-2 56
+008-1-1 57
+008-1 58
+008-2-0 59
+008-2-1 60
+008-2-10 61
+008-2-11 62
+008-2-12 63
+008-2-13 64
+008-2-14 65
+008-2-15 66
+008-2-16 67
+008-2-17 68
+008-2-18 69
+008-2-19 70
+008-2-2 71
+008-2-20 72
+008-2-21 73
+008-2-22 74
+008-2-23 75
+008-2-24 76
+008-2-25 77
+008-2-26 78
+008-2-27 79
+008-2-28 80
+008-2-29 81
+008-2-3 82
+008-2-30 83
+008-2-4 84
+008-2-5 85
+008-2-6 86
+008-2-7 87
+008-2-8 88
+008-2-9 89
+008-3-0 90
+008-3-1 91
+008-4-1 92
+test 93
+testbg 94
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 081305f7..2353115e 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -189,6 +189,10 @@ quest_db: (
 	Name: "General_Cooking"
 },
 {
+	Id: 42
+	Name: "General_Brotherhood"
+},
+{
 	Id: 1000
 	Name: "Test_testing1"
 },