Merge pull request #271 from SE-TINF22B6/benjamin/design

feat: rework shotgun, add sniper, beautify map, add cost for chest, balance weapons, balance score, add m7

game/assets/level/Decorations.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="Decorations" tilewidth="16" tileheight="16" tilecount="320" columns="20">
+ <image source="../tileSets/tilesetsAussenwelt/PixelWoods/Decorations(main)/Decorations.png" width="320" height="256"/>
+</tileset>

game/assets/level/Dungeon1.tmx

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="16" tileheight="16" infinite="0" nextlayerid="13" nextobjectid="1">
+<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="100" height="100" tilewidth="16" tileheight="16" infinite="0" nextlayerid="14" nextobjectid="1">
  <properties>
   <property name="inside" type="bool" value="true"/>
  </properties>
@@ -59,6 +59,11 @@
    eJzt3FFygyAUBdDuMtvLUtvP1AGUjOgFz/lxNAniu6AZY/vzA3zjVVlvbX9tXn8VttfeV9v3Xpuldkt93e5jNnt1L21vbSu1u31fbdnqT2197/Oz2ZsfR2rXO45Ly9J8avVvu632+dkcOV/tnRtaY7ZnnrT6U1vf+/yMes71PdePUltHX2+tr3z9AAAAgDsduZfCNXruYXINWUDd6Plgvh13Va1kcpxa5bgiC3n3GVkv39n6mB951CuHLPLIhLv9jb13aZna7spG10wm/dQsx7dZ9GQm53PV6imT+8gin0wAYD1+38khizwfWbw/l1w/Xle7B3Zm3e56xnK2TI4+Hzwyk9G+zeLqZ6f32n/ydfCu59hH7WeFLFf524LZ+vsET8tklbm0gtWz6P3Ol3D8SX0ZYcZMViWLPGrPUzx1bCceryz+LxMk922kpx43fYyTHE+9fiSTBfQxV/LIJIdrSh5Z5DA/8siCRH7jySGLPDIBAAAAAAAAAJJ5liGPTHLMnoX/rZHjrCxkch61HOsXtZ+gxw==
   </data>
  </layer>
+ <layer id="13" name="damage" width="100" height="100">
+  <data encoding="base64" compression="zlib">
+   eJzt2jERAAAIA7Faxb8JZhRwcImC39sEAAAAAAAAAACAj2o7AAAAAAAAAAAAAAAAGHz9AQAAAAAA7rDtAAAAAAAAAAAAAAANypQBJA==
+  </data>
+ </layer>
  <layer id="7" name="torch" width="100" height="100">
   <data encoding="base64" compression="zlib">
    eJzt3UkSgyAQAMC81P8/I/cURiy2Gei+JAdKWQaEUvTzIZqrU5re6Vacc0Q6AADWijr3NJ/MyboCysQyAACZPc1nr5/flmPVpmE+7VI2u15WtYP2B54YJ8ZQr3Cvd//Q3+Z6s47seb7satfnxLFqrBp1P37VGlhsQ5vefcn1CPZ33fxnH9q17O19zFL6u2Ooc94SM3VWXbNWr8/ZU0sciCF6EUsx7dQu0crym59o+dvR7nXsek5EEWIrQh5O4Rnjd7LlO1t+ye+kmLPPCcaL2oci5Cvi/Y1sdi0XMMe/MSTK+FL7DKh3BBJBr/0JGZ63EP9n0/7QTj8CeGasbLNT/UUti/1n7GZUHD/tP/M+BQAAqGfeTHZiGAAAiGy3NYt3J0OZ2I9Fe0Bus775AHDnpPGjZ1lPqrdTfQHJwyzN

game/assets/level/Underwatch.tiled-session

@@ -3,7 +3,7 @@
         "height": 4300,
         "width": 2
     },
-    "activeFile": "level5.tmx",
+    "activeFile": "startMap.tmx",
     "expandedProjectPaths": [
     ],
     "file.lastUsedOpenFilter": "All Files (*)",
@@ -58,19 +58,9 @@
             "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,
             "scaleInEditor": 1
         },
-        "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Monster.tsx": {
-            "scaleInDock": 1
-        },
-        "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx": {
-            "scaleInDock": 1
-        },
         "2.0Map.tmx": {
             "scale": 0.9133,
             "selectedLayer": 6,
@@ -91,32 +81,32 @@
             "scale": 0.7327,
             "selectedLayer": 5,
             "viewCenter": {
-                "x": 436.7408216186707,
-                "y": 452.43619489559165
+                "x": 436.0584140848915,
+                "y": 451.75378736181256
             }
         },
         "Dungeon1.tmx": {
-            "scale": 0.6124,
-            "selectedLayer": 7,
+            "scale": 0.3554,
+            "selectedLayer": 9,
             "viewCenter": {
-                "x": 772.3709993468319,
-                "y": 733.9973873285434
+                "x": 811.7613956105797,
+                "y": 1114.2374788970176
             }
         },
         "Dungeon3.tmx": {
-            "scale": 0.3837,
-            "selectedLayer": 7,
+            "scale": 0.8659,
+            "selectedLayer": 8,
             "viewCenter": {
-                "x": 328.38154808444096,
-                "y": 400.0521240552514
+                "x": 188.82088000923892,
+                "y": 262.1549832544174
             }
         },
         "Dungeon6.tmx": {
-            "scale": 1.279,
-            "selectedLayer": 9,
+            "scale": 1.3474,
+            "selectedLayer": 8,
             "viewCenter": {
-                "x": 400.312744331509,
-                "y": 160.2814698983581
+                "x": 144.35208549799611,
+                "y": 227.84622235416356
             }
         },
         "Dungeon_Monsters1.tsx": {
@@ -160,6 +150,10 @@
             "scaleInDock": 1,
             "scaleInEditor": 10.7
         },
+        "bottom.tsx": {
+            "scaleInDock": 1,
+            "scaleInEditor": 1
+        },
         "dungeon assets.tsx": {
             "scaleInDock": 1,
             "scaleInEditor": 1
@@ -177,11 +171,11 @@
             "scaleInEditor": 1
         },
         "level5.tmx": {
-            "scale": 0.6668,
-            "selectedLayer": 0,
+            "scale": 0.9243,
+            "selectedLayer": 9,
             "viewCenter": {
-                "x": 275.9448110377924,
-                "y": 251.19976004799042
+                "x": 410.5809802012334,
+                "y": 504.16531429189655
             }
         },
         "neuesTileset.tsx": {
@@ -202,17 +196,17 @@
             "scaleInEditor": 1
         },
         "startMap.tmx": {
-            "scale": 1.0337,
-            "selectedLayer": 7,
+            "scale": 1.8945,
+            "selectedLayer": 4,
             "viewCenter": {
-                "x": 498.2103124697688,
-                "y": 467.7372545225888
+                "x": 681.1823700184746,
+                "y": 611.2430720506729
             }
         }
     },
     "frame.defaultDuration": 1,
     "last.externalTilesetPath": "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsDungeon",
-    "last.imagePath": "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsDungeon",
+    "last.imagePath": "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Decorations(main)",
     "map.fixedSize": true,
     "map.height": 20,
     "map.lastUsedFormat": "tmx",
@@ -224,28 +218,31 @@
         "Demo.tmx",
         "Dungeon3.tmx",
         "level5.tmx",
+        "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsAussenwelt/plains.tsx",
+        "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx",
+        "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Monster.tsx",
         "Dungeon6.tmx",
         "startMap.tmx"
     ],
     "project": "Underwatch.tiled-project",
     "property.type": "string",
     "recentFiles": [
-        "Dungeon1.tmx",
-        "Demo.tmx",
-        "Dungeon3.tmx",
-        "startMap.tmx",
+        "bottom.tsx",
         "Dungeon6.tmx",
+        "Dungeon1.tmx",
         "level5.tmx",
+        "startMap.tmx",
+        "Dungeon3.tmx",
+        "Demo.tmx",
         "/Users/martin/repos/Underwatch/game/assets/tileSets/tilesetsAussenwelt/plains.tsx",
         "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsAussenwelt/plains.tsx",
         "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx",
         "/Users/benny/software-engeneering/Underwatch/game/assets/tileSets/tilesetsDungeon/Dungeon_Monster.tsx",
-        "pathfinding.tmx",
-        "fences.tsx"
+        "pathfinding.tmx"
     ],
     "tileset.lastUsedFormat": "tsx",
     "tileset.tileSize": {
-        "height": 32,
-        "width": 24
+        "height": 16,
+        "width": 16
     }
 }

game/assets/level/bottom.tsx

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tileset version="1.10" tiledversion="1.10.2" name="bottom" tilewidth="16" tileheight="16" tilecount="384" columns="24">
+ <image source="../tileSets/tilesetsAussenwelt/PixelWoods/Terrain(main)/terrain tiles.png" width="384" height="256"/>
+</tileset>