From f23181ca498283717d646a65bf63fb13e3e73184 Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Tue, 21 Nov 2023 03:56:08 -0800
Subject: [PATCH] Add second floor to Fado bank for Kirdneh chests

---
 data/conf/zones/fado.xml        | 61 +++++++++++++++++++++++-
 tiled/interiors/fado/bank.tmx   | 28 ++++++-----
 tiled/interiors/fado/bank_1.tmx | 83 +++++++++++++++++++++++++++++++++
 3 files changed, 160 insertions(+), 12 deletions(-)
 create mode 100644 tiled/interiors/fado/bank_1.tmx

diff --git a/data/conf/zones/fado.xml b/data/conf/zones/fado.xml
index 6f60f0d0087..b215b628267 100644
--- a/data/conf/zones/fado.xml
+++ b/data/conf/zones/fado.xml
@@ -347,6 +347,10 @@ You'll definitely need a wedding ring. Come here to get yours cast once you are
       <attribute name="move.continuous"/>
     </portal>
 
+    <portal x="13" y="2" ref="stairs_up">
+      <destination zone="int_fado_bank_1" ref="stairs_down"/>
+    </portal>
+
     <entity x="2" y="8">
       <implementation
         class-name="games.stendhal.server.entity.mapstuff.chest.PersonalChest">
@@ -380,7 +384,7 @@ You'll definitely need a wedding ring. Come here to get yours cast once you are
     <entity x="2" y="16">
       <implementation
         class-name="games.stendhal.server.entity.mapstuff.chest.PersonalChest">
-        <parameter name="slot">bank_kirdneh</parameter>
+        <parameter name="slot">bank_fado</parameter>
       </implementation>
     </entity>
 
@@ -394,6 +398,61 @@ You'll definitely need a wedding ring. Come here to get yours cast once you are
 
   </zone>
 
+  <zone name="int_fado_bank_1" file="interiors/fado/bank_1.tmx">
+    <!-- portals -->
+
+    <portal x="13" y="2" ref="stairs_down">
+      <destination zone="int_fado_bank" ref="stairs_up"/>
+    </portal>
+
+    <!-- chests -->
+
+    <entity x="2" y="8">
+      <implementation
+        class-name="games.stendhal.server.entity.mapstuff.chest.PersonalChest">
+        <parameter name="slot">bank_kirdneh</parameter>
+      </implementation>
+    </entity>
+
+    <entity x="2" y="8">
+      <implementation
+        class-name="games.stendhal.server.entity.mapstuff.area.OnePlayerArea">
+        <parameter name="width">5</parameter>
+        <parameter name="height">2</parameter>
+      </implementation>
+    </entity>
+
+    <entity x="2" y="12">
+      <implementation
+        class-name="games.stendhal.server.entity.mapstuff.chest.PersonalChest">
+        <parameter name="slot">bank_kirdneh</parameter>
+      </implementation>
+    </entity>
+
+    <entity x="2" y="12">
+      <implementation
+        class-name="games.stendhal.server.entity.mapstuff.area.OnePlayerArea">
+        <parameter name="width">5</parameter>
+        <parameter name="height">2</parameter>
+      </implementation>
+    </entity>
+
+    <entity x="2" y="16">
+      <implementation
+        class-name="games.stendhal.server.entity.mapstuff.chest.PersonalChest">
+        <parameter name="slot">bank_kirdneh</parameter>
+      </implementation>
+    </entity>
+
+    <entity x="2" y="16">
+      <implementation
+        class-name="games.stendhal.server.entity.mapstuff.area.OnePlayerArea">
+        <parameter name="width">5</parameter>
+        <parameter name="height">2</parameter>
+      </implementation>
+    </entity>
+  </zone>
+
   <zone name="int_fado_bakery" file="interiors/fado/bakery.tmx">
     <!-- NPCs -->
     <configurator class-name="games.stendhal.server.maps.fado.bakery.BakerNPC"/>
diff --git a/tiled/interiors/fado/bank.tmx b/tiled/interiors/fado/bank.tmx
index 2c4207ad069..06036306e7e 100644
--- a/tiled/interiors/fado/bank.tmx
+++ b/tiled/interiors/fado/bank.tmx
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1">
- <tileset firstgid="1" name="int_wall_pale.png" tilewidth="32" tileheight="32" tilecount="16" columns="2">
+ <tileset firstgid="1" name="int_wall_pale" tilewidth="32" tileheight="32" tilecount="16" columns="2">
   <image source="../../tileset/building/wall/int_wall_pale.png" trans="ff00ff" width="64" height="256"/>
  </tileset>
- <tileset firstgid="17" name="int_wall_purple.png" tilewidth="32" tileheight="32" tilecount="20" columns="2">
+ <tileset firstgid="17" name="int_wall_purple" tilewidth="32" tileheight="32" tilecount="20" columns="2">
   <image source="../../tileset/building/wall/int_wall_purple.png" trans="ff00ff" width="64" height="320"/>
  </tileset>
- <tileset firstgid="37" name="pale_red_ns.png" tilewidth="32" tileheight="32" tilecount="36" columns="9">
+ <tileset firstgid="37" name="pale_red_ns" tilewidth="32" tileheight="32" tilecount="36" columns="9">
   <image source="../../tileset/building/entrance/pale_red_ns.png" trans="ff00ff" width="288" height="128"/>
  </tileset>
- <tileset firstgid="73" name="small.png" tilewidth="32" tileheight="32" tilecount="2" columns="1">
+ <tileset firstgid="73" name="chest" tilewidth="32" tileheight="32" tilecount="2" columns="1">
   <image source="../../tileset/item/chest/small.png" trans="ff00ff" width="32" height="64"/>
  </tileset>
- <tileset firstgid="75" name="collision.png" tilewidth="32" tileheight="32" tilecount="1" columns="1">
+ <tileset firstgid="75" name="logic/collision" tilewidth="32" tileheight="32" tilecount="1" columns="1">
   <image source="../../tileset/logic/collision.png" width="32" height="32"/>
  </tileset>
- <tileset firstgid="76" name="protection.png" tilewidth="32" tileheight="32" tilecount="2" columns="2">
+ <tileset firstgid="76" name="logic/protection" tilewidth="32" tileheight="32" tilecount="2" columns="2">
   <image source="../../tileset/logic/protection.png" width="64" height="32"/>
  </tileset>
  <tileset firstgid="78" name="stone_desk" tilewidth="32" tileheight="32" tilecount="16" columns="4">
@@ -54,6 +54,12 @@
  <tileset firstgid="200" name="chests_banner" tilewidth="32" tileheight="32" tilecount="8" columns="1">
   <image source="../../tileset/building/decoration/chests_banner.png" width="32" height="256"/>
  </tileset>
+ <tileset firstgid="208" name="stairs" tilewidth="32" tileheight="32" tilecount="12" columns="2">
+  <image source="../../tileset/building/stairs/stairs.png" width="64" height="192"/>
+ </tileset>
+ <tileset firstgid="220" name="logic/portal" tilewidth="32" tileheight="32" tilecount="24" columns="8">
+  <image source="../../tileset/logic/portal.png" width="256" height="96"/>
+ </tileset>
  <layer id="1" name="0_floor" width="20" height="20">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA9XSuwrCQBCF4TXaqCHYeE1aY6e+o2/gLWoh5k3zL2RAJEHZnMbig4GFgXNmY+dchCNOHecxBshwRYFFwOyl6OOBGQ4dnXHBU7TvhnudV7FvWudV7bO8fl+vRRKYN2oxCcj7D/dV9Pd+X0V/llfVn+VV9Wd5R6L+LG8s6s/yqvqzvOr+/H9ZYf6DNXJsGt6WH/d4ofwyb7HDvuHNG6ICB1jf/UAGAAA=
@@ -61,7 +67,7 @@
  </layer>
  <layer id="2" name="1_terrain" width="20" height="20">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgwA/2APFeAmpIAfuAeD8Z+uKAOB6IE4C4lwj1QUA8EaovAYt8KhCnAXE6iealQvWggxwgzgXiPCLMgpkH04dNzyYizUE3D10vF4nmYDMPGfDgED9DpnnkAnqZNxjDz5N05+A1jxpgoM07T2XzCAFamreSymbTEgAAlwugGUAGAAA=
+   H4sIAAAAAAAAA2NgwA/2APFeAmpIAfuAeD8Z+uKAOB6IE4C4l4DaC0AcBMQTofoSsKhJBeI0IE4nwjwGJPNSoXrQQQ4Q5wJxHhFmwcyD6cOmZxOR5qCbh66Xi0RzsJmHDHhwiJ8h0zxyAb3MG4zh50m6c/CaRw0w0OYNp/S3kspm0xIAAHoSg6NABgAA
   </data>
  </layer>
  <layer id="3" name="2_object" width="20" height="20">
@@ -74,17 +80,17 @@
    H4sIAAAAAAAAA2NgGAXUAOsHSO8oGAWjYGDB4oF2wAACAPWNhYhABgAA
   </data>
  </layer>
- <layer id="5" name="objects" width="20" height="20">
+ <layer id="5" name="objects" width="20" height="20" visible="0">
   <data encoding="base64" compression="gzip">
-   H4sIAAAAAAAAA2NgGAWjYBSMglEwCkgHADV9EcVABgAA
+   H4sIAAAAAAAAA2NgGH7gwUA7YBSMglEwCgYAPKCzfQDzOe8NQAYAAA==
   </data>
  </layer>
- <layer id="6" name="collision" width="20" height="20" opacity="0.22">
+ <layer id="6" name="collision" width="20" height="20" visible="0" opacity="0.22">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA/NmYGDwHmKYGOCNRA9V80gB3mhsUsMS3T5sfFqaRwgMtHmDKfzISSuj4YffPEKAnuaRkn+x2UuJflIxAH4KQi1ABgAA
   </data>
  </layer>
- <layer id="7" name="protection" width="20" height="20" opacity="0.2">
+ <layer id="7" name="protection" width="20" height="20" visible="0" opacity="0.2">
   <data encoding="base64" compression="gzip">
    H4sIAAAAAAAAA/NhYGDwGcWjeBSP4lE8iknEALOiZalABgAA
   </data>
diff --git a/tiled/interiors/fado/bank_1.tmx b/tiled/interiors/fado/bank_1.tmx
new file mode 100644
index 00000000000..9d703d97a3e
--- /dev/null
+++ b/tiled/interiors/fado/bank_1.tmx
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.10" tiledversion="1.10.1" orientation="orthogonal" renderorder="right-down" width="20" height="20" tilewidth="32" tileheight="32" infinite="0" nextlayerid="8" nextobjectid="1">
+ <tileset firstgid="1" name="int_wall_pale" tilewidth="32" tileheight="32" tilecount="16" columns="2">
+  <image source="../../tileset/building/wall/int_wall_pale.png" trans="ff00ff" width="64" height="256"/>
+ </tileset>
+ <tileset firstgid="17" name="int_wall_purple" tilewidth="32" tileheight="32" tilecount="20" columns="2">
+  <image source="../../tileset/building/wall/int_wall_purple.png" trans="ff00ff" width="64" height="320"/>
+ </tileset>
+ <tileset firstgid="37" name="logic/collision" tilewidth="32" tileheight="32" tilecount="1" columns="1">
+  <image source="../../tileset/logic/collision.png" width="32" height="32"/>
+ </tileset>
+ <tileset firstgid="38" name="logic/protection" tilewidth="32" tileheight="32" tilecount="2" columns="2">
+  <image source="../../tileset/logic/protection.png" width="64" height="32"/>
+ </tileset>
+ <tileset firstgid="40" name="vendors_table" tilewidth="32" tileheight="32" tilecount="35" columns="7">
+  <image source="../../tileset/furniture/table/vendors_table.png" trans="ff00ff" width="224" height="160"/>
+ </tileset>
+ <tileset firstgid="75" name="floors_3" tilewidth="32" tileheight="32" tilecount="12" columns="6">
+  <image source="../../tileset/ground/indoor/floors_3.png" trans="ff00ff" width="192" height="64"/>
+ </tileset>
+ <tileset firstgid="87" name="wooden" tilewidth="32" tileheight="32" tilecount="5" columns="5">
+  <image source="../../tileset/furniture/chair/wooden.png" trans="ff00ff" width="160" height="32"/>
+ </tileset>
+ <tileset firstgid="92" name="int_windows_purple" tilewidth="32" tileheight="32" tilecount="16" columns="4">
+  <image source="../../tileset/building/window/int_windows_purple.png" trans="ff00ff" width="128" height="128"/>
+ </tileset>
+ <tileset firstgid="108" name="pot_plant_1" tilewidth="32" tileheight="32" tilecount="12" columns="6">
+  <image source="../../tileset/plant/indoor/pot_plant_1.png" trans="ff00ff" width="192" height="64"/>
+ </tileset>
+ <tileset firstgid="120" name="potted_plants1" tilewidth="32" tileheight="32" tilecount="6" columns="3">
+  <image source="../../tileset/plant/indoor/potted_plants1.png" trans="ff00ff" width="96" height="64"/>
+ </tileset>
+ <tileset firstgid="126" name="book" tilewidth="32" tileheight="32" tilecount="4" columns="2">
+  <image source="../../tileset/item/documents/book.png" trans="ff00ff" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="130" name="books" tilewidth="32" tileheight="32" tilecount="4" columns="2">
+  <image source="../../tileset/item/documents/books.png" trans="ff00ff" width="64" height="64"/>
+ </tileset>
+ <tileset firstgid="134" name="chests_banner" tilewidth="32" tileheight="32" tilecount="8" columns="1">
+  <image source="../../tileset/building/decoration/chests_banner.png" width="32" height="256"/>
+ </tileset>
+ <tileset firstgid="142" name="stairs" tilewidth="32" tileheight="32" tilecount="12" columns="2">
+  <image source="../../tileset/building/stairs/stairs.png" width="64" height="192"/>
+ </tileset>
+ <tileset firstgid="154" name="logic/portal" tilewidth="32" tileheight="32" tilecount="24" columns="8">
+  <image source="../../tileset/logic/portal.png" width="256" height="96"/>
+ </tileset>
+ <layer id="1" name="0_floor" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA7XSSwrCQBCE4TG60QRx4yPRK+UG8e1C9DIeOf9AGkQSwZ5y8UEzi4aqniKEkKHBPnHOMcEOJ5yxcczRFmPcsEL9g1fP2wFH3B37+lxw7fIq9i27vKp9ljfuGw2YO/NmAxaOvJ77fsv7j/sq+nu/r6I/y6vqz/Kq+rO8M1F/lrcQ9Wd5Vf1ZXnV/8b9UWCcqP+7xwDNxnqIFB/EiZ0AGAAA=
+  </data>
+ </layer>
+ <layer id="2" name="1_terrain" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgoA2ooEBvAQNDA7pYNQXmlWExbziCaCDWAGItJDEuCs3TB2JDJDEeHGp7iTTTDIgtKHATvQEl4YcNUBp+gxlgS3+Umoee/nCB4ZT+aoZQeQUAmKygBkAGAAA=
+  </data>
+ </layer>
+ <layer id="3" name="2_object" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAXDCTQyMCwYaDeMgpENmqmYBhtG0/OgBgCXf+BhQAYAAA==
+  </data>
+ </layer>
+ <layer id="4" name="3_roof" width="20" height="20">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGAWjYBSMglFALqhkYGgYaDcMFAAAxl7v/kAGAAA=
+  </data>
+ </layer>
+ <layer id="5" name="objects" width="20" height="20" visible="0">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA2NgGH5g3kA7YBSMglEwCkYAAACa3jM6QAYAAA==
+  </data>
+ </layer>
+ <layer id="6" name="collision" width="20" height="20" visible="0" opacity="0.22">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA1NlYGBQHSKYXEBNs3CZOVjMo3aY0iqOBmv44TKP2v4druE3mv4oN4+WZSi1MQDXOK6xQAYAAA==
+  </data>
+ </layer>
+ <layer id="7" name="protection" width="20" height="20" visible="0" opacity="0.2">
+  <data encoding="base64" compression="gzip">
+   H4sIAAAAAAAAA1NjYGBQG8WjeBSP4lE8iknEAPYSK/NABgAA
+  </data>
+ </layer>
+</map>