6 files changed, 20 insertions, 8 deletions
diff --git a/LICENSE b/LICENSE
index bb2ac025..1bc4f850 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1610,7 +1610,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 
 ## Tilesets
 	graphics/tilesets/accessory.png (Alige, Coolkid782, Hal9000, Len, Reid) (CC BY-SA 3.0)          (-)
-	graphics/tilesets/arena.png (???)                                       (???)                   (TMW.org)
+	graphics/tilesets/arena.png (?)                                         (GPLv2)                 (TMW.org)
 	graphics/tilesets/arrows.png (-)                                        (CC0)                   (-)
 	graphics/tilesets/artis-accessory.png (EJlol, IvanMorve, Len, Reid)     (CC BY-SA 3.0)          (Saweres)
 	graphics/tilesets/artis-accessory-x1x2.png (EJlol, IvanMorve, Reid)     (CC BY-SA 3.0)          (-)
@@ -1697,6 +1697,7 @@ https://gitlab.com/TMW2/Docs/wikis/Contributors
 	graphics/tilesets/desert2.png (?,wushin)                                (GPLv2)                 (Saulc)
 	graphics/tilesets/desert2_old.png (?,wushin)                            (GPLv2)                 (-)
 	graphics/tilesets/desert3.png ((?,wushin)                               (GPLv2)                 (Saulc)
+	graphics/tilesets/desert_arena.png (?)                                  (GPLv2)                 (Saulc)
 	graphics/tilesets/desert_castle.png (Alige, EJlol, Irukard, IvanMorve)  (GPLv2)                 (Len, MerlinX420, Wushin)
 	graphics/tilesets/desert_castle2.png (Alige, EJlol, Irukard, IvanMorve) (GPLv2)                 (Len, MerlinX420, Wushin)
 	graphics/tilesets/desert_castle_interior.png (Alige, EJlol, Irukard)    (GPLv2)                 (IvanMorve, Len, MerlinX420, Wushin)
diff --git a/graphics/tilesets/desert_arena.png b/graphics/tilesets/desert_arena.png
new file mode 100644
index 00000000..4138a97d
--- /dev/null
+++ b/graphics/tilesets/desert_arena.png
diff --git a/maps/020-3.tmx b/maps/020-3.tmx
index d09d8165..0481f52c 100644
--- a/maps/020-3.tmx
+++ b/maps/020-3.tmx
@@ -4,7 +4,7 @@
   <property name="author" value="TMW2 Team"/>
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value="graphics/minimaps/020-2.png"/>
+  <property name="minimap" value="graphics/minimaps/020-3.png"/>
   <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Nivalis Indoors"/>
  </properties>
@@ -421,6 +421,9 @@
 </data>
  </layer>
  <layer name="OverChristmas" width="61" height="59">
+  <properties>
+   <property name="Mask" value="128"/>
+  </properties>
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/020-4.tmx b/maps/020-4.tmx
index c11dc3f8..7b97de8a 100644
--- a/maps/020-4.tmx
+++ b/maps/020-4.tmx
@@ -4,7 +4,7 @@
   <property name="author" value="TMW2 Team"/>
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value="graphics/minimaps/020-2.png"/>
+  <property name="minimap" value="graphics/minimaps/020-4.png"/>
   <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Nivalis Indoors"/>
  </properties>
@@ -596,6 +596,9 @@
 </data>
  </layer>
  <layer name="OverChristmas" width="94" height="75" visible="0">
+  <properties>
+   <property name="Mask" value="128"/>
+  </properties>
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/maps/020-5.tmx b/maps/020-5.tmx
index 680ce761..5debe2b6 100644
--- a/maps/020-5.tmx
+++ b/maps/020-5.tmx
@@ -4,7 +4,7 @@
   <property name="author" value="TMW2 Team"/>
   <property name="license" value="GPL v2+"/>
   <property name="manaplus version" value="2"/>
-  <property name="minimap" value="graphics/minimaps/020-2.png"/>
+  <property name="minimap" value="graphics/minimaps/020-5.png"/>
   <property name="music" value="8bit_the_hero.ogg"/>
   <property name="name" value="Nivalis Indoors"/>
  </properties>
@@ -484,6 +484,9 @@
 </data>
  </layer>
  <layer name="OverChristmas" width="61" height="59">
+  <properties>
+   <property name="Mask" value="128"/>
+  </properties>
   <data encoding="csv">
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/quests.xml b/quests.xml
index a2ea1158..d0f2506b 100644
--- a/quests.xml
+++ b/quests.xml
@@ -169,11 +169,13 @@ Copyright (C) 2018 TMW2: Moubootaur Legends -->
             <reward text1="[Creased Boots]">1x {@@1}</reward>
         </quest>
     </var>
-    <!--
-    <var id="9">
-        Secret Quest
+    <var id="9" nowiki="1">
+        <quest name="Drunken Bottle" group="Ship" complete="1">
+            <name>Drunken Bottle</name>
+            <text>You got an empty bottle from a drunken sailor.</text>
+            <text>They should stop drinking!</text>
+        </quest>
     </var>
-    -->
 
     <!-- GENERAL QUESTS -->
     <var id="11">