diff --git a/src/images/blocks/sand-block-dark-down.png b/src/images/blocks/sand-block-dark-down.png index 059aa218e..67727d7ee 100644 Binary files a/src/images/blocks/sand-block-dark-down.png and b/src/images/blocks/sand-block-dark-down.png differ diff --git a/src/images/blocks/sand-block-dark-four.png b/src/images/blocks/sand-block-dark-four.png index d5af57f8c..2e97ea9a8 100644 Binary files a/src/images/blocks/sand-block-dark-four.png and b/src/images/blocks/sand-block-dark-four.png differ diff --git a/src/images/blocks/sand-block-dark-up.png b/src/images/blocks/sand-block-dark-up.png index 3040b6b22..27bd98011 100644 Binary files a/src/images/blocks/sand-block-dark-up.png and b/src/images/blocks/sand-block-dark-up.png differ diff --git a/src/images/blocks/sand-block-dark.png b/src/images/blocks/sand-block-dark.png index 2bd0bf0f7..a0c218955 100644 Binary files a/src/images/blocks/sand-block-dark.png and b/src/images/blocks/sand-block-dark.png differ diff --git a/src/images/blocks/sand-block.png b/src/images/blocks/sand-block.png index 8563fff56..d25abcf7e 100644 Binary files a/src/images/blocks/sand-block.png and b/src/images/blocks/sand-block.png differ diff --git a/src/images/hiddendoor/sandbarrier.png b/src/images/hiddendoor/sandbarrier.png index ed6e09349..1fa7d95eb 100644 Binary files a/src/images/hiddendoor/sandbarrier.png and b/src/images/hiddendoor/sandbarrier.png differ diff --git a/src/images/materials/animal_skeleton.png b/src/images/materials/animal_skeleton.png new file mode 100644 index 000000000..af828a248 Binary files /dev/null and b/src/images/materials/animal_skeleton.png differ diff --git a/src/images/materials/skull.png b/src/images/materials/skull.png new file mode 100644 index 000000000..a684409bc Binary files /dev/null and b/src/images/materials/skull.png differ diff --git a/src/images/tilesets/greendale-exterior.png b/src/images/tilesets/greendale-exterior.png index f6be3010b..8f994b109 100644 Binary files a/src/images/tilesets/greendale-exterior.png and b/src/images/tilesets/greendale-exterior.png differ diff --git a/src/images/tilesets/valley-sandpits.png b/src/images/tilesets/valley-sandpits.png index ac8f075e9..f8c0c2fcf 100644 Binary files a/src/images/tilesets/valley-sandpits.png and b/src/images/tilesets/valley-sandpits.png differ diff --git a/src/images/tilesets/valley.png b/src/images/tilesets/valley.png index b14661680..33d1903b6 100644 Binary files a/src/images/tilesets/valley.png and b/src/images/tilesets/valley.png differ diff --git a/src/maps/forest-2.tmx b/src/maps/forest-2.tmx index b331248ad..bf4af4794 100644 --- a/src/maps/forest-2.tmx +++ b/src/maps/forest-2.tmx @@ -1,5 +1,5 @@ - + @@ -98,101 +98,101 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -200,7 +200,7 @@ - + @@ -208,7 +208,7 @@ - + @@ -216,7 +216,7 @@ - + @@ -224,15 +224,15 @@ - + - - + + @@ -240,44 +240,44 @@ - + - + - + - - - - + + + + - - + + - + - + diff --git a/src/maps/valley-2.tmx b/src/maps/valley-2.tmx index 9885d8671..7eb6e61d9 100644 --- a/src/maps/valley-2.tmx +++ b/src/maps/valley-2.tmx @@ -1,5 +1,5 @@ - + @@ -83,7 +83,7 @@ - eJzt28tu1DAUxnEr7Z4VFGk23NqsuGiGlwGegyUo2/IOSOygr1b6EBzTWoqseDJNfMmx/z/JqmY6ynhifzlxMmMMACC2n13pHgDbZLNxQz6ASTfkAwj6Ldn4E8jHtzNjvp/l7Q+wNaH6cS3Z+EE+AAAAAMzYKdsukIudw32ibafaLpDLpbSriee/rrzPkTJ3gHah3AG4V7J+PJX690zahbTnFd3zZ02HGF5KJl5Jey3tTUX5sMecnSEnsZXan2vXMUu9lfd9J+29tA8K8xEaL5uPg7SPGfuiwefutPalm56Ta851Pp343lMNy/jjtX/4SzbSsPt7P/sq3e6MGe5KdyISdx7lP+aaYBqpjzsydkPCzTfHHy+bi9quCdZ+vB6T8Rtyf95baX/N/7pRHb9OnFI/ztN1J7qt1sK9rAkOkdcFtnbIcW24pIZE488dV0+2OKeW6E09n2WOjNtwIBtRTdWPqee1aikfVj/KR8prybf3bZh7HbattrXUHJsPt0b3r70ArfG/s2Hz4WpIzmv0D2v0obWaUuvx57zScRyvz1s6rywlxT5Oce2mVf53NsbrjyVjp+naZGlbvTYKbEFra9tYaj0n1SLn/qd+PA41N49jGVi6/7V9X11TXx1qbh7HMrA0H5rGTvNxWGu/NQnd21k7b7SMncuyxhqC9EL3dtbOGy35sPgNCkKOzeM188ZtV8P9MU1ZRl6jeRz8X61cbaz9cwKPZX/bU9t3iIFY3PrK1k3yAQBoWd+ZX7tRk8cvSvcJKM3l4klnjN/ICFrWB3LhmuRmKN3HrfsHx3dEpQ== + eJzt201u1DAYxnErPUBXQKXZlI+SFQXNcBngHCxB2ZY7ILErvVrpIXjd1lJkxZM28Ude+/+TrGpG1YwT58kbOxljAACx/e5K9wDYJpuNG/IBTLohH0DQtWTjbyAfP06M+XmStz/A1oTqx5Vk4xf5AAAAADBjp+xzgVzsMdwn+uxUnwvkciHt/cT731fe50iZO0C7UO4APChZP15I/Xsp7ZW0s4ru+TOnQwyvJRNvpL2V9q6ifNhzzs6Qk9hK7c+185ilPsj3Xkr7KO2TwnyExsvm4yDtc8a+aPC1e1r71k0fk2uudb488bunGpbxx2v/+JdspGH39372v3S7M2a4K92JSNx1lP+aNcE0Up93ZOyGhB/fHH+8bC5qWxOs/Xw9JuM35N7eW2n/zH3dqI5fJ2qrH1vdlr3MCQ6R5wW2dsh5bbighkTjHzuunmzxmFqiN/VsyxwZt+FANqKaqh9T72vVUj6sfpSPlGvJtw9tmPs/bFttc6k5Nh9uju6vvQCt8Z/ZsPlwNSTnGv3jHH1oraZw/tFlPD9v6bqylBT7OMXaTav8ZzbG8w/ykdZW10aBLWhtbhsL16Rl5dz/1I/noebmcSwDS/e/tufVNfXVoebmcSwDS/Ohaew0n4e19luT0L2dtceNlrFzWdZYQ5Be6N7O2uNGSz4sfoOCkGPH8ZrjRlM+NPUVeaWYf2jhamPt2wk8l/1tT23PEAOxjNfYyAcAoGV9Z/7sRk1en5fuE1Cay8VpZ4zfyAha1gdy4ZrkZijdx637DySgQ40= @@ -91,12 +91,12 @@ eJzt27sNgzAQAFDEAAyQHnrIghk9btJEsn0IkA16r3ZhIZ3O92EYAAAAoE/T2PoG0K9XMD7mdG4RSwAAAFClFwV5tV7UGoyfLZ17izU4lR4wQDvRNxAAlKiVAQAo0X+IS9/q0/oOwDH2NrjKknLEfPM8Ef2HCACA4+zkqc94plJtuGduf1Z9ZlcAAIDeqAUhz6wOAOiZtzzk/d7ytbnM/4zYHAeAJ9mb1+xOAQAAcIUvyN4JXQ== - + eJztmltqwzAQAAO5/0chbQ8RaNob9Cf3qqEIFGNZtvah1wwIQoSjJOuxdte+XAAAAAAAAAD65Pf6PwAAYB6+luv+Yxl34/G9jB/2GOiE4IU3dxyBhgnXcwAAAJAR10kAALPh1YeiPwU9UasPlWLLky13vXzacxrGpTUv1hw9Dy2ciT8Pxme2a9/ovw+gJm/X8gHt89zYL57RCO9txfdjGZ8Kcdao9z1r9nhf5TyHHKWeWNQ13r0t/ICjHPXEo97X9GSvFsOPcfCqt/c88a6Ht9Zb53MSl2bxI1VDaeXYM9Lif7fnZ4m7M/mRep9+g4wWPclxdK/t7bwo7YXkfmft/8F6X/PIvXr0JEft8+IMkviW+OHZV9xav9f8r8fvnKrRe/JDgnT/sPZkb31rT6yuAz16sgY/js0HrDw5sr7HPVo8eaV1P7Tur2rXH9q5fEkc4mO09xhtTyTPadQeI5GKaw/1ueQYq5jyfN+YrD3R9CPuoWmh4Yfks2BOgicaflg+N2HphyT3ui3HvA+YZ8ArEj88niey9iOVe6XcWXuBH2NT6odX/m3tR24uV5fix3la69tJ+hC141/bjzNrwTla8UQSw9rxx4/xsfQkzoctcoBUzu7lPn7Mg9c9Gms/Yqw9wQ/QxtOPgJUn+AHa1PAjntfcD/EDtKnph4Qe/YD+wI/86zNzMBb4kX99Zg50+QNxpHH2 - + @@ -190,9 +190,7 @@ - - @@ -516,8 +514,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/maps/valley-chili-fields-2.tmx b/src/maps/valley-chili-fields-2.tmx index f73d22f51..6503dbcc1 100644 --- a/src/maps/valley-chili-fields-2.tmx +++ b/src/maps/valley-chili-fields-2.tmx @@ -1,5 +1,5 @@ - + @@ -138,7 +138,7 @@ - eJzt2bEOgjAUheGbwswD4IzMgm+lu459dFsIiYsDreRY+38JI+GUWwrcmgEAAAAAAAAAAPyHzplXZ6jV5Mxml3ZuT92yXRLvPYD6bOv1Oay9A+svKnFrzO6NOgX2eoSaPYV16/i+KlJP3RbM3zK9z9/Wlv88f/Q16aOUiT4KgFq06gCVOqkDIMlo1K5Ecziu6hDYbVQHyBDfrTl7ut+g2puIdYvjV47d1gy+hn3dX+1NxfuvzvDJsO7dSW29qfCc+IneAwAAyPACJ5INuA== + eJzt2bEOgjAQBuAGdx4AZ2QGfCvddeTRJZoublD1gnxfwkhy8LdNc5cSAAAAAADAf6irNEXXsFdDldJYrXu3kVuxfuW/B/Ynn9en+extnb/sxOWQ0vUQXQVL3ebM7oG51e5Xm9TI7cn63ab39dv/4K6mj7JN+igAfNMxugBW6ZLstmicn3N0ESzWRRdQqGSm+wlRs4mcW+S3Z3uY6+pNLde+Znehcm9q3ifToPcAABR4AIU+DKA= @@ -149,12 +149,12 @@ eJzt0bEJACAQA8DHSdxQex3GUbUXRLCwuYNUaQKJAAAAAAAAAAAAAAAAAACANy3FKIesPv/eyK6vb+oh3W8AwIUJSFgSbA== - + eJztmEsOwjAMRCPl/gs2cIhKfM5AOQachUgsSCFtkjaOJ808ycsS4xk7bo0hhBBCCCGEEEL0GK0xd6udxf4Y7CdSajso1V/rXBKH2oQZ7be3JKlxBomjpUPoXPrhny018e/IpT1kqNTzewVlxyulIX1AWuLs/Hqx0zmGEFcXt457KaYLOr5+reScQ847dIv03n+SbO3jFO/F5qsma3oHZU9EQ1tLDRA8TGQoMbNyZgXiXInl1Kr/S+1MKXfb1vq83PNPkBojepSUAXVPo+fqk1JzNJ9ok1qDnmtUglCNOSPCbPVar3VFugd71QABzuopCP0QAqlHtL7H19ACRW8tHgD/v6TX53pYQmf/Nw82L44uTgI55ZxZet6hvW+n5HFYmZeUfkvU8lAuv98Ga3hgrW7+83NRi9yZUTs/CaTyR68Len4xqFubULc2QdHtDbwnw6s= - + @@ -330,5 +330,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/maps/valley-sandpits-2.tmx b/src/maps/valley-sandpits-2.tmx index d2574b917..cb170560c 100644 --- a/src/maps/valley-sandpits-2.tmx +++ b/src/maps/valley-sandpits-2.tmx @@ -1,5 +1,5 @@ - + @@ -66,7 +66,7 @@ - eJzt3LFtAkEQQNFNDJKJDH1gYuMeoASXQh92cZTCoDPSRojTYC+3vCeNFl00ydcle5QCAAAAba1bLwAd0BHk6QjydAR5OoI8HUGejiBPR5CnI8jTEY9qX8phV03rfa7REf8lWji30SUdQZ6OIE9HkPfRegEAANK+Y35aLwEAwJ+al3KYxbz83seIs8yG58CNVtHPMqbuaTk8B0a69PT24PcEAXq2q6bXe6oA9Gs/ge+OAAAAAAAAAAAAAJiOKf0/PgDAM/AdLADXvMYsWi8BpL3HbKoTGG8b81mdwHjxHvraDnOM38fW+wBwPydlbBpz + eJzt3LFtAkEQQNFNDLFxH0Bs6AFKoBT6gOIohUFnpI0snwZYbv2eNFp00SRfl+xRCgAAALS1bL0AdEBHkKcjyNMR5OkI8nQEeTqCPB1Bno4gT0e8q30px101rff5jY54lWjh1kaXdAR5OoI8HUHed+sFAABIO8WcWy8BAMBTzUs5zmI+fu5jxFlmw3Pgj76in0VM3dNieA6MdO/p883vCQL0bFdNr/dUAejXfgLfHQEAAAAAAAAAAAAwHVP6f3wAgP/Ad7AAAP1bxayrExhvE7OtTmC8eA8dNsNc4vel9T4APM4VEEkaXg== @@ -81,7 +81,7 @@ - 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 @@ -92,7 +92,7 @@ eJzt1dEJwjAQgOE4YQdwgA7gAA7QARzAAcQNHM0ICiW0V8G2AfMdfK9H7uEn95TSHf5Md0iPY9Znp+ycDdklu2a3LK04te+FrezZUu1bYUt7tPTaUftO2NpSS+mHub131L4R9rDFv/Rp6KIjGrJmS+OGBh3RmDVaKhs664gGfdNSpGzopCMatdRSpGyo1xENi1qKlA0ddUTj5lqKlA11OoLJliIagmllSxENwbxxSxENQezTUkRDsKx7tzKn9vsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADGnoPdQnQ= - + eJztnQ1u4yAQRtv7X8IXXGl3e4FttEKijoEZGJhv4HuSVSWxYcA882Mn/fgghOT8+mx/ft8IIT+ReEQIqRPVo6d+8rSN4BDZo5M5vfxo0KOYnF5+NOhRTE4vPxr0aJzf37H8qcxj/n5vX5+y/e/7lkAqP4njEdo8++5CC03sEp+8y09+EskjD2p9x2xqeaGcF/IfevRM7o839AgfVI+8xnFI/iToET7IHi3M68o2OOgRPjt5pJ37Z3ld+tzWQY/w2cGj5E/v8TM9sni2hx7hE9mjWltE8qj2WcsxrtfFILpHI8dn+17yvXX01l+rz6JHWET3CLk/mrnOSI+wiOxR2i/ft2edPK3VqQJUxmUNPcJCMn73QOnB8H2mfO27L4X3mErvW9QrPZpDa87as2bkea4c/b2M0im+T49wmVGv3h69Nunzz4b5XrVNkU7z8x6nEJ+32IndPMrx8KkQx6XYt7kOIvWo9KwssWdnjxJefVSWv3r+pOmX7q9RvBmZM0TcZtQfKl4+9Xik6ZcQ6xwxpkhEqL/VPmk9yo579ATZnwRybBGIVH+rruu9HmXHv72mR3uyw5rQTI/um0Vc3nOCksvojiOygz8JTRlG+oSWR9J+EqHOS30lecbzNwdWofUo/dXOtSQeaWLw5Mkj8s5O/U2LHo/u70nSqI3vNNcmhHNCj+qc4k9v32ox1ip51MoXaSxwqket3x9EOkcr6C2nxfxa69E9fYTzdMr86GRHJIx4NNqmJR5J1sa86I1Jci1HeKYrh87UGamf0WuT1iOrfF+U2rKm/Wo90lzP0Xw60SPJmBWhb9aM62a4U4lL9Zvh0jlS57UG4nyd6hEqrbY8I/beNSNp253p0Yw0IuXrCVqZNe3YIvanMdsIEo/SPrX86FEsUMr89Bt5LUba/qx7FVL/JePFFbHMAKVNaecso5sXVm25VZaV5baa79MjUmPmPeuV8yhJLJ7HW6URKd9dWdkHlPLw6nPzeHr6J3pEEqvqc/Y8wwKtT/RoL3r/x8QLevSO1Cd6tAel/zGhqSN6VEayNmKRhweodb6S1vozqke1+REyM9dG6NF6pPdvED2q5RnhnNIjXDTf+ZjlBj2SQY/m0GrztXlqz3MB2thm7GsFPbJNI1K+vXg8m0CP7KFH5yFZt/X8nj09sk0jUr5RGZ1rzYqp9hoRekTQoEe2aUTK984/bueVlQ== @@ -1486,6 +1486,18 @@ + + + + + + + + + + + + diff --git a/src/maps/valley-sandpits-entrance.tmx b/src/maps/valley-sandpits-entrance.tmx index 1a0fce5e8..5361aae75 100644 --- a/src/maps/valley-sandpits-entrance.tmx +++ b/src/maps/valley-sandpits-entrance.tmx @@ -1,14 +1,14 @@ - + - + - + @@ -43,7 +43,7 @@ - eJztl7FOwzAQhi2LCSTYydKlzQzlAXgrYLMEzMADFHWDSIyFRwNGfqNataIkdmwntpP7pFPaJLLvvvoahzGCIAiCaGbDmYidgw+/2mfUwl65/5gYQ1SZe9FBLf9ufNll5uUGNd8i7lpq/8T5rwBeMIbAWCJ2L51azn+Pmh8Qjy21VwGcKN6R01tkL+cd8y9R62pf7xOOz4iXnl4uLH0dsUMeOfURQeTEJfpxHfA/jCD05wTRj62HtxD71iHn8cnPxctmv5cPuUdrY+cxj887h4sX7DHlXnMULxV3q0/e7/PO0eTFJgflZsheUmvSxY3Kz5W6lz79EeodsA19XbrM5bOe6176rIOx+sjVf0gvarwxarYhpVyG7o9cSeX3iUFhuO6z38sV6aQ03DNHL0vEinWvmY8ZepGsEVexk0gQUx8RBJEeJWfb4hALfF/Ur+nnpo6q+QzPt3oUDdem7qbLhynkelIxNU+FpQOLccTgyY5EabFObJmKF5OTVPhG/MROggjKCWfXx4iuY6i51HMi1Hg5o++pYudCEHPgD4//X7E= + eJztl7FOwzAQhi2PIMFOli5tZigPwFsBmyVgBh6gqBtEYmz7aMDIb1QLK0pix3ZiO7lPOqVNIvvuq69xGCMIgiCIZjacidg5+PCjfUYt7I37j4kxRJW5Fx3U8ufGl11mXm5R8x3ivqX2Pc4fAnjBGAJjidi9dGY5/wNqfkQ8tdReBXCi+EBO75G9XHTMv0Stq2O9zzi+IF57erl08JVTHxFETlyhH9cB/8MIQn9OEP3YengLsW8dch6f/Fy8bI57+ZB7tDZ2HvP4vHO4eMEeU+41R/FScbf65P0+7xxNXmxyUG6G7CW1Jl3cqPxcqXvp0x+h3gHb0Nely1w+67nupc86GKuPXP2H9KLGG6NmG1LKZej+yJVUfp8YFIbrPvu9XJFOSsM9c/SyRKxY95r5nKEXyRpxHTuJBDH1EUEQ6VFyti3+Y4Hvi/o1/dzUUTWf4/lWj6Lh2tTddPkwhVxPKqbmqbB0YDGOGDzZkSgt1oktU/FicpIKX4jv2EkQQTnl7OYE0XUMNZd6ToQaL2f0PVXsXAhiDvwCJcJfLQ== @@ -53,10 +53,10 @@ - eJzt2VsKwjAQheFCVi14WUTByyIE3WHzUtAa00mbSSbk/2Ae+mA7HszNDgMAAACA3hxcG3X2dXG107KLfOLIJ44xl4584iTz+ri4BgCgBUe/Zp0qn1liPWjVWi8Se56z57MlpeQhtZaLRaP7Lg0t5lJCC+Nk6e77ehjtzYLleCKvOO25R9vL9/3OuE63bs5Dy9Xf++bKrFtbPd1vaZnz6J3l38Mn3qOErc2JveYjXSv25lPqvV/oTLzlXqlraGhO/lc5SL+T5ByasmfQ3lvkOjfn2h/VzkXjf4QcauViNY9Z6T269Ty09Xb+kSKDsK25TCiKkPk= + eJzt2UsKwjAQxvFC7r8QfByi4OMQgt6q2RS0xnTSZpIJ+f9gFl3Yjh/mZYcBAAAAQG8Oro06+7q42mnZRT5x5BPHmEtHPnGSeX1cXAMA0IKjX7NOlc8ssR60aq0XiT3P2fPZklLykFrLxaLRfZeGFnMpoYVxsnT3fT2M9mbBcjyRV5z23KPt5ft+Z1ynWzfnoeXq731zZdatrZ7ut7TMefTO8u/hE+9RwtbmxF7zka4Ve/Mp9d4vdCbecq/UNTQ0J/+rHKTfSXIOTdkzaO8tcp2bc+2Pauei8T9CDrVysZrHrPQe3Xoe2no7/0iRQdjWXCYs6quB - + @@ -213,8 +213,13 @@ + + + + + - + diff --git a/src/maps/valley-sandpits.tmx b/src/maps/valley-sandpits.tmx index 3ea1f894f..3c8253abe 100644 --- a/src/maps/valley-sandpits.tmx +++ b/src/maps/valley-sandpits.tmx @@ -1,5 +1,5 @@ - + @@ -56,7 +56,7 @@ - eJzt2kFuwjAURdE/DnPYTnfQ7qPMYWiJjkuXwKRdR5bGixBqZLmNqOuPbe6RLFm2iROcp8hRzAAAAAAAAAAAAACgbmuzp43Kvc8DeASDsrYibwAANOlVZes0poSleef9qbFxm+pBbeHfTvCBveh/fL6UqQ7ZqeydxpSwNO+8PzU2blM97MhbM7TnC0ND63VQeXMaU8LSvPP+1Ni4TfVwaGj9epDzHNzod+uG1uuo8uE0poSleef9qbFxm+rh2ND6wezdoQAw+zTyBkw83peQt/rd+i1Da3vymM59uoYu1ZQ3vpFJu/Vbhtb25DGd+3QN1cp5DtaUt9LfyGgNR63lWOr4uOj5+ZSrpryVpntgHH7Im3J4yjk2Wf5W+/Ppnjzy9uV2NX+n++O0ysjcb1kGrsgbelTynVHt+zfyBm+1vjMib4Af8gb4IW+AH/IG+CFvgB/yBvghb307A+vCKs0= + eJzt2kFuwjAQheFZJ3u4Tm9A79Hu6dISrEuPwKY9R47Gi1DVyErr0nQmDvk/aSTLNomDeYqCYgYAAAAAAAAAAAAAdduYPWxVc68DWINGWWvJGwAAi/Skeg6a46F03uH42Ny8T+2kvvRvC1yxR32Pu2v1bche9RI0x0PpvMPxsbl5n9ppT97g5KA6Bs3xUDrvcHxsbt6ndjqQt1BT7oNbfW6zoP06qd6C5ngonXc4PjY371M7nRa0fzB7DSgAZu9G3oBexP8l5K1+a3uXoVG1cy/CSU15W9vv6rdufZdhac/kOa29v4ZqTbkP1pQ373dktIed9rLzOj5QUlPevCnLXfNN3pTD85Rjk+Uvtd+f5hSRt4+wq/k7/T7O7YTM/ZRl4BN5A25T+/MbeQOuyBsQh7wBccgbEIe8AXHIGxCHvAFxyNt9uwBfwiZM @@ -74,7 +74,7 @@ eJzt16lOA2EYheFpy62BBw8ePHh6Ryym7IatYFq2GpZL4eBIg5zkCzPPk7z5k1HHfGKaBgAAAACArtlOO9UjoCd20171COiJ/TSuHgEAAAAAAAAAAB23mtaqR0BPrKeN6hHQE5tpq3oExDCNlt6/vv1+f1qpGAv8GweDpjlMR+k4TdJJOk1ng+p10C3nuamLdJmu0nW6Sbfpzr1Bq+5zU9P0kB7TLM3TU3p2b9Cql9zUa3pLi/SePtJn+nJvAK0Z5TdimJbf6l0AAEA3fQOCTCKR - + @@ -82,12 +82,12 @@ eJztwwEJAAAMBKHr3+YbLsdAwVVTVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVfXtA7AwbHM= - + eJzt2Q1ugkAURWG7s+5/LyZt3UA1DYkhQGfez+UNc75kEuMYRPCA4O0GALXdP7QDmJmyAXrD7OgN0KE3WKivQ0Yce9tNuY+AGdAboENvgA69ATqW3rauAX+e42Hsht4wC2tvR3O9/WT1dvZ9qAuPz72RsyevI7q3lnnv689eLmBFb4DOGb19Pee/V79RMtAbqlH2ltlWz3oAZzmjt9bhRW+opsL1W+VlAJHoDbNT3U94obc/W9vcMjz/+3tFfQbrf28j/v+29R15fy56n1bpbX1cyewt41pxTdnd0tmILMcI67Z9f69FS2+LiH1quVeh6s07ItfPKvM8eIXOPHq+Ay2PLfMKyt4yqLfXkZ5jRPY5OYL3WBi9Lj2PLfMKo/yebHmfSqqck69C0Vv09d2WjN5URl23yutdlaq3o9dGoLccFX6DXUnF3o7uD+0Zrbf1Z6yK81usSr15mlL25jm+V+9rjd5iVevtSKXerMsc7TtKb7FG6816LbE3bznf0Nv/c9g2Um8e9GZDb7Fm782zLHrTrYfHL4kXX+I= - + @@ -518,8 +518,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/src/maps/valley.tmx b/src/maps/valley.tmx index e08f2f4ca..cb5d6ca3d 100644 --- a/src/maps/valley.tmx +++ b/src/maps/valley.tmx @@ -1,5 +1,5 @@ - + @@ -73,7 +73,7 @@ - eJztm0tOwzAQhq2KNezphk3bDSC15QBecogKtgW2LXRpWHKK3oZjcAA4BDN1RzhRnEfr1m7yf9IoUZ1ORvbv8SOJUgA055nsJXYQoHXMyXTsIEDrWCirqxXZK9lb1GhAWzDK6kpHjQKkzAPZY81r38k+yGYKugLFkJYMacpotZkvmSb/1SqrKxoHDY2HZtXQD2gfc6upja4W0AMIxMLRlYGuQCCMoysA9mXYU2ZANu5ZXfFvMj9aIm8BAAAAoAH9xPyEgudJIfxck92Q3eaOebsPcbMWMQroJzVtgXiE1NVWWyaQyyjQmpDXhq3lWO3TNM/44pqS3Vl/JhVtvVAcz4nEkgqjivoINeaIHuri043kqiHZIJG21BTHPHYQCcHtU6UrbsdJgHuxn/OaeX9Sohv2Q/o001zZeaD58y5oimUR6+YJIu3jG+s5V41VcZ6p046yt8znrIfLmroq0o0w+j9mysm3GfXUum/tis6v6t1tfzTFYkrK6/anrkD5Qg09ZZcR80Nq6Iryuv2pS+TXcYda44+duv/0XOPmv12Y0D2mvf39lIE9kN0QnaH+snB98Dw01H5KmynSjuwXoP6yyJwB/S4Lz3nzc13fnpNvLn8KhG5veZ+Yz0Vb6HcW1tQFzTvYXG359pxOWVNN2lvei5qVXJP/lo/9F9VbKnu4x4J0pEVTYrJOd9vg015buIbnOffZUaPeDTefNGFm9ZX5Tm+p1JqP8i2f2vr19cWUng8cg/5WV12h6b4/owt+k/1145SX7cuk9Hzg0HCuih1DTDjHVj3/5bHwSW2+K86Mh+7+unbO8+Msv0dzpqqflwHQJb4r+oPsCYL28xPIfsm+kGcBAAAAAAAAAIBO8wfyvHS+ + eJztm0tOwzAQhq0eAPZ0w4Z2A0hpOYCXHKKCbSnb8lgalpyC23AMDgCHYKbuqE4U59Ga2nX/Txo1qtPJyP4ztieNUgD0Z0H2GDsIkB1zMh07CJAdS2V19Ur2TPYSNRqQC0ZZXemoUYCUuSO773juG9k72UxBV6Ae0pIhTRmtVusl0+e3WpV1RfOgofnQvPb0A/JjbjW10tUSegCBWDq6MtAVCIRxdAXArowGylyQFQOrK/5O1kdPyFsAAAAA6MEwMT+h4HVSCD+XZFdk15XPqt2GuFhGjAP6SU1bIB4hdbXWlgnkMgq0J+S9Ybbsa3z65hlfXFOyG+vPpKKtR4pjkUgsqTBu6Y9Qc47ooSs+3UiuGpFdJDKWmuKYxw4iIXh82nTF4zgJcC32c9Ix708adMN+SJ9mWmk7CbR+3gZNsSxjXTxBZHx8cz3nqkLV55ku4yi1ZT5mPZx11FWdboTx5rPUTr7NeKA+h9bO6fi829V2R1MspqG96/10LFC+UCNP21nE/JAauqW96/10TFT3cf+1xy+cvv/wnOPmv22Y0DWmg939NIEayHaIztB/Zbg/eB0aqp6SM3XakXoB+q+MrBlw35XhNW91reurOfnW8odA6PGW/xPzsWgL952FNXVK6w42V1u+mtMha6rPeMv/omYN51Tf5WP/df2WSg13X5COtGhKTPbp7hh82HNr9/DFgex33HzSh5nVV+k9vSelPvlT3uVTa7++ezGl5wP7YLjW1bHQt+7P6JrvpL5unPamukxKzwf+G85VsWOITdvzX54LH9TqveLSfOjW17VzXJ1ni01d2OwSJwA58d1yP0hNEOTPTyD7JftCngUAAAAAAAAAAI6aP9d9dLI= @@ -81,12 +81,12 @@ eJzt1EkKAlEQRMFP38BZEOcJZ/GEHt08ROuXJgLevhZJlQIAAAAA39FrSumnQRo2ta+hK+bZ0iIt08quaMkpWzqnS7raFfDnRvlT4zRJUz+LlqyzpU3app1d0ZJbtnRPj/RMh6a896n2XQAAAAAAwG/Nah9AJx1rH0DnvIpd0b59OtQ+AgAAAAAA4A99AAROBXI= - + eJzt2VsKgzAQQFHB/X8IrV1EoY8dVsGhRbRMkokmk3vAz5aq1ySmXQcAZbj3Z/8CeDc3RmcASsPYhBCprdAbRGwHj+lzz/7b0tYBaElPQAwZc15LQ/SEWFvzFz1BQ7MuYo0ELcYdWErpab3GAhifkMpyXTT0umOcjhvdQmkIbIW+2qZ9DwztStCXb6n7T7FdCfryLXbdntqVGGkLP6y6OtPenD/vl7wNzi90bznHYXUuR6m5K+0Yvb4nNf8HcURfFp3X3FWoHPfkMn3fVblXY7mXU0r/e9e0pa6ERV+WPXnYK1xf0xa7EjF95ezJU18tdxXiyJ5y9aWZL63mU7r6T3oqgeX4lXtN5rUrq/GlRDnmR6vGSnoOLXk9ry0xfeV6f/R63b2el8YZa74axvUULffUCp4TAAAAAABg5QNoPPzs - + @@ -108,10 +108,7 @@ - - - @@ -480,5 +477,20 @@ + + + + + + + + + + + + + + + diff --git a/src/nodes/material.lua b/src/nodes/material.lua index 152b74cb6..ebe64c9e1 100644 --- a/src/nodes/material.lua +++ b/src/nodes/material.lua @@ -23,9 +23,10 @@ function Material.new(node, collider) material.name = node.name material.type = 'material' local file = utils.require( 'nodes/materials/' .. material.name) - material.width = file.width or 24 - material.height = file.height or 24 - material.image = love.graphics.newImage('images/materials/'..node.name..'.png') + material.width = file.width or node.properties.width or 24 + material.height = file.height or node.properties.height or 24 + material.image_sprite = node.properties.sprite or node.name + material.image = love.graphics.newImage('images/materials/'..material.image_sprite..'.png') material.image_q = love.graphics.newQuad( 0, 0, material.width, material.height, material.image:getWidth(),material.image:getHeight() ) material.foreground = node.properties.foreground material.collider = collider