summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2012-01-11 03:05:24 +0100
committerReid <reidyaro@gmail.com>2012-01-11 03:05:24 +0100
commit4b48f218692aaa30435fcf467b06e6a4fadff7de (patch)
tree426cf3fb332ecdccc8fe91aa9f16b28403dbe80c
parentcea612244e8f7ea7fc9205736db9c93f23962cb9 (diff)
downloadclientdata-4b48f218692aaa30435fcf467b06e6a4fadff7de.tar.gz
clientdata-4b48f218692aaa30435fcf467b06e6a4fadff7de.tar.bz2
clientdata-4b48f218692aaa30435fcf467b06e6a4fadff7de.tar.xz
clientdata-4b48f218692aaa30435fcf467b06e6a4fadff7de.zip
Add npc.png file with dan npc inside,
Change note tiles on indoors tilesets, Add Dan place on 000-2-1 map, Add Dan ID 101.
-rw-r--r--graphics/sprites/npcs/sprite/npc.pngbin0 -> 2396 bytes
-rw-r--r--graphics/tiles/Indoor/Ship-indoor.pngbin68981 -> 69179 bytes
-rw-r--r--graphics/tiles/Indoor/Village-indoor2.pngbin45007 -> 43770 bytes
-rw-r--r--maps/000-2-1.tmx20
-rw-r--r--npcs.xml10
5 files changed, 15 insertions, 15 deletions
diff --git a/graphics/sprites/npcs/sprite/npc.png b/graphics/sprites/npcs/sprite/npc.png
new file mode 100644
index 00000000..63407153
--- /dev/null
+++ b/graphics/sprites/npcs/sprite/npc.png
Binary files differ
diff --git a/graphics/tiles/Indoor/Ship-indoor.png b/graphics/tiles/Indoor/Ship-indoor.png
index b503e33a..c9b4c491 100644
--- a/graphics/tiles/Indoor/Ship-indoor.png
+++ b/graphics/tiles/Indoor/Ship-indoor.png
Binary files differ
diff --git a/graphics/tiles/Indoor/Village-indoor2.png b/graphics/tiles/Indoor/Village-indoor2.png
index 6661f456..9d667960 100644
--- a/graphics/tiles/Indoor/Village-indoor2.png
+++ b/graphics/tiles/Indoor/Village-indoor2.png
Binary files differ
diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx
index e757312e..986061ec 100644
--- a/maps/000-2-1.tmx
+++ b/maps/000-2-1.tmx
@@ -116,28 +116,28 @@
<image source="../graphics/tiles/Collision.png" width="64" height="64"/>
</tileset>
<layer name="Ground" width="83" height="59">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+2YwU7DMAyGU02A0MQBEIcy8WA9TuW07rT3P5BIrZpZtuuEUdPpP3xam6ZZ8s2Jk3UhhA4AAAAAAAAAAAAAAAAAAAAA4MLRQGOsp+E9zrVccTyR+4fILvIx0oxl2jv35jr185HpO1cm8Rx5ibw116SyfUE7Wj+8PdXG5RRTu/G+jXxlzvbj/YG8R12msnNBG73i2duTBTo2Ot7JR2LIrr+Z8U7Pcoc5F/Lskl0v9cPbkzUue2bs9J7W4eqfyTXnU/Kcu+bKvD2VzHEaT5pbei250Rxa39nSHJfGy83hv2a4E5dL83ItpD54e6qd49xYtBwrzeNSh5y/rXjUXE65po18hjmvnsKca1M53RdZfhfNZ762eLupdSnNMc4L56g0Zy9939ZdauPS9o3WejXrQBe241Xycesc9Nv2vD3VxiV1mZ8nJxqmTMPShnRu6v+BJ6tLupekPvOz3THMeYj+b/E+Oku8kmdLbSytt96eSuNSmo9SzqH1DqOzRCu0PWTv0XPpSemPt6dal1OcanmGnlE0/9xn6Rrq7elWcSk5sOyDtLPo0jl1a/sja1x44+1pDd/pOfdfW15maQPYYtu7fwAAAAAAAAAAAAAAALAlfgCqZr/1hEwAAA==
+ <data encoding="base64" compression="zlib">
+ eJztmMFOwzAMhltNgNDEARCHMvFgPU7ltO609z+QSK3mWbbrlG0m6D98WpumWfLNiZP1TdP0AAAAAAAAAAAAAAAAAAAAAIAQ9g5aZz2L6HHey5XEE7t/SGwSHxPtVGa9899c534+Cn2XyjSeEy+Jt/aSXLYtaMfqR7SntXE5x9Rmuu8SX8TZdrrfsfe4y1x2LGhjMDxHe/LAx8bHO/vIjOT6Wxjv/Iw6pJzYsxO5XupHtCdvXA7C2Pk9ryPVP7JryafmmbqWyqI9lcxxHk+WW36tubEcet+paY5r45Xm8K0ZK3dJc0RJjN0KrQ/RnkpdWmOxcqw2j0sdSv5q8Wi5nHNNl/hsznn10JxzbS7n+yLP72L5pGtLtJu1LrU5JnmRHJXm7KXvq92lNS5r3+itt2Yd6Cvyqvm4dg76bXvRnkpcUofcJT1PzrRCmYWnDe3cNPwBT16XfC/JfdKz3b455yH+v8X75Czzyp4ttbG03kZ7Ko1LbT5qOYfX203OMp3S9kje4+fSg9GfaE9rXc5xauUZfkax/EufpWtotKdrxaXmwLMPss6iS+fU2vZH3riIJtrTPXzn59J/bbTM0wbwxXZ0/wAAAAAAAAAAAAAAAKAmfgBUX6bu
</data>
</layer>
<layer name="Ground2" width="83" height="59">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+2Xv04bQRDG5yAUKBVnbIlEKUyUIpAG444oD5DOSio6yGPkTxfixh2KLSQowU9A/r1GmoTX4AEyI89yq2HJrc1JvvN9P+nzruf2Rnuf7nZ2iQAAAAAAAAAAAAAAAAAAAAAolj3Wqxy9nNvsykWeV+9ZrYRohdtlVlPFoZvYh5wci+J13jslrNFtf4SGthJP+GfJ6Lc3ds0b6/vucsTMo+wk2tp3ysWEkJe+D0KPL66zjlnX/L/L7Zsku56XI2YeZcc+W3PGPD198LfcPmA9M17OMg/7HZSdz4HnHZjYBWuck6fN92waPZ3Cy7owZI0KyHPJ+qb6XkC+slHUewnieP0f3TdHiJOKrg1poEYMTP1NKasFmzSpBS2Nk8af0931y+Vo6di2N1Zo0GKQ5tQI6+UWZT5IXHxYZe2wHrKeqCTW0ZjNYX1fJC+F2O+qo+0pjz+LvGeD9Ygyj63vj6NnW25Sz4+DAtapj6xPEeOmWROrcu4RLxtJMT76FFk/qrJXD+2p7Z5oXsg09qk6Xr6L8O0Lq0+TOvFC2yONT4vcu01xZ1VZWw9psrZWgZi9un/u6Wr7VeOC1Okj7fcp81n6oRq9O/t0K0/o3HOucUHqtHjsPHc+S8zWaN/nOmDfy9D52Z2tHc7bsem7dcDlcD6PAjnqxA/WT9YvE5dzk/NF/PL7QzPW97nO/GH9ZV2Z+F3nJn8dcPg+g3jq/A0DAAAAAAAAAAAAAAAAmD//AG8kBKyETAAA
+ <data encoding="base64" compression="zlib">
+ eJztlztO5EAQhss8AkQEAyMtaANABDwSWIKVQBxgM7REZMAVyHhkPBICJAQIiQ2BE8AuXINkd6/BAajSVONW0eCewdLY4/+T/ilPuV1q/7K73EQAAAAAAAAAAAAAAAAAAAAA5MsiazlDS22bXbHI8mqbVU+Iejl2s4ZVnHrN7WTU6BSvs54pYYDe+iPUNEo+4Z8uoydv7IA31vfd1YiZR9FJNNpnyuWEkJe+D8IKnxxinbKe+f8Cx59Jej6rRsw8io69t+EW66zoja9y7GFNGi9bmYd9D4rOfuB+j03uhnWbUWeMrxk3mmjCy6pwzrrIoc4d6171O4d6RSOv5xLE8eMDfbZGiMuSrg0ngR5xbPrvIKW9YJwavaCuedL8FL3fv1yNuo4d88YKNeoMtjJ6hPVymlIfJC8+9LHmWP2sryrJzWvO1rC+d4qX3zXGvlfzGq94/K/Ia76wRij12Po+GjvZgnPq+bGewzq1y9qLGNfMmliWfY9QS/Lx0SfP/lGWb/XQN7X9JmoXMo01Ko+XmxG+HbKOqNEnZjUeaL5Z5NoZiturytq6QY21tQzEfKv7+54FjWeaF6RPH+jxEaU+y3GoR39rfbqlJ7Tvuda8IH1aPHaeO58lZ3u073MVsM9laP/s9tYO5+2tOXbrgKvhfL4I1KgSf1gPrEeTl32T80X88o/PzVjf5yrzl/WP9d/k39s3+euAw/cZxFPldxgAAAAAAAAAAAAAAABA+3kBnf1ceA==
</data>
</layer>
<layer name="Fringe" width="83" height="59">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3XO07DQBCA4VgRkAoh0dPQIRo6LsAJuAI3gAvQBAJ9wKSIxCO8ejgBR+AI3ABCy4yYlZzVJthgsbbzf9JonbG9Wk/Wj221AAAAAAAAAAAAAFTZWKJj2ysSy7atuY8oI6o2V6u1wL6FZPp5oVq6PjqBfU13JHHs5bqWd3YC9dTcteXb0vakPbE4lXgpf6hRHQZq0PNyZxLnEm/2W9u+5R1Xy73ke3s/mazvrmyn0l5YDCRey7iAmgnNy5HEbYE+VqWW99I+WDx6+68C/+lQcjcSoxnPkCrJMy9DniSevdxWMhlZ63+ox6AmtUR5hr+cl/g/+ndsSLRjD6Rm0hnviMs5muPvsQcABBzIPbjt5Xj3ILY83+pja/3182KB+at9ZNdO2peu6T9znJs28D5x62f/2rQum4HjtXZLdqy/pte+/DV9ExV9Xrq6qOy3UbZ2una/884ruqafZ93YA2iQ/s+HAAAAAAAAAAAAzJUvg2bm1oRMAAA=
+ <data encoding="base64" compression="zlib">
+ eJzt1ztOw0AQgOFYEZAKIdHT0CEaDsEJuAI3yAloAoE+YFJE4pEH9HACjsAROAKhZUbMSs5qCTZYrO38nzTazdhe2eON7W21AAAAAAAAAAAAAFTZXKJj/S2JTetr7j3KGVWbq9VOYNta8v1xoVq6MTqBbU13KnHm5XqWdw4D9dTcneXb0valPbe4kHgp/1SjOgnUoO/lLiWuJN7st7YDyzuulsfJV7+bLNb3SPqptNcWQ4nXMi6gZkLzciwxKTDGttRyJu2DxaO3/TZwT0eSu5cYL3mGVEmeeRnyJPHs5Q6Sxcja/UM9hjWpJcoz+uW8xP/R27En0Y59IjWTLnlH3DDHgcrh3YPY8nyrz63118/rBeavjpFdO+lYuqb/yHFs2sD/iVs/+9emddkP7K+127B9/TW9juWv6Zuo6PPS1UVlv42ytdO1+9Q7ruiafpX1Yp9Agwx+3gUAAAAAAAAAAGClfALAPzrI
</data>
</layer>
<layer name="Over" width="83" height="59">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+2YzUoDMRSFMxa3ikjX4h+4qOBCQfBnoxVaFRdWxb1VNwpi60ZfQhB8IR/Bd+nWe5kJDEMmucNEncmcDw5tkpubzCGdJFUKAAAAAAAAAAAAAAAAAAAAXBdUk/HpT8he+1xL3aha8/lreF47grhXR3uPdOHwsufI8SaYx66qtpd7gjiXD9w+zPHyKZLncHGkmuHlWLAuR5YYeClr1zHbJXJ8RvDSZ44meHlJ6jt0aul/IxiDqYOXU/T7+bLEnTvyDEj8KlwktUjtRFy3lNTZcvSTHCbOSKukLulQVd/L95Jnw/lMeUi6LdC/bWnjtbiu6nG+lPzGi/JAevSUi73cUtX2kdFefni4s6QZk1485dLvyLp4yXz/50QsXJH2k+8h3HuOlX2PPvnFHHr/Yuqwj7vg88q0ivfjGdIKaVbFz8l10jORzsF9l0kLqRyhnIlcZJ+zY2ifU7HHvKffke4zdRwzyHkvTwxjmAjRy01D+ySnbycVU2QMEyF6WbTdV46meNkq+f9lCF4eqPh+tpZ8pqXrnh15fKzLkWHcbLnqd0itjUw5XZfnt9RrRnvl8sk0l2y5rtieyeW1yatQffKBdG3DKwAAAAAAAAAAAAAAAJDzAyNTTq6ETAAA
+ <data encoding="base64" compression="zlib">
+ eJztmM1KAzEUhVOLW0Wka/Gn4KKCCwXBn41WaFVcWBX3Vt0oiK0bfQ9fyEfwXbr1XmYCQ8jkZmiqM5nzwaFNcnOTOaSTpEoBAAAAAAAAAAAAAAAAAACAu4KqMyH9idnrkGup2yjXfP4ante+R9yH0N4jXQte9oQcnx7zOFDl9vLQI07ygduHOV6+NvxzSJyqeng59liXI0cMvPRr1zF7U+T4asDLkDnq4OUNqS/owtH/3mMMpgpeztHv59sRdyXkGZD4VbhKapJaqbhuLa1z5einOWxcktqkLulEld/LaVk2ykPSQ4H+LUcbr8UtVY3zZQgvTZ5JL4FysZe7qtw+MrPyckx6D5RLvyOr5OXPf07EwS3pKP0ew73nTLn36PMZ5tD7F1OFfVyCzyvzKtmPF0gbpEWVPCfX+Z6JdA7uu05ayeSI5UwkYT5nx9K+pBKPeU9/JD0ZdRwzyLlDTixj2IjRyx1L+ySnbycTU2QMGzF6WbQ9VI66eNmc8v/LGLw8Vsn9bDP9zErXvQl5QqzLkWVcs1z2O6TWtlHO1uX57es1o72SfLLNxSxXFdczSV7bvIrVpxD4rm14BQAAAAAAAAAAAAAAAP78AnGabKg=
</data>
</layer>
<layer name="Collision" width="83" height="59" visible="0">
- <data encoding="base64" compression="gzip">
- H4sIAAAAAAAAA+3SSw6DMAxAQXr/i3DMqotuEKQxODWfiTQSQm3Aj8yvaZoBAAAAAAAAIOCzqt/hLlotn9T5u1rX/2q5XNVt9rbcWmfYo7pRtGXrurrlFXtWdrhLy+Us0XPZ2jPje1655ZEZ9v5/69l36dgz38hV3WV0y975M/e6moy5s1d1k4yWI7rsWdVNss/j2u+P7hF9j+pG0ZaR6+W9VuNR3/SMembomXFt5mjL1rOqO2Wfy0jrrb7O5e8Zj3bQUsvM3k/qUN1aSwAAAACAmDeFIWDKhEwAAA==
+ <data encoding="base64" compression="zlib">
+ eJzt0ksOgzAMQEF6/4twzKqLbhCkMTg1n4k0EkJtwI/Mr2maAQAAAAAAACDgs6rf4S5aLZ/U+bta1/9quVzVbfa23Fpn2KO6UbRl67q65RV7Vna4S8vlLNFz2doz43teueWRGfb+f+vZd+nYM9/IVd1ldMve+TP3upqMubNXdZOMliO67FnVTbLP49rvj+4RfY/qRtGWkevlvVbjUd/0jHpm6JlxbeZoy9azqjtln8tI662+zuXvGY920FLLzN5P6lDdWksAAAAAgJg3ff+A8g==
</data>
</layer>
<objectgroup name="Object" width="83" height="59" visible="0">
diff --git a/npcs.xml b/npcs.xml
index 4edc70c7..39fcf426 100644
--- a/npcs.xml
+++ b/npcs.xml
@@ -9,9 +9,13 @@ IDs 990-999 = Special
<npcs>
<!-- Unanimated NPCs -->
<npc id="100">
- <!-- Knifepit. -->
+ <!-- Knife-pit. -->
<sprite variant="0">npcs/XML1/smallnpc.xml</sprite>
</npc>
+ <npc id="101">
+ <!-- Demon-Man, siting on a chair... -->
+ <sprite variant="0">npcs/XML1/npc.xml</sprite>
+ </npc>
<!-- Animated NPCs -->
<npc id="301">
@@ -59,10 +63,6 @@ IDs 990-999 = Special
<sprite>npcs/XML1/billybons.xml</sprite>
</npc>
<npc id="312">
- <!-- Demon-Man, sittin on a chair... -->
- <sprite>npcs/XML1/npc.xml</sprite>
- </npc>
- <npc id="313">
<!-- Mudget-Man, small and not smart at all... -->
<sprite>npcs/XML1/silvio.xml</sprite>
</npc>