#68 Erste Quest implementiert, Texturen hinzugefügt und an Maps gearb…

…eitet

Koramu/Koramu.vcxproj

@@ -285,7 +285,9 @@
  <Xml Include="xmlFiles\save.xml">
  <SubType>Designer</SubType>
  </Xml>
- <Xml Include="xmlFiles\scripts.xml" />
+ <Xml Include="xmlFiles\scripts.xml">
+ <SubType>Designer</SubType>
+ </Xml>
  <Xml Include="xmlFiles\states.xml">
  <SubType>Designer</SubType>
  </Xml>
@@ -304,10 +306,14 @@
  <None Include="Scripts\Inventory\itemList.lua" />
  <None Include="Scripts\Inventory\Items\topHat.lua" />
  <None Include="Scripts\Misc\koramu.lua" />
+ <None Include="Scripts\Objects\Doors\clockmakerHouseEntry.lua" />
+ <None Include="Scripts\Objects\Doors\clockmakerHouseExit.lua" />
  <None Include="Scripts\Objects\Doors\ownHouseDoorEntry.lua" />
  <None Include="Scripts\Objects\Doors\ownHouseDoorExit.lua" />
+ <None Include="Scripts\Objects\NPCs\clockmaker.lua" />
  <None Include="Scripts\Objects\NPCs\littleGirl.lua" />
  <None Include="Scripts\Objects\player.lua" />
+ <None Include="Scripts\Quests\fixWatch\findClockmaker.lua" />
  <None Include="Scripts\Quests\prologue\prologue.lua" />
  <None Include="Scripts\Quests\prologue\startGame.lua" />
  <None Include="Scripts\test\npc1.lua" />

Koramu/Koramu.vcxproj.filters

@@ -597,5 +597,17 @@
  <None Include="Scripts\Quests\prologue\startGame.lua">
  <Filter>Lua Skripts\Quests\prologue</Filter>
  </None>
+ <None Include="Scripts\Objects\Doors\clockmakerHouseEntry.lua">
+ <Filter>Lua Skripts\Doors</Filter>
+ </None>
+ <None Include="Scripts\Objects\Doors\clockmakerHouseExit.lua">
+ <Filter>Lua Skripts\Doors</Filter>
+ </None>
+ <None Include="Scripts\Objects\NPCs\clockmaker.lua">
+ <Filter>Lua Skripts\Objects\NPCs</Filter>
+ </None>
+ <None Include="Scripts\Quests\fixWatch\findClockmaker.lua">
+ <Filter>Lua Skripts\Quests\fixWatch</Filter>
+ </None>
  </ItemGroup>
 </Project>

Koramu/Notebook.cpp

@@ -1,9 +1,13 @@
 #include "Notebook.h"
 #include "Game.h"
+#include "TextureManager.h"
 
 Notebook::Notebook(int pages)
  : m_currentLeftPage(0)
 {
+ // Id der Textur gehardcodet
+ m_textureId = "notebook";
+
  // Seitenzahl setzen und sicherstellen, dass es immmer eine gerade Anzahl an Seiten gibt (linke und rechte Seite)
  int pageNumber = pages + (pages % 2) * 1;
 
@@ -45,9 +49,15 @@ void Notebook::update()
 
 void Notebook::draw()
 {
- // Ess sollen immer die aktuelle linke Seite und die dazugehörige rechte Seite gezeichnet werden
+ // Textur des Notizbuches zeichnen
+ TheTextureManager::Instance()->draw(m_textureId,
+ m_rect.positionVector.getX(), m_rect.positionVector.getY(),
+ m_rect.width, m_rect.height);
+
+ // Es sollen immer die aktuelle linke Seite und die dazugehörige rechte Seite gezeichnet werden (hier wird der Text gezeichnet(
  m_pages[m_currentLeftPage].draw();
  m_pages[m_currentLeftPage + 1].draw();
+
 }
 
 void Notebook::browseRight()

Koramu/Scripts/Objects/Doors/clockmakerHouseEntry.lua

@@ -0,0 +1,10 @@
+-- clockmakerHouseEntry.lua
+
+local clockmakerHouseEntry = {}
+
+function clockmakerHouseEntry:onCollision ()
+ TheGame:enterMap ("clockmakerHouse")
+end
+
+
+return clockmakerHouseEntry

Koramu/Scripts/Objects/Doors/clockmakerHouseExit.lua

@@ -0,0 +1,10 @@
+-- clockmakerHouseExit.lua
+
+local clockmakerHouseExit = {}
+
+function clockmakerHouseExit:onCollision ()
+ TheGame:exitMap ()
+end
+
+
+return clockmakerHouseExit

Koramu/Scripts/Objects/Doors/ownHouseDoorExit.lua

@@ -4,7 +4,10 @@ local ownHouseDoorExit = {}
 
 function ownHouseDoorExit:onCollision()
  TheGame:exitMap()
-end
 
+ if TheGame:getPartQuestId() == "prologue" then
+ TheGame:nextQuest()
+ end
+end
 
 return ownHouseDoorExit

Koramu/Scripts/Objects/NPCs/clockmaker.lua

@@ -0,0 +1,18 @@
+-- clockmaker.lua
+
+local clockmaker = {}
+
+function clockmaker:interact (n, p)
+ interact = {}
+ interact.pl = p
+ interact.np = n
+ if TheGame:getPartQuestId() == "findClockmaker" then
+ TheGame:startDialog ("Excuse me Sir ...\nYou don't belong here, that's clear to see. What is it you want?\nWell my watch has stopped and I came to ask you to fix it for me.\nIs that so? Mmh... that is a wonderful watch. I guarantee it will work better than ever before if you give it to me. But it will take some\ntime to fix it. You can come back in half an hour at the earliest. And now don't disturb me any longer, I will go to work immediately.",
+ interact.np, interact.pl)
+ end
+end
+
+function clockmaker:onCollision ()
+end
+
+return clockmaker

Koramu/Scripts/Quests/fixWatch/findClockmaker.lua

@@ -0,0 +1,15 @@
+-- findClockmakerShop.lua
+
+local findClockmakerShop = {}
+
+function findClockmakerShop:onStart ()
+ player = {}
+ player.instance = Player.getInstance ()
+ TheGame:startNarrator ("How strange, the is still nobody to be seen!\nI think I will have another look around.\n Maybe I will at least find a place to get my watch fixed.", player.instance)
+end
+
+
+function findClockmakerShop:onDone ()
+end
+
+return findClockmakerShop

Koramu/xmlFiles/collisionRects.xml

@@ -5,6 +5,9 @@
  <collisionRect xPos="0" yPos="192" width="192" height="37" />
  <collisionRect xPos="81" yPos="229" width="22" height="14" />
  </objectType>
+ <objectType name="clockmaker">
+ <collisionRect xPos="5" yPos="150" width="60" height="30" />
+ </objectType>
  <objectType name="test">
  <collisionRect xPos="0" yPos="40" width="80" height="20" />
  </objectType>

Koramu/xmlFiles/maps.xml

@@ -17,6 +17,9 @@
 
  <!--Das Haus der Hauptcharakters-->
  <map id="ownHouse" path="../assets/Maps/ownHouse.tmx" />
+
+ <!--Das Haus des Uhrmachers-->
+ <map id="clockmakerHouse" path="../assets/Maps/clockmakerHouse.tmx" />
  </maps>
  </play>
  <pause>

Koramu/xmlFiles/quests.xml

@@ -6,6 +6,6 @@
  <partQuest id="prologue"/>
  </mainQuest>
  <mainQuest id="fixWatch">
- <partQuest id="findClockMaker1"/>
+ <partQuest id="findClockmaker"/>
  </mainQuest>
 </quests>

Koramu/xmlFiles/scripts.xml

@@ -10,10 +10,13 @@
  <!--Objects-->
  <script id="test" path="Scripts/test/npc1.lua"/>
  <script id="littleGirl" path="Scripts/Objects/NPCs/littleGirl.lua"/>
+ <script id="clockmaker" path="Scripts/Objects/NPCs/clockmaker.lua"/>
 
  <!--Doors-->
  <script id="ownHouseDoorEntry" path="Scripts/Objects/Doors/ownHouseDoorEntry.lua"/>
  <script id="ownHouseDoorExit" path="Scripts/Objects/Doors/ownHouseDoorExit.lua"/>
+ <script id="clockmakerHouseEntry" path="Scripts/Objects/Doors/clockmakerHouseEntry.lua"/>
+ <script id="clockmakerHouseExit" path="Scripts/Objects/Doors/clockmakerHouseExit.lua"/>
 
  <!--Buttons MenuState-->
  <script id="buttonPlay" path="Scripts/Buttons/buttonPlay.lua"/>
@@ -30,6 +33,8 @@
  <!--mainQuest: prologue-->
  <script id="startGame" path="Scripts/Quests/prologue/startGame.lua"/>
  <script id="prologue" path="Scripts/Quests/prologue/prologue.lua"/>
+ <!--mainQuest: fixWatch-->
+ <script id="findClockmaker" path="Scripts/Quests/fixWatch/findClockmaker.lua"/>
 
  <!--Items-->
  <script id="itemList" path="Scripts/Inventory/itemList.lua"/>

Koramu/xmlFiles/states.xml

@@ -15,9 +15,11 @@
 
  <!--GameObjects-->
  <texture id="player" path="../assets/Objects/Player.png"/>
+ <texture id="clockmaker" path="../assets/Objects/Clockmaker.png"/>
  <texture id="test" path="../assets/Objects/test.png"/>
  <texture id="littleGirl" path="../assets/Objects/LittleGirl.png"/>
  <texture id="tree" path="../assets/TreeNew.png"/>
+ <texture id="notebook" path="../assets/Notizbuch.png"/>
 
  <!--Miscellaneous-->
  <texture id="koramu" path="../assets/Koramu.png"/>
@@ -101,6 +103,16 @@
  numRows="4" numCols="4"
  mapId="ownHouse" animSpeed="200"
  uniqueId="player"/>
+ <gameObject type="player" textureId="player"
+ xPos="604" yPos="1006" width="70" height="180"
+ numRows="4" numCols="4"
+ mapId="clockmakerHouse" animSpeed="200"
+ uniqueId="player"/>
+ <gameObject type="npc" textureId="clockmaker"
+ xPos="262" yPos="382" width="70" height="180"
+ numRows="4" numCols="4"
+ mapId="clockmakerHouse" animSpeed="200"
+ uniqueId="clockmaker"/>
  <gameObject type="npc" textureId="test"
  xPos="1000" yPos="690" width="128" height="82"
  numRows="1" numCols="6"

assets/Maps/clockmakerHouse.tmx

@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="19" height="19" tilewidth="64" tileheight="64" nextobjectid="5">
+ <tileset firstgid="1" name="obj_misk_atlas-sheet64" tilewidth="64" tileheight="64" tilecount="1024" columns="32">
+ <image source="../Tilesets/obj_misk_atlas-sheet64.png" width="2048" height="2048"/>
+ </tileset>
+ <tileset firstgid="1025" name="tilesheet-sheet64" tilewidth="64" tileheight="64" tilecount="1960" columns="20">
+ <image source="../Tilesets/tilesheet-sheet64.png" width="1280" height="6272"/>
+ </tileset>
+ <layer name="Backgroundlayer" width="19" height="19">
+ <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,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,
+152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152,152
+</data>
+ </layer>
+ <layer name="Roadlayer" width="19" height="19">
+ <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,
+2633,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2634,2635,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2653,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2654,2655,
+2673,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2674,2675
+</data>
+ </layer>
+ <layer name="Collisionlayer" width="19" height="19">
+ <data encoding="csv">
+24,25,26,24,25,26,24,25,26,24,25,26,24,25,26,24,24,25,26,
+56,216,217,218,57,58,56,57,58,56,57,58,56,57,58,56,56,57,58,
+28,248,249,250,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
+60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,
+92,467,468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,
+124,467,468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,123,
+28,467,468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
+60,467,468,983,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,
+92,467,468,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,
+124,499,500,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,123,
+28,531,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
+60,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,
+92,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,91,
+124,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,123,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
+60,943,944,0,0,0,0,0,0,0,0,0,0,0,0,0,467,468,59,
+92,975,976,946,0,0,0,0,0,0,0,0,0,0,0,945,499,500,91,
+124,1007,1008,946,0,0,0,0,0,0,0,0,0,0,0,0,531,532,123,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27
+</data>
+ </layer>
+ <layer name="Decorationlayer" width="19" height="19">
+ <data encoding="csv">
+28,0,0,0,0,367,144,144,240,241,242,243,244,240,241,242,243,244,0,
+60,0,0,0,0,399,176,176,272,273,274,275,276,272,273,274,275,276,0,
+0,0,0,0,0,431,208,208,304,305,306,307,308,304,305,306,307,308,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,393,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,392,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,969,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,424,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,969,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <layer name="Foregroundlayer" width="19" height="19">
+ <data encoding="csv">
+0,184,185,186,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,59,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+</data>
+ </layer>
+ <objectgroup name="Objectlayer">
+ <object id="1" name="clockmakerHouseExit" type="door" x="578" y="1188" width="128" height="24"/>
+ </objectgroup>
+</map>

assets/Maps/mainMap.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="100" height="80" tilewidth="64" tileheight="64" nextobjectid="202">
+<map version="1.0" tiledversion="1.0.2" orientation="orthogonal" renderorder="right-down" width="100" height="80" tilewidth="64" tileheight="64" nextobjectid="204">
  <tileset firstgid="1" name="Tileset1" tilewidth="64" tileheight="64" tilecount="133" columns="19">
  <image source="../Tilesets/Tileset1.png" width="1216" height="448"/>
  </tileset>
@@ -417,8 +417,8 @@
 615,616,3611,3644,3645,3645,3645,3646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3519,3520,0,3487,3488,3487,3488,3487,3488,0,0,0,614,615,615,615,615,615,615,615,615,615,615,615,615,615,
 615,616,3643,3644,3645,3677,3645,3646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2375,2376,628,629,629,629,629,629,629,630,2375,2376,0,0,0,0,0,0,0,2623,2624,2624,2624,2624,2624,2624,2624,2624,2625,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3519,3520,3519,3520,3519,3520,3487,3488,0,614,615,615,615,615,615,615,615,615,615,615,615,615,615,
 615,616,3675,3644,3645,3677,3677,3646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2405,2406,628,629,629,0,0,629,629,630,2405,2406,0,0,0,0,0,0,0,2653,0,0,0,0,0,0,0,0,2655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3519,3520,0,614,615,615,615,615,615,615,615,615,615,615,615,615,615,
-615,616,3707,3644,3645,3677,3645,3646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2435,2436,596,597,597,0,0,597,597,598,2435,2436,0,0,0,0,0,0,0,0,3778,0,3778,0,3778,0,3778,0,2655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,646,647,520,615,615,615,615,615,615,615,615,615,615,615,
-615,551,584,3676,3677,3677,3677,3678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3810,0,3810,0,3810,0,3810,0,2655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,614,615,615,615,615,615,615,615,615,615,615,615,
+615,616,3707,3644,3645,3677,3645,3646,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2435,2436,596,597,597,0,0,597,597,598,2435,2436,0,0,0,0,0,0,0,2653,3778,0,3778,0,3778,0,3778,0,2655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,646,647,520,615,615,615,615,615,615,615,615,615,615,615,
+615,551,584,3676,3677,3677,3677,3678,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2653,3810,0,3810,0,3810,0,3810,0,2655,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,614,615,615,615,615,615,615,615,615,615,615,615,
 615,615,616,3708,3709,3709,3709,3710,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2683,2684,2684,2684,2684,2684,2684,2684,2684,2685,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,646,520,615,615,615,615,615,615,615,615,615,615,
 615,615,551,583,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,84,85,86,87,88,89,89,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,614,615,615,615,615,615,615,615,615,615,615,
 615,615,615,615,551,584,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,103,104,105,106,0,108,108,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,614,615,615,615,615,615,615,615,615,615,615,
@@ -583,6 +583,8 @@
  <object id="170" name="treeX" type="tree" x="2816" y="1408" width="192" height="256"/>
  <object id="171" name="treeX" type="tree" x="2432" y="1536" width="192" height="256"/>
  <object id="172" name="treeX" type="tree" x="2816" y="1536" width="192" height="256"/>
+ <object id="202" name="ownHouseDoorEntry" type="door" x="1472" y="552" width="64" height="24"/>
+ <object id="203" name="clockmakerHouseEntry" type="door" x="1792" y="2152" width="128" height="24"/>
  </objectgroup>
  <layer name="Foregroundlayer" width="100" height="80">
  <data encoding="csv">