diff options
220 files changed, 1142 insertions, 264 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cad8194a..df624bd7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -14,12 +14,6 @@ testxml: - ./.tools/testxml.sh - pwd -contributors: - stage: test - script: - - ./.tools/contributors.sh - - pwd - pngcheck: stage: test script: diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..9d753f39 --- /dev/null +++ b/.mailmap @@ -0,0 +1,32 @@ +Jesusaves <jesusalva@themanaworld.org> Jesusaves <cpntb1@ymail.com> +Jesusaves <jesusalva@themanaworld.org> Jonatas L. Nogueira <cpntb1@ymail.com> +Alige <aligetmw@hotmail.fr> Alige <gauvain.dauchy@free.fr> +Alige <aligetmw@hotmail.fr> Alige <alige@debian> +Reid <reidyaro@gmail.com> Reid Yaro <reidyaro@gmail.com> +Reid <reidyaro@gmail.com> Reid <reid@Chlian> +Reid <reidyaro@gmail.com> Reid Yaro <reid@Julie> +Reid <reidyaro@gmail.com> Reid <reid@IdeaPad.(none)> +gumi <git@gumi.ca> gumi <mekolat@users.noreply.github.com> +Hal9000 <miglietta.francesco@gmail.com> Hal9OOO <miglietta.francesco@gmail.com> +Hal9000 <miglietta.francesco@gmail.com> Hal9OOO (Francesco Miglietta) <miglietta.francesco@gmail.com> +Hal9000 <miglietta.francesco@gmail.com> epoc <epoc@hal9000.(none)> +Hal9000 <miglietta.francesco@gmail.com> <epoc@halthink.(none)> +Micksha <ms-shaman@gmx.de> Micksha <Micksha@users.noreply.github.com> +omatt <m.vuoso@laposte.net> omattornot <m.vuoso@laposte.net> +omatt <m.vuoso@laposte.net> omatt <m.vuoso@laposte.net> +gumi <git@gumi.ca> mekolat <mekolat@users.noreply.github.com> +wushin <pasekei@gmail.com> Wushin <pasekei@gmail.com> +Monwarez <monwarez@gmail.com> Thibault Payet <monwarez@gmail.com> +Monwarez <monwarez@gmail.com> User Monwarez <monwarez@gmail.com> +Vasily_Makarov <danilka.pro@gmail.com> Dan Sagunov <danilka.pro@gmail.com> +Vasily_Makarov <danilka.pro@gmail.com> Dan Sagunov <dan@archdemon.(none)> +Vasily_Makarov <danilka.pro@gmail.com> dan <dan@dan-P41-ES3G.(none)> +Vasily_Makarov <danilka.pro@gmail.com> Vasily <danilka.pro@gmail.com> +Akko Teru <none@null.nil> Teru <9bi at [comc]ast dot net> +jak1 <jak1@germantmw.de> jak1 <jak89_1@ftb4u.de> +Kurt Kuschinski <hocus@themanaworld.org> Hocus <hocus@themanaworld.org> +Kurt Kuschinski <hocus@themanaworld.org> Kurt Kuschinski <kurt.kuschinski@gmail.com> +Saweres <onshine20@gmail.com> root <root@saweres.localdomain> +Mikko <mikko.devel@gmail.com> Mikko <mikko@debian> +Ledmitz <ledmitz@gmail.com> Ledmitz <smoothshifter@tuta.io> + diff --git a/.tools/contributors.sh b/.tools/contributors.sh deleted file mode 100755 index 487c3cb4..00000000 --- a/.tools/contributors.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -source ./.tools/init.sh - -clientdata_init - -aptget_update -aptget_install git-core gcc ca-certificates libxml2-utils make xsltproc -rm -rf tools -gitclone https://gitlab.com/evol evol-tools.git tools - -cd tools/contrib_xsl - -make about-server -check_error $? - -cd ../../clientdata - -export RES=$(git diff) -if [[ -n "${RES}" ]]; then - echo "Contributors list not updated" - git diff - exit 1 -fi @@ -160,6 +160,7 @@ legal@themanaworld.org graphics/items/equipment/head/fancyhat.png (Crush) (CC BY-SA 3.0) (-) graphics/items/equipment/head/funkyhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/infantryhelmet.png (Black Don) (GPLv2) (-) + graphics/items/equipment/head/knighthelmet.png (Black Don) (GPLv2) (Jesusalva) graphics/items/equipment/head/minerhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/moonshroomhat.png (LEGACY) (GPLv2) (-) graphics/items/equipment/head/nohmask.png (LEGACY) (GPLv2) (-) @@ -889,6 +890,7 @@ legal@themanaworld.org graphics/sprites/equipment/head/funkyhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/headmodel-male.png (Saulc) (GPLv2) (-) graphics/sprites/equipment/head/infantryhelmet.png (LEGACY) (GPLv2) (-) + graphics/sprites/equipment/head/knighthelmet.png (Black Don) (GPLv2) (Saulc, Jesusalva) graphics/sprites/equipment/head/minerhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/moonshroomhat.png (LEGACY) (GPLv2) (-) graphics/sprites/equipment/head/nohmask.png (LEGACY) (GPLv2) (-) @@ -1116,7 +1118,10 @@ legal@themanaworld.org graphics/sprites/npcs/sprite/chest.png (Hal9000) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/chest2.png (Hal9000) (CC BY-SA 3.0) (Micksha) graphics/sprites/npcs/sprite/chest-big.png (Hal9000) (CC BY-SA 3.0) (-) + graphics/sprites/npcs/sprite/chronos.png (Lien) (GPLv2) (-) graphics/sprites/npcs/sprite/cookiemaster.png (Hal9000, Reid) (CC BY-SA 3.0) (Alige) + graphics/sprites/npcs/sprite/creepysurgeon.png (Modanung) (CC BY-SA 3.0, GPLv2) (-) + graphics/sprites/npcs/sprite/cryingchild.png (Lien, Reid) (GPLv2) (-) graphics/sprites/npcs/sprite/edouard.png (Kr0n0) (CC BY-SA 3.0) (Alige, Reid) graphics/sprites/npcs/sprite/elmo.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) graphics/sprites/npcs/sprite/eugene.png (Reid) (CC BY-SA 3.0) (Kansu) @@ -1124,16 +1129,21 @@ legal@themanaworld.org graphics/sprites/npcs/sprite/flag-small.png (Micksha) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/flask.png (Hal9000) (CC BY-SA 3.0) (Reid) graphics/sprites/npcs/sprite/galimatia.png (Micksha) (CC BY-SA 3.0) (-) + graphics/sprites/npcs/sprite/ghost-beerguy.png (Reid, Skipy) (GPLv2) (-) + graphics/sprites/npcs/sprite/ghost-innkeeper.png (Reid) (CC BY-SA 3.0, GPLv2) (-) graphics/sprites/npcs/sprite/gugli.png (Reid) (CC BY-SA 3.0) (Modanung, Talaroc) graphics/sprites/npcs/sprite/harbour.png (EJlol, Reid) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/hammock.png (IvanMorve) (CC BY-SA 3.0) (Reid) graphics/sprites/npcs/sprite/hammock-animated.png (IvanMorve) (CC BY-SA 3.0) (Reid) + graphics/sprites/npcs/sprite/hangman.png (Reid, Skipy) (GPLv2) (-) + graphics/sprites/npcs/sprite/headlessman.png (Reid, Skipy) (GPLv2) (-) graphics/sprites/npcs/sprite/hinnak.png (Micksha) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/interactive.png (Hal9000, Modanung, Reid) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/jenna.png (Reid) (CC BY-SA 3.0) (-) graphics/sprites/npcs/sprite/jukebox.png (Hocus) (MIT) (Hocus) graphics/sprites/npcs/sprite/julia.png (Reid) (CC BY-SA 3.0) (Modanung) graphics/sprites/npcs/sprite/koga.png (?) (GPLv2) (Micksha) + graphics/sprites/npcs/sprite/lightman.png (Lien) (GPLv2) (-) graphics/sprites/npcs/sprite/lumberjack.png (Crush) (CC BY-SA 3.0) (Micksha) graphics/sprites/npcs/sprite/lydon.png (Reid) (CC BY-SA 3.0) (Modanung) graphics/sprites/npcs/sprite/magicarpan.png (Reid) (CC BY-SA 3.0) (Len, Modanung) @@ -1161,6 +1171,10 @@ legal@themanaworld.org graphics/sprites/npcs/sprite/unanimated-legacy.png (LEGACY) (GPLv2?) (Micksha) graphics/sprites/npcs/sprite/unanimated-legacy-tall.png (LEGACY) (GPLv2?) (-) graphics/sprites/npcs/sprite/unanimated-tall.png (Modanung, Nard, Reid) (GPLv2) (Yuuki) + graphics/sprites/npcs/sprite/undead-banker.png (Reid) (CC BY-SA 3.0, GPLv2) (-) + graphics/sprites/npcs/sprite/undead-guard.png (Skipy) (GPLv2) (-) + graphics/sprites/npcs/sprite/undead-mouboo-master.png (LEGACY) (GPLv2) (-) + graphics/sprites/npcs/sprite/undead-receptionist.png (Skipy) (GPLv2) (-) graphics/sprites/npcs/sprite/valia.png (LEGACY) (GPLv2) (Micksha) ## Races graphics/sprites/races/demon-female.png (Modanung, Talaroc) (CC BY-SA 3.0) (Alige, Reid, Saphy) @@ -1450,15 +1464,19 @@ legal@themanaworld.org maps/jail.tmx (Kytty) (CC BY-SA 3.0) (Micksha) # Sound Effects + ## Items ### Rubber Bat sfx/items/legacy/rubberbat.ogg (Cosmotrator) (GPL v2) (-) + ## Magic -### Fireball - sfx/magic/fireball.ogg (Ledmitz) (CC BY-SA 3.0) (-) ### Heal sfx/magic/heal.ogg (Ledmitz) (CC BY-SA 3.0) (-) + ## Monsters +### Bat + sfx/monsters/bat/die1.ogg (Cosmostrator) (GPLv2) (-) + sfx/monsters/bat/hit1.ogg (Cosmostrator) (GPLv2) (-) ### Bee sfx/monsters/bee/die1.ogg (Ledmitz) (CC BY-SA 3.0) (-) sfx/monsters/bee/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-) @@ -1502,6 +1520,11 @@ legal@themanaworld.org sfx/monsters/ghost/move1.ogg (Ledmitz) (CC BY-SA 3.0) (Alivvie) sfx/monsters/ghost/move2.ogg (Ledmitz) (CC BY-SA 3.0) (Alivvie) sfx/monsters/ghost/move3.ogg (Ledmitz) (CC BY-SA 3.0) (Alivvie) +### Maggot + sfx/monsters/maggot/die1.ogg (Cosmostrator) (GPLv2) (-) + sfx/monsters/maggot/hit1.ogg (Cosmostrator) (GPLv2) (-) + sfx/monsters/maggot/hit2.ogg (Cosmostrator) (GPLv2) (-) + sfx/monsters/maggot/miss1.ogg (Cosmostrator) (GPLv2) (-) ### Piou sfx/monsters/piou/die1.ogg (Ezili) (CC BY-SA 3.0) (Reid, Socapex) sfx/monsters/piou/hit1.ogg (Ezili) (CC BY-SA 3.0) (Reid, Socapex) @@ -1529,6 +1552,8 @@ legal@themanaworld.org sfx/monsters/scorpion/hit3.ogg (Cosmostrator) (CC BY-SA 3.0) (Micksha) sfx/monsters/scorpion/hit4.ogg (Cosmostrator) (CC BY-SA 3.0) (Micksha) sfx/monsters/scorpion/miss1.ogg (Cosmostrator) (CC BY-SA 3.0) (Micksha) +### Snake + sfx/monsters/snake/hit1.ogg (Krazyjakee) (GPLv2) (-) ### Spider sfx/monsters/spider/die1.ogg (alpha) (CC BY-SA 3.0) (-) sfx/monsters/spider/hit1.ogg (alpha) (CC BY-SA 3.0) (-) @@ -1570,29 +1595,55 @@ legal@themanaworld.org sfx/system/skillup.ogg (Kenny690) (CC BY-SA 3.0) (-) sfx/system/warp.ogg (Kenny690) (CC BY-SA 3.0) (-) ## Weapons +###BansheeBow + sfx/weapons/bow-banshee/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (j1987) + sfx/weapons/bow-banshee/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (j1987) + sfx/weapons/bow-banshee/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (j1987) + sfx/weapons/bow-banshee/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/bow-banshee/miss2.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/bow-banshee/miss3.ogg (Ledmitz) (CC BY-SA 3.0) (-) ### Bare Hands sfx/weapons/barehands/hit1.ogg (Kenny690) (CC BY-SA 3.0) (-) sfx/weapons/barehands/miss1.ogg (Kenny690) (CC BY-SA 3.0) (-) ### Forest Bow sfx/weapons/bow-forest/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (smcameron) sfx/weapons/bow-forest/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (smcameron) +### Halberd + sfx/weapons/halberd/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/halberd/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/halberd/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (-) ### Knife sfx/weapons/knife/hit1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex) sfx/weapons/knife/miss1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex) +### Setzer + sfx/weapons/knife-setzer/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz) + sfx/weapons/knife-setzer/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz) + sfx/weapons/knife-setzer/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz) ### Piouslayer sfx/weapons/piouslayer/hit1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex) sfx/weapons/piouslayer/miss1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex) +### RockKnife + sfx/weapons/knife-rock/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz) + sfx/weapons/knife-rock/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (Ledmitz) ### Scythe sfx/weapons/scythe/hit1.ogg (LEGACY) (GPLv2) (Micksha) sfx/weapons/scythe/miss1.ogg (Cosmostrator) (CC BY-SA 3.0) (Socapex) ### Short Bow sfx/weapons/bow-short/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (smcameron) sfx/weapons/bow-short/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (smcameron) +### Staff + sfx/weapons/staff/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/staff/hit2.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/staff/hit3.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/staff/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/staff/miss2.ogg (Ledmitz) (CC BY-SA 3.0) (-) + sfx/weapons/staff/miss3.ogg (Ledmitz) (CC BY-SA 3.0) (-) ### Wooden Bow sfx/weapons/bow-wooden/hit1.ogg (Ledmitz) (CC BY-SA 3.0) (smcameron) sfx/weapons/bow-wooden/miss1.ogg (Ledmitz) (CC BY-SA 3.0) (smcameron) ## Env sfx/env/fart.ogg (LEGACY) (GUMI) (-) + sfx/env/fireball.ogg (Ledmitz) (CC BY-SA 3.0) (-) # / palette.gpl (Reid) (CC BY-SA 3.0) (-) diff --git a/effects.xml b/effects.xml index f0ed4831..8568a656 100644 --- a/effects.xml +++ b/effects.xml @@ -37,7 +37,7 @@ Copyright (C) 2010-2020 Evol Online --> <effect id="29" audio="npcs/fishing-cast.ogg"/> <!-- Throwing the bait in the water, in the fishing script. --> <effect id="30" audio="npcs/fishing-bite.ogg"/> <!-- Fish biting the bait, in the fishing script. --> <effect id="33" audio="monsters/piou/hit1.ogg"/> <!-- when clicking the flying piou --> - <effect id="34" particle="graphics/particles/fire-explosion.xml"/> <!-- An explosion of white particles / LEGACY --> + <effect id="34" audio="env/fireball.ogg" particle="graphics/particles/fire-explosion.xml"/> <!-- An explosion of white particles / LEGACY --> <effect id="35" particle="graphics/particles/magic-shield.xml"/> <!-- A magic shield particle effect. --> <effect id="36" particle="graphics/particles/magic.shield-ends.xml"/> <effect id="37" particle="graphics/particles/lightning1.xml"/> diff --git a/graphics/items/equipment/head/knighthelmet.png b/graphics/items/equipment/head/knighthelmet.png Binary files differnew file mode 100644 index 00000000..66cf3cae --- /dev/null +++ b/graphics/items/equipment/head/knighthelmet.png diff --git a/graphics/minimaps/008-3-5.png b/graphics/minimaps/008-3-5.png Binary files differindex f51d64f9..25bcf06d 100644 --- a/graphics/minimaps/008-3-5.png +++ b/graphics/minimaps/008-3-5.png diff --git a/graphics/minimaps/009-2-7.png b/graphics/minimaps/009-2-7.png Binary files differindex a264a6a8..af02e37d 100644 --- a/graphics/minimaps/009-2-7.png +++ b/graphics/minimaps/009-2-7.png diff --git a/graphics/minimaps/020-2-15.png b/graphics/minimaps/020-2-15.png Binary files differindex bfcd0137..7fa1c860 100644 --- a/graphics/minimaps/020-2-15.png +++ b/graphics/minimaps/020-2-15.png diff --git a/graphics/sprites/equipment/head/knighthelmet.png b/graphics/sprites/equipment/head/knighthelmet.png Binary files differnew file mode 100644 index 00000000..6362a087 --- /dev/null +++ b/graphics/sprites/equipment/head/knighthelmet.png diff --git a/graphics/sprites/equipment/head/knighthelmet.xml b/graphics/sprites/equipment/head/knighthelmet.xml new file mode 100644 index 00000000..2d625e9e --- /dev/null +++ b/graphics/sprites/equipment/head/knighthelmet.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Saulc +Copyright (C) 2018 TMW2 --> +<sprite> + <imageset name="base" + src="graphics/sprites/equipment/head/knighthelmet.png|W" + width="32" + height="64" + offsetY="1"/> + + <include file="equipment/head/headmodel-male.xml"/> +</sprite> diff --git a/graphics/sprites/npcs/sprite/chronos.png b/graphics/sprites/npcs/sprite/chronos.png Binary files differnew file mode 100644 index 00000000..fd9eb845 --- /dev/null +++ b/graphics/sprites/npcs/sprite/chronos.png diff --git a/graphics/sprites/npcs/sprite/creepysurgeon.png b/graphics/sprites/npcs/sprite/creepysurgeon.png Binary files differnew file mode 100644 index 00000000..60c650d0 --- /dev/null +++ b/graphics/sprites/npcs/sprite/creepysurgeon.png diff --git a/graphics/sprites/npcs/sprite/cryingchild.png b/graphics/sprites/npcs/sprite/cryingchild.png Binary files differnew file mode 100644 index 00000000..e839bd01 --- /dev/null +++ b/graphics/sprites/npcs/sprite/cryingchild.png diff --git a/graphics/sprites/npcs/sprite/ghost-beerguy.png b/graphics/sprites/npcs/sprite/ghost-beerguy.png Binary files differnew file mode 100644 index 00000000..5b614ac6 --- /dev/null +++ b/graphics/sprites/npcs/sprite/ghost-beerguy.png diff --git a/graphics/sprites/npcs/sprite/ghost-innkeeper.png b/graphics/sprites/npcs/sprite/ghost-innkeeper.png Binary files differnew file mode 100644 index 00000000..e78b88e8 --- /dev/null +++ b/graphics/sprites/npcs/sprite/ghost-innkeeper.png diff --git a/graphics/sprites/npcs/sprite/hangman.png b/graphics/sprites/npcs/sprite/hangman.png Binary files differnew file mode 100644 index 00000000..90973a7d --- /dev/null +++ b/graphics/sprites/npcs/sprite/hangman.png diff --git a/graphics/sprites/npcs/sprite/headlessman.png b/graphics/sprites/npcs/sprite/headlessman.png Binary files differnew file mode 100644 index 00000000..c5370b8c --- /dev/null +++ b/graphics/sprites/npcs/sprite/headlessman.png diff --git a/graphics/sprites/npcs/sprite/lightman.png b/graphics/sprites/npcs/sprite/lightman.png Binary files differnew file mode 100644 index 00000000..a91afec7 --- /dev/null +++ b/graphics/sprites/npcs/sprite/lightman.png diff --git a/graphics/sprites/npcs/sprite/tiki.png b/graphics/sprites/npcs/sprite/tiki.png Binary files differindex f55dcbba..be4878ab 100644 --- a/graphics/sprites/npcs/sprite/tiki.png +++ b/graphics/sprites/npcs/sprite/tiki.png diff --git a/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png b/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png Binary files differindex 3de447f6..01080ca1 100644 --- a/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png +++ b/graphics/sprites/npcs/sprite/unanimated-legacy-tall.png diff --git a/graphics/sprites/npcs/sprite/unanimated-legacy.png b/graphics/sprites/npcs/sprite/unanimated-legacy.png Binary files differindex f0f6ec0a..8a4fe984 100644 --- a/graphics/sprites/npcs/sprite/unanimated-legacy.png +++ b/graphics/sprites/npcs/sprite/unanimated-legacy.png diff --git a/graphics/sprites/npcs/sprite/undead-banker.png b/graphics/sprites/npcs/sprite/undead-banker.png Binary files differnew file mode 100644 index 00000000..54691e5d --- /dev/null +++ b/graphics/sprites/npcs/sprite/undead-banker.png diff --git a/graphics/sprites/npcs/sprite/undead-guard.png b/graphics/sprites/npcs/sprite/undead-guard.png Binary files differnew file mode 100644 index 00000000..60319fbc --- /dev/null +++ b/graphics/sprites/npcs/sprite/undead-guard.png diff --git a/graphics/sprites/npcs/sprite/undead-mouboo-master.png b/graphics/sprites/npcs/sprite/undead-mouboo-master.png Binary files differnew file mode 100644 index 00000000..ca14a6d4 --- /dev/null +++ b/graphics/sprites/npcs/sprite/undead-mouboo-master.png diff --git a/graphics/sprites/npcs/sprite/undead-receptionist.png b/graphics/sprites/npcs/sprite/undead-receptionist.png Binary files differnew file mode 100644 index 00000000..8d8fa2ca --- /dev/null +++ b/graphics/sprites/npcs/sprite/undead-receptionist.png diff --git a/graphics/sprites/npcs/xml/chronos.xml b/graphics/sprites/npcs/xml/chronos.xml new file mode 100644 index 00000000..603c4f42 --- /dev/null +++ b/graphics/sprites/npcs/xml/chronos.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/chronos.png" width="50" height="64"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Chronos --> + <frame index="0" delay="1000"/> + <frame index="1" delay="1000"/> + <frame index="2" delay="1000"/> + <frame index="3" delay="1000"/> + <frame index="4" delay="1000"/> + <frame index="5" delay="1000"/> + <frame index="6" delay="1000"/> + <frame index="7" delay="1000"/> + <frame index="8" delay="1000"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/creepysurgeon.xml b/graphics/sprites/npcs/xml/creepysurgeon.xml new file mode 100644 index 00000000..50be6f8d --- /dev/null +++ b/graphics/sprites/npcs/xml/creepysurgeon.xml @@ -0,0 +1,28 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/creepysurgeon.png" width="50" height="70"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Scissor demonstration --> + <sequence start="1" end="9" delay="200"/> + <frame index="10" delay="500"/> + <frame index="11" delay="500"/> + <frame index="10" delay="500"/> + <frame index="11" delay="500"/> + <frame index="10" delay="500"/> + <frame index="11" delay="500"/> + <frame index="10" delay="500"/> + <frame index="12" delay="300"/> + <frame index="13" delay="1000"/> + <sequence start="14" end="16" delay="400"/> + <frame index="0" delay="3000"/> + <!-- blinking --> + <frame index="19" delay="500"/> + <frame index="0" delay="3000"/> + <!-- checking pocket --> + <frame index="12" delay="1000"/> + <sequence start="14" end="16" delay="400"/> + <frame index="0" delay="3000"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/cryingchild.xml b/graphics/sprites/npcs/xml/cryingchild.xml new file mode 100644 index 00000000..b8ebee48 --- /dev/null +++ b/graphics/sprites/npcs/xml/cryingchild.xml @@ -0,0 +1,15 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/cryingchild.png" width="30" height="50"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Crying child animation --> + <frame index="0" delay="180"/> + <frame index="1" delay="180"/> + <frame index="2" delay="180"/> + <frame index="3" delay="180"/> + <frame index="4" delay="180"/> + <frame index="5" delay="180"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/ghost-beerguy.xml b/graphics/sprites/npcs/xml/ghost-beerguy.xml new file mode 100644 index 00000000..a2169fb2 --- /dev/null +++ b/graphics/sprites/npcs/xml/ghost-beerguy.xml @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/ghost-beerguy.png" width="32" height="118"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Ghost beer --> + <frame index="0" delay="225"/> + <frame index="1" delay="225"/> + <frame index="2" delay="225"/> + <frame index="3" delay="225"/> + <frame index="4" delay="225"/> + <frame index="5" delay="225"/> + <frame index="6" delay="225"/> + <frame index="7" delay="225"/> + <frame index="8" delay="225"/> + <frame index="9" delay="225"/> + <frame index="10" delay="225"/> + <frame index="11" delay="225"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/ghost-innkeeper.xml b/graphics/sprites/npcs/xml/ghost-innkeeper.xml new file mode 100644 index 00000000..1baf5f9e --- /dev/null +++ b/graphics/sprites/npcs/xml/ghost-innkeeper.xml @@ -0,0 +1,25 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/ghost-innkeeper.png" width="64" height="96"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Ghost --> + <frame index="0" delay="190"/> + <frame index="1" delay="190"/> + <frame index="2" delay="190"/> + <frame index="3" delay="190"/> + <frame index="4" delay="190"/> + <frame index="5" delay="190"/> + <frame index="6" delay="190"/> + <frame index="7" delay="190"/> + <frame index="8" delay="190"/> + <frame index="9" delay="190"/> + <frame index="10" delay="190"/> + <frame index="11" delay="190"/> + <frame index="12" delay="190"/> + <frame index="13" delay="190"/> + <frame index="14" delay="190"/> + <frame index="15" delay="190"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/hangman.xml b/graphics/sprites/npcs/xml/hangman.xml new file mode 100644 index 00000000..ed1b9c88 --- /dev/null +++ b/graphics/sprites/npcs/xml/hangman.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/hangman.png" width="33" height="70"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Hanghead --> + <frame index="0" delay="500"/> + <frame index="1" delay="100"/> + <frame index="2" delay="100"/> + <frame index="3" delay="100"/> + <frame index="4" delay="100"/> + <frame index="5" delay="100"/> + <frame index="7" delay="100"/> + <frame index="6" delay="80"/> + <frame index="7" delay="300"/> + <frame index="5" delay="100"/> + <frame index="4" delay="100"/> + <frame index="3" delay="100"/> + <frame index="2" delay="100"/> + <frame index="1" delay="100"/> + <frame index="9" delay="80"/> + <frame index="8" delay="100"/> + <frame index="9" delay="80"/> + <frame index="8" delay="100"/> + <frame index="9" delay="80"/> + <frame index="0" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/headlessman.xml b/graphics/sprites/npcs/xml/headlessman.xml new file mode 100644 index 00000000..47500ffb --- /dev/null +++ b/graphics/sprites/npcs/xml/headlessman.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/headlessman.png" width="40" height="60"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Head animation --> + <frame index="0" delay="300"/> + <frame index="1" delay="100"/> + <frame index="2" delay="100"/> + <frame index="3" delay="100"/> + <frame index="4" delay="100"/> + <frame index="5" delay="100"/> + <frame index="6" delay="100"/> + <frame index="7" delay="100"/> + <frame index="8" delay="100"/> + <frame index="9" delay="200"/> + <frame index="19" delay="200"/> + <frame index="18" delay="100"/> + <frame index="17" delay="100"/> + <frame index="16" delay="100"/> + <frame index="15" delay="100"/> + <frame index="14" delay="100"/> + <frame index="13" delay="100"/> + <frame index="12" delay="100"/> + <frame index="11" delay="100"/> + <frame index="10" delay="100"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/lightman.xml b/graphics/sprites/npcs/xml/lightman.xml new file mode 100644 index 00000000..baa9d7c9 --- /dev/null +++ b/graphics/sprites/npcs/xml/lightman.xml @@ -0,0 +1,29 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/lightman.png" width="50" height="80"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Light animation --> + <frame index="0" delay="80"/> + <frame index="1" delay="80"/> + <frame index="2" delay="80"/> + <frame index="3" delay="80"/> + <frame index="4" delay="80"/> + <frame index="5" delay="80"/> + <frame index="6" delay="80"/> + <frame index="7" delay="80"/> + <frame index="8" delay="80"/> + <frame index="9" delay="80"/> + <frame index="10" delay="80"/> + <frame index="11" delay="80"/> + <frame index="12" delay="80"/> + <frame index="13" delay="80"/> + <frame index="14" delay="80"/> + <frame index="15" delay="80"/> + <frame index="16" delay="80"/> + <frame index="17" delay="80"/> + <frame index="18" delay="80"/> + <frame index="19" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml b/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml index ac4bb5e6..0880f183 100644 --- a/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml +++ b/graphics/sprites/npcs/xml/unanimated-legacy-tall.xml @@ -2,7 +2,7 @@ <!-- Author: Reid, Micksha Copyright (C) 2015-2018 Evol Online --> -<sprite variants="7" variant_offset="1"> +<sprite variants="10" variant_offset="1"> <imageset name="npc" src="graphics/sprites/npcs/sprite/unanimated-legacy-tall.png" width="64" diff --git a/graphics/sprites/npcs/xml/unanimated-legacy.xml b/graphics/sprites/npcs/xml/unanimated-legacy.xml index d8ee127b..72b29557 100644 --- a/graphics/sprites/npcs/xml/unanimated-legacy.xml +++ b/graphics/sprites/npcs/xml/unanimated-legacy.xml @@ -2,7 +2,7 @@ <!-- Author: Reid, Micksha Copyright (C) 2018 Evol Online --> -<sprite variants="59" variant_offset="1"> +<sprite variants="70" variant_offset="1"> <imageset name="npc" src="graphics/sprites/npcs/sprite/unanimated-legacy.png|S" width="64" diff --git a/graphics/sprites/npcs/xml/undead-banker.xml b/graphics/sprites/npcs/xml/undead-banker.xml new file mode 100644 index 00000000..6ba358d7 --- /dev/null +++ b/graphics/sprites/npcs/xml/undead-banker.xml @@ -0,0 +1,16 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/undead-banker.png" width="32" height="64"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Banker Blood --> + <frame index="0" delay="500"/> + <frame index="1" delay="80"/> + <frame index="2" delay="80"/> + <frame index="3" delay="80"/> + <frame index="4" delay="80"/> + <frame index="5" delay="80"/> + <frame index="6" delay="80"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/undead-guard.xml b/graphics/sprites/npcs/xml/undead-guard.xml new file mode 100644 index 00000000..097c16d3 --- /dev/null +++ b/graphics/sprites/npcs/xml/undead-guard.xml @@ -0,0 +1,22 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/undead-guard.png" width="67" height="68"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Bloody Eyes --> + <frame index="0" delay="500"/> + <frame index="1" delay="90"/> + <frame index="2" delay="90"/> + <frame index="3" delay="90"/> + <frame index="4" delay="90"/> + <frame index="5" delay="90"/> + <frame index="6" delay="90"/> + <frame index="7" delay="90"/> + <frame index="8" delay="90"/> + <frame index="9" delay="90"/> + <frame index="10" delay="90"/> + <frame index="11" delay="90"/> + <frame index="12" delay="90"/> + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/undead-mouboomaster.xml b/graphics/sprites/npcs/xml/undead-mouboomaster.xml new file mode 100644 index 00000000..c8603793 --- /dev/null +++ b/graphics/sprites/npcs/xml/undead-mouboomaster.xml @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Author: Micksha +Copyright (C) 2020 Evol Online --> + +<sprite> + <imageset name="npc" + src="graphics/sprites/npcs/sprite/undead-mouboo-master.png" + width="160" + height="64"/> + + <action name="stand" imageset="npc"> + <animation direction="default"> + <label name="start"/> + <goto label="static" rand="90"/> + <goto label="pull" rand="100"/> + + <!-- static --> + <label name="static"/> + <frame index="2" delay="2000"/> + <goto label="start"/> + + <!-- pull --> + <label name="pull"/> + <frame index="2" delay="200"/> + <frame index="1" delay="100"/> + <frame index="0" delay="100"/> + <frame index="1" delay="100"/> + <frame index="2" delay="200"/> + <goto label="start"/> + + </animation> + </action> +</sprite> diff --git a/graphics/sprites/npcs/xml/undead-receptionist.xml b/graphics/sprites/npcs/xml/undead-receptionist.xml new file mode 100644 index 00000000..bbc78b80 --- /dev/null +++ b/graphics/sprites/npcs/xml/undead-receptionist.xml @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<sprite> + <imageset name="base" src="graphics/sprites/npcs/sprite/undead-receptionist.png" width="32" height="64"/> + <action name="stand" imageset="base"> + <animation direction="default"> + <!-- Bloody body --> + <frame index="0" delay="500"/> + <frame index="1" delay="370"/> + <frame index="2" delay="330"/> + <frame index="3" delay="320"/> + <frame index="4" delay="340"/> + <frame index="5" delay="320"/> + <frame index="6" delay="330"/> + <frame index="7" delay="370"/> + <frame index="8" delay="500"/> + </animation> + </action> +</sprite> diff --git a/help/about-server.txt b/help/about-server.txt index 730ab461..995255b9 100644 --- a/help/about-server.txt +++ b/help/about-server.txt @@ -3,6 +3,33 @@ @@http://evolonline.org/|<<Official site:>> http://evolonline.org@@ ##3--------------------------- +##3-- <<The Mana World rEvolt Contributors>> -- +##3--------------------------- + +##941444d494e (Andrei Karas) <4144 evolonline.org> +##9Chicka-Maria <comfycheeks themanaworld.org> +##9Ejlol (Oscar Klein Heerenbrink) +##9Freeyorp101 +##9gumi +##9Hello=) +##9Hocus Pocus Fidibus <kurt.kuschinski gmail.com> +##9jak1 (Mike Wollmann) <jak1 germantmw.de> +##9Jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com> +##9kytty +##9Ledmitz <ledmitz gmail.com> +##9Livio (Livio Recchia) +##9Micksha (Mick) <ms-shaman gmx.de> +##9mifritscher +##9Prsm +##9Reid <reid evolonline.org> +##9Rill +##9Saulc (Lucas Helaine) <lucashelaine14 gmail.com> +##9Soren +##9Tomminator +##9WildX (William Pine) <wildx evolonline.org> +##9Wushin <pasekei gmail.com> + +##3--------------------------- ##3-- <<Evol Online Contributors>> -- ##3--------------------------- @@ -23,9 +50,9 @@ ##9Crush (Philipp Sehmisch) <tmw crushnet.org> ##9Dariunas (Aasif Chaudry) <aasif.chaudry infectedmusicdesigns.co.uk> ##9Dark_Mage -##9DerLoisl (Max Isele) <der.loisl theavoraproject.org> +##9Der Loisl (Max Isele) <der.loisl theavoraproject.org> ##9Derpella -##9EJlol +##9EJlol (Oscar Klein Heerenbrink) ##9Elvano (Elvano Miok) <elvano evolonline.org> ##9Enchilado (W E Sayers) ##9Eric (Eric Matyas) <ematyas aol.com> @@ -35,10 +62,10 @@ ##9FotherJ (Jarrett Thomas-Huxley) ##9gumi ##9Hal9000 (Francesco Miglietta) <francesco.miglietta evolonline.org> -##9Irukard (Krzysztof Daszuta) +##9Irukard (Krzysztof Daszuta) <irukard gmail.com> ##9IvanMorve (Martin) -##9Jak1 (Mike Wollmann) <jak89_1 ftb4u.de> -##9jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com> +##9jak1 (Mike Wollmann) <jak1 germantmw.de> +##9Jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com> ##9KaTSuo (Gremly) <tlz.katsuo gmail.com> ##9Kenny690 (Saidullin Il'shat) <bio_editor mail.ru> ##9Kestrel @@ -62,28 +89,30 @@ ##9Nard (Bernard Hugonnet) <bernard.hugonnet bh28.net> ##9Necromonger (Mihail Barer) ##9Nelson6e65 (Nelson Martell) <nelson6e65-manaplus yahoo.es> -##9omatt <m.vuoso @laposte.net> +##9omatt <m.vuoso laposte.net> ##9Othello (Vincent Van Beveren) <v.van.beveren nikhef.nl> -##9Pajarico +##9Pajarico (Pajarico Guaje) ##9Pihro (Garett Smith) <theonewhoplayswithfire gmail.com> ##9Piman ##9Pitriss (Petr Varkoček) ##9Posydonia (Mélanie Dinot) -##9Qwerty Dragon ##9Reid <reid evolonline.org> ##9Saci -##9Saphy ##9Salius (Aleksey S.) +##9Saphy ##9saturn (Nikola Whallon) <6.saturn.6 gmail.com> ##9Saweres <onshine20 gmail.com> ##9Sir_lance ##9Socapex (Philippe Groarke) <socapex evolonline.org> +##9SudoPlatypus ##9Talaroc (Ryan Voss) <arashi86 gmail.com> ##9Taree ##9Tayoko ##9Teru +##9Tezer431 ##9Tirifto -##9Vasily Makarov (Dan Sagunov) <vasily evolonline.org> +##9Tomminator +##9Vasily Makarov (Danil Sagunov) <vasily evolonline.org> ##9VxD <vxd.michael gmail.com> ##9WildX (William Pine) <wildx evolonline.org> ##9Wushin <pasekei gmail.com> @@ -94,16 +123,145 @@ ##3-- <<The Mana World Legacy Contributors>> -- ##3--------------------------- +##941444d494e (Andrei Karas) <4144 evolonline.org> +##9Ablu (Erik Schilling) <ablu.erikschilling gmail.com> +##9AL13N (Maarten Vanraes) <alien rmail.be> +##9Alastrim (Antônio) <alasmirt gmail.com> +##9Alige <alige evolonline.org> +##9AlOns +##9Argul (Stefan Beller) +##9Arikel +##9Avaniel (Rogier Polak) +##9Bagzie +##9Bear +##9Bernhardt (Chay) +##9Bertram (Yohann Ferreira) +##9Big Crunch +##9CapitanAwesome +##9Cassy (Cassandra) +##9Catfish_Man +##9ChefChelios +##9Chetic (Fredrik Reveny) <chetic gmail.com> ##9Chicka-Maria <comfycheeks themanaworld.org> +##9Clef +##9Coolkid782 <coolkid782 evolonline.org> ##9Crush (Philipp Sehmisch) <tmw crushnet.org> +##9Dabe (David Del Re) +##9Delasia +##9Demon +##9Der Loisl (Max Isele) <der.loisl theavoraproject.org> +##9deviexx +##9dobey (Rodney Dawes) +##9doorsman +##9Ejlol (Oscar Klein Heerenbrink) +##9ElvenProgammer (Eugenio Favalli) <elvenprogrammer gmail.com> ##9Enchilado (W E Sayers) +##9FotherJ (Jarrett Thomas-Huxley) +##9Freeyorp +##9Frost +##9Gnulia +##9Golgo +##9GonzoDark (Leif Kildelund) ##9gumi +##9Hello=) +##9Hocus Pocus Fidibus <kurt.kuschinski gmail.com> +##9Irukard +##9imorgado (Igor Morgado) +##9IvanMorve (Martin) +##9jak1 (Mike Wollmann) <jak1 germantmw.de> +##9Javila (José Ãvila) +##9jaxed0127 (Jared Adams) +##9Jenalya (Jessica Tölke) +##9Jesusalva (Jonatas L. Nogueira) <cpntb1 ymail.com> +##9JoshLangley (Joshua Langley) +##9Kage (Chuck Miller) <shadowmil gmail.com> +##9Katze +##9kindjal (Huynh Ngoc Chau Tran) +##9Kineticstorm +##9kth5/Shura (Alexander Baldeck) +##9Kyokai (Kiyoshi Kyokai) +##9kytty +##9Ledmitz <ledmitz gmail.com> ##9Len (Leonard Pabin III) -##9Saphy +##9Livio (Livio Recchia) +##9Lizandra (Filipa Serra e Silva) +##9maci (Marcel W. Wysocki) +##9MadCamel +##9Maester Pixel +##9Magick (Jordan) <admin_magick hotmail.com> +##9MasterKenobi +##9meway (Andrew Hall) +##9Micksha <ms-shaman gmx.de> +##9Mkael +##9Modanung (Frode Lindeijer) +##9moi1392 (Cedric Borgese) <cedric.borgese gmail.com> +##9monwarez (Thibault Payet) <monwarez mailoo.org>[@@https://gitlab.com/u/monwarez|<<https://gitlab.com/u/monwarez>>@@] +##9Mra (Jan-Fabian Humann) <malastare gmx.net> +##9mrgrey +##9Nard (Bernard Hugonnet) <bernard.hugonnet bh28.net> +##9Narus <narus.tmw gmail.com> +##9Necromonger (Mihail Barer) +##9Neko-mon +##9Neorice +##9nym +##9o11c (Ben Longbons) +##9omatt <m.vuoso laposte.net> +##9Pajarico (Pajarico Guaje) +##9Pauan +##9peavey (Dennis Friis) <peavey placid.dk> +##9Pihro (Garett Smith) <theonewhoplayswithfire gmail.com> +##9Platyna (Zuzanna Karolina Filutowska) +##9Pluto (Arian Asimi) +##9Prsm +##9Purple (Thorbjørn Lindeijer) <thorbjorn lindeijer.nl> +##9Pyndragon (Daniel Foerster) +##9Qoal (Scott Ellis) <quiche_on_a_leash hotmail.co.uk> +##9Qwerty Dragon +##9razor85 (Romulo Fernandes) +##9Reid <reid evolonline.org> +##9Rotonen (Joni Orponen) +##9salmondine (Mark Dunbar) +##9Silene (Guillaume Melquiond) +##9Silent Dawn +##9simonedw (Simon Edwardsson) <simon crossnet.se> +##9Skipy +##9Sora +##9SudoPlatipus +##9Sull (Jean-Francois Lampron) <sull.kf gmail.com> +##9Superkoop (John Koopman) +##9Swimmy +##9Talaroc (Ryan Voss) <arashi86 gmail.com> +##9Tametomo (Ira Rice) <irarice gmail.com> +##9Tatjana +##9Tezer431 +##9Ti Sing Hao +##9Tiana +##9Tirifto +##9Tomminator +##9Turmfalke +##9tux9th +##9Ultramichy +##9Usiu (Mateusz Kaduk) +##9V0id (Vincent Petithory) ##9Varuna +##9Vasily Makarov (Danil Sagunov) <vasily evolonline.org> +##9veryapeGM +##9VictorSan +##9Vink +##9Vlady +##9WildX (William Pine) <wildx evolonline.org> ##9Wombat <hpwombat yahoo.com>[@@https://github.com/wombatism|<<https://github.com/wombatism>>@@] ##9Wushin <pasekei gmail.com> -##9Yosuhara +##9zenogais (Eric Scrivner) +##9Zipon +##9(unknown) (Aaron Marks) +##9(unknown) (Andrej Sinicyn) +##9(unknown) (Douglas Boffey) +##9(unknown) (Duane Bailey) +##9(unknown) (Johannelaliberte) +##9(unknown) (Kess Vargavind) <vargavind gmail.com> +##9(unknown) (Lloyd Bryant) <lloyd_bryant netzero.net> +##9(unknown) (Matthias Hartmann) <hartmann.matthias gmail.com> ##3--------------------------- ##3-- <<Unknown Flying Bullet Contributors>> -- @@ -132,7 +290,10 @@ ##3-- <<Related Communities>> -- ##3--------------------------- +[@@http://crc.themanaworld.org/|<<Crew of Red Corsair>>http://crc.themanaworld.org/@@] +[@@https://moubootaurlegends.org/|<<Moubotaur Legends>>https://moubootaurlegends.org/@@] [@@http://opengameart.org|<<OpenGameArt>>http://opengameart.org@@] +[@@https://www.spi-inc.org/|<<Software in the Public Interest>>https://www.spi-inc.org/@@] [@@http://tmw-br.scall.org|<<TheManaWorld-Br>>http://tmw-br.scall.org@@] +[@@https://www.mapeditor.org/|<<Tiled Map Editor>>https://www.mapeditor.org/@@] [@@http://tuxfamily.org|<<TuxFamily>>http://tuxfamily.org@@] -[@@http://crc.themanaworld.org/|<<Crew of Red Corsair>>http://crc.themanaworld.org/@@] @@ -3271,12 +3271,22 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. image="equipment/head/rangerhat.png" name="Ranger Hat" description="A leather hat traditionally worn by Rangers. Symbol of the Pinkie-Hater cult." - defense="5" - level="21" + defense="7" + level="83" type="equip-head" - weight="220"> + weight="200"> <sprite>equipment/head/rangerhat.xml</sprite> </item> + <item id="2936" + image="equipment/head/knighthelmet.png" + name="Knight Helmet" + description="A leather hat traditionally worn by Rangers. Symbol of the Pinkie-Hater cult." + defense="7" + level="53" + type="equip-head" + weight="200"> + <sprite>equipment/head/knighthelmet.xml</sprite> + </item> <!-- Neck Armors & Accessoires --> <item id="3200" @@ -3535,6 +3545,10 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. attack-action="attack" weight="250"> <sprite>equipment/weapons/piouslayer.xml</sprite> + <sound event="hit">weapons/knife-setzer/hit1.ogg</sound> + <sound event="hit">weapons/knife-setzer/hit2.ogg</sound> + <sound event="hit">weapons/knife-setzer/hit3.ogg</sound> + <sound event="miss">weapons/knife/miss1.ogg</sound> </item> <item id="3510" image="equipment/weapons/pickaxe.png" @@ -3583,6 +3597,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. attack-action="attack_chop_long" weight="400"> <sprite>equipment/weapons/staff.xml</sprite> + <sound event="hit">weapons/staff/hit1.ogg</sound> + <sound event="hit">weapons/staff/hit2.ogg</sound> + <sound event="hit">weapons/staff/hit3.ogg</sound> + <sound event="miss">weapons/staff/miss1.ogg</sound> + <sound event="miss">weapons/staff/miss2.ogg</sound> + <sound event="miss">weapons/staff/miss3.ogg</sound> </item> <item id="3514" image="equipment/weapons/halberd.png" @@ -3595,6 +3615,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. attack-action="attack_chop_long" weight="1200"> <sprite>equipment/weapons/halberd.xml</sprite> + <sound event="hit">weapons/halberd/hit1.ogg</sound> + <sound event="hit">weapons/halberd/hit2.ogg</sound> + <sound event="hit">weapons/halberd/hit3.ogg</sound> + <sound event="miss">weapons/staff/miss1.ogg</sound> + <sound event="miss">weapons/staff/miss2.ogg</sound> + <sound event="miss">weapons/staff/miss3.ogg</sound> </item> <item id="3515" image="equipment/weapons/sharpknife.png" @@ -3661,6 +3687,8 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. attack-action="attack_chop" weight="1300"> <sprite>equipment/weapons/chopper.xml</sprite> <!-- FIXME --> + <sound event="hit">weapons/knife-rock/hit1.ogg</sound> + <sound event="hit">weapons/knife-rock/hit2.ogg</sound> </item> <item id="3520" image="equipment/weapons/bronzegladius.png" @@ -4337,6 +4365,12 @@ Colors for dyeable equipments or items are now set up by itemcolors.xml. attack-action="attack_bow" weight="480"> <sprite>equipment/weapons/woodenbow.xml</sprite> + <sound event="hit">weapons/bow-banshee/hit1.ogg</sound> + <sound event="hit">weapons/bow-banshee/hit2.ogg</sound> + <sound event="hit">weapons/bow-banshee/hit3.ogg</sound> + <sound event="miss">weapons/bow-banshee/miss1.ogg</sound> + <sound event="miss">weapons/bow-banshee/miss2.ogg</sound> + <sound event="miss">weapons/bow-banshee/miss3.ogg</sound> </item> <item id="6006" image="equipment/weapons/slingshot.png" diff --git a/maps/000-0-0.tmx b/maps/000-0-0.tmx index ed3919f4..e6af06fe 100644 --- a/maps/000-0-0.tmx +++ b/maps/000-0-0.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-0-0.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="Sailor's Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/000-0-1.tmx b/maps/000-0-1.tmx index c1193529..469704e4 100644 --- a/maps/000-0-1.tmx +++ b/maps/000-0-1.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-0-0.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="Sailor's Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/000-0.tmx b/maps/000-0.tmx index 6d3d43d3..ca208316 100644 --- a/maps/000-0.tmx +++ b/maps/000-0.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-0.png"/> - <property name="music" value="ezili - ocean sounds.ogg"/> + <property name="music" value="ocean.ogg"/> <property name="name" value="Oceania"/> <property name="overlay0image" value="graphics/images/ambient/fog.png"/> <property name="overlay0parallax" value="1.0"/> diff --git a/maps/000-1.tmx b/maps/000-1.tmx index 726fa09e..7540a797 100644 --- a/maps/000-1.tmx +++ b/maps/000-1.tmx @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="120" height="160" tilewidth="32" tileheight="32" infinite="0" nextobjectid="45"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="120" height="160" tilewidth="32" tileheight="32" infinite="0" nextlayerid="9" nextobjectid="45"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/000-1.png"/> - <property name="music" value="bartk - the adventure begins.ogg"/> + <property name="music" value="ocean.ogg"/> <property name="name" value="Drasil Island"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> @@ -44,7 +44,7 @@ <image source="../graphics/tilesets/level-number.png" width="512" height="32"/> </tileset> <tileset firstgid="1121" source="../graphics/tilesets/ship-flags-x3x2.tsx"/> - <layer name="Ground" width="120" height="160"> + <layer id="1" name="Ground" width="120" height="160"> <data encoding="csv"> 878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878, 878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878, @@ -208,7 +208,7 @@ 878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878,878 </data> </layer> - <layer name="Ground 2" width="120" height="160"> + <layer id="2" name="Ground 2" width="120" height="160"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -372,7 +372,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Ground 3" width="120" height="160"> + <layer id="3" name="Ground 3" width="120" height="160"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -536,7 +536,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Fringe" width="120" height="160"> + <layer id="4" name="Fringe" width="120" height="160"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -700,7 +700,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Over" width="120" height="160"> + <layer id="5" name="Over" width="120" height="160"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -864,7 +864,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Collision" width="120" height="160"> + <layer id="6" name="Collision" width="120" height="160"> <data encoding="csv"> 718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718, 718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718, @@ -1028,7 +1028,7 @@ 718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718,718 </data> </layer> - <layer name="Heights" width="120" height="160"> + <layer id="7" name="Heights" width="120" height="160"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -1192,7 +1192,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <objectgroup name="Object"> + <objectgroup id="8" name="Object"> <object id="1" name="To La Johanne" type="warp" x="3008" y="3200" width="32" height="32"> <properties> <property name="dest_map" value="000-2-0"/> @@ -1280,14 +1280,6 @@ <property name="spawn" value="25000"/> </properties> </object> - <object id="13" name="Blub" type="spawn" x="2656" y="2112" width="288" height="256"> - <properties> - <property name="death" value="120000"/> - <property name="max_beings" value="1"/> - <property name="monster_id" value="1008"/> - <property name="spawn" value="60000"/> - </properties> - </object> <object id="14" name="Little Blub" type="spawn" x="2656" y="960" width="160" height="256"> <properties> <property name="death" value="120000"/> diff --git a/maps/000-2-0.tmx b/maps/000-2-0.tmx index 352a5226..b039d126 100644 --- a/maps/000-2-0.tmx +++ b/maps/000-2-0.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-0.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="First Deck"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/000-2-1.tmx b/maps/000-2-1.tmx index 1ed006dd..c8629ecc 100644 --- a/maps/000-2-1.tmx +++ b/maps/000-2-1.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-1.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="Second Deck"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/000-2-2.tmx b/maps/000-2-2.tmx index 2ca42fda..bf440850 100644 --- a/maps/000-2-2.tmx +++ b/maps/000-2-2.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-2.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="Hold"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/000-2-3.tmx b/maps/000-2-3.tmx index 4825be37..76d52602 100644 --- a/maps/000-2-3.tmx +++ b/maps/000-2-3.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-3.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Nard's Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/000-2-4.tmx b/maps/000-2-4.tmx index 88dfeda8..ce6a5ec6 100644 --- a/maps/000-2-4.tmx +++ b/maps/000-2-4.tmx @@ -5,7 +5,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-4.png"/> - <property name="music" value="guitarz-halloween-theme.ogg"/> <property name="name" value="Alige's Hiding Place"/> <property name="overlay0image" value="graphics/images/ambient/fog.png"/> <property name="overlay0parallax" value="1.0"/> diff --git a/maps/001-1.tmx b/maps/001-1.tmx index db3a4eac..4de87a7a 100644 --- a/maps/001-1.tmx +++ b/maps/001-1.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-1.png"/> - <property name="music" value="bartk - the adventure begins.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Artis"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> diff --git a/maps/001-2-0.tmx b/maps/001-2-0.tmx index fc4549dd..78539508 100644 --- a/maps/001-2-0.tmx +++ b/maps/001-2-0.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-0.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Light Armor Shop"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-1.tmx b/maps/001-2-1.tmx index ae26bd84..bcac4053 100644 --- a/maps/001-2-1.tmx +++ b/maps/001-2-1.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-1.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Noble House"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-10.tmx b/maps/001-2-10.tmx index f4bf5357..4a79b3d0 100644 --- a/maps/001-2-10.tmx +++ b/maps/001-2-10.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-10.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Noble House"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-11.tmx b/maps/001-2-11.tmx index 35bd6df6..39d0d6ba 100644 --- a/maps/001-2-11.tmx +++ b/maps/001-2-11.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-11.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Noble House"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-12.tmx b/maps/001-2-12.tmx index c4d168df..84b7c7d4 100644 --- a/maps/001-2-12.tmx +++ b/maps/001-2-12.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-12.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Noble House"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-13.tmx b/maps/001-2-13.tmx index f18059e7..a76d5077 100644 --- a/maps/001-2-13.tmx +++ b/maps/001-2-13.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-13.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="First Floor"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-14.tmx b/maps/001-2-14.tmx index f749536f..b5befd29 100644 --- a/maps/001-2-14.tmx +++ b/maps/001-2-14.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-14.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Basement"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> @@ -505,4 +505,4 @@ </properties> </object> </objectgroup> -</map> +</map>
\ No newline at end of file diff --git a/maps/001-2-15.tmx b/maps/001-2-15.tmx index 5168f597..01f41f53 100644 --- a/maps/001-2-15.tmx +++ b/maps/001-2-15.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-15.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Noble House"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-16.tmx b/maps/001-2-16.tmx index b64523e5..4de92af0 100644 --- a/maps/001-2-16.tmx +++ b/maps/001-2-16.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-16.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Harbourmaster Lodge"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-17.tmx b/maps/001-2-17.tmx index fd3ea2fa..c1b1680f 100644 --- a/maps/001-2-17.tmx +++ b/maps/001-2-17.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-17.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Backroom"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-18.tmx b/maps/001-2-18.tmx index 0f4d0b5f..50caad34 100644 --- a/maps/001-2-18.tmx +++ b/maps/001-2-18.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-18.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Docks Warehouse"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-19.tmx b/maps/001-2-19.tmx index 9548a28f..d35bab41 100644 --- a/maps/001-2-19.tmx +++ b/maps/001-2-19.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-19.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Merchant Hall"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-2.tmx b/maps/001-2-2.tmx index 23c7b4eb..3039fa96 100644 --- a/maps/001-2-2.tmx +++ b/maps/001-2-2.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-2.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Moon's House"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-20.tmx b/maps/001-2-20.tmx index 03b58a23..5744c347 100644 --- a/maps/001-2-20.tmx +++ b/maps/001-2-20.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-20.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Backroom"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-21.tmx b/maps/001-2-21.tmx index 5c82b239..da53334b 100644 --- a/maps/001-2-21.tmx +++ b/maps/001-2-21.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-0.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="First Deck"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/001-2-22.tmx b/maps/001-2-22.tmx index bad75f64..c931dde7 100644 --- a/maps/001-2-22.tmx +++ b/maps/001-2-22.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-1.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="Second Deck"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/001-2-23.tmx b/maps/001-2-23.tmx index c08992aa..bed3fcbd 100644 --- a/maps/001-2-23.tmx +++ b/maps/001-2-23.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-2.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="johanne.ogg"/> <property name="name" value="Hold"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/001-2-24.tmx b/maps/001-2-24.tmx index 045fc2a3..eb248c54 100644 --- a/maps/001-2-24.tmx +++ b/maps/001-2-24.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/000-2-3.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Nard's Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/001-2-25.tmx b/maps/001-2-25.tmx index 4a8fb7ed..c6c1dc23 100644 --- a/maps/001-2-25.tmx +++ b/maps/001-2-25.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-25.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Storage Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-26.tmx b/maps/001-2-26.tmx index 8cd7a829..f9541254 100644 --- a/maps/001-2-26.tmx +++ b/maps/001-2-26.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-26.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Alchemy Lab"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-27.tmx b/maps/001-2-27.tmx index 13018150..5f28b333 100644 --- a/maps/001-2-27.tmx +++ b/maps/001-2-27.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-27.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Blacksmith Shop"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-28.tmx b/maps/001-2-28.tmx index ffd3a2ac..d54d5a57 100644 --- a/maps/001-2-28.tmx +++ b/maps/001-2-28.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-28.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Red Plush Inn"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-29.tmx b/maps/001-2-29.tmx index cfd7bdf5..934d5fe8 100644 --- a/maps/001-2-29.tmx +++ b/maps/001-2-29.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-29.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="First Floor"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-3.tmx b/maps/001-2-3.tmx index e25f4e40..ecdb8803 100644 --- a/maps/001-2-3.tmx +++ b/maps/001-2-3.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-3.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="First Floor"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-30.tmx b/maps/001-2-30.tmx index 906bd167..4dd34e69 100644 --- a/maps/001-2-30.tmx +++ b/maps/001-2-30.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-30.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Second Floor"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-31.tmx b/maps/001-2-31.tmx index 85003df4..75a83706 100644 --- a/maps/001-2-31.tmx +++ b/maps/001-2-31.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-31.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="West Commercial Building"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-32.tmx b/maps/001-2-32.tmx index 568ac50a..015212bb 100644 --- a/maps/001-2-32.tmx +++ b/maps/001-2-32.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-32.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Training Arena Lobby"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-33.tmx b/maps/001-2-33.tmx index 8dd88970..84aeea10 100644 --- a/maps/001-2-33.tmx +++ b/maps/001-2-33.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-33.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Legion of Aemil Headquarters"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-34.tmx b/maps/001-2-34.tmx index 48cf49cb..22107cfe 100644 --- a/maps/001-2-34.tmx +++ b/maps/001-2-34.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-34.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Training Room Lobby"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-35.tmx b/maps/001-2-35.tmx index f8b6a8dd..277e5f15 100644 --- a/maps/001-2-35.tmx +++ b/maps/001-2-35.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-35.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Training Arena"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-36.tmx b/maps/001-2-36.tmx index 024b543b..440457c5 100644 --- a/maps/001-2-36.tmx +++ b/maps/001-2-36.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-36.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Training Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-37.tmx b/maps/001-2-37.tmx index 8aff504b..9af111f6 100644 --- a/maps/001-2-37.tmx +++ b/maps/001-2-37.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-37.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Legion West Wing"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-38.tmx b/maps/001-2-38.tmx index f4e2d674..783b313d 100644 --- a/maps/001-2-38.tmx +++ b/maps/001-2-38.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-38.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Legion East Wing"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-39.tmx b/maps/001-2-39.tmx index 19c15ad7..dc427738 100644 --- a/maps/001-2-39.tmx +++ b/maps/001-2-39.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-39.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Legion Command Room"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-4.tmx b/maps/001-2-4.tmx index 8b30ae06..8f4e1b99 100644 --- a/maps/001-2-4.tmx +++ b/maps/001-2-4.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-4.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Library"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-40.tmx b/maps/001-2-40.tmx index 54eaa570..f4c82abb 100644 --- a/maps/001-2-40.tmx +++ b/maps/001-2-40.tmx @@ -4,8 +4,8 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-40.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> - <property name="name" value="unnamed"/> + <property name="music" value="artis.ogg"/> + <property name="name" value="Legion Basement"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tilesets/artis-indoor.png" width="512" height="512"/> diff --git a/maps/001-2-41.tmx b/maps/001-2-41.tmx index e7a19b60..14afac81 100644 --- a/maps/001-2-41.tmx +++ b/maps/001-2-41.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-41.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Barber"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-42.tmx b/maps/001-2-42.tmx index 7e67ed74..c7d710cc 100644 --- a/maps/001-2-42.tmx +++ b/maps/001-2-42.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-42.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Docks Warehouse Second Level"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-43.tmx b/maps/001-2-43.tmx index 181a305b..440a7562 100644 --- a/maps/001-2-43.tmx +++ b/maps/001-2-43.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-43.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Archive"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/001-2-5.tmx b/maps/001-2-5.tmx index bfcd5076..46dda0b4 100644 --- a/maps/001-2-5.tmx +++ b/maps/001-2-5.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-5.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Warehouse"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-6.tmx b/maps/001-2-6.tmx index 3b61def6..2f3bba8f 100644 --- a/maps/001-2-6.tmx +++ b/maps/001-2-6.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-6.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="First Floor"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-7.tmx b/maps/001-2-7.tmx index ddcab4ae..ff943256 100644 --- a/maps/001-2-7.tmx +++ b/maps/001-2-7.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-7.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="City Hall"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-8.tmx b/maps/001-2-8.tmx index f515b858..2ebfe1f2 100644 --- a/maps/001-2-8.tmx +++ b/maps/001-2-8.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-8.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Left Wing"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-2-9.tmx b/maps/001-2-9.tmx index d55ef732..3909cab6 100644 --- a/maps/001-2-9.tmx +++ b/maps/001-2-9.tmx @@ -4,7 +4,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/001-2-9.png"/> - <property name="music" value="bartk - in the forest of the birches.ogg"/> <property name="name" value="Right Wing"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/001-3-0.tmx b/maps/001-3-0.tmx index 16237433..51f2a690 100644 --- a/maps/001-3-0.tmx +++ b/maps/001-3-0.tmx @@ -3,8 +3,8 @@ <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> - <property name="minimap" value=""/> - <property name="music" value=""/> + <property name="minimap" value="graphics/minimaps/001-3-0.png"/> + <property name="music" value="sewer.ogg"/> <property name="name" value="Sewer"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/001-3-1.tmx b/maps/001-3-1.tmx index b9762ede..c65ad268 100644 --- a/maps/001-3-1.tmx +++ b/maps/001-3-1.tmx @@ -3,8 +3,8 @@ <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> - <property name="minimap" value=""/> - <property name="music" value=""/> + <property name="minimap" value="graphics/minimaps/001-3-1.png"/> + <property name="music" value="sewer.ogg"/> <property name="name" value="Rivercave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/001-3-2.tmx b/maps/001-3-2.tmx index 26696891..f31a6d39 100644 --- a/maps/001-3-2.tmx +++ b/maps/001-3-2.tmx @@ -3,8 +3,7 @@ <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> - <property name="minimap" value=""/> - <property name="music" value=""/> + <property name="minimap" value="graphics/minimaps/001-3-2.png"/> <property name="name" value="Hideout"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/008-1-1.tmx b/maps/008-1-1.tmx index e53b4c1e..93530000 100644 --- a/maps/008-1-1.tmx +++ b/maps/008-1-1.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-1-1.png"/> + <property name="music" value="forest.ogg"/> <property name="name" value="Woodland"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> diff --git a/maps/008-1.tmx b/maps/008-1.tmx index 2d92aec3..74171ee6 100644 --- a/maps/008-1.tmx +++ b/maps/008-1.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="350" height="250" tilewidth="32" tileheight="32" infinite="0" nextlayerid="28" nextobjectid="272"> +<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" width="350" height="250" tilewidth="32" tileheight="32" infinite="0" nextlayerid="28" nextobjectid="272"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-1.png"/> + <property name="music" value="real.ogg"/> <property name="name" value="Hurnscald"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> @@ -3076,7 +3077,7 @@ </data> </layer> <objectgroup id="12" name="Object"> - <object id="18" name="magick-real.ogg" type="MUSIC" x="7168" y="2944" width="2400" height="1664"/> + <object id="18" name="hurns.ogg" type="MUSIC" x="6268" y="2946" width="4514" height="1858"/> <object id="32" name="To Celestia's house" type="warp" x="8832" y="3904" width="32" height="32"> <properties> <property name="dest_map" value="008-2-0"/> @@ -4286,5 +4287,6 @@ <property name="spawn" value="18000"/> </properties> </object> + <object id="251" name="hurns.ogg" type="MUSIC" x="6914" y="776" width="3200" height="2202"/> </objectgroup> </map> diff --git a/maps/008-2-0.tmx b/maps/008-2-0.tmx index 3521f1c6..2db95ff6 100644 --- a/maps/008-2-0.tmx +++ b/maps/008-2-0.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-0.png"/> + <property name="music" value="despair.ogg"/> <property name="name" value="Chez Celestia"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/008-2-2.tmx b/maps/008-2-2.tmx index 0feae771..e926d29f 100644 --- a/maps/008-2-2.tmx +++ b/maps/008-2-2.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-2.png"/> + <property name="music" value="store.ogg"/> <property name="name" value="The Rusty Pick"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/008-2-20.tmx b/maps/008-2-20.tmx index d04d7026..a80718ef 100644 --- a/maps/008-2-20.tmx +++ b/maps/008-2-20.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-20.png"/> + <property name="music" value="ghoulish.ogg"/> <property name="name" value="Forsaken Inn"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/008-2-21.tmx b/maps/008-2-21.tmx index 52aec1e5..15b506d5 100644 --- a/maps/008-2-21.tmx +++ b/maps/008-2-21.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-21.png"/> + <property name="music" value="ghoulish.ogg"/> <property name="name" value="Forsaken Inn Basement"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> @@ -631,4 +632,4 @@ </properties> </object> </objectgroup> -</map> +</map>
\ No newline at end of file diff --git a/maps/008-2-22.tmx b/maps/008-2-22.tmx index 1cf45f22..a80422fe 100644 --- a/maps/008-2-22.tmx +++ b/maps/008-2-22.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-22.png"/> + <property name="music" value="fire.ogg"/> <property name="name" value="Mages Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/008-2-24.tmx b/maps/008-2-24.tmx index bf45669f..993bddff 100644 --- a/maps/008-2-24.tmx +++ b/maps/008-2-24.tmx @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.0" tiledversion="1.1.4" orientation="orthogonal" renderorder="right-down" width="65" height="65" tilewidth="32" tileheight="32" infinite="0" nextobjectid="11"> +<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" width="65" height="65" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="11"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-24.png"/> - <property name="music" value="clouds-calling.ogg"/> + <property name="music" value="dimond.ogg"/> <property name="name" value="Dimond's Cove Ground Floor"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> @@ -46,7 +46,7 @@ <tileset firstgid="1375" name="hurns-ground" tilewidth="32" tileheight="32" tilecount="256" columns="16"> <image source="../graphics/tilesets/hurns-ground.png" width="512" height="512"/> </tileset> - <layer name="Ground1" width="65" height="65"> + <layer id="1" name="Ground1" width="65" height="65"> <data encoding="csv"> 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, @@ -115,7 +115,7 @@ 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8 </data> </layer> - <layer name="Ground2" width="65" height="65"> + <layer id="2" name="Ground2" width="65" height="65"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -184,7 +184,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Ground3" width="65" height="65"> + <layer id="3" name="Ground3" width="65" height="65"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -253,7 +253,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Fringe" width="65" height="65"> + <layer id="4" name="Fringe" width="65" height="65"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -322,7 +322,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Over1" width="65" height="65"> + <layer id="5" name="Over1" width="65" height="65"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -391,7 +391,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Over2" width="65" height="65"> + <layer id="6" name="Over2" width="65" height="65"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -460,7 +460,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer name="Collision" width="65" height="65"> + <layer id="7" name="Collision" width="65" height="65"> <data encoding="csv"> 1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367, 1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367, @@ -529,7 +529,7 @@ 1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367,1367 </data> </layer> - <layer name="Heights" width="65" height="65"> + <layer id="8" name="Heights" width="65" height="65"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -598,7 +598,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <objectgroup name="Objects"> + <objectgroup id="9" name="Objects"> <object id="1" name="To Cellar" type="warp" x="864" y="768" width="32" height="32"> <properties> <property name="dest_map" value="008-2-27"/> @@ -613,7 +613,6 @@ <property name="dest_y" value="27"/> </properties> </object> - <object id="8" name="dimonds-cove.ogg" type="MUSIC" x="992" y="992" width="416" height="416"/> <object id="10" name="To Outside" type="warp" x="1024" y="1472" width="32" height="32"> <properties> <property name="dest_map" value="008-1"/> diff --git a/maps/008-2-25.tmx b/maps/008-2-25.tmx index 54774c4a..79b4cff7 100644 --- a/maps/008-2-25.tmx +++ b/maps/008-2-25.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-25.png"/> - <property name="music" value="clouds-calling.ogg"/> + <property name="music" value="dimond.ogg"/> <property name="name" value="Dimond's Cove Second Floor"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/008-2-26.tmx b/maps/008-2-26.tmx index 5928f326..6b9f5604 100644 --- a/maps/008-2-26.tmx +++ b/maps/008-2-26.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-26.png"/> - <property name="music" value="clouds-calling.ogg"/> + <property name="music" value="dimond.ogg"/> <property name="name" value="Dimond's Cove Third Floor"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/008-2-27.tmx b/maps/008-2-27.tmx index d6687db3..6191cd3a 100644 --- a/maps/008-2-27.tmx +++ b/maps/008-2-27.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-27.png"/> - <property name="music" value="clouds-calling.ogg"/> + <property name="music" value="dimond.ogg"/> <property name="name" value="Dimond's Cove Cellar"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> @@ -586,4 +586,4 @@ </properties> </object> </objectgroup> -</map> +</map>
\ No newline at end of file diff --git a/maps/008-2-32.tmx b/maps/008-2-32.tmx index 45c933aa..42d86a41 100644 --- a/maps/008-2-32.tmx +++ b/maps/008-2-32.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-32.png"/> + <property name="music" value="forest.ogg"/> <property name="name" value="Merchant House"/> </properties> <tileset firstgid="1" name="hurns-indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/008-2-7.tmx b/maps/008-2-7.tmx index 9680f8a4..95eaa176 100644 --- a/maps/008-2-7.tmx +++ b/maps/008-2-7.tmx @@ -481,4 +481,4 @@ </properties> </object> </objectgroup> -</map> +</map>
\ No newline at end of file diff --git a/maps/008-2-9.tmx b/maps/008-2-9.tmx index 9758ba3c..66ca3bda 100644 --- a/maps/008-2-9.tmx +++ b/maps/008-2-9.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-2-9.png"/> + <property name="music" value="fire.ogg"/> <property name="name" value="Jack's Abode"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/008-3-0.tmx b/maps/008-3-0.tmx index f7da741d..9fed6a2d 100644 --- a/maps/008-3-0.tmx +++ b/maps/008-3-0.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-0.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="surreal.ogg"/> <property name="name" value="Rossy Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/008-3-1.tmx b/maps/008-3-1.tmx index 7c6a4ded..38d2edf4 100644 --- a/maps/008-3-1.tmx +++ b/maps/008-3-1.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-1.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="cavesong.ogg"/> <property name="name" value="Bat Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/008-3-2.tmx b/maps/008-3-2.tmx index 5aed1b85..f80328be 100644 --- a/maps/008-3-2.tmx +++ b/maps/008-3-2.tmx @@ -7,7 +7,7 @@ <property name="license" value="GPL v2+, CC BY SA 3.0+"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-2.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="surreal.ogg"/> <property name="name" value="Calamity Dungeon"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/008-3-3.tmx b/maps/008-3-3.tmx index 8cf79d89..d8421f5c 100644 --- a/maps/008-3-3.tmx +++ b/maps/008-3-3.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-3.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="cavesong.ogg"/> <property name="name" value="Obelisk Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> @@ -23,7 +23,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-1.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="surreal.ogg"/> <property name="name" value="Bat Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/008-3-4.tmx b/maps/008-3-4.tmx index 5d29620a..4e6187de 100644 --- a/maps/008-3-4.tmx +++ b/maps/008-3-4.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-4.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="cavesong.ogg"/> <property name="name" value="North Mine"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/008-3-5.tmx b/maps/008-3-5.tmx index fbe6b84f..a004602d 100644 --- a/maps/008-3-5.tmx +++ b/maps/008-3-5.tmx @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="180" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="44"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="180" height="140" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="44"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-5.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="bandit.ogg"/> <property name="name" value="Bandit Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> @@ -596,6 +596,153 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> + <layer id="13" name="Barrier" width="180" height="140"> + <properties> + <property name="TileCondition" value="4"/> + </properties> + <data encoding="csv"> +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,177,180,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,226,225,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 +</data> + </layer> <layer id="4" name="Fringe" width="180" height="140"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/008-3-6.tmx b/maps/008-3-6.tmx index 42ecb3a8..338b255a 100644 --- a/maps/008-3-6.tmx +++ b/maps/008-3-6.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-6.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="chilling.ogg"/> <property name="name" value="Hurnscald Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/009-1.tmx b/maps/009-1.tmx index b349371a..2a118837 100644 --- a/maps/009-1.tmx +++ b/maps/009-1.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-1.png"/> - <property name="music" value="graveyard.ogg"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Swamp"/> <property name="overlay0image" value="graphics/images/ambient/rain.png"/> <property name="overlay0parallax" value="1.0"/> diff --git a/maps/009-2-0.tmx b/maps/009-2-0.tmx index e1fd8a77..0ac103cd 100644 --- a/maps/009-2-0.tmx +++ b/maps/009-2-0.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-0.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Soren's Home"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/009-2-10.tmx b/maps/009-2-10.tmx index 09246be9..c7b1a5e8 100644 --- a/maps/009-2-10.tmx +++ b/maps/009-2-10.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="3"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="3"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-10.png"/> + <property name="music" value="crypt.ogg"/> <property name="name" value="Migglemire Crypt Level 2"/> </properties> <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16"> @@ -536,7 +537,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="7" name="Collision" width="90" height="80" locked="1"> + <layer id="7" name="Collision" width="90" height="80" visible="0" locked="1"> <data encoding="csv"> 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, @@ -620,7 +621,7 @@ 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82 </data> </layer> - <layer id="9" name="Heights" width="90" height="80"> + <layer id="9" name="Heights" width="90" height="80" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-11.tmx b/maps/009-2-11.tmx index f8120af3..ef15d383 100644 --- a/maps/009-2-11.tmx +++ b/maps/009-2-11.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="4"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="4"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-11.png"/> + <property name="music" value="crypt.ogg"/> <property name="name" value="Migglemire Crypt Boss Chamber"/> </properties> <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16"> @@ -32,7 +33,7 @@ <tileset firstgid="790" name="crypt-accessory-x1x4" tilewidth="32" tileheight="128" tilecount="32" columns="16"> <image source="../graphics/tilesets/crypt-accessory-x1x4.png" width="512" height="256"/> </tileset> - <layer id="1" name="Ground" width="90" height="80" visible="0"> + <layer id="1" name="Ground" width="90" height="80"> <data encoding="csv"> 552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552, 552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552, @@ -116,7 +117,7 @@ 552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552 </data> </layer> - <layer id="2" name="Ground 2" width="90" height="80" visible="0"> + <layer id="2" name="Ground 2" width="90" height="80"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -200,7 +201,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="3" name="Ground 3" width="90" height="80" visible="0"> + <layer id="3" name="Ground 3" width="90" height="80"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -284,7 +285,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="4" name="Fringe" width="90" height="80" visible="0"> + <layer id="4" name="Fringe" width="90" height="80"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -368,7 +369,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="5" name="Over" width="90" height="80" visible="0"> + <layer id="5" name="Over" width="90" height="80"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -452,7 +453,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="6" name="Over 2" width="90" height="80" visible="0"> + <layer id="6" name="Over 2" width="90" height="80"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -536,7 +537,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="7" name="Collision" width="90" height="80"> + <layer id="7" name="Collision" width="90" height="80" visible="0"> <data encoding="csv"> 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, @@ -620,7 +621,7 @@ 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82 </data> </layer> - <layer id="9" name="Heights" width="90" height="80"> + <layer id="9" name="Heights" width="90" height="80" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-12.tmx b/maps/009-2-12.tmx index efd7c553..48e6884f 100644 --- a/maps/009-2-12.tmx +++ b/maps/009-2-12.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="3"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="3"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-12.png"/> + <property name="music" value="crypt.ogg"/> <property name="name" value="Asphodel Moor Crypt Ground Level"/> </properties> <tileset firstgid="1" name="crypt-ground" tilewidth="32" tileheight="32" tilecount="384" columns="16"> @@ -32,7 +33,7 @@ <tileset firstgid="790" name="dark-tileset-accessory-x1x2" tilewidth="32" tileheight="64" tilecount="64" columns="8"> <image source="../graphics/tilesets/dark-tileset-accessory-x1x2.png" width="256" height="512"/> </tileset> - <layer id="1" name="Ground" width="70" height="70" visible="0"> + <layer id="1" name="Ground" width="70" height="70"> <data encoding="csv"> 147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147, 147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147,147, @@ -476,7 +477,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="7" name="Collision" width="70" height="70"> + <layer id="7" name="Collision" width="70" height="70" visible="0"> <data encoding="csv"> 386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386, 386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386, @@ -550,7 +551,7 @@ 386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386 </data> </layer> - <layer id="8" name="Heights" width="70" height="70"> + <layer id="8" name="Heights" width="70" height="70" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-13.tmx b/maps/009-2-13.tmx index 8380d468..1cc2b7f1 100644 --- a/maps/009-2-13.tmx +++ b/maps/009-2-13.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="3"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="3"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-13.png"/> + <property name="music" value="crypt.ogg"/> <property name="name" value="Asphodel Moor Crypt Level 2"/> </properties> <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16"> @@ -32,7 +33,7 @@ <tileset firstgid="790" name="crypt-accessory-x1x4" tilewidth="32" tileheight="128" tilecount="32" columns="16"> <image source="../graphics/tilesets/crypt-accessory-x1x4.png" width="512" height="256"/> </tileset> - <layer id="1" name="Ground" width="90" height="80" visible="0"> + <layer id="1" name="Ground" width="90" height="80"> <data encoding="csv"> 552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552, 552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552, @@ -536,7 +537,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="7" name="Collision" width="90" height="80"> + <layer id="7" name="Collision" width="90" height="80" visible="0"> <data encoding="csv"> 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, @@ -620,7 +621,7 @@ 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82 </data> </layer> - <layer id="9" name="Heights" width="90" height="80"> + <layer id="9" name="Heights" width="90" height="80" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-14.tmx b/maps/009-2-14.tmx index 01dad93a..d7f9c915 100644 --- a/maps/009-2-14.tmx +++ b/maps/009-2-14.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="4"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="90" height="80" tilewidth="32" tileheight="32" infinite="0" nextlayerid="11" nextobjectid="4"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-14.png"/> + <property name="music" value="crypt.ogg"/> <property name="name" value="Asphodel Moor Crypt Boss Chamber"/> </properties> <tileset firstgid="1" name="crypt-accessory-x1x3" tilewidth="32" tileheight="96" tilecount="80" columns="16"> @@ -536,7 +537,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="7" name="Collision" width="90" height="80"> + <layer id="7" name="Collision" width="90" height="80" visible="0"> <data encoding="csv"> 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82, @@ -620,7 +621,7 @@ 82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82,82 </data> </layer> - <layer id="9" name="Heights" width="90" height="80"> + <layer id="9" name="Heights" width="90" height="80" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-15.tmx b/maps/009-2-15.tmx index a2f82993..c1849119 100644 --- a/maps/009-2-15.tmx +++ b/maps/009-2-15.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-15.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Chapel"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/009-2-16.tmx b/maps/009-2-16.tmx index b84e67a4..1277df7c 100644 --- a/maps/009-2-16.tmx +++ b/maps/009-2-16.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-16.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Chapel Tower 1st Floor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/009-2-17.tmx b/maps/009-2-17.tmx index 37ab11fb..65daff1e 100644 --- a/maps/009-2-17.tmx +++ b/maps/009-2-17.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-17.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Chapel Tower 2nd Floor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/009-2-18.tmx b/maps/009-2-18.tmx index b9a137c7..005da5d3 100644 --- a/maps/009-2-18.tmx +++ b/maps/009-2-18.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-18.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Chapel Tower Top"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/009-2-2.tmx b/maps/009-2-2.tmx index 2f18b411..384eb2f3 100644 --- a/maps/009-2-2.tmx +++ b/maps/009-2-2.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-2.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Gardenhouse"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/009-2-3.tmx b/maps/009-2-3.tmx index 5261f83a..fd9ec6db 100644 --- a/maps/009-2-3.tmx +++ b/maps/009-2-3.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-3.png"/> + <property name="music" value="reid.ogg"/> <property name="name" value="Reid's Inn"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -620,7 +621,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="85" height="70"> + <layer id="8" name="Collision" width="85" height="70" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -694,7 +695,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="85" height="70"> + <layer id="9" name="Heights" width="85" height="70" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-4.tmx b/maps/009-2-4.tmx index 37fe476c..c718e02a 100644 --- a/maps/009-2-4.tmx +++ b/maps/009-2-4.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-4.png"/> + <property name="music" value="reid.ogg"/> <property name="name" value="Reid's Inn Basement"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -818,7 +819,7 @@ 2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119,2119 </data> </layer> - <layer id="8" name="Collision" width="85" height="70"> + <layer id="8" name="Collision" width="85" height="70" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -892,7 +893,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="85" height="70"> + <layer id="9" name="Heights" width="85" height="70" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-5.tmx b/maps/009-2-5.tmx index df07946b..61719f1a 100644 --- a/maps/009-2-5.tmx +++ b/maps/009-2-5.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-5.png"/> + <property name="music" value="reid.ogg"/> <property name="name" value="Reid's Inn First Floor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -614,7 +615,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="85" height="70"> + <layer id="8" name="Collision" width="85" height="70" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -688,7 +689,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="85" height="70"> + <layer id="9" name="Heights" width="85" height="70" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-6.tmx b/maps/009-2-6.tmx index 696110e6..4452f139 100644 --- a/maps/009-2-6.tmx +++ b/maps/009-2-6.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="17"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="60" height="60" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="17"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-6.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Small House"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -538,7 +539,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="60" height="60"> + <layer id="8" name="Collision" width="60" height="60" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -602,7 +603,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="60" height="60"> + <layer id="9" name="Heights" width="60" height="60" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-7.tmx b/maps/009-2-7.tmx index 4a19db76..41993974 100644 --- a/maps/009-2-7.tmx +++ b/maps/009-2-7.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-7.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Shop"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -185,9 +186,9 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1636,1637,1637,1636,1637,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1267,1268,1269,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1283,1284,1285,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1299,1300,1301,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -249,9 +250,9 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,1495,1496,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,582,0,1587,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,581,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -376,7 +377,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,1487,1488,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,1606,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1603,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -439,8 +440,8 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1434,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1434,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-8.tmx b/maps/009-2-8.tmx index d246c450..79b8863c 100644 --- a/maps/009-2-8.tmx +++ b/maps/009-2-8.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="70" height="65" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="17"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="70" height="65" tilewidth="32" tileheight="32" infinite="0" nextlayerid="13" nextobjectid="17"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-8.png"/> + <property name="music" value="swamp.ogg"/> <property name="name" value="Blacksmith"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -90,7 +91,7 @@ <tileset firstgid="1721" name="castle1" tilewidth="32" tileheight="32" tilecount="374" columns="17"> <image source="../graphics/tilesets/castle1.png" width="544" height="704"/> </tileset> - <layer id="1" name="Ground" width="70" height="65" visible="0"> + <layer id="1" name="Ground" width="70" height="65"> <data encoding="csv"> 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, 17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17,17, @@ -573,7 +574,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="70" height="65"> + <layer id="8" name="Collision" width="70" height="65" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -642,7 +643,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="70" height="65"> + <layer id="9" name="Heights" width="70" height="65" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/009-2-9.tmx b/maps/009-2-9.tmx index 9e031fa7..388fd1de 100644 --- a/maps/009-2-9.tmx +++ b/maps/009-2-9.tmx @@ -1,9 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.2" tiledversion="1.3.4" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="3"> +<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" width="70" height="70" tilewidth="32" tileheight="32" infinite="0" nextlayerid="10" nextobjectid="3"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/009-2-9.png"/> + <property name="music" value="crypt.ogg"/> <property name="name" value="Migglemire Crypt Ground Level"/> </properties> <tileset firstgid="1" name="crypt-ground" tilewidth="32" tileheight="32" tilecount="384" columns="16"> @@ -180,7 +181,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="3" name="Ground 3" width="70" height="70" visible="0"> + <layer id="3" name="Ground 3" width="70" height="70"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -254,7 +255,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="4" name="Fringe" width="70" height="70" visible="0"> + <layer id="4" name="Fringe" width="70" height="70"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -328,7 +329,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="5" name="Over" width="70" height="70" visible="0"> + <layer id="5" name="Over" width="70" height="70"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -402,7 +403,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="6" name="Over 2" width="70" height="70" visible="0"> + <layer id="6" name="Over 2" width="70" height="70"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -476,7 +477,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="7" name="Collision" width="70" height="70"> + <layer id="7" name="Collision" width="70" height="70" visible="0"> <data encoding="csv"> 386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386, 386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386, diff --git a/maps/012-1.tmx b/maps/012-1.tmx index 9ed26941..53bbd787 100644 --- a/maps/012-1.tmx +++ b/maps/012-1.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-1.png"/> - <property name="music" value="bartk - the adventure begins.ogg"/> + <property name="music" value="candor.ogg"/> <property name="name" value="Candor Island"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> @@ -1642,7 +1642,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/000-1.png"/> - <property name="music" value="bartk - the adventure begins.ogg"/> + <property name="music" value="artis.ogg"/> <property name="name" value="Candor Island"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> diff --git a/maps/012-2-1.tmx b/maps/012-2-1.tmx index c288b3b9..f170a075 100644 --- a/maps/012-2-1.tmx +++ b/maps/012-2-1.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-2-1.png"/> + <property name="music" value="candor.ogg"/> <property name="name" value="Sorfina's Home"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/012-2-2.tmx b/maps/012-2-2.tmx index 54c7f33c..e06f0a49 100644 --- a/maps/012-2-2.tmx +++ b/maps/012-2-2.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-2-2.png"/> + <property name="music" value="candor.ogg"/> <property name="name" value="Sleeping Room"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/012-2-4.tmx b/maps/012-2-4.tmx index 428c2d30..0e324df5 100644 --- a/maps/012-2-4.tmx +++ b/maps/012-2-4.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-2-4.png"/> + <property name="music" value="candor.ogg"/> <property name="name" value="Alchemy Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/012-2-5.tmx b/maps/012-2-5.tmx index d41d9973..7e56b942 100644 --- a/maps/012-2-5.tmx +++ b/maps/012-2-5.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-2-5.png"/> + <property name="music" value="candor.ogg"/> <property name="name" value="Candor Smith"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/012-2-6.tmx b/maps/012-2-6.tmx index c346d3c9..06fbfb1b 100644 --- a/maps/012-2-6.tmx +++ b/maps/012-2-6.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-2-6.png"/> + <property name="music" value="candor.ogg"/> <property name="name" value="Storage Room"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/012-2-7.tmx b/maps/012-2-7.tmx index 1a9dda16..cc0d4245 100644 --- a/maps/012-2-7.tmx +++ b/maps/012-2-7.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-2-7.png"/> + <property name="music" value="fire.ogg"/> <property name="name" value="Small House"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/012-3-1.tmx b/maps/012-3-1.tmx index 2eef33f4..18bd6677 100644 --- a/maps/012-3-1.tmx +++ b/maps/012-3-1.tmx @@ -4,8 +4,8 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-3-1.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> - <property name="name" value="Cador Cave"/> + <property name="music" value="surreal.ogg"/> + <property name="name" value="Candor Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> <property name="overlay0mask" value="2"/> diff --git a/maps/012-3-2.tmx b/maps/012-3-2.tmx index a1e6761f..5429e13c 100644 --- a/maps/012-3-2.tmx +++ b/maps/012-3-2.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-3-2.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="surreal.ogg"/> <property name="name" value="Parua Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> @@ -23,7 +23,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/008-3-1.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="surreal.ogg"/> <property name="name" value="Candor Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/012-3-3.tmx b/maps/012-3-3.tmx index 541da21b..32591e1c 100644 --- a/maps/012-3-3.tmx +++ b/maps/012-3-3.tmx @@ -4,7 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/012-3-3.png"/> - <property name="music" value="eric matyas - surreal place.ogg"/> + <property name="music" value="surreal.ogg"/> <property name="name" value="Mana Tree Cave"/> <property name="overlay0image" value="graphics/images/ambient/spot.png"/> <property name="overlay0keepratio" value="true"/> diff --git a/maps/020-1.tmx b/maps/020-1.tmx index 617c5848..74f3d9cd 100644 --- a/maps/020-1.tmx +++ b/maps/020-1.tmx @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<map version="1.4" tiledversion="1.4.1" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="320" height="280" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="204"> +<map version="1.4" tiledversion="1.4.2" orientation="orthogonal" renderorder="right-down" compressionlevel="0" width="320" height="280" tilewidth="32" tileheight="32" infinite="0" nextlayerid="14" nextobjectid="205"> <properties> <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-1.png"/> - <property name="music" value="bartk - the adventure begins.ogg"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Tulimshar"/> <property name="overlay0image" value="graphics/images/ambient/cloud.png"/> <property name="overlay0parallax" value="1.0"/> @@ -3102,7 +3102,7 @@ <property name="dest_y" value="33"/> </properties> </object> - <object id="170" name="To Large Slum Hut" type="warp" x="8544" y="5792" width="32" height="32"> + <object id="170" name="To Clinic" type="warp" x="8544" y="5792" width="32" height="32"> <properties> <property name="dest_map" value="020-2-15"/> <property name="dest_x" value="45"/> @@ -3263,6 +3263,7 @@ <property name="dest_y" value="22"/> </properties> </object> + <object id="204" name="academy.ogg" type="MUSIC" x="1088" y="1280" width="2404" height="2876"/> </objectgroup> <objectgroup id="13" name="Spawns" visible="0"> <object id="28" name="Maggot" type="spawn" x="4832" y="2080" width="928" height="800"> @@ -3329,14 +3330,6 @@ <property name="spawn" value="5000"/> </properties> </object> - <object id="36" name="Golden Scorpion" type="spawn" x="4736" y="7968" width="608" height="224"> - <properties> - <property name="death" value="120000"/> - <property name="max_beings" value="1"/> - <property name="monster_id" value="1110"/> - <property name="spawn" value="120000"/> - </properties> - </object> <object id="37" name="Brotherhood Fighter" type="spawn" x="4672" y="2240" width="1408" height="736"> <properties> <property name="death" value="18000"/> diff --git a/maps/020-2-0.tmx b/maps/020-2-0.tmx index 22622135..a419a612 100644 --- a/maps/020-2-0.tmx +++ b/maps/020-2-0.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-0.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Ratto Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-1.tmx b/maps/020-2-1.tmx index 40361f37..fa09df99 100644 --- a/maps/020-2-1.tmx +++ b/maps/020-2-1.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-1.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Brotherhood Castle"/> </properties> <tileset firstgid="1" name="desert-castle-indoor" tilewidth="32" tileheight="32" tilecount="512" columns="16"> diff --git a/maps/020-2-10.tmx b/maps/020-2-10.tmx index edb65871..3cb57f23 100644 --- a/maps/020-2-10.tmx +++ b/maps/020-2-10.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-10.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Tailor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-11.tmx b/maps/020-2-11.tmx index 4319dfbf..06ab816e 100644 --- a/maps/020-2-11.tmx +++ b/maps/020-2-11.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-11.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Ramshackle Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -483,7 +484,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="75" height="55"> + <layer id="8" name="Collision" width="75" height="55" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -542,7 +543,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="75" height="55"> + <layer id="9" name="Heights" width="75" height="55" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/020-2-12.tmx b/maps/020-2-12.tmx index 421ac0df..90aaccd7 100644 --- a/maps/020-2-12.tmx +++ b/maps/020-2-12.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-12.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Small Garden Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-13.tmx b/maps/020-2-13.tmx index 04de906a..7e1ddf2b 100644 --- a/maps/020-2-13.tmx +++ b/maps/020-2-13.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-13.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Large Garden Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-14.tmx b/maps/020-2-14.tmx index 564a4027..7cf44a68 100644 --- a/maps/020-2-14.tmx +++ b/maps/020-2-14.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-14.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Small Slum Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -483,7 +484,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="80" height="55"> + <layer id="8" name="Collision" width="80" height="55" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -542,7 +543,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="80" height="55"> + <layer id="9" name="Heights" width="80" height="55" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/020-2-15.tmx b/maps/020-2-15.tmx index d6552d4d..e170e727 100644 --- a/maps/020-2-15.tmx +++ b/maps/020-2-15.tmx @@ -4,7 +4,8 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-15.png"/> - <property name="name" value="Large Slum Hut"/> + <property name="music" value="peace.ogg"/> + <property name="name" value="Tulimshar Clinic"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> <image source="../graphics/tilesets/collision.png" width="96" height="96"/> @@ -158,7 +159,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,394,394,394,394,394,394,394,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,429,426,426,426,426,426,426,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,330,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -215,9 +216,9 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,490,491,492,490,491,492,490,491,492,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,506,0,508,506,0,508,506,0,508,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,523,524,522,523,524,522,523,524,0,683,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -273,7 +274,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,586,593,594,589,590,591,592,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -334,7 +335,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,462,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,462,0,0,0,0,0,0,0,464,463,463,463,463,0,0,448,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, +0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,462,507,0,0,507,0,0,507,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,462,0,0,0,0,0,0,0,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,478,479,479,479,479,479,461,0,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,463,463,463,463,463,463,463,462,0,0,0,0,0,0,0,0,464,463,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -483,7 +484,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="80" height="55"> + <layer id="8" name="Collision" width="80" height="55" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -512,7 +513,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, -2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, +2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,0,0,2,0,0,2,0,0,2,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -542,7 +543,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="80" height="55"> + <layer id="9" name="Heights" width="80" height="55" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/020-2-16.tmx b/maps/020-2-16.tmx index c5bcd9e1..47330579 100644 --- a/maps/020-2-16.tmx +++ b/maps/020-2-16.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-16.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Slum Laundry"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-17.tmx b/maps/020-2-17.tmx index 47320f88..238ebb91 100644 --- a/maps/020-2-17.tmx +++ b/maps/020-2-17.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-17.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Fisherman's Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-18.tmx b/maps/020-2-18.tmx index 997fba0b..0abefb62 100644 --- a/maps/020-2-18.tmx +++ b/maps/020-2-18.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-18.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Market Administration"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-19.tmx b/maps/020-2-19.tmx index ac2058ca..d976b268 100644 --- a/maps/020-2-19.tmx +++ b/maps/020-2-19.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-19.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Farmer's Home"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-2.tmx b/maps/020-2-2.tmx index 316a5fe8..b48891f3 100644 --- a/maps/020-2-2.tmx +++ b/maps/020-2-2.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-2.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Brotherhood Tower"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-20.tmx b/maps/020-2-20.tmx index 6ac1152f..b7754df9 100644 --- a/maps/020-2-20.tmx +++ b/maps/020-2-20.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-20.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Tulimshar Inn"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-21.tmx b/maps/020-2-21.tmx index d9c532f3..f6af19a2 100644 --- a/maps/020-2-21.tmx +++ b/maps/020-2-21.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-21.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Queer Hut"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> @@ -448,7 +449,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="8" name="Collision" width="75" height="50"> + <layer id="8" name="Collision" width="75" height="50" visible="0"> <data encoding="csv"> 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, @@ -502,7 +503,7 @@ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2 </data> </layer> - <layer id="9" name="Heights" width="75" height="50"> + <layer id="9" name="Heights" width="75" height="50" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/020-2-22.tmx b/maps/020-2-22.tmx index 8c782baf..74638f0b 100644 --- a/maps/020-2-22.tmx +++ b/maps/020-2-22.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-22.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Residence"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-23.tmx b/maps/020-2-23.tmx index c33af6da..da05ccc7 100644 --- a/maps/020-2-23.tmx +++ b/maps/020-2-23.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-23.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Brotherhood Inn First Floor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-24.tmx b/maps/020-2-24.tmx index 34bcc294..3bc501e2 100644 --- a/maps/020-2-24.tmx +++ b/maps/020-2-24.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-24.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Tulimshar Inn First Floor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-25.tmx b/maps/020-2-25.tmx index 50d137c8..951a0742 100644 --- a/maps/020-2-25.tmx +++ b/maps/020-2-25.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-25.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Residence First Floor"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-26.tmx b/maps/020-2-26.tmx index 1515b5ee..a0af9e92 100644 --- a/maps/020-2-26.tmx +++ b/maps/020-2-26.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-26.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Magic Academy Ground Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-27.tmx b/maps/020-2-27.tmx index 6de1cb6c..b4644b6d 100644 --- a/maps/020-2-27.tmx +++ b/maps/020-2-27.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-27.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Magic Acedemy Central, First Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-28.tmx b/maps/020-2-28.tmx index 6727acc7..b213dc0d 100644 --- a/maps/020-2-28.tmx +++ b/maps/020-2-28.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-28.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Magic Acedemy Central, Second Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-29.tmx b/maps/020-2-29.tmx index e31e9ec2..4bb5129c 100644 --- a/maps/020-2-29.tmx +++ b/maps/020-2-29.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-29.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Magic Acedemy East, First Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-3.tmx b/maps/020-2-3.tmx index 8b280412..dc1b5d6f 100644 --- a/maps/020-2-3.tmx +++ b/maps/020-2-3.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-3.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Brotherhood Inn"/> </properties> <tileset firstgid="1" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/020-2-30.tmx b/maps/020-2-30.tmx index cef27b71..fce870a7 100644 --- a/maps/020-2-30.tmx +++ b/maps/020-2-30.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-30.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Magic Acedemy West, First Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-31.tmx b/maps/020-2-31.tmx index cd49bd1b..3c42c0e5 100644 --- a/maps/020-2-31.tmx +++ b/maps/020-2-31.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-31.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Lighthouse Ground Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-32.tmx b/maps/020-2-32.tmx index bb8e9797..1333ab45 100644 --- a/maps/020-2-32.tmx +++ b/maps/020-2-32.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-32.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Lighthouse First Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-33.tmx b/maps/020-2-33.tmx index bb183377..fb837667 100644 --- a/maps/020-2-33.tmx +++ b/maps/020-2-33.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-33.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Lighthouse Second Floor"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-34.tmx b/maps/020-2-34.tmx index 5390d7f6..4f079a58 100644 --- a/maps/020-2-34.tmx +++ b/maps/020-2-34.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-20.png"/> + <property name="music" value="academy.ogg"/> <property name="name" value="Tulimshar Casino"/> </properties> <tileset firstgid="1" name="Collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/020-2-4.tmx b/maps/020-2-4.tmx index 332cc711..af2d6e10 100644 --- a/maps/020-2-4.tmx +++ b/maps/020-2-4.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-4.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Brotherhood Hut"/> </properties> <tileset firstgid="1" name="hurns-indoor-accessory" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/020-2-5.tmx b/maps/020-2-5.tmx index 82c143af..3eaec0f8 100644 --- a/maps/020-2-5.tmx +++ b/maps/020-2-5.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-5.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Legion Castle"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-6.tmx b/maps/020-2-6.tmx index 5386efd5..8ae0f390 100644 --- a/maps/020-2-6.tmx +++ b/maps/020-2-6.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-6.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Legion Tower"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-7.tmx b/maps/020-2-7.tmx index 2b111a18..e74a7322 100644 --- a/maps/020-2-7.tmx +++ b/maps/020-2-7.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-7.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Legion Guardhouse"/> </properties> <tileset firstgid="1" name="desert-castle" tilewidth="32" tileheight="32" tilecount="512" columns="32"> diff --git a/maps/020-2-8.tmx b/maps/020-2-8.tmx index 52093fb0..7fd8c124 100644 --- a/maps/020-2-8.tmx +++ b/maps/020-2-8.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-8.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Tulimshar Blacksmith"/> </properties> <tileset firstgid="1" name="desert-castle-indoor" tilewidth="32" tileheight="32" tilecount="512" columns="16"> @@ -12,7 +13,7 @@ <tileset firstgid="513" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> <image source="../graphics/tilesets/collision.png" width="96" height="96"/> </tileset> - <layer id="2" name="Ground" width="76" height="56" visible="0"> + <layer id="2" name="Ground" width="76" height="56"> <data encoding="csv"> 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, 34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34, @@ -312,7 +313,7 @@ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 </data> </layer> - <layer id="6" name="Collision" width="76" height="56"> + <layer id="6" name="Collision" width="76" height="56" visible="0"> <data encoding="csv"> 514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, 514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, @@ -372,7 +373,7 @@ 514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514 </data> </layer> - <layer id="8" name="Heights" width="76" height="56"> + <layer id="8" name="Heights" width="76" height="56" visible="0"> <data encoding="csv"> 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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/maps/020-2-9.tmx b/maps/020-2-9.tmx index 30427adf..7b0dfedd 100644 --- a/maps/020-2-9.tmx +++ b/maps/020-2-9.tmx @@ -4,6 +4,7 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/020-2-9.png"/> + <property name="music" value="faith.ogg"/> <property name="name" value="Tulimshar Townhall"/> </properties> <tileset firstgid="1" name="collision" tilewidth="32" tileheight="32" tilecount="9" columns="3"> diff --git a/maps/botcheck.tmx b/maps/botcheck.tmx index 6b099753..2bbe7af4 100644 --- a/maps/botcheck.tmx +++ b/maps/botcheck.tmx @@ -4,6 +4,7 @@ <property name="license" value="Apache 2"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/botcheck.png"/> + <property name="music" value="botcheck.ogg"/> <property name="name" value="Botcheck Area"/> </properties> <tileset firstgid="1" name="Artis Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/fermi.tmx b/maps/fermi.tmx index acb432d0..446a7059 100644 --- a/maps/fermi.tmx +++ b/maps/fermi.tmx @@ -4,7 +4,6 @@ <property name="license" value="Apache 2"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/fermi.png"/> - <property name="music" value="ezili - ocean sounds.ogg"/> <property name="name" value="Three Fermi Land"/> </properties> <tileset firstgid="1" name="Artis Indoor" tilewidth="32" tileheight="32" tilecount="256" columns="16"> diff --git a/maps/marine-2.tmx b/maps/marine-2.tmx index 7583b671..09da227f 100644 --- a/maps/marine-2.tmx +++ b/maps/marine-2.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 4.0"/> <property name="manaplus version" value="1"/> <property name="minimap" value="graphics/minimaps/marine-2.png"/> - <property name="music" value="water_prelude.ogg"/> + <property name="music" value="marine.ogg"/> <property name="name" value="Ocean"/> </properties> <tileset firstgid="1" source="../graphics/tilesets/water-raging.tsx"/> diff --git a/maps/marine.tmx b/maps/marine.tmx index e000fcc6..022399b5 100644 --- a/maps/marine.tmx +++ b/maps/marine.tmx @@ -5,7 +5,7 @@ <property name="license" value="CC BY-SA 4.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/marine.png"/> - <property name="music" value="sail_away.ogg"/> + <property name="music" value="waterlude.ogg"/> <property name="name" value="La Marine"/> </properties> <tileset firstgid="1" name="Indoor" tilewidth="32" tileheight="32" tilecount="128" columns="8"> diff --git a/maps/sec_pri.tmx b/maps/sec_pri.tmx index f0e58e67..c64ced59 100644 --- a/maps/sec_pri.tmx +++ b/maps/sec_pri.tmx @@ -5,7 +5,6 @@ <property name="license" value="CC BY-SA 3.0"/> <property name="manaplus version" value="2"/> <property name="minimap" value="graphics/minimaps/jail.png"/> - <property name="music" value=""/> <property name="name" value="Jail"/> </properties> <tileset firstgid="1" name="dark-tileset-accessory" tilewidth="32" tileheight="32" tilecount="60" columns="15"> diff --git a/monsters.xml b/monsters.xml index 2837ebdf..6192c391 100644 --- a/monsters.xml +++ b/monsters.xml @@ -138,8 +138,8 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1018" name="Crafty" targetCursor="small"> <sprite>monsters/crafty.xml</sprite> - <sound event="die">monsters/piou/die1.ogg</sound> - <sound event="hit">monsters/piou/hit1.ogg</sound> + <sound event="die">monsters/bat/die1.ogg</sound> + <sound event="hit">monsters/bat/hit1.ogg</sound> <sound event="hurt">monsters/piou/hurt1.ogg</sound> <sound event="hurt">monsters/piou/hurt2.ogg</sound> <sound event="miss">monsters/piou/miss1.ogg</sound> @@ -187,12 +187,24 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1026" name="Maggot" walkType="walk" targetCursor="small"> <sprite>monsters/maggot.xml</sprite> + <sound event="die">monsters/maggot/die1.ogg</sound> + <sound event="hit">monsters/maggot/hit1.ogg</sound> + <sound event="hit">monsters/maggot/hit2.ogg</sound> + <sound event="miss">monsters/maggot/miss1.ogg</sound> </monster> <monster id="1027" name="Cave Maggot" walkType="walk" targetCursor="small"> <sprite>monsters/maggot.xml|#0f1315,242214,652b51,6f706f</sprite> + <sound event="die">monsters/maggot/die1.ogg</sound> + <sound event="hit">monsters/maggot/hit1.ogg</sound> + <sound event="hit">monsters/maggot/hit2.ogg</sound> + <sound event="miss">monsters/maggot/miss1.ogg</sound> </monster> <monster id="1028" name="Forest Maggot" walkType="walk" targetCursor="small"> <sprite>monsters/maggot.xml|#121c14,223626,334f38,3d5e3d,5e915e</sprite> + <sound event="die">monsters/maggot/die1.ogg</sound> + <sound event="hit">monsters/maggot/hit1.ogg</sound> + <sound event="hit">monsters/maggot/hit2.ogg</sound> + <sound event="miss">monsters/maggot/miss1.ogg</sound> </monster> <monster id="1029" name="Bee" walkType="fly" targetCursor="small"> <sprite>monsters/bee.xml</sprite> @@ -248,6 +260,7 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1042" name="Grass Snake" walkType="walk" targetCursor="small"> <sprite>monsters/snake.xml|#205839,60a65d,80dba9,ffffff</sprite> + <sound event="hit">monsters/snake/hit1.ogg</sound> </monster> <monster id="1043" name="Scorpion" walkType="walk" targetCursor="small"> <sprite>monsters/scorpion.xml|#4d422d,826242,d8c282,e6e6e6</sprite> @@ -359,8 +372,8 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or <sprite>equipment/head/bandithood.xml</sprite> <sprite>equipment/weapons/woodenbow.xml</sprite> <sprite>equipment/chest/forestarmor-male.xml</sprite> - <sound event="hit">weapons/piouslayer/hit1.ogg</sound> - <sound event="miss">weapons/piouslayer/miss1.ogg</sound> + <sound event="hit">weapons/bow-wooden/hit1.ogg</sound> + <sound event="miss">weapons/bow-wooden/miss1.ogg</sound> <attack id="1" missile-particle="graphics/particles/training-arrow.xml" action="attack_bow"/> </monster> <monster id="1065" name="Bandit Lord"> @@ -372,8 +385,8 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or <sprite>equipment/weapons/woodenbow.xml</sprite> <sprite>equipment/chest/forestarmor-female.xml</sprite> <sprite>equipment/neck/banditshawl.xml</sprite> - <sound event="hit">weapons/piouslayer/hit1.ogg</sound> - <sound event="miss">weapons/piouslayer/miss1.ogg</sound> + <sound event="hit">weapons/bow-wooden/hit1.ogg</sound> + <sound event="miss">weapons/bow-wooden/miss1.ogg</sound> </monster> <monster id="1066" name="Legion Swordswoman"> <sprite>races/human-female-medium.xml</sprite> @@ -436,12 +449,14 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1075" name="Snake" walkType="walk" targetCursor="small"> <sprite>monsters/snake.xml|#594d36,b49b6c,f4d293</sprite> + <sound event="hit">monsters/snake/hit1.ogg</sound> </monster> <monster id="1076" name="Giant Maggot" walkType="walk" targetCursor="medium"> <sprite>monsters/giant-maggot.xml</sprite> </monster> <monster id="1077" name="Desert Snake" walkType="walk" targetCursor="small"> <sprite>monsters/snake.xml|#3d2613,4e3117,774c20,8f5d22,ae772d,dbae5c,f7e1ad</sprite> + <sound event="hit">monsters/snake/hit1.ogg</sound> </monster> <monster id="1078" name="Desert Scorpion" walkType="walk" targetCursor="small"> <sprite>monsters/scorpion.xml|#594d36,b49b6c,f4d293</sprite> @@ -481,8 +496,8 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or <sprite>equipment/weapons/woodenbow.xml</sprite> <sprite>equipment/hands/armbands-female.xml|#663d38,5e3434,8f5c52,a46349,ad7c65,ce8b5b,d9c9b2,ce8b5b</sprite> <sprite>equipment/chest/wizardrobe-female.xml</sprite> - <sound event="hit">weapons/piouslayer/hit1.ogg</sound> - <sound event="miss">weapons/piouslayer/miss1.ogg</sound> + <sound event="hit">weapons/bow-wooden/hit1.ogg</sound> + <sound event="miss">weapons/bow-wooden/miss1.ogg</sound> <attack id="1" missile-particle="graphics/particles/training-arrow.xml" action="attack_bow"/> </monster> <monster id="1083" name="Brotherhood Leader"> @@ -567,8 +582,8 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1103" name="Angry Crafty" targetCursor="small"> <sprite>monsters/crafty.xml</sprite> - <sound event="die">monsters/piou/die1.ogg</sound> - <sound event="hit">monsters/piou/hit1.ogg</sound> + <sound event="die">monsters/bat/die1.ogg</sound> + <sound event="hit">monsters/bat/hit1.ogg</sound> <sound event="hurt">monsters/piou/hurt1.ogg</sound> <sound event="hurt">monsters/piou/hurt2.ogg</sound> <sound event="miss">monsters/piou/miss1.ogg</sound> @@ -698,8 +713,8 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1125" name="Crafty Ghost" targetCursor="small"> <sprite>monsters/ghost-crafty.xml</sprite> - <sound event="die">monsters/piou/die1.ogg</sound> - <sound event="hit">monsters/piou/hit1.ogg</sound> + <sound event="die">monsters/bat/die1.ogg</sound> + <sound event="hit">monsters/bat/hit1.ogg</sound> <sound event="hurt">monsters/piou/hurt1.ogg</sound> <sound event="hurt">monsters/piou/hurt2.ogg</sound> <sound event="miss">monsters/piou/miss1.ogg</sound> @@ -707,6 +722,7 @@ event="" Links the sfx to an action, like die, hit, hurt, miss, move or </monster> <monster id="1126" name="Snake Ghost" walkType="walk" targetCursor="small"> <sprite>monsters/ghost-snake.xml</sprite> + <sound event="hit">monsters/snake/hit1.ogg</sound> </monster> <monster id="1127" name="Scorpion Ghost" walkType="walk" targetCursor="small"> <sprite>monsters/ghost-scorpion.xml</sprite> @@ -668,6 +668,76 @@ IDs 900-999 = Special <sprite>npcs/xml/tiki.xml</sprite> <menu name="Talk" command="talk 'NAME'"/> </npc> + <npc id="231"> + <!-- Golbenez. No more info required. --> + <sprite variant="7">npcs/xml/unanimated-legacy-tall.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="232"> + <!-- Chef, The undead chef. --> + <sprite variant="8">npcs/xml/unanimated-legacy-tall.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="233"> + <!-- Archibald, Chef's Apprentice. --> + <sprite variant="8">npcs/xml/unanimated-legacy-tall.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="234"> + <!-- Leofwin, the Asphodel Moor Alchemist. --> + <sprite variant="59">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="235"> + <!-- Umfrey, a trader in Asphodel Moor. --> + <sprite variant="60">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="236"> + <!-- Lovers, laying in a bed in Asphodel Moor. --> + <sprite variant="61">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="237"> + <!-- Barbara, a skel Lady in Asphodel Moor. --> + <sprite variant="62">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="238"> + <!-- Wolfgang, a game-addicted werewolf in Asphodel Moor. --> + <sprite variant="63">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="239"> + <!-- Bennet, a skeleton behind a desk. --> + <sprite variant="64">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="240"> + <!-- Edwin, another skeleton behind a desk. --> + <sprite variant="65">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="241"> + <!-- Darnel, a totally drunk undead..? After all, he still got beer. --> + <sprite variant="66">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="242"> + <!-- Estrilda, Waitress in the Inn in Asphodel Moor. --> + <sprite variant="67">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="243"> + <!-- The one and only Caretaker. --> + <sprite variant="68">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="244"> + <!-- The Caretaker's Wife. A bit not so alive, unfortunately. --> + <sprite variant="69">npcs/xml/unanimated-legacy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> <!-- Animated NPCs --> @@ -1181,6 +1251,67 @@ IDs 900-999 = Special <particlefx>graphics/particles/circle-magic.xml</particlefx> <menu name="Summon" command="talk 'NAME'"/> </npc> + <npc id="479"> + <!-- The formerly unused undead Mouboo Master. Mmh undead Mouboo steak. --> + <sprite>npcs/xml/undead-mouboomaster.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="480"> + <!-- The undead receptionist, formerly known as Barbara Grey. --> + <sprite>npcs/xml/undead-receptionist.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="481"> + <!-- The strange guards from Asphodel Moor. Feel free to not use them. --> + <sprite>npcs/xml/undead-guard.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="482"> + <!-- J.P. Morbid, the undead banker in Asphodel Moor. --> + <sprite>npcs/xml/undead-banker.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="483"> + <!-- Hamond, the man holding a lantern in the Moor. --> + <sprite>npcs/xml/lightman.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="484"> + <!-- Thurstan, that weird guy carrying his head around. In his hands. --> + <sprite>npcs/xml/headlessman.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="485"> + <!-- Nothing to see here, just some guy formerly known as Savaric hanging around. --> + <sprite>npcs/xml/hangman.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="486"> + <!-- Reid's Ghost. --> + <sprite>npcs/xml/ghost-innkeeper.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="487"> + <!-- Nigel. If there is still any question if alcohol is bad - yes, it is. --> + <sprite>npcs/xml/ghost-beerguy.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="488"> + <!-- Eurni. Need boobs? Three of them? A whale's dick? Eurni cares about you. --> + <sprite>npcs/xml/creepysurgeon.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="489"> + <!-- Chronos. Formerly unused I think, but if you need to travel in time he may be the guy to ask. --> + <sprite>npcs/xml/chronos.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <npc id="490"> + <!-- A crying child. Did not see much sun lately. --> + <sprite>npcs/xml/cryingchild.xml</sprite> + <menu name="Talk" command="talk 'NAME'"/> + </npc> + <!-- Test NPCs --> diff --git a/sfx/magic/fireball.ogg b/sfx/env/fireball.ogg Binary files differindex 3e7cc48e..3e7cc48e 100644 --- a/sfx/magic/fireball.ogg +++ b/sfx/env/fireball.ogg diff --git a/sfx/monsters/bat/die1.ogg b/sfx/monsters/bat/die1.ogg Binary files differnew file mode 100644 index 00000000..81c410b4 --- /dev/null +++ b/sfx/monsters/bat/die1.ogg diff --git a/sfx/monsters/bat/hit1.ogg b/sfx/monsters/bat/hit1.ogg Binary files differnew file mode 100644 index 00000000..3b28bb61 --- /dev/null +++ b/sfx/monsters/bat/hit1.ogg diff --git a/sfx/monsters/maggot/die1.ogg b/sfx/monsters/maggot/die1.ogg Binary files differnew file mode 100644 index 00000000..e05a5235 --- /dev/null +++ b/sfx/monsters/maggot/die1.ogg diff --git a/sfx/monsters/maggot/hit1.ogg b/sfx/monsters/maggot/hit1.ogg Binary files differnew file mode 100644 index 00000000..695cb483 --- /dev/null +++ b/sfx/monsters/maggot/hit1.ogg diff --git a/sfx/monsters/maggot/hit2.ogg b/sfx/monsters/maggot/hit2.ogg Binary files differnew file mode 100644 index 00000000..12d92bb9 --- /dev/null +++ b/sfx/monsters/maggot/hit2.ogg diff --git a/sfx/monsters/maggot/miss1.ogg b/sfx/monsters/maggot/miss1.ogg Binary files differnew file mode 100644 index 00000000..a251bf97 --- /dev/null +++ b/sfx/monsters/maggot/miss1.ogg diff --git a/sfx/monsters/snake/hit1.ogg b/sfx/monsters/snake/hit1.ogg Binary files differnew file mode 100644 index 00000000..ee840f0f --- /dev/null +++ b/sfx/monsters/snake/hit1.ogg diff --git a/sfx/weapons/bow-banshee/hit1.ogg b/sfx/weapons/bow-banshee/hit1.ogg Binary files differnew file mode 100644 index 00000000..5bdbf97b --- /dev/null +++ b/sfx/weapons/bow-banshee/hit1.ogg diff --git a/sfx/weapons/bow-banshee/hit2.ogg b/sfx/weapons/bow-banshee/hit2.ogg Binary files differnew file mode 100644 index 00000000..38bc095c --- /dev/null +++ b/sfx/weapons/bow-banshee/hit2.ogg diff --git a/sfx/weapons/bow-banshee/hit3.ogg b/sfx/weapons/bow-banshee/hit3.ogg Binary files differnew file mode 100644 index 00000000..2c9ba4ec --- /dev/null +++ b/sfx/weapons/bow-banshee/hit3.ogg diff --git a/sfx/weapons/bow-banshee/miss1.ogg b/sfx/weapons/bow-banshee/miss1.ogg Binary files differnew file mode 100644 index 00000000..22967ce8 --- /dev/null +++ b/sfx/weapons/bow-banshee/miss1.ogg diff --git a/sfx/weapons/bow-banshee/miss2.ogg b/sfx/weapons/bow-banshee/miss2.ogg Binary files differnew file mode 100644 index 00000000..662de19a --- /dev/null +++ b/sfx/weapons/bow-banshee/miss2.ogg diff --git a/sfx/weapons/bow-banshee/miss3.ogg b/sfx/weapons/bow-banshee/miss3.ogg Binary files differnew file mode 100644 index 00000000..4321349b --- /dev/null +++ b/sfx/weapons/bow-banshee/miss3.ogg diff --git a/sfx/weapons/halberd/hit1.ogg b/sfx/weapons/halberd/hit1.ogg Binary files differnew file mode 100644 index 00000000..b5c2c247 --- /dev/null +++ b/sfx/weapons/halberd/hit1.ogg diff --git a/sfx/weapons/halberd/hit2.ogg b/sfx/weapons/halberd/hit2.ogg Binary files differnew file mode 100644 index 00000000..b4bc8c9f --- /dev/null +++ b/sfx/weapons/halberd/hit2.ogg diff --git a/sfx/weapons/halberd/hit3.ogg b/sfx/weapons/halberd/hit3.ogg Binary files differnew file mode 100644 index 00000000..eaef35df --- /dev/null +++ b/sfx/weapons/halberd/hit3.ogg diff --git a/sfx/weapons/knife-rock/hit1.ogg b/sfx/weapons/knife-rock/hit1.ogg Binary files differnew file mode 100644 index 00000000..49068f89 --- /dev/null +++ b/sfx/weapons/knife-rock/hit1.ogg diff --git a/sfx/weapons/knife-rock/hit2.ogg b/sfx/weapons/knife-rock/hit2.ogg Binary files differnew file mode 100644 index 00000000..15dbfd71 --- /dev/null +++ b/sfx/weapons/knife-rock/hit2.ogg diff --git a/sfx/weapons/knife-setzer/hit1.ogg b/sfx/weapons/knife-setzer/hit1.ogg Binary files differnew file mode 100644 index 00000000..26695069 --- /dev/null +++ b/sfx/weapons/knife-setzer/hit1.ogg diff --git a/sfx/weapons/knife-setzer/hit2.ogg b/sfx/weapons/knife-setzer/hit2.ogg Binary files differnew file mode 100644 index 00000000..b9409ec5 --- /dev/null +++ b/sfx/weapons/knife-setzer/hit2.ogg diff --git a/sfx/weapons/knife-setzer/hit3.ogg b/sfx/weapons/knife-setzer/hit3.ogg Binary files differnew file mode 100644 index 00000000..91ee7ad4 --- /dev/null +++ b/sfx/weapons/knife-setzer/hit3.ogg diff --git a/sfx/weapons/staff/hit1.ogg b/sfx/weapons/staff/hit1.ogg Binary files differnew file mode 100644 index 00000000..76da7d17 --- /dev/null +++ b/sfx/weapons/staff/hit1.ogg diff --git a/sfx/weapons/staff/hit2.ogg b/sfx/weapons/staff/hit2.ogg Binary files differnew file mode 100644 index 00000000..c1c32c2d --- /dev/null +++ b/sfx/weapons/staff/hit2.ogg diff --git a/sfx/weapons/staff/hit3.ogg b/sfx/weapons/staff/hit3.ogg Binary files differnew file mode 100644 index 00000000..8d68997e --- /dev/null +++ b/sfx/weapons/staff/hit3.ogg diff --git a/sfx/weapons/staff/miss1.ogg b/sfx/weapons/staff/miss1.ogg Binary files differnew file mode 100644 index 00000000..a3fabf6e --- /dev/null +++ b/sfx/weapons/staff/miss1.ogg diff --git a/sfx/weapons/staff/miss2.ogg b/sfx/weapons/staff/miss2.ogg Binary files differnew file mode 100644 index 00000000..8f97cb20 --- /dev/null +++ b/sfx/weapons/staff/miss2.ogg diff --git a/sfx/weapons/staff/miss3.ogg b/sfx/weapons/staff/miss3.ogg Binary files differnew file mode 100644 index 00000000..4d6a3286 --- /dev/null +++ b/sfx/weapons/staff/miss3.ogg |
