Adds small castle rooms

8bitgentleman · Mar 12, 2014 · 7f80d81 · 7f80d81
1 parent 1f2ddbd
commit 7f80d81
Show file tree

Hide file tree

Showing 20 changed files with 293 additions and 14 deletions.
diff --git a/src/images/keys/bluetower.png b/src/images/keys/bluetower.png
diff --git a/src/images/keys/throneroom.png b/src/images/keys/throneroom.png
diff --git a/src/images/keys/tower.png b/src/images/keys/tower.png
diff --git a/src/images/materials/keyshardbottom.png b/src/images/materials/keyshardbottom.png
diff --git a/src/images/materials/keyshardtop.png b/src/images/materials/keyshardtop.png
diff --git a/src/images/tilesets/castle-hawkthorne.png b/src/images/tilesets/castle-hawkthorne.png
diff --git a/src/items/keys/bluetower.lua b/src/items/keys/bluetower.lua
@@ -0,0 +1,9 @@
+return{
+    name = "bluetower",
+    description = "Blue Tower",
+    type = "key",
+    subtype = "key",
+    MAX_ITEMS = 5,
+    quantity = 1,
+    directory = 'keys/'
+}
diff --git a/src/items/keys/throneroom.lua b/src/items/keys/throneroom.lua
@@ -0,0 +1,9 @@
+return{
+    name = "throneroom",
+    description = "Throne Room",    
+    type = "key",
+    subtype = "key",
+    MAX_ITEMS = 5,
+    quantity = 1,
+    directory = 'keys/'
+}
diff --git a/src/items/keys/tower.lua b/src/items/keys/tower.lua
@@ -0,0 +1,9 @@
+return{
+    name = "tower",
+    description = "Tower",
+    type = "key",
+    subtype = "key",
+    MAX_ITEMS = 5,
+    quantity = 1,
+    directory = 'keys/'
+}
diff --git a/src/items/materials/keyshardbottom.lua b/src/items/materials/keyshardbottom.lua
@@ -0,0 +1,5 @@
+return{
+    name = 'keyshardbottom',
+    type = 'material',
+    MAX_ITEMS = 1,
+}
diff --git a/src/items/materials/keyshardtop.lua b/src/items/materials/keyshardtop.lua
@@ -0,0 +1,5 @@
+return{
+    name = 'keyshardtop',
+    type = 'material',
+    MAX_ITEMS = 1,
+}
diff --git a/src/items/recipes.lua b/src/items/recipes.lua
@@ -55,4 +55,9 @@ return {
         { type='material', name='leaf' },
         { type='weapon', name='arrow' }
     },
+    {
+        { type='material', name='keyshardbottom' },
+        { type='material', name='keyshardtop' },
+        { type='key', name='throneroom' }
+    },
 }
diff --git a/src/maps/castle-hawkthorne-room-1.tmx b/src/maps/castle-hawkthorne-room-1.tmx
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="24" tileheight="24">
+ <properties>
+  <property name="blue" value="0"/>
+  <property name="green" value="0"/>
+  <property name="offset" value="20"/>
+  <property name="overworldName" value="caverns"/>
+  <property name="red" value="0"/>
+  <property name="soundtrack" value="castle"/>
+ </properties>
+ <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/castle-hawkthorne.png" width="384" height="1200"/>
+ </tileset>
+ <layer name="wall" width="20" height="10" opacity="0.38">
+  <data encoding="base64" compression="zlib">
+   eJxbxsDAsGwUj+JRjBUDALVlgbE=
+  </data>
+ </layer>
+ <layer name="pillar" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJwLYqAeCGJgaABiBlYgZqOieZQAZLdQwzxkQEvzqBGGtHBfEhXNA5rVQEXjaAIA76QJYg==
+  </data>
+ </layer>
+ <layer name="floor" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DgwFQgnkYlPB2IlzMwNCwD0tTAQLMYAOBxGTM=
+  </data>
+ </layer>
+ <layer name="features" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF2EA2Fc3qAuJuIO6hknmzgHg2EM9BElOkwLxVQLwaiNcgiRlSYN4uIN4NxHuQxBwpMG8gAQCshgij
+  </data>
+ </layer>
+ <objectgroup color="#a41f05" draworder="topdown" name="nodes" width="20" height="10">
+  <object type="sprite" x="336" y="96" width="24" height="24">
+   <properties>
+    <property name="animation" value="1-3,1"/>
+    <property name="height" value="24"/>
+    <property name="sheet" value="images/sprites/castle/flame.png"/>
+    <property name="width" value="24"/>
+   </properties>
+  </object>
+  <object name="tower" type="key" x="168" y="168" width="24" height="24"/>
+  <object name="main" type="door" x="230" y="118" width="47" height="71">
+   <properties>
+    <property name="level" value="castle-hawkthorne"/>
+    <property name="to" value="room1"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup draworder="topdown" name="block" width="20" height="10">
+  <object x="0" y="192" width="480" height="48"/>
+  <object x="456" y="0" width="24" height="192"/>
+  <object x="0" y="0" width="24" height="192"/>
+ </objectgroup>
+</map>
diff --git a/src/maps/castle-hawkthorne-room-2.tmx b/src/maps/castle-hawkthorne-room-2.tmx
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="24" tileheight="24">
+ <properties>
+  <property name="blue" value="0"/>
+  <property name="green" value="0"/>
+  <property name="offset" value="20"/>
+  <property name="overworldName" value="caverns"/>
+  <property name="red" value="0"/>
+  <property name="soundtrack" value="castle"/>
+ </properties>
+ <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/castle-hawkthorne.png" width="384" height="1200"/>
+ </tileset>
+ <layer name="wall" width="20" height="10" opacity="0.38">
+  <data encoding="base64" compression="zlib">
+   eJxbxsDAsGwUj+JRjBUDALVlgbE=
+  </data>
+ </layer>
+ <layer name="pillar" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJwLYqAeCGJgaABiBlYgZqOieZQAZLdQwzxkQEvzqBGGtHBfEhXNA5rVQEXjaAIA76QJYg==
+  </data>
+ </layer>
+ <layer name="floor" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DgwFQgnkYlPB2IlzMwNCwD0tTAQLMYAOBxGTM=
+  </data>
+ </layer>
+ <layer name="features" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF2EA2Fc3qAuJuIO6hknmzgHg2EM9BElOkwLxVQLwaiNcgiRlSYN4uIN4NxHuQxBwpMG8gAQCshgij
+  </data>
+ </layer>
+ <objectgroup color="#a41f05" draworder="topdown" name="nodes" width="20" height="10">
+  <object type="sprite" x="336" y="96" width="24" height="24">
+   <properties>
+    <property name="animation" value="1-3,1"/>
+    <property name="height" value="24"/>
+    <property name="sheet" value="images/sprites/castle/flame.png"/>
+    <property name="width" value="24"/>
+   </properties>
+  </object>
+  <object name="bluetower" type="key" x="168" y="168" width="24" height="24"/>
+  <object name="main" type="door" x="230" y="118" width="47" height="71">
+   <properties>
+    <property name="level" value="castle-hawkthorne"/>
+    <property name="to" value="room2"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup draworder="topdown" name="block" width="20" height="10">
+  <object x="0" y="192" width="480" height="48"/>
+  <object x="456" y="0" width="24" height="192"/>
+  <object x="0" y="0" width="24" height="192"/>
+ </objectgroup>
+</map>
diff --git a/src/maps/castle-hawkthorne-room-3.tmx b/src/maps/castle-hawkthorne-room-3.tmx
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="24" tileheight="24">
+ <properties>
+  <property name="blue" value="0"/>
+  <property name="green" value="0"/>
+  <property name="offset" value="20"/>
+  <property name="overworldName" value="caverns"/>
+  <property name="red" value="0"/>
+  <property name="soundtrack" value="castle"/>
+ </properties>
+ <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/castle-hawkthorne.png" width="384" height="1200"/>
+ </tileset>
+ <layer name="wall" width="20" height="10" opacity="0.38">
+  <data encoding="base64" compression="zlib">
+   eJxbxsDAsGwUj+JRjBUDALVlgbE=
+  </data>
+ </layer>
+ <layer name="pillar" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJwLYqAeCGJgaABiBlYgZqOieZQAZLdQwzxkQEvzqBGGtHBfEhXNA5rVQEXjaAIA76QJYg==
+  </data>
+ </layer>
+ <layer name="floor" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DgwFQgnkYlPB2IlzMwNCwD0tTAQLMYAOBxGTM=
+  </data>
+ </layer>
+ <layer name="features" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF2EA2Fc3qAuJuIO6hknmzgHg2EM9BElOkwLxVQLwaiNcgiRlSYN4uIN4NxHuQxBwpMG8gAQCshgij
+  </data>
+ </layer>
+ <objectgroup color="#a41f05" draworder="topdown" name="nodes" width="20" height="10">
+  <object type="sprite" x="336" y="96" width="24" height="24">
+   <properties>
+    <property name="animation" value="1-3,1"/>
+    <property name="height" value="24"/>
+    <property name="sheet" value="images/sprites/castle/flame.png"/>
+    <property name="width" value="24"/>
+   </properties>
+  </object>
+  <object name="main" type="door" x="230" y="118" width="47" height="71">
+   <properties>
+    <property name="level" value="castle-hawkthorne"/>
+    <property name="to" value="room3"/>
+   </properties>
+  </object>
+  <object name="keyshardtop" type="material" x="168" y="166" width="24" height="24"/>
+ </objectgroup>
+ <objectgroup draworder="topdown" name="block" width="20" height="10">
+  <object x="0" y="192" width="480" height="48"/>
+  <object x="456" y="0" width="24" height="192"/>
+  <object x="0" y="0" width="24" height="192"/>
+ </objectgroup>
+</map>
diff --git a/src/maps/castle-hawkthorne-room-4.tmx b/src/maps/castle-hawkthorne-room-4.tmx
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" orientation="orthogonal" width="20" height="10" tilewidth="24" tileheight="24">
+ <properties>
+  <property name="blue" value="0"/>
+  <property name="green" value="0"/>
+  <property name="offset" value="20"/>
+  <property name="overworldName" value="caverns"/>
+  <property name="red" value="0"/>
+  <property name="soundtrack" value="castle"/>
+ </properties>
+ <tileset firstgid="1" name="castle-hawkthorne" tilewidth="24" tileheight="24">
+  <image source="../images/tilesets/castle-hawkthorne.png" width="384" height="1200"/>
+ </tileset>
+ <layer name="wall" width="20" height="10" opacity="0.38">
+  <data encoding="base64" compression="zlib">
+   eJxbxsDAsGwUj+JRjBUDALVlgbE=
+  </data>
+ </layer>
+ <layer name="pillar" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJwLYqAeCGJgaABiBlYgZqOieZQAZLdQwzxkQEvzqBGGtHBfEhXNA5rVQEXjaAIA76QJYg==
+  </data>
+ </layer>
+ <layer name="floor" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgFo2DgwFQgnkYlPB2IlzMwNCwD0tTAQLMYAOBxGTM=
+  </data>
+ </layer>
+ <layer name="features" width="20" height="10">
+  <data encoding="base64" compression="zlib">
+   eJxjYBgF2EA2Fc3qAuJuIO6hknmzgHg2EM9BElOkwLxVQLwaiNcgiRlSYN4uIN4NxHuQxBwpMG8gAQCshgij
+  </data>
+ </layer>
+ <objectgroup color="#a41f05" draworder="topdown" name="nodes" width="20" height="10">
+  <object type="sprite" x="336" y="96" width="24" height="24">
+   <properties>
+    <property name="animation" value="1-3,1"/>
+    <property name="height" value="24"/>
+    <property name="sheet" value="images/sprites/castle/flame.png"/>
+    <property name="width" value="24"/>
+   </properties>
+  </object>
+  <object name="keyshardbottom" type="material" x="168" y="168" width="24" height="24"/>
+  <object name="main" type="door" x="230" y="118" width="47" height="71">
+   <properties>
+    <property name="level" value="castle-hawkthorne"/>
+    <property name="to" value="room4"/>
+   </properties>
+  </object>
+ </objectgroup>
+ <objectgroup draworder="topdown" name="block" width="20" height="10">
+  <object x="0" y="192" width="480" height="48"/>
+  <object x="456" y="0" width="24" height="192"/>
+  <object x="0" y="0" width="24" height="192"/>
+ </objectgroup>
+</map>
diff --git a/src/maps/castle-hawkthorne.tmx b/src/maps/castle-hawkthorne.tmx
@@ -23,10 +23,10 @@
  </layer>
  <layer name="features" width="98" height="40">
   <data encoding="base64" compression="zlib">
-   eJzt2ktugzAQxnHve4SseoQcIefIZbruI9m3abvvc9+8DpMjVNl3FkUaJDDgAjOm/5/0KZEsxAhLxsYOAQDQt6V1AQh3kpVkbV3IP3QZwlXx/1HyJHkut2MEc9UP75IPyWe5HSNYqH7YSw6SY7kdAAAkupbcSG6tC1E81jS0e8mDZGNdiOKxpqG9SF4lb9aFKB5rGtqXZCvZWReieKwJAAD45XFNc2F0bV9SnmnVmkbvvViYGV37F3o/KmWdWLWmmRv3Q470flTKOrFqTbOgHzrT+1Ge1oltxumxxvKm+3h4pwylzTidOpZ3PTvTdB+rd0rOPM7vpqxuzhabi3CGpn91c7bYXCR2hubUQ005+v79PXdsK9TN2WJzkdgZmtg9Y3UAmA7rbyNdTPn9ntO3kSmfkc3p2whnZAEAHvwAMV1Bvw==
+   eJzt2rsNwjAQBmD3jEDFCIzAHIzAEtQ8e549z57nMIyA6LmCSBfJcXCIc+fwf9IvkKwop1hy7NjGAABA2brSBYAZUyaUqXQhf6hlTD/5v6SsKOt0O1SgzfphTzlQjul2qECH9cOVcqPc0+0AABCpnnQBFhprCmlAGVJG0oUwGmsKbUaZUxbShTAaawptQ9lSdtKFMBprCu1EOVMu0oUwGmsCAADI8m9rmir4PlONa5qG0LVlKfJMbWsavvcioSl07S/4flSRdaJtTdMW7ocY8f2oIutE25qmg37wxvejNK0TvxmnqxrL8+6j4Z0SyjfjdNGx3PfsTN59pN4pMdM4v6uzrDmbay6CMzTly5qzueYirjM0jxJqitHz8/vybEtkzdlccxHXGRrXPV11AEB9SH8b8VHn93tM30bqfEY2pm8jOCMLAAAavAGpSENr
   </data>
  </layer>
- <objectgroup color="#a41f05" name="nodes" width="98" height="40">
+ <objectgroup color="#a41f05" draworder="topdown" name="nodes" width="98" height="40">
   <object name="main" type="door" x="1189" y="674" width="49" height="68">
    <properties>
     <property name="level" value="castle-hawkthorne-entrance"/>
@@ -35,6 +35,7 @@
   </object>
   <object name="next" type="door" x="1166" y="121" width="47" height="71">
    <properties>
+    <property name="key" value="throneroom"/>
     <property name="level" value="castle-hawkthorne-throne"/>
     <property name="to" value="main"/>
    </properties>
@@ -103,28 +104,34 @@
     <property name="width" value="24"/>
    </properties>
   </object>
-  <object type="info" x="131" y="521" width="55" height="78">
+  <object name="room1" type="door" x="133" y="530" width="47" height="71">
    <properties>
-    <property name="info" value="Under construction"/>
+    <property name="level" value="castle-hawkthorne-room-1"/>
+    <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="info" x="708" y="307" width="55" height="78">
+  <object name="room2" type="door" x="2173" y="528" width="47" height="71">
    <properties>
-    <property name="info" value="Under construction"/>
+    <property name="level" value="castle-hawkthorne-room-2"/>
+    <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="info" x="1593" y="307" width="55" height="78">
+  <object name="room3" type="door" x="711" y="312" width="47" height="71">
    <properties>
-    <property name="info" value="Under construction"/>
+    <property name="key" value="tower"/>
+    <property name="level" value="castle-hawkthorne-room-3"/>
+    <property name="to" value="main"/>
    </properties>
   </object>
-  <object type="info" x="2169" y="522" width="55" height="78">
+  <object name="room4" type="door" x="1600" y="312" width="47" height="71">
    <properties>
-    <property name="info" value="Under construction"/>
+    <property name="key" value="bluetower"/>
+    <property name="level" value="castle-hawkthorne-room-4"/>
+    <property name="to" value="main"/>
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="platform" width="98" height="40">
+ <objectgroup draworder="topdown" name="platform" width="98" height="40" visible="0">
   <object x="0" y="600">
    <properties>
     <property name="drop" value="false"/>

diff --git a/src/maps/town.tmx b/src/maps/town.tmx
@@ -66,7 +66,7 @@
    eJztks0KQEAUhZX/BUrKBi+AlYXCw82jO5KapBR3Qs5XX01Tc2buaSyLEEKIDR3oQg/6MHj0RfKYnDE93lNC8a/gaMbcYDb7u5et9xfCTOiuMyIYw0Q49y//r4AlrIRz/9JfDRvYCud+ob9uVfUXzy3rAY5w2u3fZZtRz5TqjxDyLWYJuAqz
   </data>
  </layer>
- <objectgroup color="#000000" name="nodes" width="80" height="14">
+ <objectgroup color="#000000" draworder="topdown" name="nodes" width="80" height="14">
   <object type="cow" x="415" y="206" width="84" height="60"/>
   <object name="main" type="door" x="48" y="216" width="24" height="48"/>
   <object type="door" x="1896" y="120" width="24" height="144">
@@ -114,10 +114,10 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup color="#12a460" name="block" width="80" height="14">
+ <objectgroup color="#12a460" draworder="topdown" name="block" width="80" height="14">
   <object x="0" y="264" width="1920" height="72"/>
  </objectgroup>
- <objectgroup color="#a42118" name="platform" width="80" height="14">
+ <objectgroup color="#a42118" draworder="topdown" name="platform" width="80" height="14">
   <object x="720" y="185" width="110" height="22">
    <polyline points="0,0 47,-25 117,10 -2,10 -1,0"/>
   </object>

diff --git a/src/nodes/materials/keyshardbottom.lua b/src/nodes/materials/keyshardbottom.lua
@@ -0,0 +1,3 @@
+return{
+    name = "keyshardbottom",
+}
diff --git a/src/nodes/materials/keyshardtop.lua b/src/nodes/materials/keyshardtop.lua
@@ -0,0 +1,3 @@
+return{
+    name = "keyshardtop",
+}