Merge remote-tracking branch 'origin/main'

assets/sprites/genericItems_spritesheet_colored.xml

@@ -153,7 +153,7 @@
     <SubTexture name="genericItem_color_152.png" x="467" y="406" width="85" height="100"/>
     <SubTexture name="genericItem_color_153.png" x="553" y="1608" width="73" height="132"/>
     <SubTexture name="genericItem_color_154.png" x="367" y="964" width="94" height="73"/>
-    <SubTexture name="genericItem_color_155.png" x="625" y="293" width="63" height="65"/>
+    <SubTexture name="key" x="625" y="293" width="63" height="65"/>
     <SubTexture name="genericItem_color_156.png" x="550" y="1075" width="77" height="100"/>
     <SubTexture name="genericItem_color_157.png" x="363" y="1942" width="98" height="102"/>
     <SubTexture name="money" x="268" y="649" width="101" height="106"/>

assets/tiled/level_fruehling.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="12" nextobjectid="3">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="13" nextobjectid="9">
  <properties>
   <property name="description" value="15.04.2005"/>
   <property name="id" type="int" value="1"/>
@@ -497,6 +497,24 @@
    <point/>
   </object>
  </objectgroup>
+ <objectgroup id="12" name="SFX">
+  <object id="6" x="1536" y="3008" width="384" height="704">
+   <properties>
+    <property name="ground" value="indoor"/>
+   </properties>
+  </object>
+  <object id="7" x="1984" y="3008" width="320" height="704">
+   <properties>
+    <property name="ground" value="indoor"/>
+   </properties>
+  </object>
+  <object id="8" x="1536" y="1792">
+   <properties>
+    <property name="ground" value="indoor"/>
+   </properties>
+   <polygon points="0,0 448,0 448,192 768,192 768,896 0,896"/>
+  </object>
+ </objectgroup>
  <layer id="9" name="Z_Spawn" width="64" height="64" opacity="0.57">
   <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,

assets/tiled/level_herbst.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="12" nextobjectid="5">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="64" tileheight="64" infinite="0" nextlayerid="13" nextobjectid="7">
  <properties>
   <property name="description" value="01.10.2001"/>
   <property name="id" type="int" value="1"/>
@@ -498,7 +498,13 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup id="11" name="Collectibles"/>
+ <objectgroup id="11" name="Collectibles">
+  <object id="5" x="2048" y="3264" width="64" height="64">
+   <properties>
+    <property name="item" value="key"/>
+   </properties>
+  </object>
+ </objectgroup>
  <objectgroup id="8" name="Spawnpoints">
   <object id="1" x="2081" y="2330">
    <properties>
@@ -507,6 +513,14 @@
    <point/>
   </object>
  </objectgroup>
+ <objectgroup id="12" name="SFX">
+  <object id="6" x="1536" y="1792">
+   <properties>
+    <property name="ground" value="indoor"/>
+   </properties>
+   <polyline points="0,0 448,0 448,192 768,192 768,896 0,896 0,0"/>
+  </object>
+ </objectgroup>
  <layer id="9" name="Z_Spawn" width="64" height="64" opacity="0.57">
   <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,