Merge pull request #243 from SE-TINF22B6/martin/shotgun_trophy

feat: bugfixing
SE-TINF22B6 · May 27, 2024 · 29d3b00 · 29d3b00
2 parents 38e9953 + 0f49f4f
commit 29d3b00
Show file tree

Hide file tree

Showing 20 changed files with 583 additions and 504 deletions.
diff --git a/...ets/tileSets/tilesetsDungeon/troohy_1.png → ...tems and trap_animation/trophy/trophy.png b/...ets/tileSets/tilesetsDungeon/troohy_1.png → ...tems and trap_animation/trophy/trophy.png
diff --git a/...l/2D Pixel Dungeon Asset Pack/items and trap_animation/trophy/trophy_open_1.png b/...l/2D Pixel Dungeon Asset Pack/items and trap_animation/trophy/trophy_open_1.png
diff --git a/...ets/tileSets/tilesetsDungeon/troohy_2.png → ...d trap_animation/trophy/trophy_open_2.png b/...ets/tileSets/tilesetsDungeon/troohy_2.png → ...d trap_animation/trophy/trophy_open_2.png
diff --git a/...ets/tileSets/tilesetsDungeon/troohy_3.png → ...d trap_animation/trophy/trophy_open_3.png b/...ets/tileSets/tilesetsDungeon/troohy_3.png → ...d trap_animation/trophy/trophy_open_3.png
diff --git a/...l/2D Pixel Dungeon Asset Pack/items and trap_animation/trophy/trophy_open_4.png b/...l/2D Pixel Dungeon Asset Pack/items and trap_animation/trophy/trophy_open_4.png
diff --git a/game/assets/level/Underwatch.tiled-session b/game/assets/level/Underwatch.tiled-session
@@ -3,7 +3,7 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "pathfinding.tmx",
+    "activeFile": "startMap.tmx",
     "expandedProjectPaths": [
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
@@ -43,6 +43,15 @@
             "scaleInDock": 1,
             "scaleInEditor": 1
         },
+        "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsAussenwelt/fences.tsx": {
+            "scaleInDock": 1
+        },
+        "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsAussenwelt/plains.tsx": {
+            "scaleInDock": 1
+        },
+        "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx": {
+            "scaleInDock": 1
+        },
         "2.0Map.tmx": {
             "scale": 0.9133,
             "selectedLayer": 6,
@@ -156,8 +165,8 @@
             "scale": 1.4398437499999999,
             "selectedLayer": 0,
             "viewCenter": {
-                "x": 411.8502441671189,
-                "y": 343.44004340748785
+                "x": 160.43407487791646,
+                "y": 160.08681497558334
             }
         },
         "plains.tsx": {
@@ -167,7 +176,7 @@
         },
         "startMap.tmx": {
             "scale": 0.8452,
-            "selectedLayer": 10,
+            "selectedLayer": 1,
             "viewCenter": {
                 "x": 451.96403218173214,
                 "y": 399.3137718883105
@@ -184,34 +193,25 @@
     "map.tileWidth": 16,
     "map.width": 50,
     "openFiles": [
-        "Dungeon_Tileset.tsx",
-        "2.0Map.tmx",
         "startMap.tmx",
-        "dungeon1(amogus).tmx",
-        "TeleportTestFixed.tmx",
-        "50x50MapMitHitbox.tmx",
         "babo.tsx",
-        "Dungeon_Monsters1.tsx",
-        "dungeon assets.tsx",
-        "plains.tsx",
-        "fences.tsx",
         "pathfinding.tmx"
     ],
     "project": "Underwatch.tiled-project",
     "property.type": "bool",
     "recentFiles": [
+        "pathfinding.tmx",
+        "babo.tsx",
+        "startMap.tmx",
         "Dungeon3.tmx",
         "Demo.tmx",
         "Dungeon1.tmx",
-        "pathfinding.tmx",
         "fences.tsx",
         "plains.tsx",
         "dungeon assets.tsx",
         "Dungeon_Monsters1.tsx",
-        "babo.tsx",
         "50x50MapMitHitbox.tmx",
-        "TeleportTestFixed.tmx",
-        "dungeon1(amogus).tmx"
+        "TeleportTestFixed.tmx"
     ],
     "tileset.lastUsedFormat": "tsx",
     "tileset.tileSize": {

diff --git a/game/assets/level/startMap.tmx b/game/assets/level/startMap.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" class="outside" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="12" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.2" class="outside" orientation="orthogonal" renderorder="right-down" width="50" height="50" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="1">
  <properties>
   <property name="inside" type="bool" value="false"/>
  </properties>
@@ -15,6 +15,11 @@
    eJztmL0OgCAMhFk0Ifr+zyujg9byZ6/lhm8hIVyPa0PIKaVMCFGzFXbFWs1+C47CKax96Xzaj4gXnbWg5KhXF+r9oOoi7dlH65m3jKHPXq2P1jpn6kPL0ggPItZE5hA5K9Ib31Pd0hufPfIfnjIjUZOZ6DVHr280Fn7NONNibqLPavbCml73aEHyGkkLscOyt0aebZln5F5Cmp1RPSZ1oGfS81/vXTuiPi2etbfel2c83he9J6tzAf7RV6U=
   </data>
  </layer>
+ <layer id="12" name="trophy" width="50" height="50">
+  <data encoding="base64" compression="zlib">
+   eJztzkERAAAIA6D172Q3U+x8CAlIgG/mOgAAAAAAAAAAAAULEU4Avg==
+  </data>
+ </layer>
  <layer id="2" name="walls" width="50" height="50">
   <properties>
    <property name="render" value="below"/>