diff --git a/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big.png b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big.png new file mode 100644 index 0000000..06a3ce2 Binary files /dev/null and b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big.png differ diff --git a/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_1.png b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_1.png new file mode 100644 index 0000000..06a3ce2 Binary files /dev/null and b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_1.png differ diff --git a/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_2.png b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_2.png new file mode 100644 index 0000000..d1560c3 Binary files /dev/null and b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_2.png differ diff --git a/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_3.png b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_3.png new file mode 100644 index 0000000..9859975 Binary files /dev/null and b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_3.png differ diff --git a/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_4.png b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_4.png new file mode 100644 index 0000000..d1560c3 Binary files /dev/null and b/game/assets/level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks/damage_big_open_4.png differ diff --git a/game/assets/level/Decorations.tsx b/game/assets/level/Decorations.tsx new file mode 100644 index 0000000..c76cf45 --- /dev/null +++ b/game/assets/level/Decorations.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/game/assets/level/Dungeon1.tmx b/game/assets/level/Dungeon1.tmx index 988815b..f7c68aa 100644 --- a/game/assets/level/Dungeon1.tmx +++ b/game/assets/level/Dungeon1.tmx @@ -1,5 +1,5 @@ - + @@ -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== + + + eJzt2jERAAAIA7Faxb8JZhRwcImC39sEAAAAAAAAAACAj2o7AAAAAAAAAAAAAAAAGHz9AQAAAAAA7rDtAAAAAAAAAAAAAAANypQBJA== + + eJzt3UkSgyAQAMC81P8/I/cURiy2Gei+JAdKWQaEUvTzIZqrU5re6Vacc0Q6AADWijr3NJ/MyboCysQyAACZPc1nr5/flmPVpmE+7VI2u15WtYP2B54YJ8ZQr3Cvd//Q3+Z6s47seb7satfnxLFqrBp1P37VGlhsQ5vefcn1CPZ33fxnH9q17O19zFL6u2Ooc94SM3VWXbNWr8/ZU0sciCF6EUsx7dQu0crym59o+dvR7nXsek5EEWIrQh5O4Rnjd7LlO1t+ye+kmLPPCcaL2oci5Cvi/Y1sdi0XMMe/MSTK+FL7DKh3BBJBr/0JGZ63EP9n0/7QTj8CeGasbLNT/UUti/1n7GZUHD/tP/M+BQAAqGfeTHZiGAAAiGy3NYt3J0OZ2I9Fe0Bus775AHDnpPGjZ1lPqrdTfQHJwyzN diff --git a/game/assets/level/Underwatch.tiled-session b/game/assets/level/Underwatch.tiled-session index 1004ed2..1858159 100644 --- a/game/assets/level/Underwatch.tiled-session +++ b/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 } } diff --git a/game/assets/level/bottom.tsx b/game/assets/level/bottom.tsx new file mode 100644 index 0000000..f1df87f --- /dev/null +++ b/game/assets/level/bottom.tsx @@ -0,0 +1,4 @@ + + + + diff --git a/game/assets/level/level5.tmx b/game/assets/level/level5.tmx index 4b052c6..d7aacf2 100644 --- a/game/assets/level/level5.tmx +++ b/game/assets/level/level5.tmx @@ -1,66 +1,122 @@ - + + + -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, -9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9 +325,373,372,324,325,373,348,373,324,372,372,349,324,373,324,348,349,349,325,324,373,373,373,349,348,372,349,373,324,373,349,348,372,325,372,324,324,372,325,373,373,348,348,372,372,373,348,372,325,324, +324,324,349,372,324,325,373,348,348,325,324,373,324,348,349,324,325,349,349,325,372,348,325,348,349,349,349,325,373,349,325,325,373,324,348,349,373,372,348,325,325,324,373,348,324,348,373,324,373,348, +325,348,349,348,349,349,349,373,373,349,349,349,348,373,324,324,349,324,373,349,325,349,348,349,348,348,372,373,372,325,324,348,324,373,372,324,325,325,349,349,348,373,325,348,373,325,348,373,325,324, +372,324,324,373,373,348,372,325,348,348,324,325,348,325,373,372,348,348,324,349,372,325,348,348,325,325,348,324,348,372,324,324,325,348,324,349,373,325,324,324,372,325,373,325,348,325,348,348,324,349, +373,372,372,324,348,324,324,324,372,373,348,325,324,373,348,324,348,324,325,324,325,348,324,324,373,324,372,324,372,349,349,372,373,325,373,348,325,324,373,325,372,348,324,372,348,325,372,349,348,324, +324,349,373,349,373,373,372,349,348,373,348,348,325,373,325,325,324,372,372,349,348,324,324,372,372,349,349,324,324,373,372,372,372,324,372,373,349,349,373,324,372,348,348,324,349,349,324,349,372,324, +348,372,372,348,372,349,373,348,325,349,373,348,372,325,372,372,372,349,348,348,349,324,373,324,373,324,324,373,349,325,348,373,372,372,348,349,324,373,324,373,348,349,348,373,373,372,348,348,373,324, +325,324,325,373,325,325,372,348,372,325,348,349,373,372,373,349,324,348,349,348,373,324,325,325,373,348,373,325,348,325,348,348,349,348,325,349,348,373,348,373,372,325,349,373,349,325,372,373,348,324, +372,348,373,348,373,372,373,372,325,349,348,373,372,348,325,373,372,348,349,349,349,325,372,324,349,372,373,372,325,348,348,372,372,372,373,373,373,373,325,324,373,373,325,349,325,372,325,349,373,324, +324,324,349,325,373,372,349,348,372,372,372,348,348,324,372,325,349,349,325,349,349,372,373,372,325,349,324,372,349,324,325,348,372,325,373,324,324,348,348,324,324,348,325,372,349,372,324,325,348,372, +325,349,324,324,349,324,325,373,349,372,324,349,349,348,373,324,349,373,324,349,349,324,325,325,348,373,348,348,372,348,373,325,349,349,372,373,349,349,349,348,372,348,325,372,348,324,349,348,325,348, +325,348,372,349,349,349,325,348,373,349,324,324,373,325,349,373,324,373,373,349,373,349,373,324,324,373,372,372,325,349,373,373,373,324,372,372,324,324,325,325,325,349,373,348,325,324,372,348,373,373, +373,372,325,373,349,348,372,348,325,325,348,372,373,372,349,325,325,373,373,324,349,372,348,349,325,324,372,373,372,325,325,325,325,348,348,324,348,372,349,372,324,372,373,348,325,349,348,349,324,372, +348,324,325,349,373,349,348,372,348,325,373,349,372,373,373,349,349,325,325,324,324,349,324,348,372,373,325,372,372,325,325,349,325,348,372,349,372,348,324,324,373,349,373,348,349,349,324,373,348,372, +372,372,325,372,372,348,324,348,372,372,349,373,349,349,349,348,324,349,349,348,373,348,325,325,373,325,325,349,349,348,373,325,373,372,373,325,325,324,348,324,372,325,348,349,325,373,324,349,372,324, +348,325,349,324,325,348,325,325,349,324,373,324,373,349,325,373,373,373,325,349,348,348,325,348,324,372,373,372,348,349,372,372,373,349,372,372,325,372,349,348,325,372,373,349,372,324,373,373,373,325, +325,324,325,372,349,373,372,348,324,325,348,325,373,349,325,324,373,348,372,348,372,324,348,325,325,324,349,325,349,349,373,372,372,373,324,372,348,324,348,325,325,373,348,373,372,372,324,325,324,372, +373,348,373,348,325,349,372,349,372,373,372,372,324,373,372,324,373,325,325,325,372,349,348,324,372,373,372,348,373,373,373,348,324,349,349,325,349,372,349,372,373,372,372,324,373,349,324,324,373,349, +325,325,372,324,325,373,373,349,324,324,373,349,348,373,349,348,373,324,348,349,348,324,373,349,324,325,373,373,324,324,325,324,348,324,349,373,372,348,325,348,372,325,325,348,324,372,325,325,372,348, +349,349,349,349,373,349,325,372,372,325,373,373,373,373,349,372,324,372,372,325,324,372,372,324,372,373,372,324,324,324,324,349,349,373,324,349,372,372,373,324,349,324,372,324,372,348,372,349,348,348, +325,372,372,349,372,349,372,325,349,325,325,324,373,348,324,372,324,373,325,372,372,349,349,373,372,324,349,324,373,348,373,373,325,349,349,324,372,372,325,373,372,325,349,348,348,372,324,373,349,373, +372,373,324,348,348,373,372,348,349,373,372,372,373,349,373,324,348,349,349,325,324,325,324,325,372,373,325,348,348,325,348,372,349,348,372,373,324,325,348,349,325,325,348,373,372,349,324,372,325,324, +324,372,324,348,348,372,349,373,348,373,372,372,348,373,324,372,349,372,325,324,373,349,349,325,372,372,373,325,324,325,348,372,373,373,349,348,372,325,373,348,349,325,349,324,348,349,373,372,324,372, +349,325,373,349,372,325,324,373,349,348,372,372,324,372,372,324,372,324,325,324,373,372,372,373,372,325,372,348,372,349,348,372,349,324,325,373,324,325,349,373,373,324,325,373,373,348,372,324,325,324, +349,349,349,349,373,372,349,349,373,325,348,324,324,349,372,324,349,373,325,373,324,324,373,348,348,325,348,324,325,324,373,324,349,372,372,325,372,348,325,348,349,372,348,372,349,373,325,325,324,324, +373,349,348,373,324,349,349,324,373,373,325,324,349,373,348,373,349,325,349,373,372,325,372,373,324,324,325,348,373,372,349,349,372,325,325,324,348,324,325,372,349,373,324,325,348,372,373,324,373,349, +372,324,324,325,348,348,349,349,325,324,372,349,324,348,325,373,325,349,373,373,373,349,372,324,324,373,349,348,349,324,325,348,373,325,349,372,325,348,373,372,348,372,348,373,324,372,325,324,373,349, +348,324,372,348,349,324,373,324,325,372,349,324,372,325,349,325,349,325,349,349,349,372,325,348,373,348,324,324,373,325,373,324,348,349,349,348,372,324,349,324,348,349,348,348,373,348,349,373,325,349, +324,324,349,349,349,324,372,349,324,373,372,325,348,325,325,349,324,372,373,325,349,372,372,325,349,325,324,324,372,348,349,372,348,373,373,373,325,324,372,348,373,349,348,324,348,324,348,348,349,349, +348,373,348,324,373,349,348,324,349,325,372,325,349,372,349,324,372,324,324,324,348,373,373,349,348,348,348,348,324,325,325,373,324,325,324,373,348,324,349,325,372,325,349,325,349,325,373,325,349,373, +372,372,348,348,325,372,324,348,348,324,348,349,348,372,349,372,349,372,373,324,373,372,324,325,373,373,372,372,373,325,324,372,324,348,324,372,349,324,324,372,324,373,349,325,372,372,373,325,324,325, +349,349,349,348,373,373,325,372,373,373,373,373,348,372,324,372,348,324,325,348,324,349,349,348,325,349,373,372,324,348,324,373,349,325,348,373,349,325,372,348,324,324,349,348,348,324,325,349,373,348, +373,349,324,325,348,373,348,349,325,324,349,325,324,348,372,372,325,349,348,372,324,348,348,324,348,373,324,349,348,348,373,348,348,373,348,373,348,348,349,349,372,372,325,325,324,324,348,324,348,324, +324,373,349,324,372,348,373,324,372,324,324,349,349,373,372,373,324,372,349,349,325,372,325,372,325,349,349,324,324,373,324,324,372,348,324,349,324,372,349,348,324,349,372,349,349,325,349,325,348,372, +372,372,324,373,324,348,373,372,373,348,348,324,372,324,372,348,349,325,324,372,348,324,373,349,373,372,325,348,372,348,373,325,324,373,325,349,325,372,325,325,372,373,372,349,372,348,324,372,372,325, +372,373,325,348,373,324,348,373,325,348,349,372,373,373,325,324,372,325,349,349,373,373,324,348,325,349,372,324,372,372,349,325,349,324,348,373,325,349,373,348,348,325,349,324,349,325,373,325,325,348, +324,372,325,324,348,372,324,373,349,348,372,373,372,349,373,325,324,324,349,348,325,373,324,349,373,372,373,325,372,324,373,325,324,348,325,349,372,348,324,348,349,348,373,324,373,324,325,373,348,324, +325,349,325,372,373,348,349,372,373,325,324,325,325,372,349,372,349,324,324,325,349,372,348,324,372,372,373,348,324,348,372,348,324,373,372,349,325,373,348,324,349,372,373,348,349,373,348,372,325,372, +348,348,373,372,373,324,348,373,372,373,325,325,348,373,348,349,325,325,372,324,373,325,373,372,325,372,324,324,348,372,324,349,372,325,372,373,348,349,373,372,325,325,349,373,372,349,372,324,325,349, +324,373,348,372,348,372,373,348,349,325,325,325,349,324,348,348,373,373,348,373,348,349,348,325,372,372,325,325,372,372,325,349,373,324,349,325,373,373,325,372,373,348,348,373,349,324,349,373,373,373, +373,349,373,349,325,325,373,348,325,325,348,349,349,372,348,373,324,372,325,325,373,372,373,349,325,372,325,349,372,373,325,325,324,349,348,372,325,372,349,324,372,373,325,348,373,324,372,349,373,349, +348,349,373,372,349,325,348,349,349,373,373,324,373,325,372,372,373,373,372,349,348,325,349,348,373,349,348,348,325,324,349,372,349,325,348,325,372,349,325,349,372,349,324,373,325,372,372,349,373,325, +372,372,324,324,325,372,372,324,373,372,325,324,372,324,325,348,349,324,372,348,349,349,325,349,373,349,325,325,325,325,325,372,324,325,373,348,372,349,324,325,324,372,325,373,373,324,349,373,324,348, +373,372,348,348,324,325,373,325,349,324,324,324,325,373,324,372,349,372,349,372,372,349,324,324,325,348,372,348,372,349,349,349,325,324,325,372,372,372,325,349,372,372,349,348,348,324,349,373,372,372, +349,324,349,349,373,325,372,372,373,349,325,325,372,373,348,349,325,372,325,349,324,373,348,373,349,324,348,348,349,348,324,348,324,348,372,349,349,349,348,373,324,372,325,372,324,348,349,325,325,349, +373,349,349,348,325,373,325,372,372,372,348,348,348,348,373,325,325,324,372,349,324,372,349,325,349,349,373,348,324,324,349,348,372,348,373,348,348,348,372,348,373,348,372,373,349,373,372,372,325,373, +373,324,373,349,373,325,324,372,373,324,349,348,349,372,325,348,373,372,324,325,349,373,348,325,349,349,349,349,325,325,325,348,373,372,372,372,348,325,372,348,373,324,372,348,373,324,348,325,324,325, +372,325,349,348,348,372,349,372,373,373,349,348,349,373,349,373,348,372,373,372,372,325,325,373,349,324,373,373,324,324,324,348,373,325,349,348,349,373,324,348,325,372,372,324,373,325,349,372,348,373, +324,349,325,349,373,349,349,373,348,325,373,349,325,348,348,373,324,325,372,324,349,324,349,372,325,348,348,324,324,325,373,373,325,348,348,348,348,349,349,373,324,324,348,348,348,349,349,348,325,373, +325,372,349,372,372,373,348,324,325,349,349,373,325,325,372,325,349,373,373,349,325,324,325,373,349,324,324,372,324,348,373,373,325,324,348,349,348,324,373,373,324,373,349,324,324,325,372,324,324,325 + + + + +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,741,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,741,0,0,0,781,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,741,0,0,741,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,759,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,781,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,741,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,781,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,895,0,0,759,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,883,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0, +0,0,0,738,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,739,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,894,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,738,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,759,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,739,0,0,0,0,895,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,895,0,0,0,0,0,0,0,0,0,0,0,0,780,0,0, +0,0,883,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,780,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,741,0,740,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,883,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,759,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,780,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,0,0, +0,0,741,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,780,0,0,0, +0,758,758,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,779,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,800,739,0,0,0,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,758,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,741,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,882,0,0,0,0,758,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,780,819,0, +0,0,0,0,0,801,0,0,0,0,0,0,882,0,0,0,759,0,0,0,0,0,0,0,0,819,0,780,0,0,0,740,800,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,758,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,781,0,779,0,819,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,740,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,874,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,874,0,0,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,894,0,0,759,0,781,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,779,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,883,0,0,0,759,0,0,0,0,0,0,0, +0,740,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,894,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,801,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,741,0,0,0,0,0,0,0,0,739,0,0,779,0,0,781,0,874,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,895,0,0,0,0,0,0,0,0,0,0,0,0,0,740,0,0,0,0,0,894,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,758,0,0,0,0,738,0,0,0,0,0,0,738,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,874,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,739,0,0,0,0,0,0,780,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,801,0,0,0,758,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 diff --git a/game/assets/level/startMap.tmx b/game/assets/level/startMap.tmx index e62fd4a..2243f33 100644 --- a/game/assets/level/startMap.tmx +++ b/game/assets/level/startMap.tmx @@ -1,5 +1,5 @@ - + @@ -8,12 +8,14 @@ + + - eJztmL0OgCAMhFk0Ifr+zyujg9byZ6/lhm8hIVyPa0PIKaVMCFGzFXbFWs1+C47CKax96Xzaj4gXnbWg5KhXF+r9oOoi7dlH65m3jKHPXq2P1jpn6kPL0ggPItZE5hA5K9Ib31Pd0hufPfIfnjIjUZOZ6DVHr280Fn7NONNibqLPavbCml73aEHyGkkLscOyt0aebZln5F5Cmp1RPSZ1oGfS81/vXTuiPi2etbfel2c83he9J6tzAf7RV6U= + eJx911GOq0AMRNFhkbAL2AWs+82T0tLJjTMfKAlp3G67XFU828/P/ntdr8+T78fv9bw+15rzde2v/9b/9+tzrV3r139r7UWcJ+vv17Vin6xf607WredP1h45izkePLtyMNd13ey/8+xBfOuw9lk1aC4XZz8TZ+da8W7WWQdr49nXvZ017v2txu515fl133Na13WZg+uO7b3/xlzfix3xt+63Tyf31+8j++/bJw6fxHy291zb27XGmNbO9asf9/aOMfHnnvZWXB75bd7O34rTs7nGfO3Xvb3XcOUmrszdeTkSwxod2ycejWN/zM+62GP3lkPsj2e9tvezeq6De+3bmXgrplhtXVcccyxWJm4pJ9kT6/fX/jf7erYr+5Sbn+29Buf2Xkv5/uTTHjVfuXjKxb4a19n3/ophzPbYXht7mmdns3t3vycxW5OH2NVJ6zJphzVzFsSonFbOnvpm/s5tc9yzXi6SN+SPb3iv9qtf1YryQnX6zvPGsNbmKC4bR36Qd47tEy/yovXruautk5cpH9jr+p8r//XMEw/2fGfum5v65frjyz2fqx9z5j2fHkYc6e3WmeUCz62PsW5Hfnv/zhq1YdKM9sJn99yvz3tyqWuteT2gNfC3+HE+rOU0z1Nu1lZOmfipXnmql9ouHuybmPEZ+6XWXYlfP28PxH7fI+SAcvmeva1vv3tuubqe2n44T/Wp+ms53bqUyyY/4z0x5//lNM/R+sjDzmW5uHxi3vVo394XJi/Qvdt/MSwHTDwnH7n2GPayD+2TtZrOV6xe2b/esLqjZtpv6zOdV13YWVMf2H3kQt8nqjXOz1TDkz37riZu/O7slwM8U/2bmJYj9zx75/40m2qZPGsu+5f1aqv1tC+dS5+1fsWK3NVZtn/lmWq/vN/3HbnYOTNe/XT7Xf6Uk+1t8a4mq+tqrf5Ibqof1mtWA627mDSHO/fr3+rZxFk11tlvbe21WiNvFIP1hvKK8+wZyk9Xnql3r77XG5T77YN1mHzfFNeznflsf9un+j5j1otat/Jlub+ccG2fPbTO8pecL1aqTX62rubd/8vzal+15cj3zmd5TeyWR5wr106+3d7Uj6kfetxyWH83d+suhtsT6zHptnpffNU3PsPz4tf9Vp1Wfdb3e4jTmREXV2LWN5/bZ56tkXW2LpO+iXW9wzdfWT20T879tIf4th9yf/1tNcseioPOj/2Tk825Zyyeqn1yjH2Tz4uTnlmenzxXuVztlEP83nydXTVKDev7Rj1V/awYr2bZ5+K5mn4kRvepLppfde8Z1q7ryFWOdh7EgP3wjH1XqWaoLdf2WTP9X33UNB/2o16lOVQDfNb9i8FpzuqvzG86iz7YtdXxao11cL/OvGfsnNX7V2M6j563+m/O9Xzyeed/4iL11zlYs1f+rubIw41zE1+PoLe2Hp6n/tvZc26L20lb7Y9cYx3NufpVfSzOJw9Y72y9Vs3kTvWoPFG+rfev95CLzqz1nUd9L6bEu7rRXqm3T+7Jj51fZ0lMyWWT9taHP3lWrpGDxXZ5txgsHsRb/ec0t+Klc6OmltvKDfobPYE5iJ9yiXhV29TnJ8+rFc23fNuZru7UI+pv7u29X/UKd/bwP//XF1VHnf/6WblJL1ocqFWTb6l/be+m970n+9efTZ7jm4a1H/VbYlEu7yyKsXKPelT/4oyLMWs/ceuV/52B+gx93pP19RTiQm3qGf6abbFb/yCvlKvk1u4nJuuRi2Fx4uy1z55R3REz7XnfP8znGWIatzgRy+apdyjW9dTyXbVu4tJ6MXvgM/bLmnvPmsqTxu4ZphmuH+07gXi3ltP56nE6R2pqudPemUev6v//6x8n4zZM @@ -45,7 +47,7 @@ - eJzt1bENACAIBED3X8Q1LexMbNQIIXclBXm+oTUAAAAAAKijRwcAgGDrL+yb+c1O/srSf5Ycp17nr9BHthtO82S7I4oeYBpfRAkj + eJztmc0OwiAMxxd30CfYycfxraZejF7VvcQeUN3ZLHGRkNLxUUoH+x0xjNLCvy1W1UpJfDapLSiDQw2Pnw3jS2A6O52yh7b+/4btDfIHlS/2wHe2Qv0M2epKq33D5U7fmf0y2fZOoDsvpjVN/lfvyS7hefTRfKk6BfnRFOfQ+Ifc1cZyLrbGXNwotMSX0DriGWg7tL6ui65cCfxpyvs5MenaXC5Jofm50QjJISt5MPzupNT6eETV0KFADdFjIzlWGJ1wux+e9vnWXdy9lwmuvoiblPUwB9xxc9EdCp2+RYif6c719EuhUPYFtr2lTT+j9vm+esil89LzSclcGGJDpQ9YHubYRywo+8NT4LcwLZHWx3L2GPpaIW9ORyI/6rmwN4yP2OYedW7M/iX0zQ8iRh3CDXV9Y6OLUJy56yxqqO3PwR+x9wDpMfZ/g6892LwYuiKVpZ9JF9Q+LNd3kBV/vt4mOAI= @@ -63,6 +65,16 @@ eJzt1sEJADAIBDD3H9cJ+u9LaNEWkgnk4NQIAG7J6QEAOGaX18gJgFe4SQAA//C7QT+9myH3XvIGdguCEAeR + + + eJztzgEJAAAMA6D1j/R0jzEYmsAEAAAAAAAAAACg69oBJjzPbwC7 + + + + + eJztxTENAAAIA7D5F4NGJOwmtE8TLpkyAAAAAAAAAADAVwupWwK5 + + eJztzgENAAAIA6D3j2NCY1w3SEDCVdMOAAAAAAAAAAAAPLIzPgCz diff --git a/game/assets/sfx/mp7.mp3 b/game/assets/sfx/mp7.mp3 new file mode 100644 index 0000000..b350ab6 Binary files /dev/null and b/game/assets/sfx/mp7.mp3 differ diff --git a/game/assets/sfx/sniper.mp3 b/game/assets/sfx/sniper.mp3 new file mode 100644 index 0000000..2cba675 Binary files /dev/null and b/game/assets/sfx/sniper.mp3 differ diff --git a/game/assets/textureAtlas/Underwatch.atlas b/game/assets/textureAtlas/Underwatch.atlas index a509504..8e5e6e4 100644 --- a/game/assets/textureAtlas/Underwatch.atlas +++ b/game/assets/textureAtlas/Underwatch.atlas @@ -3,1348 +3,1390 @@ size:512,512 repeat:none Babo_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 O1_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 O2_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 O3_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 O4_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 O5_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 SH_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 SS_idle_left index:1 -bounds:2,328,24,32 +bounds:2,376,24,32 Babo_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 O1_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 O2_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 O3_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 O4_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 O5_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 SH_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 SS_idle_left index:3 -bounds:80,159,24,32 +bounds:80,215,24,32 Babo_walk_back index:1 -bounds:54,22,24,32 +bounds:54,41,24,32 Babo_walk_back index:3 -bounds:396,461,24,32 +bounds:132,249,24,32 Babo_walk_back index:2 -bounds:132,257,24,32 +bounds:210,14,24,32 Babo_walk_front index:2 -bounds:28,362,24,32 +bounds:28,415,24,32 Babo_walk_front index:1 -bounds:422,458,24,32 +bounds:132,215,24,32 Babo_walk_front index:3 -bounds:332,393,24,32 +bounds:184,184,24,32 Babo_walk_left index:2 -bounds:28,260,24,32 +bounds:28,313,24,32 Babo_walk_left index:1 -bounds:158,427,24,32 +bounds:132,79,24,32 Babo_walk_left index:3 -bounds:384,393,24,32 +bounds:184,116,24,32 Babo_walk_right index:3 -bounds:88,431,24,32 +bounds:28,7,24,32 Babo_walk_right index:2 -bounds:150,393,24,32 +bounds:150,388,24,32 Babo_walk_right index:1 -bounds:158,223,24,32 +bounds:236,116,24,32 Just_arrow -bounds:168,132,16,16 +bounds:442,296,16,16 O1_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 Babo_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 O2_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 O3_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 O4_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 O5_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 SH_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 SS_idle_back index:3 -bounds:28,56,24,32 +bounds:28,109,24,32 O1_walk_back index:3 -bounds:28,294,24,32 +bounds:28,347,24,32 O1_walk_back index:2 -bounds:132,427,24,32 +bounds:132,113,24,32 O1_walk_back index:1 -bounds:184,325,24,32 +bounds:236,320,24,32 O1_walk_front index:2 -bounds:54,294,24,32 +bounds:54,313,24,32 O1_walk_front index:1 -bounds:202,393,24,32 +bounds:158,320,24,32 O1_walk_front index:3 -bounds:218,359,24,32 +bounds:210,286,24,32 O1_walk_left index:1 -bounds:28,158,24,32 +bounds:28,211,24,32 O1_walk_left index:3 -bounds:106,193,24,32 +bounds:106,283,24,32 O1_walk_left index:2 -bounds:436,390,24,32 +bounds:184,48,24,32 O1_walk_right index:1 -bounds:2,396,24,32 +bounds:2,444,24,32 O1_walk_right index:3 -bounds:80,193,24,32 +bounds:80,249,24,32 O1_walk_right index:2 -bounds:418,424,24,32 +bounds:158,82,24,32 O2_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 Babo_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 O1_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 O3_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 O4_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 O5_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 SH_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 SS_idle_left index:2 -bounds:36,430,24,32 +bounds:2,36,24,32 O2_walk_back index:1 -bounds:28,90,24,32 +bounds:28,143,24,32 O2_walk_back index:3 -bounds:106,159,24,32 +bounds:106,249,24,32 O2_walk_back index:2 -bounds:462,390,24,32 +bounds:184,14,24,32 O2_walk_front index:3 -bounds:80,295,24,32 +bounds:80,351,24,32 O2_walk_front index:2 -bounds:392,427,24,32 +bounds:158,116,24,32 O2_walk_front index:1 -bounds:184,223,24,32 +bounds:262,252,24,32 O2_walk_left index:2 -bounds:2,294,24,32 +bounds:2,342,24,32 O2_walk_left index:1 -bounds:106,91,24,32 +bounds:106,181,24,32 O2_walk_left index:3 -bounds:470,424,24,32 +bounds:158,14,24,32 O2_walk_right index:2 -bounds:28,328,24,32 +bounds:28,381,24,32 O2_walk_right index:1 -bounds:474,458,24,32 +bounds:132,147,24,32 O2_walk_right index:3 -bounds:358,394,24,32 +bounds:184,150,24,32 O3_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 Babo_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 O1_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 O2_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 O4_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 O5_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 SH_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 SS_idle_right index:1 -bounds:28,226,24,32 +bounds:28,279,24,32 O3_walk_back index:2 -bounds:2,192,24,32 +bounds:2,240,24,32 O3_walk_back index:1 -bounds:160,461,24,32 +bounds:106,45,24,32 O3_walk_back index:3 -bounds:228,393,24,32 +bounds:184,320,24,32 O3_walk_front index:2 -bounds:2,22,24,32 +bounds:2,70,24,32 O3_walk_front index:1 -bounds:326,462,24,32 +bounds:132,317,24,32 O3_walk_front index:3 -bounds:280,393,24,32 +bounds:184,252,24,32 O3_walk_left index:2 -bounds:80,57,24,32 +bounds:80,113,24,32 O3_walk_left index:1 -bounds:254,393,24,32 +bounds:184,286,24,32 O3_walk_left index:3 -bounds:210,325,24,32 +bounds:236,184,24,32 O3_walk_right index:3 -bounds:62,431,24,32 +bounds:28,41,24,32 O3_walk_right index:2 -bounds:124,393,24,32 +bounds:469,426,24,32 O3_walk_right index:1 -bounds:184,291,24,32 +bounds:236,218,24,32 O4_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 Babo_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 O1_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 O2_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 O3_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 O5_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 SH_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 SS_idle_back index:1 -bounds:80,397,24,32 +bounds:54,7,24,32 O4_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 Babo_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 O1_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 O2_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 O3_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 O5_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 SH_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 SS_idle_right index:2 -bounds:54,226,24,32 +bounds:54,245,24,32 O4_walk_back index:2 -bounds:80,23,24,32 +bounds:80,79,24,32 O4_walk_back index:1 -bounds:306,393,24,32 +bounds:184,218,24,32 O4_walk_back index:3 -bounds:132,189,24,32 +bounds:236,150,24,32 O4_walk_front index:3 -bounds:28,192,24,32 +bounds:28,245,24,32 O4_walk_front index:2 -bounds:184,427,24,32 +bounds:132,45,24,32 O4_walk_front index:1 -bounds:132,223,24,32 +bounds:236,286,24,32 O4_walk_left index:3 -bounds:54,158,24,32 +bounds:54,177,24,32 O4_walk_left index:2 -bounds:288,427,24,32 +bounds:158,252,24,32 O4_walk_left index:1 -bounds:210,291,24,32 +bounds:236,48,24,32 O4_walk_right index:1 -bounds:106,261,24,32 +bounds:106,351,24,32 O4_walk_right index:3 -bounds:366,428,24,32 +bounds:158,150,24,32 O4_walk_right index:2 -bounds:132,155,24,32 +bounds:246,388,24,32 O5_walk_back index:3 -bounds:54,124,24,32 +bounds:54,143,24,32 O5_walk_back index:2 -bounds:314,427,24,32 +bounds:158,218,24,32 O5_walk_back index:1 -bounds:236,325,24,32 +bounds:236,14,24,32 O5_walk_front index:3 -bounds:28,396,24,32 +bounds:2,2,24,32 O5_walk_front index:2 -bounds:352,462,24,32 +bounds:132,283,24,32 O5_walk_front index:1 -bounds:158,325,24,32 +bounds:210,48,24,32 O5_walk_left index:1 -bounds:80,363,24,32 +bounds:80,419,24,32 O5_walk_left index:3 -bounds:448,458,24,32 +bounds:132,181,24,32 O5_walk_left index:2 -bounds:158,291,24,32 +bounds:220,388,24,32 O5_walk_right index:3 -bounds:2,124,24,32 +bounds:2,172,24,32 O5_walk_right index:2 -bounds:186,461,24,32 +bounds:106,11,24,32 O5_walk_right index:1 -bounds:270,359,24,32 +bounds:210,218,24,32 SH_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 Babo_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 O1_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 O2_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 O3_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 O4_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 O5_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 SS_idle_front index:1 -bounds:2,226,24,32 +bounds:2,274,24,32 SH_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 Babo_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 O1_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 O2_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 O3_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 O4_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 O5_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 SS_idle_front index:3 -bounds:80,125,24,32 +bounds:80,181,24,32 SH_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 Babo_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 O1_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 O2_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 O3_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 O4_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 O5_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 SS_idle_right index:3 -bounds:80,329,24,32 +bounds:80,385,24,32 SH_walk_back index:3 -bounds:28,22,24,32 +bounds:28,75,24,32 SH_walk_back index:2 -bounds:236,428,24,32 +bounds:443,444,24,32 SH_walk_back index:1 -bounds:158,257,24,32 +bounds:236,252,24,32 SH_walk_front index:1 -bounds:106,329,24,32 +bounds:80,45,24,32 SH_walk_front index:3 -bounds:262,427,24,32 +bounds:158,286,24,32 SH_walk_front index:2 -bounds:184,257,24,32 +bounds:236,82,24,32 SH_walk_left index:1 -bounds:54,192,24,32 +bounds:54,211,24,32 SH_walk_left index:3 -bounds:230,462,24,32 +bounds:475,460,24,32 SH_walk_left index:2 -bounds:296,359,24,32 +bounds:210,184,24,32 SH_walk_right index:3 -bounds:2,260,24,32 +bounds:2,308,24,32 SH_walk_right index:2 -bounds:106,23,24,32 +bounds:106,113,24,32 SH_walk_right index:1 -bounds:322,359,24,32 +bounds:210,150,24,32 SS_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 Babo_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 O1_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 O2_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 O3_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 O4_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 O5_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 SH_idle_back index:2 -bounds:2,56,24,32 +bounds:2,104,24,32 SS_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 Babo_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 O1_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 O2_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 O3_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 O4_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 O5_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 SH_idle_front index:2 -bounds:2,158,24,32 +bounds:2,206,24,32 SS_walk_back index:2 -bounds:2,362,24,32 +bounds:2,410,24,32 SS_walk_back index:1 -bounds:106,125,24,32 +bounds:106,215,24,32 SS_walk_back index:3 -bounds:444,424,24,32 +bounds:158,48,24,32 SS_walk_front index:1 -bounds:54,56,24,32 +bounds:54,75,24,32 SS_walk_front index:3 -bounds:300,461,24,32 +bounds:132,351,24,32 SS_walk_front index:2 -bounds:132,291,24,32 +bounds:210,82,24,32 SS_walk_left index:1 -bounds:54,328,24,32 +bounds:54,347,24,32 SS_walk_left index:3 -bounds:106,57,24,32 +bounds:106,147,24,32 SS_walk_left index:2 -bounds:192,359,24,32 +bounds:210,320,24,32 SS_walk_right index:1 -bounds:54,260,24,32 +bounds:54,279,24,32 SS_walk_right index:3 -bounds:134,461,24,32 +bounds:106,79,24,32 SS_walk_right index:2 -bounds:244,359,24,32 +bounds:210,252,24,32 ak index:4 -bounds:69,479,45,13 +bounds:187,497,45,13 ak index:1 -bounds:134,495,45,13 +bounds:234,497,45,13 ak index:2 -bounds:181,495,44,13 +bounds:36,464,44,13 ak index:3 -bounds:274,495,44,13 +bounds:28,449,44,13 arrow index:3 -bounds:106,397,16,32 +bounds:106,419,16,32 arrow index:2 -bounds:256,462,16,32 +bounds:176,388,16,32 arrow index:4 -bounds:114,442,16,32 +bounds:228,354,16,32 arrow index:1 -bounds:262,325,16,32 +bounds:262,320,16,32 bow index:2 -bounds:228,237,16,16 +bounds:232,430,16,16 bow index:1 -bounds:228,145,16,16 +bounds:334,296,16,16 bow index:3 -bounds:222,55,16,16 +bounds:306,206,16,16 box_1 index:4 -bounds:333,303,16,16 +bounds:393,458,16,16 box_1 index:1 -bounds:264,213,16,16 +bounds:380,386,16,16 box_1 index:3 -bounds:345,194,16,16 +bounds:316,332,16,16 box_1 index:2 -bounds:256,31,16,16 +bounds:396,260,16,16 box_2 index:4 -bounds:298,341,16,16 +bounds:134,467,16,16 box_2_open index:4 -bounds:298,341,16,16 +bounds:134,467,16,16 box_2 index:1 -bounds:148,42,16,16 +bounds:326,386,16,16 box_2_open index:1 -bounds:148,42,16,16 +bounds:326,386,16,16 box_2 index:3 -bounds:139,6,16,16 +bounds:344,350,16,16 box_2_open index:3 -bounds:139,6,16,16 +bounds:344,350,16,16 box_2_open index:2 -bounds:262,307,16,16 +bounds:278,72,16,16 box_2 index:2 -bounds:262,307,16,16 +bounds:278,72,16,16 bullet7x13 -bounds:502,495,7,13 +bounds:242,470,7,13 c1_idle_back index:4 -bounds:28,124,24,32 +bounds:28,177,24,32 c1_idle_back index:2 -bounds:28,124,24,32 +bounds:28,177,24,32 c1_idle_back index:1 -bounds:80,91,24,32 +bounds:80,147,24,32 c1_idle_back index:3 -bounds:210,427,24,32 +bounds:132,11,24,32 c1_idle_front index:2 -bounds:54,396,24,32 +bounds:54,415,24,32 c1_idle_front index:4 -bounds:54,396,24,32 +bounds:54,415,24,32 c1_idle_front index:3 -bounds:140,359,24,32 +bounds:194,388,24,32 c1_idle_left index:2 -bounds:54,362,24,32 +bounds:54,381,24,32 c1_idle_left index:4 -bounds:54,362,24,32 +bounds:54,381,24,32 c1_walk_left index:2 -bounds:54,362,24,32 +bounds:54,381,24,32 c1_walk_left index:4 -bounds:54,362,24,32 +bounds:54,381,24,32 c1_idle_left index:1 -bounds:176,393,24,32 +bounds:158,354,24,32 c1_idle_left index:3 -bounds:166,359,24,32 +bounds:202,354,24,32 c1_idle_right index:3 -bounds:80,261,24,32 +bounds:80,317,24,32 c1_idle_right index:1 -bounds:210,257,24,32 +bounds:262,218,24,32 c1_walk_back index:2 -bounds:106,227,24,32 +bounds:106,317,24,32 c1_walk_back index:4 -bounds:106,227,24,32 +bounds:106,317,24,32 c1_walk_back index:1 -bounds:410,390,24,32 +bounds:184,82,24,32 c1_walk_back index:3 -bounds:158,189,24,32 +bounds:246,354,24,32 c1_walk_front index:4 -bounds:54,90,24,32 +bounds:54,109,24,32 c1_idle_front index:1 -bounds:54,90,24,32 +bounds:54,109,24,32 c1_walk_front index:2 -bounds:54,90,24,32 +bounds:54,109,24,32 c1_walk_front index:1 -bounds:106,295,24,32 +bounds:80,11,24,32 c1_walk_front index:3 -bounds:340,428,24,32 +bounds:158,184,24,32 c1_walk_left index:3 -bounds:80,227,24,32 +bounds:80,283,24,32 c1_walk_left index:1 -bounds:236,291,24,32 +bounds:262,184,24,32 c1_walk_right index:3 -bounds:2,90,24,32 +bounds:2,138,24,32 c1_walk_right index:2 -bounds:274,461,24,32 -c1_idle_right -index:2 -bounds:274,461,24,32 +bounds:124,385,24,32 c1_idle_right index:4 -bounds:274,461,24,32 +bounds:124,385,24,32 +c1_idle_right +index:2 +bounds:124,385,24,32 c1_walk_right index:4 -bounds:274,461,24,32 +bounds:124,385,24,32 c1_walk_right index:1 -bounds:132,325,24,32 +bounds:210,116,24,32 candlestick_1 index:3 -bounds:333,285,16,16 +bounds:160,449,16,16 candlestick_1 index:2 -bounds:210,147,16,16 +bounds:334,332,16,16 candlestick_1 index:4 -bounds:204,57,16,16 +bounds:342,278,16,16 candlestick_1 index:1 -bounds:276,102,16,16 +bounds:360,206,16,16 candlestick_2 index:3 -bounds:297,323,16,16 +bounds:170,467,16,16 candlestick_2 index:2 -bounds:334,230,16,16 +bounds:398,350,16,16 candlestick_2 index:4 -bounds:166,24,16,16 +bounds:494,386,16,16 candlestick_2 index:1 -bounds:238,33,16,16 +bounds:360,242,16,16 chest index:3 -bounds:150,132,16,16 +bounds:290,368,16,16 chest index:2 -bounds:264,139,16,16 +bounds:370,314,16,16 chest index:4 -bounds:240,123,16,16 +bounds:360,260,16,16 chest index:1 -bounds:294,65,16,16 +bounds:396,206,16,16 chest_open index:3 -bounds:316,341,16,16 +bounds:188,467,16,16 chest_open index:2 -bounds:334,212,16,16 +bounds:416,350,16,16 chest_open index:4 -bounds:168,60,16,16 +bounds:476,336,16,16 chest_open index:1 -bounds:238,15,16,16 +bounds:378,260,16,16 coin index:2 -bounds:238,199,16,16 +bounds:380,368,16,16 coin index:4 -bounds:238,199,16,16 +bounds:380,368,16,16 coin index:1 -bounds:168,96,16,16 +bounds:460,318,16,16 coin index:3 -bounds:276,84,16,16 +bounds:378,224,16,16 +damage_big_open +index:1 +bounds:251,465,16,16 +damage_big +bounds:251,465,16,16 +damage_big_open +index:3 +bounds:429,404,16,16 +damage_big_open +index:2 +bounds:494,332,16,16 +damage_big_open +index:4 +bounds:494,332,16,16 fireAnimation11 -bounds:282,211,16,16 +bounds:434,386,16,16 fireAnimation13 -bounds:264,157,16,16 +bounds:352,296,16,16 fireAnimation14 -bounds:254,253,16,16 +bounds:290,386,16,16 fireAnimation12 -bounds:254,253,16,16 +bounds:290,386,16,16 fireAnimation21 -bounds:328,176,16,16 +bounds:280,332,16,16 fireAnimation22 -bounds:262,289,16,16 +bounds:323,462,16,16 fireAnimation23 -bounds:184,41,16,16 +bounds:288,242,16,16 fireAnimation24 -bounds:324,267,16,16 +bounds:465,408,16,16 fireAnimation3 index:3 -bounds:150,96,16,16 +bounds:308,386,16,16 fireAnimation3 index:1 -bounds:150,96,16,16 +bounds:308,386,16,16 fireAnimation3 index:2 -bounds:282,138,16,16 +bounds:370,296,16,16 fireAnimation3 index:4 -bounds:240,105,16,16 +bounds:378,278,16,16 fireAnimation42 -bounds:174,151,16,16 +bounds:326,350,16,16 fireAnimation43 -bounds:132,103,16,16 +bounds:278,36,16,16 fireAnimation41 -bounds:132,103,16,16 +bounds:278,36,16,16 fireAnimation44 -bounds:168,114,16,16 +bounds:458,336,16,16 flag index:2 -bounds:280,341,16,16 +bounds:278,54,16,16 flag index:4 -bounds:264,231,16,16 +bounds:375,404,16,16 flag index:1 -bounds:174,169,16,16 +bounds:308,350,16,16 flag index:3 -bounds:372,140,16,16 +bounds:442,314,16,16 flamethrower_1 index:4 -bounds:106,363,16,32 +bounds:106,385,16,32 flamethrower_1 index:1 -bounds:212,461,16,32 +bounds:124,419,16,32 flamethrower_1 index:3 -bounds:378,462,16,32 +bounds:184,354,16,32 flamethrower_1 index:2 -bounds:132,121,16,32 +bounds:262,286,16,32 flamethrower_2 index:4 -bounds:2,4,32,16 +bounds:82,453,32,16 flamethrower_2 index:1 -bounds:434,492,32,16 +bounds:323,480,32,16 flamethrower_2 index:3 -bounds:468,492,32,16 +bounds:375,476,32,16 flamethrower_2 index:2 -bounds:36,4,32,16 +bounds:409,476,32,16 flasks_big_open index:2 -bounds:150,78,16,16 +bounds:308,368,16,16 flasks_big_open index:4 -bounds:150,78,16,16 +bounds:308,368,16,16 flasks_big_open index:1 -bounds:300,155,16,16 +bounds:388,314,16,16 flasks_big -bounds:300,155,16,16 +bounds:388,314,16,16 flasks_big_open index:3 -bounds:240,87,16,16 +bounds:306,188,16,16 flasks_small -bounds:488,398,16,16 +bounds:214,449,16,16 flasks_small_open index:1 -bounds:488,398,16,16 +bounds:214,449,16,16 flasks_small_open index:4 -bounds:220,183,16,16 +bounds:344,386,16,16 flasks_small_open index:2 -bounds:220,183,16,16 +bounds:344,386,16,16 flasks_small_open index:3 -bounds:334,158,16,16 +bounds:406,314,16,16 handgun -bounds:114,432,12,8 +bounds:278,26,12,8 idleak -bounds:400,495,32,13 +bounds:289,483,32,13 idlebow -bounds:352,158,16,16 +bounds:424,332,16,16 idlem4 -bounds:366,496,32,12 +bounds:255,483,32,12 +idlemp7 +bounds:469,494,34,16 idleshotgun -bounds:2,464,51,13 +bounds:84,471,35,11 +idlesniper +bounds:443,478,30,14 keys_1 index:2 -bounds:290,247,16,16 +bounds:416,386,16,16 keys_1 index:4 -bounds:228,163,16,16 +bounds:352,332,16,16 keys_1 index:1 -bounds:186,131,16,16 +bounds:494,368,16,16 keys_1 index:3 -bounds:294,101,16,16 +bounds:396,224,16,16 keys_2 index:2 -bounds:246,235,16,16 +bounds:362,386,16,16 keys_2 index:4 -bounds:192,149,16,16 +bounds:298,332,16,16 keys_2 index:1 -bounds:354,140,16,16 +bounds:424,314,16,16 keys_2 index:3 -bounds:258,85,16,16 +bounds:342,206,16,16 m4 index:1 -bounds:55,465,46,12 +bounds:281,498,46,12 m4 index:2 -bounds:227,496,45,12 +bounds:329,498,45,12 m4 index:4 -bounds:227,496,45,12 +bounds:329,498,45,12 m4 index:3 -bounds:320,496,44,12 +bounds:87,484,44,12 mini_box_1 index:3 -bounds:382,375,16,16 +bounds:178,449,16,16 mini_box_1 index:2 -bounds:363,194,16,16 +bounds:316,296,16,16 mini_box_1 index:4 -bounds:202,39,16,16 +bounds:288,206,16,16 mini_box_1 index:1 -bounds:276,66,16,16 +bounds:396,242,16,16 mini_box_2 index:3 -bounds:184,187,16,16 +bounds:269,465,16,16 mini_box_2 index:2 -bounds:327,194,16,16 +bounds:434,350,16,16 mini_box_2 index:4 -bounds:186,95,16,16 +bounds:288,278,16,16 mini_box_2 index:1 -bounds:258,121,16,16 +bounds:396,278,16,16 mini_chest index:2 -bounds:220,201,16,16 +bounds:339,404,16,16 mini_chest_open index:1 -bounds:220,201,16,16 +bounds:339,404,16,16 mini_chest index:4 -bounds:316,231,16,16 +bounds:380,350,16,16 mini_chest index:1 -bounds:318,137,16,16 +bounds:388,296,16,16 mini_chest index:3 -bounds:240,51,16,16 +bounds:342,224,16,16 mini_chest_open index:2 -bounds:103,5,16,16 +bounds:196,449,16,16 mini_chest_open index:4 -bounds:292,174,16,16 +bounds:452,354,16,16 mini_chest_open index:3 -bounds:222,109,16,16 +bounds:342,260,16,16 +mp7 +index:1 +bounds:36,479,46,16 +mp7 +index:2 +bounds:376,494,45,16 +mp7 +index:4 +bounds:376,494,45,16 +mp7 +index:3 +bounds:423,494,44,16 particle -bounds:2,430,32,32 +bounds:2,478,32,32 peaks index:1 -bounds:132,67,16,16 +bounds:206,467,16,16 peaks index:3 -bounds:256,177,16,16 +bounds:398,368,16,16 peaks index:2 -bounds:166,42,16,16 +bounds:494,404,16,16 peaks index:4 -bounds:274,30,16,16 +bounds:432,278,16,16 priest1_dash index:2 -bounds:132,85,16,16 +bounds:152,467,16,16 priest1_dash index:4 -bounds:238,181,16,16 +bounds:393,404,16,16 priest1_dash index:1 -bounds:157,6,16,16 +bounds:362,350,16,16 priest1_dash index:3 -bounds:168,78,16,16 +bounds:460,300,16,16 priest1_v1 index:4 -bounds:236,273,16,16 +bounds:278,90,16,16 priest1_v1 index:1 -bounds:121,5,16,16 +bounds:178,431,16,16 priest1_v1 index:3 -bounds:310,173,16,16 +bounds:470,354,16,16 priest1_v1 index:2 -bounds:222,91,16,16 +bounds:360,278,16,16 priest1_v2 index:1 -bounds:236,255,16,16 +bounds:305,465,16,16 priest1_v2 index:3 -bounds:274,175,16,16 +bounds:447,408,16,16 priest1_v2 index:2 -bounds:186,59,16,16 +bounds:306,278,16,16 priest1_v2 index:4 -bounds:312,65,16,16 +bounds:432,242,16,16 priest2_v1 index:2 -bounds:202,185,16,16 +bounds:214,431,16,16 priest2_v1 index:4 -bounds:488,380,16,16 +bounds:290,350,16,16 priest2_v1 index:1 -bounds:364,176,16,16 +bounds:334,314,16,16 priest2_v1 index:3 -bounds:222,73,16,16 +bounds:288,188,16,16 priest2_v2 index:2 -bounds:297,305,16,16 +bounds:341,462,16,16 priest2_v2 index:4 -bounds:324,249,16,16 +bounds:452,390,16,16 priest2_v2 index:1 -bounds:192,167,16,16 +bounds:280,314,16,16 priest2_v2 index:3 -bounds:184,23,16,16 +bounds:306,260,16,16 priest3_v1 index:3 -bounds:254,271,16,16 +bounds:272,367,16,16 priest3_v1 index:2 -bounds:246,141,16,16 +bounds:370,332,16,16 priest3_v1 index:4 -bounds:220,19,16,16 +bounds:342,242,16,16 priest3_v1 index:1 -bounds:312,101,16,16 +bounds:378,188,16,16 priest3_v2 index:3 -bounds:315,305,16,16 +bounds:375,458,16,16 priest3_v2 index:2 -bounds:352,230,16,16 +bounds:280,296,16,16 priest3_v2 index:4 -bounds:204,129,16,16 +bounds:324,278,16,16 priest3_v2 index:1 -bounds:258,67,16,16 +bounds:360,224,16,16 shaman_idle_back index:2 -bounds:334,340,14,17 +bounds:278,165,14,17 shaman_idle_back index:1 -bounds:334,340,14,17 +bounds:278,165,14,17 shaman_idle_front index:1 -bounds:280,322,15,17 +bounds:495,441,15,17 shaman_idle_front index:2 -bounds:342,266,15,17 +bounds:278,127,15,17 shaman_idle_left index:2 -bounds:333,321,15,17 +bounds:278,146,15,17 shaman_idle_left index:1 -bounds:300,228,14,17 -shaman_idle_right -index:1 -bounds:316,287,15,16 +bounds:232,448,14,17 shaman_idle_right index:2 -bounds:70,4,13,16 +bounds:288,404,13,16 +shaman_idle_right +index:1 +bounds:452,426,15,16 shaman_walk_back index:3 -bounds:496,437,14,19 +bounds:262,163,14,19 shaman_walk_back index:2 -bounds:496,416,14,19 +bounds:262,142,14,19 shaman_walk_back index:4 -bounds:124,372,14,19 +bounds:262,121,14,19 shaman_walk_back index:1 -bounds:158,168,14,19 +bounds:262,100,14,19 shaman_walk_front index:3 -bounds:132,47,14,18 +bounds:262,80,14,18 shaman_walk_front index:2 -bounds:132,27,14,18 +bounds:262,60,14,18 shaman_walk_front index:4 -bounds:348,373,14,18 +bounds:262,40,14,18 shaman_walk_front index:1 -bounds:290,265,14,18 +bounds:262,20,14,18 shaman_walk_left index:1 -bounds:280,303,15,17 -shaman_walk_left -index:3 -bounds:308,250,14,17 +bounds:495,422,15,17 shaman_walk_left index:2 -bounds:310,191,15,17 +bounds:278,108,15,17 +shaman_walk_left +index:3 +bounds:280,7,14,17 shaman_walk_left index:4 -bounds:318,212,14,17 +bounds:272,403,14,17 shaman_walk_right index:4 -bounds:158,150,14,16 +bounds:359,462,14,16 shaman_walk_right index:1 -bounds:256,195,16,16 +bounds:398,386,16,16 shaman_walk_right index:3 -bounds:318,155,14,16 +bounds:442,332,14,16 shaman_walk_right index:2 -bounds:276,48,16,16 +bounds:414,260,16,16 shotgun index:1 -bounds:2,494,65,14 +bounds:36,497,49,13 shotgun index:3 -bounds:2,494,65,14 +bounds:36,497,49,13 shotgun index:4 -bounds:2,479,65,13 +bounds:87,498,49,12 shotgun index:2 -bounds:69,494,63,14 +bounds:138,497,47,13 side_torch index:3 -bounds:280,285,16,16 +bounds:411,458,16,16 side_torch index:2 -bounds:346,176,16,16 +bounds:298,296,16,16 side_torch index:4 -bounds:204,93,16,16 +bounds:306,242,16,16 side_torch index:1 -bounds:256,13,16,16 +bounds:414,278,16,16 skeleton2_v1 index:4 -bounds:210,239,16,16 +bounds:262,2,16,16 skeleton2_v1 index:1 -bounds:85,5,16,16 +bounds:160,431,16,16 skeleton2_v1 index:3 -bounds:292,192,16,16 +bounds:470,372,16,16 skeleton2_v1 index:2 -bounds:222,127,16,16 +bounds:324,242,16,16 skeleton2_v2 index:1 -bounds:210,221,16,16 +bounds:287,465,16,16 skeleton2_v2 index:3 -bounds:274,193,16,16 +bounds:434,368,16,16 skeleton2_v2 index:2 -bounds:186,77,16,16 +bounds:288,260,16,16 skeleton2_v2 index:4 -bounds:312,83,16,16 +bounds:414,224,16,16 skeleton_v1 index:3 -bounds:148,24,16,16 +bounds:326,368,16,16 skeleton_v1 index:2 -bounds:300,137,16,16 +bounds:406,332,16,16 skeleton_v1 index:4 -bounds:240,69,16,16 +bounds:324,206,16,16 skeleton_v1 index:1 -bounds:294,47,16,16 +bounds:396,188,16,16 skeleton_v2 index:3 -bounds:298,287,16,16 +bounds:142,449,16,16 skeleton_v2 index:2 -bounds:210,165,16,16 +bounds:316,314,16,16 skeleton_v2 index:4 -bounds:204,75,16,16 +bounds:324,260,16,16 skeleton_v2 index:1 -bounds:276,120,16,16 +bounds:342,188,16,16 skull_v1 index:4 -bounds:116,476,16,16 +bounds:357,480,16,16 skull_v1 index:1 -bounds:364,376,16,16 +bounds:142,431,16,16 skull_v1 index:3 -bounds:300,210,16,16 +bounds:470,390,16,16 skull_v1 index:2 -bounds:202,21,16,16 +bounds:306,224,16,16 skull_v2 index:1 -bounds:315,323,16,16 +bounds:224,467,16,16 skull_v2 index:3 -bounds:282,229,16,16 +bounds:416,368,16,16 skull_v2 index:2 -bounds:186,113,16,16 +bounds:494,350,16,16 skull_v2 index:4 -bounds:312,119,16,16 +bounds:414,242,16,16 +sniper +index:4 +bounds:133,485,39,10 +sniper +index:2 +bounds:133,485,39,10 +sniper +index:1 +bounds:174,485,39,10 +sniper +index:3 +bounds:215,485,38,10 speed_big_open index:2 -bounds:342,248,16,16 +bounds:452,372,16,16 speed_big_open index:4 -bounds:342,248,16,16 +bounds:452,372,16,16 speed_big_open index:1 -bounds:204,111,16,16 +bounds:288,224,16,16 speed_big -bounds:204,111,16,16 +bounds:288,224,16,16 speed_big_open index:3 -bounds:312,47,16,16 +bounds:414,206,16,16 speed_small -bounds:150,60,16,16 +bounds:321,404,16,16 speed_small_open index:1 -bounds:150,60,16,16 +bounds:321,404,16,16 speed_small_open index:2 -bounds:306,269,16,16 +bounds:411,404,16,16 speed_small_open index:4 -bounds:306,269,16,16 +bounds:411,404,16,16 speed_small_open index:3 -bounds:294,119,16,16 +bounds:378,206,16,16 torch index:2 -bounds:246,217,16,16 +bounds:362,368,16,16 torch index:4 -bounds:352,212,16,16 +bounds:298,314,16,16 torch index:1 -bounds:370,158,16,16 +bounds:424,296,16,16 torch index:3 -bounds:258,49,16,16 +bounds:378,242,16,16 trophy -bounds:272,249,16,16 +bounds:357,404,16,16 trophy_open index:1 -bounds:272,249,16,16 +bounds:357,404,16,16 trophy_open index:3 -bounds:150,114,16,16 +bounds:303,404,16,16 trophy_open index:2 -bounds:282,156,16,16 +bounds:388,332,16,16 trophy_open index:4 -bounds:282,156,16,16 +bounds:388,332,16,16 vampire_v1 index:1 -bounds:184,205,16,16 +bounds:116,453,16,16 vampire_v1 index:3 -bounds:272,267,16,16 +bounds:344,368,16,16 vampire_v1 index:2 -bounds:336,140,16,16 +bounds:406,296,16,16 vampire_v1 index:4 -bounds:258,103,16,16 +bounds:324,188,16,16 vampire_v2 index:3 -bounds:228,219,16,16 +bounds:272,385,16,16 vampire_v2 index:2 -bounds:246,159,16,16 +bounds:352,314,16,16 vampire_v2 index:4 -bounds:220,37,16,16 +bounds:324,224,16,16 vampire_v2 index:1 -bounds:294,83,16,16 +bounds:432,260,16,16 volume_mute -bounds:274,12,16,16 +bounds:360,188,16,16 volume_on -bounds:202,203,16,16 +bounds:196,431,16,16 diff --git a/game/assets/textureAtlas/Underwatch.png b/game/assets/textureAtlas/Underwatch.png index 274be84..489457d 100644 Binary files a/game/assets/textureAtlas/Underwatch.png and b/game/assets/textureAtlas/Underwatch.png differ diff --git a/game/assets/textureAtlas/UnderwatchAtlas.tpproj b/game/assets/textureAtlas/UnderwatchAtlas.tpproj index 2b1c614..d3c643b 100644 --- a/game/assets/textureAtlas/UnderwatchAtlas.tpproj +++ b/game/assets/textureAtlas/UnderwatchAtlas.tpproj @@ -34,7 +34,7 @@ prettyPrint=false legacyOutput=false scaleFactors=[{suffix:"",factor:1,resampling:bicubic}] -inputFiles=[{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton1/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton2/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton1/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton2/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skull/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skull/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/vampire/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/vampire/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest1/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest1/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest2/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest2/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest3/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest3/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/arrow,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/box_1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/chest,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/coin,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/flag,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/flamethrower,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/keys,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/mini_box_1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/mini_box_2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/mini_chest,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/peaks,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/torch,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/handgun.png,type:Input,regionName:null},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priest_dash,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/bullet7x13.png,type:Input,regionName:null},{path:../enemy/Shaman/idle,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../enemy/Shaman/walk,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../character,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/bow,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/ak,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/m4,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../enemy/monster,type:Input,dirFilePrefix:null,recursive:true,flattenPaths:true},{path:../weapon/shotgun,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/trophy,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../soundIcons,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../fireanimation,type:Input,dirFilePrefix:null,recursive:true,flattenPaths:true},{path:../particles,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false}] +inputFiles=[{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton1/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton2/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton1/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skeleton2/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skull/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/skull/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/vampire/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/monsters_idle/vampire/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest1/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest1/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest2/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest2/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest3/v1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priests_idle/priest3/v2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/arrow,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/box_1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/box_2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/chest,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/coin,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/flag,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/flamethrower,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/flasks,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/keys,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/mini_box_1,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/mini_box_2,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/mini_chest,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/peaks,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/torch,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/handgun.png,type:Input,regionName:null},{path:../level/2D Pixel Dungeon Asset Pack/Character_animation/priest_dash,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/bullet7x13.png,type:Input,regionName:null},{path:../enemy/Shaman/idle,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../enemy/Shaman/walk,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../character,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/bow,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/ak,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/m4,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../enemy/monster,type:Input,dirFilePrefix:null,recursive:true,flattenPaths:true},{path:../weapon/shotgun,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../level/2D Pixel Dungeon Asset Pack/items and trap_animation/trophy,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../soundIcons,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../fireanimation,type:Input,dirFilePrefix:null,recursive:true,flattenPaths:true},{path:../particles,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/sniper,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false},{path:../weapon/mp7,type:Input,dirFilePrefix:null,recursive:false,flattenPaths:false}] keepInputFileExtensions=false diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Bridge/Bridge.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Bridge/Bridge.png new file mode 100644 index 0000000..8db2d94 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Bridge/Bridge.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Decorations(main)/Decorations.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Decorations(main)/Decorations.png new file mode 100644 index 0000000..7f9a580 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Decorations(main)/Decorations.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/autumn/decorations.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/autumn/decorations.png new file mode 100644 index 0000000..3e223ab Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/autumn/decorations.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/autumn/terrain1.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/autumn/terrain1.png new file mode 100644 index 0000000..9f2954d Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/autumn/terrain1.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/Decorations1.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/Decorations1.png new file mode 100644 index 0000000..213f31f Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/Decorations1.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/terrain tiles.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/terrain tiles.png new file mode 100644 index 0000000..7bc23d6 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/terrain tiles.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/waterfalls1.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/waterfalls1.png new file mode 100644 index 0000000..31d3a3c Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/spring/waterfalls1.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/winter/decorations.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/winter/decorations.png new file mode 100644 index 0000000..64b8d61 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/winter/decorations.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/winter/terrain.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/winter/terrain.png new file mode 100644 index 0000000..2888c03 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Seasons/winter/terrain.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Terrain(main)/terrain tiles.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Terrain(main)/terrain tiles.png new file mode 100644 index 0000000..215be34 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Terrain(main)/terrain tiles.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Waterfall/waterfalls.png b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Waterfall/waterfalls.png new file mode 100644 index 0000000..d045540 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/PixelWoods/Waterfall/waterfalls.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/bottom.png b/game/assets/tileSets/tilesetsAussenwelt/bottom.png new file mode 100644 index 0000000..23ce543 Binary files /dev/null and b/game/assets/tileSets/tilesetsAussenwelt/bottom.png differ diff --git a/game/assets/tileSets/tilesetsAussenwelt/plains.tsx b/game/assets/tileSets/tilesetsAussenwelt/plains.tsx index 18dc808..608a7c6 100644 --- a/game/assets/tileSets/tilesetsAussenwelt/plains.tsx +++ b/game/assets/tileSets/tilesetsAussenwelt/plains.tsx @@ -21,6 +21,16 @@ + + + + + + + + + + @@ -36,6 +46,16 @@ + + + + + + + + + + diff --git a/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx b/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx index c5d36b2..f08b43b 100644 --- a/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx +++ b/game/assets/tileSets/tilesetsDungeon/Dungeon_Tileset.tsx @@ -161,6 +161,11 @@ + + + + + diff --git a/game/assets/weapon/mp7/idlemp7.png b/game/assets/weapon/mp7/idlemp7.png new file mode 100644 index 0000000..44be293 Binary files /dev/null and b/game/assets/weapon/mp7/idlemp7.png differ diff --git a/game/assets/weapon/mp7/mp7_1.png b/game/assets/weapon/mp7/mp7_1.png new file mode 100644 index 0000000..2d759cb Binary files /dev/null and b/game/assets/weapon/mp7/mp7_1.png differ diff --git a/game/assets/weapon/mp7/mp7_2.png b/game/assets/weapon/mp7/mp7_2.png new file mode 100644 index 0000000..7b96d4d Binary files /dev/null and b/game/assets/weapon/mp7/mp7_2.png differ diff --git a/game/assets/weapon/mp7/mp7_3.png b/game/assets/weapon/mp7/mp7_3.png new file mode 100644 index 0000000..aa8bfad Binary files /dev/null and b/game/assets/weapon/mp7/mp7_3.png differ diff --git a/game/assets/weapon/mp7/mp7_4.png b/game/assets/weapon/mp7/mp7_4.png new file mode 100644 index 0000000..b791315 Binary files /dev/null and b/game/assets/weapon/mp7/mp7_4.png differ diff --git a/game/assets/weapon/shotgun/idleshotgun.png b/game/assets/weapon/shotgun/idleshotgun.png index 249bc21..e84baa9 100644 Binary files a/game/assets/weapon/shotgun/idleshotgun.png and b/game/assets/weapon/shotgun/idleshotgun.png differ diff --git a/game/assets/weapon/shotgun/shotgun_1.png b/game/assets/weapon/shotgun/shotgun_1.png index 22dca21..f026aa1 100644 Binary files a/game/assets/weapon/shotgun/shotgun_1.png and b/game/assets/weapon/shotgun/shotgun_1.png differ diff --git a/game/assets/weapon/shotgun/shotgun_2.png b/game/assets/weapon/shotgun/shotgun_2.png index 02a07ea..8081807 100644 Binary files a/game/assets/weapon/shotgun/shotgun_2.png and b/game/assets/weapon/shotgun/shotgun_2.png differ diff --git a/game/assets/weapon/shotgun/shotgun_3.png b/game/assets/weapon/shotgun/shotgun_3.png index 6842eec..7a46980 100644 Binary files a/game/assets/weapon/shotgun/shotgun_3.png and b/game/assets/weapon/shotgun/shotgun_3.png differ diff --git a/game/assets/weapon/shotgun/shotgun_4.png b/game/assets/weapon/shotgun/shotgun_4.png index b44b696..e6f73a5 100644 Binary files a/game/assets/weapon/shotgun/shotgun_4.png and b/game/assets/weapon/shotgun/shotgun_4.png differ diff --git a/game/assets/weapon/sniper/idlesniper.png b/game/assets/weapon/sniper/idlesniper.png new file mode 100644 index 0000000..2f5095f Binary files /dev/null and b/game/assets/weapon/sniper/idlesniper.png differ diff --git a/game/assets/weapon/sniper/sniper_1.png b/game/assets/weapon/sniper/sniper_1.png new file mode 100644 index 0000000..9c4f184 Binary files /dev/null and b/game/assets/weapon/sniper/sniper_1.png differ diff --git a/game/assets/weapon/sniper/sniper_2.png b/game/assets/weapon/sniper/sniper_2.png new file mode 100644 index 0000000..22b2fc8 Binary files /dev/null and b/game/assets/weapon/sniper/sniper_2.png differ diff --git a/game/assets/weapon/sniper/sniper_3.png b/game/assets/weapon/sniper/sniper_3.png new file mode 100644 index 0000000..4ca9b97 Binary files /dev/null and b/game/assets/weapon/sniper/sniper_3.png differ diff --git a/game/assets/weapon/sniper/sniper_4.png b/game/assets/weapon/sniper/sniper_4.png new file mode 100644 index 0000000..6d08f97 Binary files /dev/null and b/game/assets/weapon/sniper/sniper_4.png differ diff --git a/game/core/src/main/de/dhbw/tinf22b6/gameobject/Player.java b/game/core/src/main/de/dhbw/tinf22b6/gameobject/Player.java index 3101d8c..3172e5d 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/gameobject/Player.java +++ b/game/core/src/main/de/dhbw/tinf22b6/gameobject/Player.java @@ -6,6 +6,7 @@ import static de.dhbw.tinf22b6.util.Constants.TILE_SIZE; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.Camera; import com.badlogic.gdx.graphics.g2d.Animation; import com.badlogic.gdx.graphics.g2d.Batch; @@ -155,6 +156,9 @@ public void tick(float delta) { pos.x = body.getPosition().x - (float) TILE_SIZE / 2; pos.y = body.getPosition().y - (float) TILE_SIZE / 4; } + if (Gdx.input.isButtonPressed(Input.Buttons.LEFT)) { + shoot(); + } } public void applyForce(Vector2 motionVector) { @@ -225,6 +229,8 @@ public void shoot() { PlayerStatistics.instance.getCurrentWeapon().shoot(); } + + public Vector2 getMotionVector() { return motionVector; } diff --git a/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/MPBullet.java b/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/MPBullet.java new file mode 100644 index 0000000..cf60c05 --- /dev/null +++ b/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/MPBullet.java @@ -0,0 +1,11 @@ +package de.dhbw.tinf22b6.gameobject.bullet; + +import com.badlogic.gdx.math.Vector2; + +public class MPBullet extends Bullet { + public MPBullet(Vector2 position, float angle, int damage, short mask) { + super("bullet7x13", position, angle, damage, mask); + this.speed = 3; + this.range = 1.5f; + } +} \ No newline at end of file diff --git a/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/PlayerBullet.java b/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/PlayerBullet.java index 7d54405..68ce5d5 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/PlayerBullet.java +++ b/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/PlayerBullet.java @@ -7,4 +7,5 @@ public class PlayerBullet extends Bullet { public PlayerBullet(Vector2 position, float angle, int damage, short mask) { super("bullet7x13", position, angle, damage, mask); } + } diff --git a/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/SniperBullet.java b/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/SniperBullet.java new file mode 100644 index 0000000..25431fd --- /dev/null +++ b/game/core/src/main/de/dhbw/tinf22b6/gameobject/bullet/SniperBullet.java @@ -0,0 +1,11 @@ +package de.dhbw.tinf22b6.gameobject.bullet; + +import com.badlogic.gdx.math.Vector2; + +public class SniperBullet extends Bullet { + public SniperBullet(Vector2 position, float angle, int damage, short mask) { + super("bullet7x13", position, angle, damage, mask); + this.speed = 10; + this.range = 5; + } +} diff --git a/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/DamageBoost.java b/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/DamageBoost.java new file mode 100644 index 0000000..53c63f7 --- /dev/null +++ b/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/DamageBoost.java @@ -0,0 +1,28 @@ +package de.dhbw.tinf22b6.gameobject.interaction; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.math.Rectangle; +import com.badlogic.gdx.math.Vector2; +import de.dhbw.tinf22b6.gameobject.Player; +import de.dhbw.tinf22b6.util.PlayerStatistics; + +public class DamageBoost extends InteractionObject { + + public DamageBoost(Vector2 position, Rectangle rectangle) { + super("damage_big", position, rectangle, false); + } + + @Override + public void activate() { + super.activate(); +// Gdx.audio +// .newSound(Gdx.files.internal("sfx/damage_boost.mp3")) +// .play(Gdx.app.getPreferences("Controls").getFloat("sfx")); + } + + @Override + public void interact(Player player) { + PlayerStatistics.instance.addDamageModifier(0.2f); + super.interact(player); + } +} \ No newline at end of file diff --git a/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/WeaponBox.java b/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/WeaponBox.java index 18cbc72..fc6455b 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/WeaponBox.java +++ b/game/core/src/main/de/dhbw/tinf22b6/gameobject/interaction/WeaponBox.java @@ -4,6 +4,7 @@ import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Vector2; import de.dhbw.tinf22b6.gameobject.Player; +import de.dhbw.tinf22b6.util.PlayerStatistics; public class WeaponBox extends InteractionObject { @@ -21,7 +22,12 @@ public void activate() { @Override public void interact(Player player) { - player.pickupWeapon(); - super.interact(player); + int playerCoins = PlayerStatistics.instance.coins(); + int costForChest = 10; + if (playerCoins >= costForChest) { + player.pickupWeapon(); + PlayerStatistics.instance.removeCoins(costForChest); + super.interact(player); + } } -} +} \ No newline at end of file diff --git a/game/core/src/main/de/dhbw/tinf22b6/util/PlayerStatistics.java b/game/core/src/main/de/dhbw/tinf22b6/util/PlayerStatistics.java index 03762ee..ea49e9d 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/util/PlayerStatistics.java +++ b/game/core/src/main/de/dhbw/tinf22b6/util/PlayerStatistics.java @@ -2,10 +2,8 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.math.Vector2; -import de.dhbw.tinf22b6.weapon.Ak; -import de.dhbw.tinf22b6.weapon.M4; -import de.dhbw.tinf22b6.weapon.Shotgun; -import de.dhbw.tinf22b6.weapon.Weapon; +import de.dhbw.tinf22b6.weapon.*; + import java.util.ArrayList; import java.util.List; @@ -22,12 +20,13 @@ public class PlayerStatistics { private boolean won; private Vector2 startLocation; private boolean canSwitchWeapon; - + private float damageModifier; // singleton: prevent instantiation from other classes private PlayerStatistics() {} public void init() { this.weapons = new ArrayList<>(); + weapons.add(new Ak()); this.canSwitchWeapon = true; this.hp = 200; @@ -37,6 +36,7 @@ public void init() { this.gameTime = 0; this.coins = 0; this.enemies_kills = 0; + this.damageModifier = 1f; Gdx.app.debug(TAG, "PlayerStatistics initialized " + instance.toString()); } @@ -69,7 +69,7 @@ public void enemyKilled() { } public int getScore() { - return Math.max(coins * 5 + enemies_kills * 10 + (hasWon() ? 100 : 0) - (int) (gameTime / 60), 0); + return Math.max(coins * 2 + enemies_kills * 10 + (hasWon() ? 3000 : 0) - (int) (gameTime / 60), 0); } public float getGameTime() { @@ -116,6 +116,12 @@ public void pickupWeapon() { } else if (this.weapons.size() == 2) { // Player has AK and M4 this.weapons.add(new Shotgun()); this.currentWeaponIndex = weapons.size() - 1; + } else if (this.weapons.size() == 3) { // Player has AK and M4 and Shotgun + this.weapons.add(new Sniper()); + this.currentWeaponIndex = weapons.size() - 1; + } else if (this.weapons.size() == 4) { // Player has AK and M4 and Shotgun + this.weapons.add(new MP7()); + this.currentWeaponIndex = weapons.size() - 1; } else { reloadWeapons(); } @@ -146,4 +152,10 @@ public Vector2 getStartLocation() { public void setStartLocation(Vector2 startLocation) { this.startLocation = startLocation; } + public void addDamageModifier(float damageModifier) { + this.damageModifier += damageModifier; + } + public float getDamageModifier() { + return damageModifier; + } } diff --git a/game/core/src/main/de/dhbw/tinf22b6/weapon/Ak.java b/game/core/src/main/de/dhbw/tinf22b6/weapon/Ak.java index 4c3702b..f721395 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/weapon/Ak.java +++ b/game/core/src/main/de/dhbw/tinf22b6/weapon/Ak.java @@ -12,7 +12,7 @@ public class Ak extends Weapon { public Ak() { - super("ak", 25, 0.2f, 50); + super("ak", 25, 0.3f, 50); this.shootingAnimation = new Animation<>(0.01f, Assets.instance.getAnimationAtlasRegion("ak")); } @@ -28,7 +28,7 @@ public boolean shoot() { EntitySystem.instance.add(new PlayerBullet( new Vector2(pos.x + r * cosDeg(angle), pos.y + 5 + r * sinDeg(angle)), angle, - this.damage, + this.getDamage(), Constants.WEAPON_BIT)); } catch (InterruptedException e) { throw new RuntimeException(e); diff --git a/game/core/src/main/de/dhbw/tinf22b6/weapon/M4.java b/game/core/src/main/de/dhbw/tinf22b6/weapon/M4.java index 604b597..eb3b283 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/weapon/M4.java +++ b/game/core/src/main/de/dhbw/tinf22b6/weapon/M4.java @@ -9,7 +9,7 @@ public class M4 extends Weapon { public M4() { - super("m4", 30, 0.05f, 40); + super("m4", 30, 0.2f, 40); this.shootingAnimation = new Animation<>(0.001f, Assets.instance.getAnimationAtlasRegion("m4")); } @@ -22,7 +22,7 @@ public boolean shoot() { float angle = EntitySystem.instance.getPlayer().getAngle(); Vector2 pos = EntitySystem.instance.getPlayer().getPos(); EntitySystem.instance.add(new PlayerBullet( - new Vector2(pos.x + 15 / 2f, pos.y + 5), angle, this.damage, Constants.WEAPON_BIT)); + new Vector2(pos.x + 15 / 2f, pos.y + 5), angle, this.getDamage(), Constants.WEAPON_BIT)); } catch (InterruptedException e) { throw new RuntimeException(e); } diff --git a/game/core/src/main/de/dhbw/tinf22b6/weapon/MP7.java b/game/core/src/main/de/dhbw/tinf22b6/weapon/MP7.java new file mode 100644 index 0000000..3c8414a --- /dev/null +++ b/game/core/src/main/de/dhbw/tinf22b6/weapon/MP7.java @@ -0,0 +1,36 @@ +package de.dhbw.tinf22b6.weapon; + +import com.badlogic.gdx.graphics.g2d.Animation; +import com.badlogic.gdx.math.Vector2; +import de.dhbw.tinf22b6.gameobject.bullet.MPBullet; +import de.dhbw.tinf22b6.gameobject.bullet.PlayerBullet; +import de.dhbw.tinf22b6.util.Assets; +import de.dhbw.tinf22b6.util.Constants; +import de.dhbw.tinf22b6.util.EntitySystem; + +public class MP7 extends Weapon { + public MP7() { + super("mp7", 40, 0.05f, 40); + this.shootingAnimation = new Animation<>(0.005f, Assets.instance.getAnimationAtlasRegion("mp7")); + } + + @Override + public boolean shoot() { + if (super.shoot()) { + new Thread(() -> { + try { + Thread.sleep((long) (shootingAnimation.getAnimationDuration() * 1000)); + float angle = EntitySystem.instance.getPlayer().getAngle(); + Vector2 pos = EntitySystem.instance.getPlayer().getPos(); + EntitySystem.instance.add(new MPBullet( + new Vector2(pos.x + 15 / 2f, pos.y + 5), angle, this.getDamage(), Constants.WEAPON_BIT)); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }) + .start(); + } + return true; + } +} + diff --git a/game/core/src/main/de/dhbw/tinf22b6/weapon/Shotgun.java b/game/core/src/main/de/dhbw/tinf22b6/weapon/Shotgun.java index 637b5af..029605d 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/weapon/Shotgun.java +++ b/game/core/src/main/de/dhbw/tinf22b6/weapon/Shotgun.java @@ -9,8 +9,8 @@ public class Shotgun extends Weapon { public Shotgun() { - super("shotgun", 25, 0.2f, 50); - this.shootingAnimation = new Animation<>(0.06f, Assets.instance.getAnimationAtlasRegion("shotgun")); + super("shotgun", 25, 0.5f, 20); + this.shootingAnimation = new Animation<>(0.005f, Assets.instance.getAnimationAtlasRegion("shotgun")); } @Override @@ -22,7 +22,7 @@ public boolean shoot() { angle += i; Vector2 pos = EntitySystem.instance.getPlayer().getPos(); EntitySystem.instance.add(new PlayerBullet( - new Vector2(pos.x + 15 / 2f, pos.y + 5), angle, this.damage, Constants.WEAPON_BIT)); + new Vector2(pos.x + 15 / 2f, pos.y + 5), angle, this.getDamage(), Constants.WEAPON_BIT)); } }) .start(); diff --git a/game/core/src/main/de/dhbw/tinf22b6/weapon/Sniper.java b/game/core/src/main/de/dhbw/tinf22b6/weapon/Sniper.java new file mode 100644 index 0000000..9fe02e5 --- /dev/null +++ b/game/core/src/main/de/dhbw/tinf22b6/weapon/Sniper.java @@ -0,0 +1,42 @@ +package de.dhbw.tinf22b6.weapon; + +import static com.badlogic.gdx.math.MathUtils.cosDeg; +import static com.badlogic.gdx.math.MathUtils.sinDeg; + +import com.badlogic.gdx.graphics.g2d.Animation; +import com.badlogic.gdx.math.Vector2; +import de.dhbw.tinf22b6.gameobject.bullet.PlayerBullet; +import de.dhbw.tinf22b6.gameobject.bullet.SniperBullet; +import de.dhbw.tinf22b6.util.Assets; +import de.dhbw.tinf22b6.util.Constants; +import de.dhbw.tinf22b6.util.EntitySystem; + +public class Sniper extends Weapon { + public Sniper() { + super("sniper", 10, 2.0f, 200); + this.shootingAnimation = new Animation<>(0.001f, Assets.instance.getAnimationAtlasRegion("sniper")); + } + + @Override + public boolean shoot() { + if (super.shoot()) { + new Thread(() -> { + try { + Thread.sleep((long) (shootingAnimation.getAnimationDuration() * 1000)); + float angle = EntitySystem.instance.getPlayer().getAngle(); + Vector2 pos = EntitySystem.instance.getPlayer().getPos(); + int r = 30; + EntitySystem.instance.add(new SniperBullet( + new Vector2(pos.x + r * cosDeg(angle), pos.y + 5 + r * sinDeg(angle)), + angle, + this.getDamage(), + Constants.WEAPON_BIT)); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + }) + .start(); + } + return true; + } +} diff --git a/game/core/src/main/de/dhbw/tinf22b6/weapon/Weapon.java b/game/core/src/main/de/dhbw/tinf22b6/weapon/Weapon.java index 9dc9189..55bca77 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/weapon/Weapon.java +++ b/game/core/src/main/de/dhbw/tinf22b6/weapon/Weapon.java @@ -5,6 +5,7 @@ import com.badlogic.gdx.graphics.g2d.Animation; import com.badlogic.gdx.graphics.g2d.TextureAtlas; import de.dhbw.tinf22b6.util.Assets; +import de.dhbw.tinf22b6.util.PlayerStatistics; public abstract class Weapon { private static final String TAG = Weapon.class.getName(); @@ -29,6 +30,9 @@ public Weapon(String regionName, int ammo, float weaponCooldown, int damage) { this.sound = Gdx.audio.newSound(Gdx.files.internal("sfx/" + regionName + ".mp3")); } + public int getDamage() { + return (int) (this.damage + Math.ceil(this.damage * PlayerStatistics.instance.getDamageModifier())); + } public boolean shoot() { if (this.ammo <= 0) { Gdx.audio @@ -43,7 +47,7 @@ public boolean shoot() { new Thread(() -> { try { Thread.sleep((long) (shootingAnimation.getAnimationDuration() * 1000)); - sound.play(Gdx.app.getPreferences("Controls").getFloat("sfx")); + sound.play(Gdx.app.getPreferences("Controls").getFloat("sfx")*4); this.remainingWeaponCooldown = this.weaponCooldown; this.weaponStateTime = 0; this.isShooting = false; diff --git a/game/core/src/main/de/dhbw/tinf22b6/world/WorldParser.java b/game/core/src/main/de/dhbw/tinf22b6/world/WorldParser.java index df18aa0..5bd8d84 100644 --- a/game/core/src/main/de/dhbw/tinf22b6/world/WorldParser.java +++ b/game/core/src/main/de/dhbw/tinf22b6/world/WorldParser.java @@ -99,7 +99,7 @@ public static ArrayList parseGameObjects(TiledMap map) { ArrayList list = new ArrayList<>(); // TODO refactor animated game objects using an enum String[] objects = new String[] { - "coins", "torch", "chests", "enemy", "teleporter", "start", "hp", "speed", "trophy", "ammo" + "coins", "torch", "chests", "enemy", "teleporter", "start", "hp", "speed", "trophy", "ammo", "damage" }; for (String s : objects) { TiledMapTileLayer layer = (TiledMapTileLayer) map.getLayers().get(s); @@ -168,6 +168,9 @@ public static ArrayList parseGameObjects(TiledMap map) { case "ammo": list.add(new AmmoBox(new Vector2(x, y), rectangleObject.getRectangle())); break; + case "damage": + list.add(new DamageBoost(new Vector2(x, y), rectangleObject.getRectangle())); + break; } } }